[pypy-svn] r79388 - pypy/branch/arm-backend/pypy/jit/backend/arm/test

[david at codespeak.net]

Author: david
Date: Tue Nov 23 12:17:52 2010
New Revision: 79388

Modified:
   pypy/branch/arm-backend/pypy/jit/backend/arm/test/test_runner.py
Log:
refactor test_result_is_spilled

Modified: pypy/branch/arm-backend/pypy/jit/backend/arm/test/test_runner.py
==============================================================================
--- pypy/branch/arm-backend/pypy/jit/backend/arm/test/test_runner.py	(original)
+++ pypy/branch/arm-backend/pypy/jit/backend/arm/test/test_runner.py	Tue Nov 23 12:17:52 2010
@@ -27,17 +27,24 @@
     def test_result_is_spilled(self):
         cpu = self.cpu
         inp = [BoxInt(i) for i in range(1, 15)]
-        out = list(inp)
-        out.reverse()
+        out = [BoxInt(i) for i in range(1, 15)]
+        #out.reverse()
         looptoken = LoopToken()
         operations = [
-            ResOperation(rop.INT_ADD, [inp[0], inp[1]], inp[2]),
-            ResOperation(rop.INT_SUB, [inp[1], ConstInt(1)], inp[4]),
-            ResOperation(rop.INT_ADD, [inp[4], ConstInt(0)], inp[3]),
-            ResOperation(rop.INT_ADD, [inp[5], inp[6]], inp[7]),
-            ResOperation(rop.INT_SUB, [inp[8], ConstInt(1)], inp[9]),
-            ResOperation(rop.INT_ADD, [inp[10], ConstInt(1)], inp[3]),
-            ResOperation(rop.INT_ADD, [inp[11], inp[12]], inp[13]),
+            ResOperation(rop.INT_ADD, [inp[0] , inp[1]], out[0]),
+            ResOperation(rop.INT_ADD, [inp[2] , inp[3]], out[1]),
+            ResOperation(rop.INT_ADD, [inp[4] , inp[5]], out[2]),
+            ResOperation(rop.INT_ADD, [inp[6] , inp[7]], out[3]),
+            ResOperation(rop.INT_ADD, [inp[8] , inp[9]], out[4]),
+            ResOperation(rop.INT_ADD, [inp[10], inp[11]], out[5]),
+            ResOperation(rop.INT_ADD, [inp[12], inp[13]], out[6]),
+            ResOperation(rop.INT_ADD, [inp[0] , inp[1]], out[7]),
+            ResOperation(rop.INT_ADD, [inp[2] , inp[3]], out[8]),
+            ResOperation(rop.INT_ADD, [inp[4] , inp[5]], out[9]),
+            ResOperation(rop.INT_ADD, [inp[6] , inp[7]], out[10]),
+            ResOperation(rop.INT_ADD, [inp[8] , inp[9]], out[11]),
+            ResOperation(rop.INT_ADD, [inp[10], inp[11]], out[12]),
+            ResOperation(rop.INT_ADD, [inp[12], inp[13]], out[13]),
             ResOperation(rop.FINISH, out, None, descr=BasicFailDescr(1)),
             ]
         cpu.compile_loop(inp, operations, looptoken)
@@ -45,5 +52,5 @@
             self.cpu.set_future_value_int(i-1, i)
         res = self.cpu.execute_token(looptoken)
         output = [self.cpu.get_latest_value_int(i-1) for i in range(1, 15)]
-        expected = [25,13,12,11,8,9,13,7,6,1,12,3,2,1]
+        expected = [3, 7, 11, 15, 19, 23, 27, 3, 7, 11, 15, 19, 23, 27]
         assert output == expected