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

[hakanardo at codespeak.net]

Author: hakanardo
Date: Sat Dec 11 17:12:46 2010
New Revision: 79987

Modified:
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_optimizebasic.py
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_optimizeopt.py
Log:
fixed tests

Modified: pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_optimizebasic.py
==============================================================================
--- pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_optimizebasic.py	(original)
+++ pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_optimizebasic.py	Sat Dec 11 17:12:46 2010
@@ -39,7 +39,7 @@
     b1 = BoxInt()
     opt = optimizeopt.Optimizer(FakeMetaInterpStaticData(LLtypeMixin.cpu),
                                 None)
-    fdescr = ResumeGuardDescr(None)
+    fdescr = ResumeGuardDescr()
     op = ResOperation(rop.GUARD_TRUE, ['dummy'], None, descr=fdescr)
     # setup rd data
     fi0 = resume.FrameInfo(None, "code0", 11)
@@ -261,14 +261,13 @@
                                                      OptVirtualize,
                                                      OptString,
                                                      OptHeap,
-                                                     OptFfiCall,
                                                      Optimizer)
         optimizations = [OptIntBounds(),
                          OptRewrite(),
                          OptVirtualize(),
                          OptString(),
                          OptHeap(),
-                         OptFfiCall(),
+                         #OptFfiCall(),
                          ]
         optimizer = Optimizer(metainterp_sd, loop, optimizations)
         optimizer.propagate_all_forward()
@@ -796,6 +795,7 @@
         """
         expected = """
         [i]
+        guard_no_exception() []
         i1 = int_add(i, 3)
         i2 = call(i1, descr=nonwritedescr)
         guard_no_exception() [i1, i2]

Modified: pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_optimizeopt.py
==============================================================================
--- pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_optimizeopt.py	(original)
+++ pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_optimizeopt.py	Sat Dec 11 17:12:46 2010
@@ -887,7 +887,7 @@
         # note that 'guard_no_exception' at the very start must be kept
         # around: bridges may start with one.  (In case of loops we could
         # remove it, but we probably don't care.)
-        expected = """
+        preamble = """
         [i]
         guard_no_exception() []
         i1 = int_add(i, 3)
@@ -896,7 +896,15 @@
         i3 = call(i2, descr=nonwritedescr)
         jump(i1)
         """
-        self.optimize_loop(ops, expected, expected)
+        expected = """
+        [i]
+        i1 = int_add(i, 3)
+        i2 = call(i1, descr=nonwritedescr)
+        guard_no_exception() [i1, i2]
+        i3 = call(i2, descr=nonwritedescr)
+        jump(i1)
+        """
+        self.optimize_loop(ops, expected, preamble)
 
     # ----------
 
@@ -2240,7 +2248,18 @@
         setfield_gc(ConstPtr(myptr), p9, descr=nextdescr)
         jump(p30)
         """
-        self.optimize_loop(ops, 'Not', ops)
+        preamble = """
+        [p9]
+        setfield_gc(ConstPtr(myptr), p9, descr=nextdescr)
+        jump()
+        """
+        expected = """
+        []
+        p30 = new_with_vtable(ConstClass(node_vtable))
+        setfield_gc(ConstPtr(myptr), p30, descr=nextdescr)
+        jump()
+        """
+        self.optimize_loop(ops, expected, preamble)
 
     def test_invalid_loop_1(self):
         ops = """