Fix JIT tests that broke because they were more optimized by inlining.

Author: alex

pypy/jit/metainterp/test/test_ajit.py

@@ -16,7 +16,7 @@
 from pypy.jit.metainterp.optimizeopt import ALL_OPTS_DICT
 from pypy.jit.metainterp.test.support import LLJitMixin, OOJitMixin
 
-class BasicTests:    
+class BasicTests:
 
     def test_basic(self):
         def f(x, y):
@@ -36,7 +36,7 @@ def f(n):
 
     def test_uint_floordiv(self):
         from pypy.rlib.rarithmetic import r_uint
-        
+
         def f(a, b):
             a = r_uint(a)
             b = r_uint(b)
@@ -251,7 +251,7 @@ def track_init(self, name):
             res = self.meta_interp(f, [6, 15], no_stats=True)
         finally:
             history.TreeLoop.__init__ = old_init
-            
+
         assert res == f(6, 15)
         gc.collect()
 
@@ -839,7 +839,7 @@ def f(n):
 
     def test_bridge_from_interpreter_4(self):
         jitdriver = JitDriver(reds = ['n', 'k'], greens = [])
-        
+
         def f(n, k):
             while n > 0:
                 jitdriver.can_enter_jit(n=n, k=k)
@@ -852,7 +852,7 @@ def f(n, k):
 
         from pypy.rpython.test.test_llinterp import get_interpreter, clear_tcache
         from pypy.jit.metainterp.warmspot import WarmRunnerDesc
-        
+
         interp, graph = get_interpreter(f, [0, 0], backendopt=False,
                                         inline_threshold=0, type_system=self.type_system)
         clear_tcache()
@@ -1207,14 +1207,22 @@ def f(n):
     def test_residual_external_call(self):
         import math
         myjitdriver = JitDriver(greens = [], reds = ['y', 'x', 'res'])
+
+        # When this test was written ll_math couldn't be inlined, now it can,
+        # instead of rewriting this test, just ensure that an external call is
+        # still generated by wrapping the function.
+        @dont_look_inside
+        def modf(x):
+            return math.modf(x)
+
         def f(x, y):
             x = float(x)
             res = 0.0
             while y > 0:
                 myjitdriver.can_enter_jit(x=x, y=y, res=res)
                 myjitdriver.jit_merge_point(x=x, y=y, res=res)
                 # this is an external call that the default policy ignores
-                rpart, ipart = math.modf(x)
+                rpart, ipart = modf(x)
                 res += ipart
                 y -= 1
             return res
@@ -1248,7 +1256,7 @@ def f(x):
             return x
         res = self.meta_interp(f, [299], listops=True)
         assert res == f(299)
-        self.check_loops(guard_class=0, guard_value=2)        
+        self.check_loops(guard_class=0, guard_value=2)
         self.check_loops(guard_class=0, guard_value=5, everywhere=True)
 
     def test_merge_guardnonnull_guardclass(self):
@@ -1542,9 +1550,9 @@ def f(x, y):
 
     def test_raw_malloc_and_access(self):
         from pypy.rpython.lltypesystem import rffi
-        
+
         TP = rffi.CArray(lltype.Signed)
-        
+
         def f(n):
             a = lltype.malloc(TP, n, flavor='raw')
             a[0] = n
@@ -1557,9 +1565,9 @@ def f(n):
 
     def test_raw_malloc_and_access_float(self):
         from pypy.rpython.lltypesystem import rffi
-        
+
         TP = rffi.CArray(lltype.Float)
-        
+
         def f(n, f):
             a = lltype.malloc(TP, n, flavor='raw')
             a[0] = f
@@ -1862,7 +1870,7 @@ def g(x, y):
 
     def test_dont_trace_every_iteration(self):
         myjitdriver = JitDriver(greens = [], reds = ['a', 'b', 'i', 'sa'])
-        
+
         def main(a, b):
             i = sa = 0
             #while i < 200:
@@ -1958,7 +1966,7 @@ def f(x):
             return n
         res = self.meta_interp(f, [sys.maxint>>10])
         assert res == 11
-        self.check_tree_loop_count(2)        
+        self.check_tree_loop_count(2)
 
     def test_wrap_around_sub(self):
         myjitdriver = JitDriver(greens = [], reds = ['x', 'n'])
@@ -1974,7 +1982,7 @@ def f(x):
             return n
         res = self.meta_interp(f, [10-sys.maxint])
         assert res == 12
-        self.check_tree_loop_count(2)        
+        self.check_tree_loop_count(2)
 
 
 
@@ -2052,7 +2060,7 @@ def f(flag, n):
                                policy=StopAtXPolicy(getcls),
                                enable_opts='')
         assert not res
-        
+
         res = self.meta_interp(f, [0, 100],
                                policy=StopAtXPolicy(getcls),
                                enable_opts='')
@@ -2072,7 +2080,7 @@ def f():
 
     def test_oops_on_nongc(self):
         from pypy.rpython.lltypesystem import lltype
-        
+
         TP = lltype.Struct('x')
         def f(i1, i2):
             p1 = prebuilt[i1]
@@ -2144,7 +2152,7 @@ def __init__(self, i):
 
         def f():
             a = A(0)
-            
+
             while a.i < 10:
                 jitdriver.jit_merge_point(a=a)
                 jitdriver.can_enter_jit(a=a)