Author: David Schneider <[email protected]>
Branch:
Changeset: r62726:6a0ae7b3637f
Date: 2013-03-24 13:32 +0200
http://bitbucket.org/pypy/pypy/changeset/6a0ae7b3637f/
Log: fix even more tests
diff --git a/rpython/jit/backend/arm/test/test_generated.py
b/rpython/jit/backend/arm/test/test_generated.py
--- a/rpython/jit/backend/arm/test/test_generated.py
+++ b/rpython/jit/backend/arm/test/test_generated.py
@@ -36,19 +36,20 @@
ResOperation(rop.INT_SUB, [ConstInt(-1073741824), v7], v11),
ResOperation(rop.INT_GE, [v3, ConstInt(23)], v12),
ResOperation(rop.GUARD_TRUE, [v12], None, descr=faildescr1),
- ResOperation(rop.FINISH, [v9, v6, v10, v2, v8, v5, v1, v4], None,
descr=faildescr2),
+ ResOperation(rop.GUARD_FALSE, [v1], None, descr=faildescr2),
]
looptoken = JitCellToken()
operations[2].setfailargs([v12, v8, v3, v2, v1, v11])
+ operations[3].setfailargs([v9, v6, v10, v2, v8, v5, v1, v4])
cpu.compile_loop(inputargs, operations, looptoken)
args = [-12 , -26 , -19 , 7 , -5 , -24 , -37 , 62 , 9 , 12]
- op = cpu.execute_token(looptoken, *args)
- assert cpu.get_latest_value_int(0) == 0
- assert cpu.get_latest_value_int(1) == 62
- assert cpu.get_latest_value_int(2) == -19
- assert cpu.get_latest_value_int(3) == -26
- assert cpu.get_latest_value_int(4) == -12
- assert cpu.get_latest_value_int(5) == -1073741787
+ deadframe = cpu.execute_token(looptoken, *args)
+ assert cpu.get_int_value(deadframe, 0) == 0
+ assert cpu.get_int_value(deadframe, 1) == 62
+ assert cpu.get_int_value(deadframe, 2) == -19
+ assert cpu.get_int_value(deadframe, 3) == -26
+ assert cpu.get_int_value(deadframe, 4) == -12
+ assert cpu.get_int_value(deadframe, 5) == -1073741787
def test_overflow(self):
faildescr1 = BasicFailDescr(1)
@@ -86,21 +87,22 @@
ResOperation(rop.UINT_GT, [v15, v5], v17),
ResOperation(rop.UINT_LE, [ConstInt(-9), v13], v18),
ResOperation(rop.GUARD_FALSE, [v13], None, descr=faildescr2),
- ResOperation(rop.FINISH, [v7, v1, v2], None, descr=faildescr3),
+ ResOperation(rop.GUARD_FALSE, [v1], None, descr=faildescr3),
]
operations[2].setfailargs([v10, v6])
operations[9].setfailargs([v15, v7, v10, v18, v4, v17, v1])
+ operations[-1].setfailargs([v7, v1, v2])
looptoken = JitCellToken()
cpu.compile_loop(inputargs, operations, looptoken)
args = [16 , 5 , 5 , 16 , 46 , 6 , 63 , 39 , 78 , 0]
- op = cpu.execute_token(looptoken, *args)
- assert cpu.get_latest_value_int(0) == 105
- assert cpu.get_latest_value_int(1) == 63
- assert cpu.get_latest_value_int(2) == 0
- assert cpu.get_latest_value_int(3) == 0
- assert cpu.get_latest_value_int(4) == 16
- assert cpu.get_latest_value_int(5) == 1
- assert cpu.get_latest_value_int(6) == 16
+ deadframe = cpu.execute_token(looptoken, *args)
+ assert cpu.get_int_value(deadframe, 0) == 105
+ assert cpu.get_int_value(deadframe, 1) == 63
+ assert cpu.get_int_value(deadframe, 2) == 0
+ assert cpu.get_int_value(deadframe, 3) == 0
+ assert cpu.get_int_value(deadframe, 4) == 16
+ assert cpu.get_int_value(deadframe, 5) == 1
+ assert cpu.get_int_value(deadframe, 6) == 16
def test_sub_with_neg_const_first_arg(self):
faildescr1 = BasicFailDescr(1)
@@ -128,20 +130,22 @@
ResOperation(rop.GUARD_NO_OVERFLOW, [], None, descr=faildescr1),
ResOperation(rop.INT_IS_ZERO, [v12], tmp13),
ResOperation(rop.GUARD_TRUE, [tmp13], None, descr=faildescr2),
- ResOperation(rop.FINISH, [v5, v2, v1, v10, v3, v8, v4, v6], None,
descr=faildescr3)
+ ResOperation(rop.GUARD_FALSE, [v1], None, descr=faildescr3)
]
operations[2].setfailargs([v8, v3])
operations[4].setfailargs([v2, v12, v1, v3, v4])
+ operations[-1].setfailargs([v5, v2, v1, v10, v3, v8, v4, v6])
+
looptoken = JitCellToken()
cpu.compile_loop(inputargs, operations, looptoken)
args = [-5 , 24 , 46 , -15 , 13 , -8 , 0 , -6 , 6 , 6]
- op = cpu.execute_token(looptoken, *args)
- assert op.identifier == 2
- assert cpu.get_latest_value_int(0) == 24
- assert cpu.get_latest_value_int(1) == -32
- assert cpu.get_latest_value_int(2) == -5
- assert cpu.get_latest_value_int(3) == 46
- assert cpu.get_latest_value_int(4) == -15
+ deadframe = cpu.execute_token(looptoken, *args)
+ assert cpu.get_latest_descr(deadframe).identifier == 2
+ assert cpu.get_int_value(deadframe, 0) == 24
+ assert cpu.get_int_value(deadframe, 1) == -32
+ assert cpu.get_int_value(deadframe, 2) == -5
+ assert cpu.get_int_value(deadframe, 3) == 46
+ assert cpu.get_int_value(deadframe, 4) == -15
def test_tempbox_spilling_in_sub(self):
faildescr1 = BasicFailDescr(1)
@@ -171,20 +175,21 @@
ResOperation(rop.INT_IS_TRUE, [v3], v14),
ResOperation(rop.INT_SUB_OVF, [v3, ConstInt(-95)], v15),
ResOperation(rop.GUARD_NO_OVERFLOW, [], None, descr=faildescr1),
- ResOperation(rop.FINISH, [v8, v2, v6, v5, v7, v1, v10], None,
descr=faildescr2),
+ ResOperation(rop.GUARD_FALSE, [v1], None, descr=faildescr2),
]
operations[5].setfailargs([])
+ operations[-1].setfailargs([v8, v2, v6, v5, v7, v1, v10])
looptoken = JitCellToken()
cpu.compile_loop(inputargs, operations, looptoken)
args = [19 , -3 , -58 , -7 , 12 , 22 , -54 , -29 , -19 , -64]
- op = cpu.execute_token(looptoken, *args)
- assert cpu.get_latest_value_int(0) == -29
- assert cpu.get_latest_value_int(1) == -3
- assert cpu.get_latest_value_int(2) == 22
- assert cpu.get_latest_value_int(3) == 12
- assert cpu.get_latest_value_int(4) == -54
- assert cpu.get_latest_value_int(5) == 19
- assert cpu.get_latest_value_int(6) == -64
+ deadframe = cpu.execute_token(looptoken, *args)
+ assert cpu.get_int_value(deadframe, 0) == -29
+ assert cpu.get_int_value(deadframe, 1) == -3
+ assert cpu.get_int_value(deadframe, 2) == 22
+ assert cpu.get_int_value(deadframe, 3) == 12
+ assert cpu.get_int_value(deadframe, 4) == -54
+ assert cpu.get_int_value(deadframe, 5) == 19
+ assert cpu.get_int_value(deadframe, 6) == -64
def test_tempbox2(self):
faildescr1 = BasicFailDescr(1)
@@ -214,19 +219,20 @@
ResOperation(rop.INT_SUB, [ConstInt(99), v6], v14),
ResOperation(rop.INT_MUL_OVF, [v6, v9], v15),
ResOperation(rop.GUARD_NO_OVERFLOW, [], None, descr=faildescr1),
- ResOperation(rop.FINISH, [v1, v4, v10, v8, v7, v3], None,
descr=faildescr2),
+ ResOperation(rop.GUARD_FALSE, [v1], None, descr=faildescr2),
]
looptoken = JitCellToken()
operations[5].setfailargs([])
+ operations[-1].setfailargs([v1, v4, v10, v8, v7, v3])
cpu.compile_loop(inputargs, operations, looptoken)
args = [1073741824 , 95 , -16 , 5 , 92 , 12 , 32 , 17 , 37 , -63]
- op = cpu.execute_token(looptoken, *args)
- assert cpu.get_latest_value_int(0) == 1073741824
- assert cpu.get_latest_value_int(1) == 5
- assert cpu.get_latest_value_int(2) == -63
- assert cpu.get_latest_value_int(3) == 17
- assert cpu.get_latest_value_int(4) == 32
- assert cpu.get_latest_value_int(5) == -16
+ deadframe = cpu.execute_token(looptoken, *args)
+ assert cpu.get_int_value(deadframe, 0) == 1073741824
+ assert cpu.get_int_value(deadframe, 1) == 5
+ assert cpu.get_int_value(deadframe, 2) == -63
+ assert cpu.get_int_value(deadframe, 3) == 17
+ assert cpu.get_int_value(deadframe, 4) == 32
+ assert cpu.get_int_value(deadframe, 5) == -16
def test_wrong_guard(self):
# generated by:
@@ -267,18 +273,19 @@
ResOperation(rop.GUARD_TRUE, [tmp16], None, descr=faildescr2),
ResOperation(rop.INT_IS_TRUE, [v12], tmp17),
ResOperation(rop.GUARD_FALSE, [tmp17], None, descr=faildescr3),
- ResOperation(rop.FINISH, [v8, v10, v6, v3, v2, v9], None,
descr=faildescr4),
+ ResOperation(rop.GUARD_FALSE, [v1], None, descr=faildescr4),
]
looptoken = JitCellToken()
operations[1].setfailargs([v8, v6, v1])
operations[7].setfailargs([v4])
operations[9].setfailargs([v10, v13])
+ operations[-1].setfailargs([v8, v10, v6, v3, v2, v9])
args = [32 , 41 , -9 , 12 , -18 , 46 , 15 , 17 , 10 , 12]
cpu.compile_loop(inputargs, operations, looptoken)
- op = cpu.execute_token(looptoken, *args)
- assert op.identifier == 3
- assert cpu.get_latest_value_int(0) == 12
- assert cpu.get_latest_value_int(1) == 23
+ deadframe = cpu.execute_token(looptoken, *args)
+ assert cpu.get_latest_descr(deadframe).identifier == 3
+ assert cpu.get_int_value(deadframe, 0) == 12
+ assert cpu.get_int_value(deadframe, 1) == 23
def test_wrong_guard2(self):
# random seed: 8029
@@ -316,17 +323,18 @@
ResOperation(rop.INT_NE, [ConstInt(1), v11], v15),
ResOperation(rop.INT_NE, [ConstInt(23), v15], v16),
ResOperation(rop.GUARD_FALSE, [v15], None, descr=faildescr2),
- ResOperation(rop.FINISH, [v4, v10, v6, v5, v9, v7], None,
descr=faildescr3),
+ ResOperation(rop.GUARD_FALSE, [v1], None, descr=faildescr3),
]
operations[1].setfailargs([v6, v8, v1, v4])
operations[8].setfailargs([v5, v9])
+ operations[-1].setfailargs([v4, v10, v6, v5, v9, v7])
looptoken = JitCellToken()
cpu.compile_loop(inputargs, operations, looptoken)
args = [-8 , 0 , 62 , 35 , 16 , 9 , 30 , 581610154 , -1 , 738197503]
- op = cpu.execute_token(looptoken, *args)
- assert op.identifier == 2
- assert cpu.get_latest_value_int(0) == 16
- assert cpu.get_latest_value_int(1) == -1
+ deadframe = cpu.execute_token(looptoken, *args)
+ assert cpu.get_latest_descr(deadframe).identifier == 2
+ assert cpu.get_int_value(deadframe, 0) == 16
+ assert cpu.get_int_value(deadframe, 1) == -1
def test_wrong_guard3(self):
# random seed: 8029
@@ -364,21 +372,22 @@
ResOperation(rop.GUARD_VALUE, [v15, ConstInt(-32)], None,
descr=faildescr4),
ResOperation(rop.INT_FLOORDIV, [v3, ConstInt(805306366)], v16),
ResOperation(rop.GUARD_VALUE, [v15, ConstInt(0)], None,
descr=faildescr1),
- ResOperation(rop.FINISH, [v10, v8, v1, v6, v4], None,
descr=faildescr2),
+ ResOperation(rop.GUARD_FALSE, [v1], None, descr=faildescr2),
]
operations[3].setfailargs([])
operations[-4].setfailargs([v15])
operations[-2].setfailargs([v9, v4, v10, v11, v14])
+ operations[-1].setfailargs([v10, v8, v1, v6, v4])
looptoken = JitCellToken()
cpu.compile_loop(inputargs, operations, looptoken)
args = [-39 , -18 , 1588243114 , -9 , -4 , 1252698794 , 0 , 715827882
, -15 , 536870912]
- op = cpu.execute_token(looptoken, *args)
- assert op.identifier == 1
- assert cpu.get_latest_value_int(0) == -15
- assert cpu.get_latest_value_int(1) == -9
- assert cpu.get_latest_value_int(2) == 536870912
- assert cpu.get_latest_value_int(3) == 0
- assert cpu.get_latest_value_int(4) == 0
+ deadframe = cpu.execute_token(looptoken, *args)
+ assert cpu.get_latest_descr(deadframe).identifier == 1
+ assert cpu.get_int_value(deadframe, 0) == -15
+ assert cpu.get_int_value(deadframe, 1) == -9
+ assert cpu.get_int_value(deadframe, 2) == 536870912
+ assert cpu.get_int_value(deadframe, 3) == 0
+ assert cpu.get_int_value(deadframe, 4) == 0
def test_wrong_result(self):
# generated by:
@@ -418,23 +427,24 @@
ResOperation(rop.INT_IS_TRUE, [v4], v14),
ResOperation(rop.INT_XOR, [v14, v3], v15),
ResOperation(rop.GUARD_VALUE, [v8, ConstInt(-8)], None,
descr=faildescr3),
- ResOperation(rop.FINISH, [v1, v2, v9], None, descr=faildescr4),
+ ResOperation(rop.GUARD_FALSE, [v1], None, descr=faildescr4),
]
operations[1].setfailargs([v9, v1])
operations[5].setfailargs([v10, v2, v11, v3])
operations[9].setfailargs([v5, v7, v12, v14, v2, v13, v8])
+ operations[-1].setfailargs([v1, v2, v9])
looptoken = JitCellToken()
cpu.compile_loop(inputargs, operations, looptoken)
args = [0 , -2 , 24 , 1 , -4 , 13 , -95 , 33 , 2 , -44]
- op = cpu.execute_token(looptoken, *args)
- assert op.identifier == 3
- assert cpu.get_latest_value_int(0) == -4
- assert cpu.get_latest_value_int(1) == -95
- assert cpu.get_latest_value_int(2) == 45
- assert cpu.get_latest_value_int(3) == 1
- assert cpu.get_latest_value_int(4) == -2
- assert cpu.get_latest_value_int(5) == 0
- assert cpu.get_latest_value_int(6) == 33
+ deadframe = cpu.execute_token(looptoken, *args)
+ assert cpu.get_latest_descr(deadframe).identifier == 3
+ assert cpu.get_int_value(deadframe, 0) == -4
+ assert cpu.get_int_value(deadframe, 1) == -95
+ assert cpu.get_int_value(deadframe, 2) == 45
+ assert cpu.get_int_value(deadframe, 3) == 1
+ assert cpu.get_int_value(deadframe, 4) == -2
+ assert cpu.get_int_value(deadframe, 5) == 0
+ assert cpu.get_int_value(deadframe, 6) == 33
def test_int_add(self):
# random seed: 1202
@@ -461,20 +471,21 @@
ResOperation(rop.INT_ADD, [ConstInt(-1073741825), v3], v11),
ResOperation(rop.INT_IS_TRUE, [v1], tmp12),
ResOperation(rop.GUARD_FALSE, [tmp12], None, descr=faildescr1),
- ResOperation(rop.FINISH, [v8, v2, v10, v6, v7, v9, v5, v4], None,
descr=faildescr2),
+ ResOperation(rop.GUARD_FALSE, [v1], None, descr=faildescr2),
]
operations[2].setfailargs([v10, v3, v6, v11, v9, v2])
+ operations[-1].setfailargs([v8, v2, v10, v6, v7, v9, v5, v4])
looptoken = JitCellToken()
cpu.compile_loop(inputargs, operations, looptoken)
args = [3 , -5 , 1431655765 , 47 , 12 , 1789569706 , 15 , 939524096 ,
16 , -43]
- op = cpu.execute_token(looptoken, *args)
- assert op.identifier == 1
- assert cpu.get_latest_value_int(0) == -43
- assert cpu.get_latest_value_int(1) == 1431655765
- assert cpu.get_latest_value_int(2) == 1789569706
- assert cpu.get_latest_value_int(3) == 357913940
- assert cpu.get_latest_value_int(4) == 16
- assert cpu.get_latest_value_int(5) == -5
+ deadframe = cpu.execute_token(looptoken, *args)
+ assert cpu.get_latest_descr(deadframe).identifier == 1
+ assert cpu.get_int_value(deadframe, 0) == -43
+ assert cpu.get_int_value(deadframe, 1) == 1431655765
+ assert cpu.get_int_value(deadframe, 2) == 1789569706
+ assert cpu.get_int_value(deadframe, 3) == 357913940
+ assert cpu.get_int_value(deadframe, 4) == 16
+ assert cpu.get_int_value(deadframe, 5) == -5
def test_wrong_result2(self):
# block length 10
@@ -508,18 +519,19 @@
ResOperation(rop.GUARD_VALUE, [v14, ConstInt(1)], None, descr=f3),
ResOperation(rop.INT_MUL, [v13, ConstInt(12)], v15),
ResOperation(rop.GUARD_FALSE, [v11], None, descr=f1),
- ResOperation(rop.FINISH, [v2, v3, v5, v7, v10, v8, v9], None,
descr=f2),
+ ResOperation(rop.GUARD_FALSE, [v1], None, descr=f2),
]
operations[-2].setfailargs([v4, v10, v3, v9, v14, v2])
+ operations[-1].setfailargs([v2, v3, v5, v7, v10, v8, v9])
operations[4].setfailargs([v14])
looptoken = JitCellToken()
cpu.compile_loop(inputargs, operations, looptoken)
args = [14 , -20 , 18 , -2058005163 , 6 , 1 , -16 , 11 , 0 , 19]
- op = cpu.execute_token(looptoken, *args)
- assert op.identifier == 1
- assert cpu.get_latest_value_int(0) == -2058005163
- assert cpu.get_latest_value_int(1) == 19
- assert cpu.get_latest_value_int(2) == 18
- assert cpu.get_latest_value_int(3) == 0
- assert cpu.get_latest_value_int(4) == 1
- assert cpu.get_latest_value_int(5) == -20
+ deadframe = cpu.execute_token(looptoken, *args)
+ assert cpu.get_latest_descr(deadframe).identifier == 1
+ assert cpu.get_int_value(deadframe, 0) == -2058005163
+ assert cpu.get_int_value(deadframe, 1) == 19
+ assert cpu.get_int_value(deadframe, 2) == 18
+ assert cpu.get_int_value(deadframe, 3) == 0
+ assert cpu.get_int_value(deadframe, 4) == 1
+ assert cpu.get_int_value(deadframe, 5) == -20
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
