[pypy-commit] pypy conditional_call_value_4: fix some tests

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: conditional_call_value_4
Changeset: r88598:1323559e78f2
Date: 2016-11-23 23:05 +0100
http://bitbucket.org/pypy/pypy/changeset/1323559e78f2/

Log:	fix some tests

diff --git a/rpython/jit/metainterp/test/test_dict.py b/rpython/jit/metainterp/test/test_dict.py
--- a/rpython/jit/metainterp/test/test_dict.py
+++ b/rpython/jit/metainterp/test/test_dict.py
@@ -194,7 +194,8 @@
                            'guard_true': 4, 'jump': 1,
                            'new_with_vtable': 2, 'getinteriorfield_gc_i': 2,
                            'setfield_gc': 14, 'int_gt': 2, 'int_sub': 2,
-                           'call_i': 6, 'call_n': 2, 'call_r': 2, 'int_ge': 2,
+                           'call_i': 4, 'call_n': 2, 'call_r': 2, 'int_ge': 2,
+                           'cond_call_value_i': 2, 'strhash': 4,
                            'guard_no_exception': 8, 'new': 2,
                            'guard_nonnull': 2})
 
@@ -273,7 +274,7 @@
 
         res = self.meta_interp(f, [10])
         assert res == f(10)
-        self.check_simple_loop(call_i=4, call_n=1)
+        self.check_simple_loop(call_i=3, cond_call_value_i=1, call_n=1)
 
     def test_dict_array_write_invalidates_caches(self):
         driver = JitDriver(greens = [], reds = 'auto')
@@ -295,7 +296,7 @@
         exp = f(10)
         res = self.meta_interp(f, [10])
         assert res == exp
-        self.check_simple_loop(call_i=5, call_n=2)
+        self.check_simple_loop(call_i=4, cond_call_value_i=1, call_n=2)
 
     def test_dict_double_lookup_2(self):
         driver = JitDriver(greens = [], reds = 'auto')
@@ -314,7 +315,7 @@
 
         res = self.meta_interp(f, [10])
         assert res == f(10)
-        self.check_simple_loop(call_i=2, call_n=1)
+        self.check_simple_loop(call_i=1, cond_call_value_i=1, call_n=1)
 
     def test_dict_eq_can_release_gil(self):
         from rpython.rtyper.lltypesystem import lltype, rffi