[pypy-svn] r63274 - pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test
arigo at codespeak.net
arigo at codespeak.net
Tue Mar 24 12:15:13 CET 2009
Author: arigo
Date: Tue Mar 24 12:15:13 2009
New Revision: 63274
Modified:
pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_list_optimize.py
pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_optimize.py
pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_vable_optimize.py
Log:
Fix these three tests.
Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_list_optimize.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_list_optimize.py (original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_list_optimize.py Tue Mar 24 12:15:13 2009
@@ -45,8 +45,8 @@
spec.find_nodes()
spec.intersect_input_and_output()
spec.optimize_loop()
- assert spec.loop.inputargs == [A.l, A.e0]
- equaloplists(spec.loop.operations, [
+ assert spec.history.inputargs == [A.l, A.e0]
+ equaloplists(spec.history.operations, [
ResOperation(rop.SETARRAYITEM_GC, [A.l, ConstInt(0), A.e0], None, A.ad),
ResOperation(rop.JUMP, [A.l, A.e0], None)
])
@@ -74,8 +74,8 @@
spec.find_nodes()
spec.intersect_input_and_output()
spec.optimize_loop()
- assert spec.loop.inputargs == [B.l, B.e0]
- equaloplists(spec.loop.operations, [
+ assert spec.history.inputargs == [B.l, B.e0]
+ equaloplists(spec.history.operations, [
ResOperation(rop.INT_ADD, [B.e0, ConstInt(1)], B.e1),
ResOperation(rop.SETARRAYITEM_GC, [B.l, ConstInt(0), B.e1], None, B.ad),
ResOperation(-123, [B.e1], None),
Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_optimize.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_optimize.py (original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_optimize.py Tue Mar 24 12:15:13 2009
@@ -141,8 +141,8 @@
spec.find_nodes()
spec.intersect_input_and_output()
spec.optimize_loop()
- assert spec.loop.inputargs == [A.sum, A.v]
- equaloplists(spec.loop.operations, [
+ assert spec.history.inputargs == [A.sum, A.v]
+ equaloplists(spec.history.operations, [
ResOperation('int_sub', [A.v, ConstInt(1)], A.v2),
ResOperation('int_add', [A.sum, A.v], A.sum2),
ResOperation('jump', [A.sum2, A.v2], None),
@@ -189,8 +189,8 @@
spec.find_nodes()
spec.intersect_input_and_output()
spec.optimize_loop()
- assert spec.loop.inputargs == [B.sum, B.n1]
- equaloplists(spec.loop.operations, [
+ assert spec.history.inputargs == [B.sum, B.n1]
+ equaloplists(spec.history.operations, [
# guard_class is gone
ResOperation('escape', [B.n1], None),
ResOperation('getfield_gc', [B.n1], B.v, B.ofs_value),
@@ -244,8 +244,8 @@
spec.find_nodes()
spec.intersect_input_and_output()
spec.optimize_loop()
- assert spec.loop.inputargs == [C.sum, C.n1]
- equaloplists(spec.loop.operations, [
+ assert spec.history.inputargs == [C.sum, C.n1]
+ equaloplists(spec.history.operations, [
# guard_class is gone
ResOperation('escape', [C.n1], None), # <== escaping
ResOperation('getfield_gc', [C.n1], C.v, C.ofs_value),
@@ -303,15 +303,15 @@
spec.find_nodes()
spec.intersect_input_and_output()
spec.optimize_loop()
- assert spec.loop.inputargs == [E.sum, E.v]
- equaloplists(spec.loop.operations, [
+ assert spec.history.inputargs == [E.sum, E.v]
+ equaloplists(spec.history.operations, [
# guard_class is gone
ResOperation('int_sub', [E.v, ConstInt(1)], E.v2),
ResOperation('int_add', [E.sum, E.v], E.sum2),
ResOperation('guard_true', [E.v2], None),
ResOperation('jump', [E.sum2, E.v2], None),
])
- guard_op = spec.loop.operations[-2]
+ guard_op = spec.history.operations[-2]
assert guard_op.getopname() == 'guard_true'
_, n2 = guard_op.suboperations[-1].args
equaloplists(guard_op.suboperations, [
@@ -326,7 +326,7 @@
## spec.find_nodes()
## spec.intersect_input_and_output()
## spec.optimize_loop()
-## guard_op = spec.loop.operations[-2]
+## guard_op = spec.history.operations[-2]
## v_sum_b = BoxInt(13)
## v_v_b = BoxInt(14)
## history = History(cpu)
@@ -383,8 +383,8 @@
spec.intersect_input_and_output()
assert spec.nodes[F.n3].escaped
spec.optimize_loop()
- assert spec.loop.inputargs == [F.sum, F.v, F.n3]
- equaloplists(spec.loop.operations, [
+ assert spec.history.inputargs == [F.sum, F.v, F.n3]
+ equaloplists(spec.history.operations, [
ResOperation('int_sub', [F.v, ConstInt(1)], F.v2),
ResOperation('int_add', [F.sum, F.v], F.sum2),
ResOperation('oononnull', [F.n3], F.vbool3),
@@ -415,7 +415,7 @@
spec.find_nodes()
spec.intersect_input_and_output()
spec.optimize_loop()
- equaloplists(spec.loop.operations, F2.ops)
+ equaloplists(spec.history.operations, F2.ops)
# ____________________________________________________________
@@ -445,15 +445,15 @@
spec.find_nodes()
spec.intersect_input_and_output()
spec.optimize_loop()
- assert spec.loop.inputargs == [G.sum, G.v]
- equaloplists(spec.loop.operations, [
+ assert spec.history.inputargs == [G.sum, G.v]
+ equaloplists(spec.history.operations, [
# guard_class is gone
ResOperation('int_sub', [G.v, ConstInt(1)], G.v2),
ResOperation('int_add', [G.sum, G.v], G.sum2),
ResOperation('guard_true', [G.v2], None),
ResOperation('jump', [G.sum2, ConstInt(124)], None),
])
- guard_op = spec.loop.operations[-2]
+ guard_op = spec.history.operations[-2]
assert guard_op.getopname() == 'guard_true'
_, n2 = guard_op.suboperations[-1].args
equaloplists(guard_op.suboperations, [
@@ -578,9 +578,9 @@
spec.find_nodes()
spec.intersect_input_and_output()
spec.optimize_loop()
- v4 = spec.loop.operations[-1].args[-1]
- assert spec.loop.inputargs == [K0.sum, K0.n1, K0.v]
- equaloplists(spec.loop.operations, [
+ v4 = spec.history.operations[-1].args[-1]
+ assert spec.history.inputargs == [K0.sum, K0.n1, K0.v]
+ equaloplists(spec.history.operations, [
ResOperation('int_sub', [K0.v, ConstInt(1)], K0.v2),
ResOperation('int_add', [K0.sum, K0.v], K0.sum2),
ResOperation('int_add', [K0.sum2, K0.v], K0.sum3),
@@ -612,9 +612,9 @@
spec.find_nodes()
spec.intersect_input_and_output()
spec.optimize_loop()
- v4 = spec.loop.operations[-1].args[-1]
- assert spec.loop.inputargs == [K1.sum, K1.n1, K1.v]
- equaloplists(spec.loop.operations, [
+ v4 = spec.history.operations[-1].args[-1]
+ assert spec.history.inputargs == [K1.sum, K1.n1, K1.v]
+ equaloplists(spec.history.operations, [
ResOperation('int_sub', [K1.v, ConstInt(1)], K1.v2),
ResOperation('int_add', [K1.sum, K1.v], K1.sum2),
ResOperation('int_add', [K1.sum2, K1.sum], K1.sum3),
@@ -645,8 +645,8 @@
spec.find_nodes()
spec.intersect_input_and_output()
spec.optimize_loop()
- assert spec.loop.inputargs == [K.sum, K.n1, K.v]
- equaloplists(spec.loop.operations, [
+ assert spec.history.inputargs == [K.sum, K.n1, K.v]
+ equaloplists(spec.history.operations, [
ResOperation('int_sub', [K.v, ConstInt(1)], K.v2),
ResOperation('int_add', [K.sum, K.v], K.sum2),
ResOperation('int_add', [K.sum2, K.v], K.sum3),
@@ -676,8 +676,8 @@
spec.find_nodes()
spec.intersect_input_and_output()
spec.optimize_loop()
- assert spec.loop.inputargs == [L.sum, L.n1, L.v]
- equaloplists(spec.loop.operations, [
+ assert spec.history.inputargs == [L.sum, L.n1, L.v]
+ equaloplists(spec.history.operations, [
ResOperation('int_sub', [L.v, ConstInt(1)], L.v2),
ResOperation('int_add', [L.sum, L.v], L.sum2),
ResOperation('escape', [L.n1], None),
@@ -707,9 +707,9 @@
spec.find_nodes()
spec.intersect_input_and_output()
spec.optimize_loop()
- v4 = spec.loop.operations[-1].args[-1]
- assert spec.loop.inputargs == [M.sum, M.n1, M.v]
- equaloplists(spec.loop.operations, [
+ v4 = spec.history.operations[-1].args[-1]
+ assert spec.history.inputargs == [M.sum, M.n1, M.v]
+ equaloplists(spec.history.operations, [
ResOperation('int_sub', [M.v, ConstInt(1)], M.v2),
ResOperation('int_add', [M.sum, M.v], M.sum2),
ResOperation('escape', [M.n1], None),
@@ -738,9 +738,9 @@
spec.find_nodes()
spec.intersect_input_and_output()
spec.optimize_loop()
- v4 = spec.loop.operations[-1].args[-1]
- assert spec.loop.inputargs == [N.sum, N.n1, N.v]
- equaloplists(spec.loop.operations, [
+ v4 = spec.history.operations[-1].args[-1]
+ assert spec.history.inputargs == [N.sum, N.n1, N.v]
+ equaloplists(spec.history.operations, [
ResOperation('int_sub', [N.v, ConstInt(1)], N.v2),
ResOperation('int_add', [N.sum, N.v], N.sum2),
ResOperation('escape', [N.n1], None),
@@ -767,8 +767,8 @@
spec.find_nodes()
spec.intersect_input_and_output()
spec.optimize_loop()
- assert spec.loop.inputargs == []
- equaloplists(spec.loop.operations, [
+ assert spec.history.inputargs == []
+ equaloplists(spec.history.operations, [
ResOperation('escape', [], O1.n1),
# only the first guard_class is left
ResOperation('guard_class', [O1.n1, ConstAddr(node_vtable, cpu)],
@@ -797,8 +797,8 @@
spec.find_nodes()
spec.intersect_input_and_output()
spec.optimize_loop()
- assert spec.loop.inputargs == []
- equaloplists(spec.loop.operations, [
+ assert spec.history.inputargs == []
+ equaloplists(spec.history.operations, [
ResOperation('escape', [], O2.n1),
ResOperation('guard_class', [O2.n1, ConstAddr(node_vtable, cpu)],
None),
@@ -829,8 +829,8 @@
spec.find_nodes()
spec.intersect_input_and_output()
spec.optimize_loop()
- assert spec.loop.inputargs == []
- equaloplists(spec.loop.operations, [
+ assert spec.history.inputargs == []
+ equaloplists(spec.history.operations, [
ResOperation('escape', [], O3.n1),
ResOperation('guard_class', [O3.n1, ConstAddr(node_vtable, cpu)],
None),
@@ -868,4 +868,4 @@
# If it does, then aliasing is not correctly detected.
# It is ok to reorder just the 'getfield_gc[n1], n2' operation,
# but the three remaining getfields/setfields *must* be in that order.
- equaloplists(spec.loop.operations, P.ops)
+ equaloplists(spec.history.operations, P.ops)
Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_vable_optimize.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_vable_optimize.py (original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/test/test_vable_optimize.py Tue Mar 24 12:15:13 2009
@@ -119,8 +119,8 @@
spec.find_nodes()
spec.intersect_input_and_output()
spec.optimize_loop()
- assert spec.loop.inputargs == [A.sum, A.fr, A.v]
- equaloplists(spec.loop.operations, [
+ assert spec.history.inputargs == [A.sum, A.fr, A.v]
+ equaloplists(spec.history.operations, [
ResOperation('int_sub', [A.v, ConstInt(1)], A.v2),
ResOperation('int_add', [A.sum, A.v], A.sum2),
ResOperation('jump', [A.sum2, A.fr, A.v2], None),
More information about the Pypy-commit
mailing list