Author: Maciej Fijalkowski <[email protected]>
Branch:
Changeset: r62531:fb6f326f73df
Date: 2013-03-19 17:55 -0700
http://bitbucket.org/pypy/pypy/changeset/fb6f326f73df/
Log: just to make sure
diff --git a/pypy/tool/jitlogparser/test/test_parser.py
b/pypy/tool/jitlogparser/test/test_parser.py
--- a/pypy/tool/jitlogparser/test/test_parser.py
+++ b/pypy/tool/jitlogparser/test/test_parser.py
@@ -14,7 +14,7 @@
ops = parse('''
[i7]
i9 = int_lt(i7, 1003)
- guard_true(i9, descr=<Guard2>) []
+ guard_true(i9, descr=<Guard0x2>) []
i13 = getfield_raw(151937600, descr=<SignedFieldDescr
pypysig_long_struct.c_value 0>)
''').operations
assert len(ops) == 3
@@ -137,7 +137,7 @@
ops = parse("""
[p6, p1]
debug_merge_point(0, 0, '<code object h. file '%(fname)s'. line 11> #17
FOR_ITER')
- guard_class(p6, 144264192, descr=<Guard2>)
+ guard_class(p6, 144264192, descr=<Guard0x2>)
p12 = getfield_gc(p6, descr=<GcPtrFieldDescr
pypy.objspace.std.iterobject.W_AbstractSeqIterObject.inst_w_seq 12>)
""" % locals())
res = Function.from_operations(ops.operations, LoopStorage())
@@ -146,7 +146,7 @@
def test_reassign_loops():
main = parse('''
[v0]
- guard_false(v0, descr=<Guard18>) []
+ guard_false(v0, descr=<Guard0x18>) []
''')
main.count = 10
bridge = parse('''
@@ -168,8 +168,8 @@
def test_adjust_bridges():
main = parse('''
[v0]
- guard_false(v0, descr=<Guard1a>)
- guard_true(v0, descr=<Guard5>)
+ guard_false(v0, descr=<Guard0x1a>)
+ guard_true(v0, descr=<Guard0x5>)
''')
bridge = parse('''
# bridge out of Guard 0x1a
@@ -198,7 +198,7 @@
[p0, p1, p2, p3, i4]
debug_merge_point(0, 0, '<code object f. file 'x.py'. line 2> #15
COMPARE_OP')
+166: i6 = int_lt(i4, 10000)
- guard_true(i6, descr=<Guard3>) [p1, p0, p2, p3, i4]
+ guard_true(i6, descr=<Guard0x3>) [p1, p0, p2, p3, i4]
debug_merge_point(0, 0, '<code object f. file 'x.py'. line 2> #27
INPLACE_ADD')
+179: i8 = int_add(i4, 1)
debug_merge_point(0, 0, '<code object f. file 'x.py'. line 2> #31
JUMP_ABSOLUTE')
@@ -206,7 +206,7 @@
+191: i12 = int_sub(i10, 1)
+195: setfield_raw(40564608, i12, descr=<SignedFieldDescr
pypysig_long_struct.c_value 0>)
+203: i14 = int_lt(i12, 0)
- guard_false(i14, descr=<Guard4>) [p1, p0, p2, p3, i8, None]
+ guard_false(i14, descr=<Guard0x4>) [p1, p0, p2, p3, i8, None]
debug_merge_point(0, '<code object f. file 'x.py'. line 2> #9 LOAD_FAST')
+213: jump(p0, p1, p2, p3, i8, descr=<Loop0>)
+218: --end of the loop--""", backend_dump=backend_dump,
@@ -228,7 +228,7 @@
+88: label(i0, i1, p2, descr=TargetToken(1081858608))
debug_merge_point(0, 're StrMatchIn at 92 [17. 4. 0. 20. 393237. 21. 0. 29. 9.
1. 65535. 15. 4. 9. 3. 0. 1. 21. 1. 29. 9. 1. 65535. 15. 4. 9. 2. 0. 1. 1...')
+116: i3 = int_lt(i0, i1)
-guard_true(i3, descr=<Guard86>) [i1, i0, p2]
+guard_true(i3, descr=<Guard0x86>) [i1, i0, p2]
+124: p4 = getfield_gc(p2, descr=<FieldP
rpython.rlib.rsre.rsre_core.StrMatchContext.inst__string 36>)
+128: i5 = strgetitem(p4, i0)
+136: i7 = int_eq(40, i5)
@@ -241,13 +241,13 @@
+204: i18 = int_is_true(i17)
+216: i19 = int_or(i10, i18)
+220: i20 = int_is_true(i19)
-guard_false(i20, descr=<Guard87>) [i1, i0, p2]
+guard_false(i20, descr=<Guard0x87>) [i1, i0, p2]
+228: i22 = int_add(i0, 1)
debug_merge_point(0, 're StrMatchIn at 92 [17. 4. 0. 20. 393237. 21. 0. 29. 9.
1. 65535. 15. 4. 9. 3. 0. 1. 21. 1. 29. 9. 1. 65535. 15. 4. 9. 2. 0. 1. 1...')
+232: label(i22, i1, p2, p4, descr=TargetToken(1081858656))
debug_merge_point(0, 're StrMatchIn at 92 [17. 4. 0. 20. 393237. 21. 0. 29. 9.
1. 65535. 15. 4. 9. 3. 0. 1. 21. 1. 29. 9. 1. 65535. 15. 4. 9. 2. 0. 1. 1...')
+264: i23 = int_lt(i22, i1)
-guard_true(i23, descr=<Guard88>) [i1, i22, p2]
+guard_true(i23, descr=<Guard0x88>) [i1, i22, p2]
+272: i24 = strgetitem(p4, i22)
+280: i25 = int_eq(40, i24)
+296: i26 = int_eq(41, i24)
@@ -259,7 +259,7 @@
+348: i32 = int_is_true(i31)
+360: i33 = int_or(i27, i32)
+364: i34 = int_is_true(i33)
-guard_false(i34, descr=<Guard8a>) [i1, i22, p2]
+guard_false(i34, descr=<Guard0x8a>) [i1, i22, p2]
+372: i35 = int_add(i22, 1)
debug_merge_point(0, 're StrMatchIn at 92 [17. 4. 0. 20. 393237. 21. 0. 29. 9.
1. 65535. 15. 4. 9. 3. 0. 1. 21. 1. 29. 9. 1. 65535. 15. 4. 9. 2. 0. 1. 1...')
+376: jump(i35, i1, p2, p4, descr=TargetToken(1081858656))
@@ -300,11 +300,11 @@
[i7]
i9 = int_lt(i7, 1003)
label(i9, descr=grrr)
- guard_true(i9, descr=<Guard2>) []
+ guard_true(i9, descr=<Guard0x2>) []
i13 = getfield_raw(151937600, descr=<SignedFieldDescr
pypysig_long_struct.c_value 0>)
label(i13, descr=asb)
i19 = int_lt(i13, 1003)
- guard_true(i19, descr=<Guard2>) []
+ guard_true(i19, descr=<Guard0x2>) []
i113 = getfield_raw(151937600, descr=<SignedFieldDescr
pypysig_long_struct.c_value 0>)
''')
loop.comment = 'Loop 0'
@@ -321,11 +321,11 @@
[i7]
i9 = int_lt(i7, 1003)
label(i9, descr=grrr)
- guard_true(i9, descr=<Guardaf>) []
+ guard_true(i9, descr=<Guard0xaf>) []
i13 = getfield_raw(151937600, descr=<SignedFieldDescr
pypysig_long_struct.c_value 0>)
label(i13, descr=asb)
i19 = int_lt(i13, 1003)
- guard_true(i19, descr=<Guard3>) []
+ guard_true(i19, descr=<Guard0x3>) []
i113 = getfield_raw(151937600, descr=<SignedFieldDescr
pypysig_long_struct.c_value 0>)
''')
bridge = parse('''
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit