Author: Maciej Fijalkowski <[email protected]>
Branch: rewritten-loop-logging
Changeset: r66187:dcc329cbd387
Date: 2013-08-17 17:54 +0200
http://bitbucket.org/pypy/pypy/changeset/dcc329cbd387/
Log: fix arm tests
diff --git a/rpython/jit/backend/arm/test/test_regalloc2.py
b/rpython/jit/backend/arm/test/test_regalloc2.py
--- a/rpython/jit/backend/arm/test/test_regalloc2.py
+++ b/rpython/jit/backend/arm/test/test_regalloc2.py
@@ -24,7 +24,7 @@
cpu = CPU(None, None)
cpu.setup_once()
looptoken = JitCellToken()
- cpu.compile_loop(inputargs, operations, looptoken)
+ cpu.compile_loop(None, inputargs, operations, looptoken)
deadframe = cpu.execute_token(looptoken, 9)
assert cpu.get_int_value(deadframe, 0) == (9 >> 3)
assert cpu.get_int_value(deadframe, 1) == (~18)
@@ -48,7 +48,7 @@
cpu = CPU(None, None)
cpu.setup_once()
looptoken = JitCellToken()
- cpu.compile_loop(inputargs, operations, looptoken)
+ cpu.compile_loop(None, inputargs, operations, looptoken)
deadframe = cpu.execute_token(looptoken, -10)
assert cpu.get_int_value(deadframe, 0) == 0
assert cpu.get_int_value(deadframe, 1) == -1000
@@ -145,7 +145,7 @@
cpu = CPU(None, None)
cpu.setup_once()
looptoken = JitCellToken()
- cpu.compile_loop(inputargs, operations, looptoken)
+ cpu.compile_loop(None, inputargs, operations, looptoken)
args = [-13 , 10 , 10 , 8 , -8 , -16 , -18 , 46 , -12 , 26]
deadframe = cpu.execute_token(looptoken, *args)
assert cpu.get_int_value(deadframe, 0) == 0
@@ -252,7 +252,7 @@
cpu = CPU(None, None)
cpu.setup_once()
looptoken = JitCellToken()
- cpu.compile_loop(inputargs, operations, looptoken)
+ cpu.compile_loop(None, inputargs, operations, looptoken)
args = [17 , -20 , -6 , 6 , 1 , 13 , 13 , 9 , 49 , 8]
deadframe = cpu.execute_token(looptoken, *args)
assert cpu.get_int_value(deadframe, 0) == 0
diff --git a/rpython/jit/backend/arm/test/test_runner.py
b/rpython/jit/backend/arm/test/test_runner.py
--- a/rpython/jit/backend/arm/test/test_runner.py
+++ b/rpython/jit/backend/arm/test/test_runner.py
@@ -75,7 +75,7 @@
ResOperation(rop.FINISH, [inp[1]], None, descr=BasicFinalDescr(1)),
]
operations[-2].setfailargs(out)
- cpu.compile_loop(inp, operations, looptoken)
+ cpu.compile_loop(None, inp, operations, looptoken)
args = [i for i in range(1, 15)]
deadframe = self.cpu.execute_token(looptoken, *args)
output = [self.cpu.get_int_value(deadframe, i - 1) for i in range(1,
15)]
@@ -117,9 +117,9 @@
i1 = int_sub(i0, 1)
finish(i1)
''')
- self.cpu.compile_loop(loop2.inputargs, loop2.operations, lt2)
- self.cpu.compile_loop(loop3.inputargs, loop3.operations, lt3)
- self.cpu.compile_loop(loop1.inputargs, loop1.operations, lt1)
+ self.cpu.compile_loop(None, loop2.inputargs, loop2.operations, lt2)
+ self.cpu.compile_loop(None, loop3.inputargs, loop3.operations, lt3)
+ self.cpu.compile_loop(None, loop1.inputargs, loop1.operations, lt1)
df = self.cpu.execute_token(lt1, 10)
assert self.cpu.get_int_value(df, 0) == 7
@@ -214,7 +214,7 @@
ops = "".join(ops)
loop = parse(ops)
looptoken = JitCellToken()
- self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
+ self.cpu.compile_loop(None, loop.inputargs, loop.operations,
looptoken)
ARGS = [lltype.Signed] * numargs
RES = lltype.Signed
args = [i+1 for i in range(numargs)]
@@ -246,7 +246,7 @@
try:
self.cpu.assembler.set_debug(True)
looptoken = JitCellToken()
- self.cpu.compile_loop(ops.inputargs, ops.operations, looptoken)
+ self.cpu.compile_loop(None, ops.inputargs, ops.operations,
looptoken)
self.cpu.execute_token(looptoken, 0)
# check debugging info
struct = self.cpu.assembler.loop_run_counters[0]
@@ -280,7 +280,7 @@
faildescr = BasicFailDescr(2)
loop = parse(ops, self.cpu, namespace=locals())
looptoken = JitCellToken()
- info = self.cpu.compile_loop(loop.inputargs, loop.operations,
looptoken)
+ info = self.cpu.compile_loop(None, loop.inputargs, loop.operations,
looptoken)
ops2 = """
[i0, f1]
i1 = same_as(i0)
@@ -293,7 +293,7 @@
"""
loop2 = parse(ops2, self.cpu, namespace=locals())
looptoken2 = JitCellToken()
- info = self.cpu.compile_loop(loop2.inputargs, loop2.operations,
looptoken2)
+ info = self.cpu.compile_loop(None, loop2.inputargs, loop2.operations,
looptoken2)
deadframe = self.cpu.execute_token(looptoken, -9,
longlong.getfloatstorage(-13.5))
res = longlong.getrealfloat(self.cpu.get_float_value(deadframe, 0))
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
