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

cfbolz at codespeak.net cfbolz at codespeak.net
Sat Oct 30 19:20:45 CEST 2010


Author: cfbolz
Date: Sat Oct 30 19:20:43 2010
New Revision: 78562

Modified:
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_optimizeopt.py
Log:
kill some tests. their equivalent in test_optimizebasic should be fixed


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 Oct 30 19:20:43 2010
@@ -2542,97 +2542,6 @@
         boxes = reader.consume_boxes()
         self._verify_fail_args(boxes, fdescr.oparse, expectedtext)
 
-    def test_expand_fail_v_all_1(self):
-        ops = """
-        [i1, p1a, i2]
-        p6s = getarrayitem_gc(p1a, 0, descr=arraydescr2)
-        p7v = getfield_gc(p6s, descr=bdescr)
-        p5s = new(descr=ssize)
-        setfield_gc(p5s, i2, descr=adescr)
-        setfield_gc(p5s, p7v, descr=bdescr)
-        setarrayitem_gc(p1a, 1, p5s, descr=arraydescr2)
-        guard_true(i1, descr=fdescr) [p1a]
-        p2s = new(descr=ssize)
-        p3v = new_with_vtable(ConstClass(node_vtable))
-        p4a = new_array(2, descr=arraydescr2)
-        setfield_gc(p2s, i1, descr=adescr)
-        setfield_gc(p2s, p3v, descr=bdescr)
-        setfield_gc(p3v, i2, descr=valuedescr)
-        setarrayitem_gc(p4a, 0, p2s, descr=arraydescr2)
-        jump(i1, p4a, i2)
-        """
-        expected = """
-        [i1, ia, iv, pnull, i2]
-        guard_true(i1, descr=fdescr) [ia, iv, i2]
-        jump(1, 1, i2, NULL, i2)
-        """
-        xxx
-        self.optimize_loop(ops, '''
-            Not,
-            VArray(arraydescr2,
-                   VStruct(ssize,
-                           adescr=Not,
-                           bdescr=Virtual(node_vtable,
-                                          valuedescr=Not)),
-                   Not),
-            Not''', expected)
-        self.check_expanded_fail_descr('''p1a
-            where p1a is a varray arraydescr2: p6s, p5s
-            where p6s is a vstruct ssize, adescr=ia, bdescr=p7v
-            where p5s is a vstruct ssize, adescr=i2, bdescr=p7v
-            where p7v is a node_vtable, valuedescr=iv
-            ''', rop.GUARD_TRUE)
-
-    def test_expand_fail_lazy_setfield_1(self):
-        ops = """
-        [p1, i2, i3]
-        p2 = new_with_vtable(ConstClass(node_vtable))
-        setfield_gc(p2, i2, descr=valuedescr)
-        setfield_gc(p1, p2, descr=nextdescr)
-        guard_true(i3, descr=fdescr) []
-        i4 = int_neg(i2)
-        setfield_gc(p1, NULL, descr=nextdescr)
-        jump(p1, i2, i4)
-        """
-        expected = """
-        [p1, i2, i3]
-        guard_true(i3, descr=fdescr) [p1, i2]
-        i4 = int_neg(i2)
-        setfield_gc(p1, NULL, descr=nextdescr)
-        jump(p1, i2, i4)
-        """
-        self.optimize_loop(ops, expected)
-        self.loop.inputargs[0].value = self.nodebox.value
-        self.check_expanded_fail_descr('''
-            p1.nextdescr = p2
-            where p2 is a node_vtable, valuedescr=i2
-            ''', rop.GUARD_TRUE)
-
-    def test_expand_fail_lazy_setfield_2(self):
-        ops = """
-        [i2, i3]
-        p2 = new_with_vtable(ConstClass(node_vtable))
-        setfield_gc(p2, i2, descr=valuedescr)
-        setfield_gc(ConstPtr(myptr), p2, descr=nextdescr)
-        guard_true(i3, descr=fdescr) []
-        i4 = int_neg(i2)
-        setfield_gc(ConstPtr(myptr), NULL, descr=nextdescr)
-        jump(i2, i4)
-        """
-        expected = """
-        [i2, i3]
-        guard_true(i3, descr=fdescr) [i2]
-        i4 = int_neg(i2)
-        setfield_gc(ConstPtr(myptr), NULL, descr=nextdescr)
-        jump(i2, i4)
-        """
-        self.optimize_loop(ops, expected)
-        self.check_expanded_fail_descr('''
-            ConstPtr(myptr).nextdescr = p2
-            where p2 is a node_vtable, valuedescr=i2
-            ''', rop.GUARD_TRUE)
-
-
 class TestLLtype(OptimizeOptTest, LLtypeMixin):
 
     def test_residual_call_does_not_invalidate_caches(self):



More information about the Pypy-commit mailing list