[pypy-svn] r78278 - pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test

[hakanardo at codespeak.net]

Author: hakanardo
Date: Mon Oct 25 21:38:58 2010
New Revision: 78278

Modified:
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_send.py
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_virtual.py
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_virtualizable.py
Log:
Some tests ajusted to reflect the new optimization

Modified: pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_send.py
==============================================================================
--- pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_send.py	(original)
+++ pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_send.py	Mon Oct 25 21:38:58 2010
@@ -98,7 +98,7 @@
             return res
         res = self.meta_interp(f, [4, -1])
         assert res == 145
-        self.check_loops(int_add = 1)
+        self.check_loops(int_add = 1, everywhere=True)
 
     def test_oosend_base(self):
         myjitdriver = JitDriver(greens = [], reds = ['x', 'y', 'w'])

Modified: pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_virtual.py
==============================================================================
--- pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_virtual.py	(original)
+++ pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_virtual.py	Mon Oct 25 21:38:58 2010
@@ -316,10 +316,9 @@
 
         self.check_tree_loop_count(2)      # the loop and the entry path
         # we get:
-        #    ENTER             - compile the new loop
-        #    ENTER             - compile the entry bridge
+        #    ENTER             - compile the new loop and entry bridge
         #    ENTER             - compile the leaving path
-        self.check_enter_count(3)
+        self.check_enter_count(2)
 
 class VirtualMiscTests:
 

Modified: pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_virtualizable.py
==============================================================================
--- pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_virtualizable.py	(original)
+++ pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_virtualizable.py	Mon Oct 25 21:38:58 2010
@@ -197,7 +197,7 @@
             return xy.inst_x
         res = self.meta_interp(f, [20])
         assert res == 134
-        self.check_loops(getfield_gc=1, setfield_gc=1)
+        self.check_loops(getfield_gc=1, setfield_gc=1, everywhere=True)
 
     # ------------------------------
 
@@ -1124,7 +1124,7 @@
  
          res = self.meta_interp(f, [10])
          assert res == 55
-         self.check_loops(new_with_vtable=0, ptr_eq=1)
+         self.check_loops(new_with_vtable=0, ptr_eq=1, everywhere=True)
 
     def test_virtual_child_frame_with_arrays(self):
         myjitdriver = JitDriver(greens = [], reds = ['frame'],