[pypy-commit] pypy optresult-unroll: fix some tests

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: optresult-unroll
Changeset: r79302:9d930c5c8569
Date: 2015-08-30 12:22 +0200
http://bitbucket.org/pypy/pypy/changeset/9d930c5c8569/

Log:	fix some tests

diff --git a/rpython/jit/metainterp/test/test_jitdriver.py b/rpython/jit/metainterp/test/test_jitdriver.py
--- a/rpython/jit/metainterp/test/test_jitdriver.py
+++ b/rpython/jit/metainterp/test/test_jitdriver.py
@@ -104,7 +104,7 @@
         res = self.meta_interp(loop2, [4, 40], repeat=7, inline=True)
         assert res == loop2(4, 40)
         # we expect no int_sub, but a residual call
-        self.check_resops(call=2, int_sub=0)
+        self.check_resops(call_i=2, int_sub=0)
 
     def test_multiple_jits_trace_too_long(self):
         myjitdriver1 = JitDriver(greens=["n"], reds=["i", "box"])
diff --git a/rpython/jit/metainterp/test/test_list.py b/rpython/jit/metainterp/test/test_list.py
--- a/rpython/jit/metainterp/test/test_list.py
+++ b/rpython/jit/metainterp/test/test_list.py
@@ -8,7 +8,8 @@
 
     def check_all_virtualized(self):
         self.check_resops(setarrayitem_gc=0, new_array=0, arraylen_gc=0,
-                          getarrayitem_gc=0)        
+                          getarrayitem_gc_i=0, getarrayitem_gc_r=0,
+                          getarrayitem_gc_f=0)        
 
     def test_simple_array(self):
         jitdriver = JitDriver(greens = [], reds = ['n'])
@@ -57,7 +58,7 @@
         res = self.meta_interp(f, [10], listops=True)
         assert res == f(10)
         # one setitem should be gone by now
-        self.check_resops(setarrayitem_gc=4, getarrayitem_gc=2, call=2)
+        self.check_resops(setarrayitem_gc=4, getarrayitem_gc_i=2, call_r=2)
 
 
     def test_ll_fixed_setitem_fast(self):
@@ -95,7 +96,7 @@
 
         res = self.meta_interp(f, [10], listops=True, backendopt=True)
         assert res == f(10)
-        self.check_resops(setarrayitem_gc=0, call=0, getarrayitem_gc=0)
+        self.check_resops(setarrayitem_gc=0, call=0, getarrayitem_gc_i=0)
 
     def test_arraycopy_simpleoptimize(self):
         def f():
@@ -361,7 +362,7 @@
         assert res == f(37)
         # There is the one actual field on a, plus several fields on the list
         # itself
-        self.check_resops(getfield_gc=7)
+        self.check_resops(getfield_gc_i=2, getfield_gc_r=5)
 
     def test_conditional_call_append(self):
         jitdriver = JitDriver(greens = [], reds = 'auto')