[pypy-commit] pypy optresult-unroll: fix jitlogparser tests
fijal
noreply at buildbot.pypy.org
Tue Sep 8 10:49:00 CEST 2015
Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: optresult-unroll
Changeset: r79526:4032080f53ea
Date: 2015-09-08 10:48 +0200
http://bitbucket.org/pypy/pypy/changeset/4032080f53ea/
Log: fix jitlogparser tests
diff --git a/pypy/module/__pypy__/__init__.py b/pypy/module/__pypy__/__init__.py
--- a/pypy/module/__pypy__/__init__.py
+++ b/pypy/module/__pypy__/__init__.py
@@ -116,6 +116,8 @@
# proper fix would be to use some llop that is only rendered by the
# JIT
#
+ if self.space.config.translation.fork_before == 'pyjitpl':
+ return
try:
from rpython.jit.backend import detect_cpu
model = detect_cpu.autodetect()
diff --git a/rpython/tool/jitlogparser/test/logtest.log b/rpython/tool/jitlogparser/test/logtest.log
--- a/rpython/tool/jitlogparser/test/logtest.log
+++ b/rpython/tool/jitlogparser/test/logtest.log
@@ -23,7 +23,7 @@
+179: i8 = int_add(i4, 1)
debug_merge_point(0, '<code object f. file 'x.py'. line 2> #28 STORE_FAST')
debug_merge_point(0, '<code object f. file 'x.py'. line 2> #31 JUMP_ABSOLUTE')
-+183: i10 = getfield_raw(40564608, descr=<SignedFieldDescr pypysig_long_struct.c_value 0>)
++183: i10 = getfield_raw_i(40564608, descr=<SignedFieldDescr pypysig_long_struct.c_value 0>)
+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)
diff --git a/rpython/tool/jitlogparser/test/logtest2.log b/rpython/tool/jitlogparser/test/logtest2.log
--- a/rpython/tool/jitlogparser/test/logtest2.log
+++ b/rpython/tool/jitlogparser/test/logtest2.log
@@ -118,19 +118,19 @@
[1cffd9b20d9f] {jit-log-opt-loop
# Loop 0 (<code object g, file 'x.py', line 8> #9 LOAD_FAST) : loop with 59 ops
[p0, p1]
-+110: p2 = getfield_gc(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_w_f_trace 128>)
-+124: p3 = getfield_gc(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_last_exception 80>)
-+128: p4 = getfield_gc(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_pycode 112>)
-+132: i5 = getfield_gc(p0, descr=<FieldU pypy.interpreter.pyframe.PyFrame.inst_is_being_profiled 142>)
-+140: p6 = getfield_gc(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_lastblock 96>)
-+144: i7 = getfield_gc(p0, descr=<FieldS pypy.interpreter.pyframe.PyFrame.inst_valuestackdepth 120>)
-+148: i8 = getfield_gc(p0, descr=<FieldS pypy.interpreter.pyframe.PyFrame.inst_last_instr 88>)
-+152: p9 = getfield_gc(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_locals_stack_w 104>)
-+156: p11 = getarrayitem_gc(p9, 0, descr=<ArrayP 8>)
-+160: p13 = getarrayitem_gc(p9, 1, descr=<ArrayP 8>)
-+164: p15 = getarrayitem_gc(p9, 2, descr=<ArrayP 8>)
-+168: p17 = getarrayitem_gc(p9, 3, descr=<ArrayP 8>)
-+172: p18 = getfield_gc(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_cells 40>)
++110: p2 = getfield_gc_r(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_w_f_trace 128>)
++124: p3 = getfield_gc_r(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_last_exception 80>)
++128: p4 = getfield_gc_r(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_pycode 112>)
++132: i5 = getfield_gc_i(p0, descr=<FieldU pypy.interpreter.pyframe.PyFrame.inst_is_being_profiled 142>)
++140: p6 = getfield_gc_r(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_lastblock 96>)
++144: i7 = getfield_gc_i(p0, descr=<FieldS pypy.interpreter.pyframe.PyFrame.inst_valuestackdepth 120>)
++148: i8 = getfield_gc_i(p0, descr=<FieldS pypy.interpreter.pyframe.PyFrame.inst_last_instr 88>)
++152: p9 = getfield_gc_r(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_locals_stack_w 104>)
++156: p11 = getarrayitem_gc_r(p9, 0, descr=<ArrayP 8>)
++160: p13 = getarrayitem_gc_r(p9, 1, descr=<ArrayP 8>)
++164: p15 = getarrayitem_gc_r(p9, 2, descr=<ArrayP 8>)
++168: p17 = getarrayitem_gc_r(p9, 3, descr=<ArrayP 8>)
++172: p18 = getfield_gc_r(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_cells 40>)
+172: label(p0, p1, p2, p3, p4, i5, p6, i7, i8, p11, p13, p15, p17, descr=TargetToken(140003404595232))
debug_merge_point(0, 0, '<code object g. file 'x.py'. line 8> #9 LOAD_FAST')
+251: guard_value(i7, 2, descr=<Guard0x7f551532e020>) [i7, p1, p0, p2, p3, p4, i5, p6, i8, p11, p13, p15, p17]
@@ -139,7 +139,7 @@
debug_merge_point(0, 0, '<code object g. file 'x.py'. line 8> #12 LOAD_CONST')
+289: guard_value(p4, ConstPtr(ptr22), descr=<Guard0x7f551538c548>) [p1, p0, p4, p2, p3, p6, p11, p13, p17]
debug_merge_point(0, 0, '<code object g. file 'x.py'. line 8> #15 COMPARE_OP')
-+308: i23 = getfield_gc_pure(p11, descr=<FieldS pypy.objspace.std.intobject.W_IntObject.inst_intval 8>)
++308: i23 = getfield_gc_pure_i(p11, descr=<FieldS pypy.objspace.std.intobject.W_IntObject.inst_intval 8>)
+312: i25 = int_lt(i23, 10)
guard_true(i25, descr=<Guard0x7f551538c4d0>) [p1, p0, p11, p2, p3, p6, p13]
debug_merge_point(0, 0, '<code object g. file 'x.py'. line 8> #18 POP_JUMP_IF_FALSE')
@@ -152,7 +152,7 @@
debug_merge_point(0, 0, '<code object g. file 'x.py'. line 8> #34 STORE_FAST')
debug_merge_point(0, 0, '<code object g. file 'x.py'. line 8> #37 JUMP_ABSOLUTE')
+327: guard_not_invalidated(descr=<Guard0x7f551538c458>) [p1, p0, p2, p3, p6, i27]
-+327: i29 = getfield_raw(51804288, descr=<FieldS pypysig_long_struct.c_value 0>)
++327: i29 = getfield_raw_i(51804288, descr=<FieldS pypysig_long_struct.c_value 0>)
+335: i31 = int_lt(i29, 0)
guard_false(i31, descr=<Guard0x7f551538c3e0>) [p1, p0, p2, p3, p6, i27]
debug_merge_point(0, 0, '<code object g. file 'x.py'. line 8> #9 LOAD_FAST')
@@ -172,7 +172,7 @@
debug_merge_point(0, 0, '<code object g. file 'x.py'. line 8> #34 STORE_FAST')
debug_merge_point(0, 0, '<code object g. file 'x.py'. line 8> #37 JUMP_ABSOLUTE')
+390: guard_not_invalidated(descr=<Guard0x7f551538c2f0>) [p1, p0, p2, p3, p6, i33, None]
-+390: i35 = getfield_raw(51804288, descr=<FieldS pypysig_long_struct.c_value 0>)
++390: i35 = getfield_raw_i(51804288, descr=<FieldS pypysig_long_struct.c_value 0>)
+398: i36 = int_lt(i35, 0)
guard_false(i36, descr=<Guard0x7f551538c278>) [p1, p0, p2, p3, p6, i33, None]
debug_merge_point(0, 0, '<code object g. file 'x.py'. line 8> #9 LOAD_FAST')
@@ -262,32 +262,32 @@
[1cffd9ed0c35] {jit-log-opt-loop
# Loop 1 (<code object h, file 'x.py', line 14> #13 FOR_ITER) : loop with 82 ops
[p0, p1]
-+110: p2 = getfield_gc(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_w_f_trace 128>)
-+124: p3 = getfield_gc(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_last_exception 80>)
-+128: p4 = getfield_gc(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_pycode 112>)
-+132: i5 = getfield_gc(p0, descr=<FieldU pypy.interpreter.pyframe.PyFrame.inst_is_being_profiled 142>)
-+140: p6 = getfield_gc(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_lastblock 96>)
-+144: i7 = getfield_gc(p0, descr=<FieldS pypy.interpreter.pyframe.PyFrame.inst_valuestackdepth 120>)
-+148: i8 = getfield_gc(p0, descr=<FieldS pypy.interpreter.pyframe.PyFrame.inst_last_instr 88>)
-+152: p9 = getfield_gc(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_locals_stack_w 104>)
-+156: p11 = getarrayitem_gc(p9, 0, descr=<ArrayP 8>)
-+160: p13 = getarrayitem_gc(p9, 1, descr=<ArrayP 8>)
-+164: p15 = getarrayitem_gc(p9, 2, descr=<ArrayP 8>)
-+168: p17 = getarrayitem_gc(p9, 3, descr=<ArrayP 8>)
-+172: p18 = getfield_gc(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_cells 40>)
++110: p2 = getfield_gc_r(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_w_f_trace 128>)
++124: p3 = getfield_gc_r(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_last_exception 80>)
++128: p4 = getfield_gc_r(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_pycode 112>)
++132: i5 = getfield_gc_i(p0, descr=<FieldU pypy.interpreter.pyframe.PyFrame.inst_is_being_profiled 142>)
++140: p6 = getfield_gc_r(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_lastblock 96>)
++144: i7 = getfield_gc_i(p0, descr=<FieldS pypy.interpreter.pyframe.PyFrame.inst_valuestackdepth 120>)
++148: i8 = getfield_gc_i(p0, descr=<FieldS pypy.interpreter.pyframe.PyFrame.inst_last_instr 88>)
++152: p9 = getfield_gc_r(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_locals_stack_w 104>)
++156: p11 = getarrayitem_gc_r(p9, 0, descr=<ArrayP 8>)
++160: p13 = getarrayitem_gc_r(p9, 1, descr=<ArrayP 8>)
++164: p15 = getarrayitem_gc_r(p9, 2, descr=<ArrayP 8>)
++168: p17 = getarrayitem_gc_r(p9, 3, descr=<ArrayP 8>)
++172: p18 = getfield_gc_r(p0, descr=<FieldP pypy.interpreter.pyframe.PyFrame.inst_cells 40>)
+172: label(p0, p1, p2, p3, p4, i5, p6, i7, i8, p11, p13, p15, p17, descr=TargetToken(140003443320224))
debug_merge_point(0, 0, '<code object h. file 'x.py'. line 14> #13 FOR_ITER')
+244: guard_value(i7, 3, descr=<Guard0x7f55177f96a0>) [i7, p1, p0, p2, p3, p4, i5, p6, i8, p11, p13, p15, p17]
+254: guard_class(p15, 26177128, descr=<Guard0x7f5517834a70>) [p1, p0, p15, p2, p3, p4, i5, p6, p11, p13, p17]
-+266: p21 = getfield_gc(p15, descr=<FieldP pypy.objspace.std.iterobject.W_AbstractSeqIterObject.inst_w_seq 16>)
++266: p21 = getfield_gc_r(p15, descr=<FieldP pypy.objspace.std.iterobject.W_AbstractSeqIterObject.inst_w_seq 16>)
+270: guard_nonnull(p21, descr=<Guard0x7f55178349f8>) [p1, p0, p15, p21, p2, p3, p4, i5, p6, p11, p13, p17]
-+279: i22 = getfield_gc(p15, descr=<FieldS pypy.objspace.std.iterobject.W_AbstractSeqIterObject.inst_index 8>)
-+283: p23 = getfield_gc(p21, descr=<FieldP pypy.objspace.std.listobject.W_ListObject.inst_strategy 16>)
++279: i22 = getfield_gc_i(p15, descr=<FieldS pypy.objspace.std.iterobject.W_AbstractSeqIterObject.inst_index 8>)
++283: p23 = getfield_gc_r(p21, descr=<FieldP pypy.objspace.std.listobject.W_ListObject.inst_strategy 16>)
+287: guard_class(p23, 26517736, descr=<Guard0x7f5517834980>) [p1, p0, p15, i22, p23, p21, p2, p3, p4, i5, p6, p11, p13, p17]
-+299: p25 = getfield_gc(p21, descr=<FieldP pypy.objspace.std.listobject.W_ListObject.inst_lstorage 8>)
-+303: i26 = getfield_gc_pure(p25, descr=<FieldS tuple3.item0 8>)
-+307: i27 = getfield_gc_pure(p25, descr=<FieldS tuple3.item1 16>)
-+311: i28 = getfield_gc_pure(p25, descr=<FieldS tuple3.item2 24>)
++299: p25 = getfield_gc_r(p21, descr=<FieldP pypy.objspace.std.listobject.W_ListObject.inst_lstorage 8>)
++303: i26 = getfield_gc_pure_i(p25, descr=<FieldS tuple3.item0 8>)
++307: i27 = getfield_gc_pure_i(p25, descr=<FieldS tuple3.item1 16>)
++311: i28 = getfield_gc_pure_i(p25, descr=<FieldS tuple3.item2 24>)
+315: i30 = int_lt(i22, 0)
guard_false(i30, descr=<Guard0x7f5517834908>) [p1, p0, p15, i22, i28, i27, i26, p2, p3, p4, i5, p6, p11, p13, p17]
+325: i31 = int_ge(i22, i28)
@@ -300,20 +300,20 @@
debug_merge_point(0, 0, '<code object h. file 'x.py'. line 14> #16 STORE_FAST')
debug_merge_point(0, 0, '<code object h. file 'x.py'. line 14> #19 LOAD_FAST')
debug_merge_point(0, 0, '<code object h. file 'x.py'. line 14> #22 LIST_APPEND')
-+365: p37 = getfield_gc(p13, descr=<FieldP pypy.objspace.std.listobject.W_ListObject.inst_strategy 16>)
++365: p37 = getfield_gc_r(p13, descr=<FieldP pypy.objspace.std.listobject.W_ListObject.inst_strategy 16>)
+369: guard_class(p37, 26402184, descr=<Guard0x7f55178347a0>) [p1, p0, p37, p13, p2, p3, p4, p6, p15, i33]
-+382: p39 = getfield_gc(p13, descr=<FieldP pypy.objspace.std.listobject.W_ListObject.inst_lstorage 8>)
-+386: i40 = getfield_gc(p39, descr=<FieldS list.length 8>)
++382: p39 = getfield_gc_r(p13, descr=<FieldP pypy.objspace.std.listobject.W_ListObject.inst_lstorage 8>)
++386: i40 = getfield_gc_i(p39, descr=<FieldS list.length 8>)
+390: i42 = int_add(i40, 1)
-+394: p43 = getfield_gc(p39, descr=<FieldP list.items 16>)
++394: p43 = getfield_gc_r(p39, descr=<FieldP list.items 16>)
+394: i44 = arraylen_gc(p43, descr=<ArrayS 8>)
-+394: call(ConstClass(_ll_list_resize_ge_trampoline__v672___simple_call__function__), p39, i42, descr=<Callv 0 ri EF=4>)
++394: call_n(ConstClass(_ll_list_resize_ge_trampoline__v672___simple_call__function__), p39, i42, descr=<Callv 0 ri EF=4>)
+506: guard_no_exception(descr=<Guard0x7f5517834728>) [p1, p0, i40, i33, p39, p2, p3, p4, p6, p13, p15, None]
-+521: p47 = getfield_gc(p39, descr=<FieldP list.items 16>)
++521: p47 = getfield_gc_r(p39, descr=<FieldP list.items 16>)
+532: setarrayitem_gc(p47, i40, i33, descr=<ArrayS 8>)
debug_merge_point(0, 0, '<code object h. file 'x.py'. line 14> #25 JUMP_ABSOLUTE')
+551: guard_not_invalidated(descr=<Guard0x7f55178346b0>) [p1, p0, p2, p3, p4, p6, p13, p15, i33]
-+551: i49 = getfield_raw(51804288, descr=<FieldS pypysig_long_struct.c_value 0>)
++551: i49 = getfield_raw_i(51804288, descr=<FieldS pypysig_long_struct.c_value 0>)
+559: i51 = int_lt(i49, 0)
guard_false(i51, descr=<Guard0x7f5517834638>) [p1, p0, p2, p3, p4, p6, p13, p15, i33]
+569: guard_value(p4, ConstPtr(ptr52), descr=<Guard0x7f55178345c0>) [p1, p0, p4, p2, p3, p6, p13, p15, i33]
@@ -328,18 +328,18 @@
debug_merge_point(0, 0, '<code object h. file 'x.py'. line 14> #16 STORE_FAST')
debug_merge_point(0, 0, '<code object h. file 'x.py'. line 14> #19 LOAD_FAST')
debug_merge_point(0, 0, '<code object h. file 'x.py'. line 14> #22 LIST_APPEND')
-+659: i57 = getfield_gc(p39, descr=<FieldS list.length 8>)
++659: i57 = getfield_gc_i(p39, descr=<FieldS list.length 8>)
+663: i58 = int_add(i57, 1)
-+667: p59 = getfield_gc(p39, descr=<FieldP list.items 16>)
++667: p59 = getfield_gc_r(p39, descr=<FieldP list.items 16>)
+667: i60 = arraylen_gc(p59, descr=<ArrayS 8>)
-+667: call(ConstClass(_ll_list_resize_ge_trampoline__v672___simple_call__function__), p39, i58, descr=<Callv 0 ri EF=4>)
++667: call_n(ConstClass(_ll_list_resize_ge_trampoline__v672___simple_call__function__), p39, i58, descr=<Callv 0 ri EF=4>)
+744: setfield_gc(p15, i56, descr=<FieldS pypy.objspace.std.iterobject.W_AbstractSeqIterObject.inst_index 8>)
+755: guard_no_exception(descr=<Guard0x7f55178344d0>) [p1, p0, i57, i55, p39, p2, p3, p6, p13, p15, None]
-+770: p61 = getfield_gc(p39, descr=<FieldP list.items 16>)
++770: p61 = getfield_gc_r(p39, descr=<FieldP list.items 16>)
+781: setarrayitem_gc(p61, i57, i55, descr=<ArrayS 8>)
debug_merge_point(0, 0, '<code object h. file 'x.py'. line 14> #25 JUMP_ABSOLUTE')
+793: guard_not_invalidated(descr=<Guard0x7f5517834458>) [p1, p0, p2, p3, p6, p13, p15, i55, None]
-+793: i62 = getfield_raw(51804288, descr=<FieldS pypysig_long_struct.c_value 0>)
++793: i62 = getfield_raw_i(51804288, descr=<FieldS pypysig_long_struct.c_value 0>)
+801: i63 = int_lt(i62, 0)
guard_false(i63, descr=<Guard0x7f55178343e0>) [p1, p0, p2, p3, p6, p13, p15, i55, None]
debug_merge_point(0, 0, '<code object h. file 'x.py'. line 14> #13 FOR_ITER')
diff --git a/rpython/tool/jitlogparser/test/test_parser.py b/rpython/tool/jitlogparser/test/test_parser.py
--- a/rpython/tool/jitlogparser/test/test_parser.py
+++ b/rpython/tool/jitlogparser/test/test_parser.py
@@ -16,7 +16,7 @@
[i7]
i9 = int_lt(i7, 1003)
guard_true(i9, descr=<Guard0x2>) []
- i13 = getfield_raw(151937600, descr=<SignedFieldDescr pypysig_long_struct.c_value 0>)
+ i13 = getfield_raw_i(151937600, descr=<SignedFieldDescr pypysig_long_struct.c_value 0>)
''').operations
assert len(ops) == 3
assert ops[0].name == 'int_lt'
@@ -26,7 +26,7 @@
assert ops[0].repr() == 'i9 = int_lt(i7, 1003)'
assert ops[2].descr is not None
assert len(ops[2].args) == 1
- assert ops[-1].repr() == 'i13 = getfield_raw(151937600, descr=<SignedFieldDescr pypysig_long_struct.c_value 0>)'
+ assert ops[-1].repr() == 'i13 = getfield_raw_i(151937600, descr=<SignedFieldDescr pypysig_long_struct.c_value 0>)'
def test_parse_non_code():
ops = parse('''
@@ -60,7 +60,7 @@
ops = parse("""
[]
debug_merge_point(0, 0, '<code object inlined_call. file 'source.py'. line 12> #28 CALL_FUNCTION')
- i18 = getfield_gc(p0, descr=<BoolFieldDescr pypy.interpreter.pyframe.PyFrame.inst_is_being_profiled 89>)
+ i18 = getfield_gc_i(p0, descr=<BoolFieldDescr pypy.interpreter.pyframe.PyFrame.inst_is_being_profiled 89>)
debug_merge_point(1, 1, '<code object inner. file 'source.py'. line 9> #0 LOAD_FAST')
debug_merge_point(1, 1, '<code object inner. file 'source.py'. line 9> #3 LOAD_CONST')
debug_merge_point(1, 1, '<code object inner. file 'source.py'. line 9> #7 RETURN_VALUE')
@@ -146,8 +146,8 @@
def test_reassign_loops():
main = parse('''
- [v0]
- guard_false(v0, descr=<Guard0x18>) []
+ [i0]
+ guard_false(i0, descr=<Guard0x18>) []
''')
main.count = 10
bridge = parse('''
@@ -168,9 +168,9 @@
def test_adjust_bridges():
main = parse('''
- [v0]
- guard_false(v0, descr=<Guard0x1a>)
- guard_true(v0, descr=<Guard0x5>)
+ [i0]
+ guard_false(i0, descr=<Guard0x1a>)
+ guard_true(i0, descr=<Guard0x5>)
''')
bridge = parse('''
# bridge out of Guard 0x1a
@@ -204,7 +204,7 @@
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')
- +183: i10 = getfield_raw(40564608, descr=<SignedFieldDescr pypysig_long_struct.c_value 0>)
+ +183: i10 = getfield_raw_i(40564608, descr=<SignedFieldDescr pypysig_long_struct.c_value 0>)
+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)
@@ -233,7 +233,7 @@
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=<Guard0x86>) [i1, i0, p2]
-+124: p4 = getfield_gc(p2, descr=<FieldP rpython.rlib.rsre.rsre_core.StrMatchContext.inst__string 36>)
++124: p4 = getfield_gc_r(p2, descr=<FieldP rpython.rlib.rsre.rsre_core.StrMatchContext.inst__string 36>)
+128: i5 = strgetitem(p4, i0)
+136: i7 = int_eq(40, i5)
+152: i9 = int_eq(41, i5)
@@ -311,11 +311,11 @@
i9 = int_lt(i7, 1003)
label(i9, descr=grrr)
guard_true(i9, descr=<Guard0x2>) []
- i13 = getfield_raw(151937600, descr=<SignedFieldDescr pypysig_long_struct.c_value 0>)
+ i13 = getfield_raw_i(151937600, descr=<SignedFieldDescr pypysig_long_struct.c_value 0>)
label(i13, descr=asb)
i19 = int_lt(i13, 1003)
guard_true(i19, descr=<Guard0x2>) []
- i113 = getfield_raw(151937600, descr=<SignedFieldDescr pypysig_long_struct.c_value 0>)
+ i113 = getfield_raw_i(151937600, descr=<SignedFieldDescr pypysig_long_struct.c_value 0>)
''')
loop.comment = 'Loop 0'
parts = split_trace(loop)
@@ -332,11 +332,11 @@
i9 = int_lt(i7, 1003)
label(i9, descr=grrr)
guard_true(i9, descr=<Guard0xaf>) []
- i13 = getfield_raw(151937600, descr=<SignedFieldDescr pypysig_long_struct.c_value 0>)
+ i13 = getfield_raw_i(151937600, descr=<SignedFieldDescr pypysig_long_struct.c_value 0>)
label(i13, descr=asb)
i19 = int_lt(i13, 1003)
guard_true(i19, descr=<Guard0x3>) []
- i113 = getfield_raw(151937600, descr=<SignedFieldDescr pypysig_long_struct.c_value 0>)
+ i113 = getfield_raw_i(151937600, descr=<SignedFieldDescr pypysig_long_struct.c_value 0>)
''')
bridge = parse('''
# bridge out of Guard 0xaf with 1 ops
More information about the pypy-commit
mailing list