[pypy-svn] r66911 - pypy/branch/pyjitpl5/pypy/jit/metainterp/test

[fijal at codespeak.net]

Author: fijal
Date: Tue Aug 18 16:34:44 2009
New Revision: 66911

Modified:
   pypy/branch/pyjitpl5/pypy/jit/metainterp/test/oparser.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_oparser.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_optimizefindnode.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_optimizeopt.py
Log:
(arigo, pedronis, fijal) Port r66823 from pyjitpl5-floats


Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/test/oparser.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/test/oparser.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/test/oparser.py	Tue Aug 18 16:34:44 2009
@@ -115,9 +115,9 @@
             elif arg.startswith('ConstPtr('):
                 name = arg[len('ConstPtr('):-1]
                 if self.type_system == 'lltype':
-                    return ConstPtr(self.boxkinds[name])
+                    return ConstPtr(self.consts[name])
                 else:
-                    return ConstObj(self.boxkinds[name])
+                    return ConstObj(self.consts[name])
             return self.vars[arg]
 
     def parse_op(self, line):

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_oparser.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_oparser.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_oparser.py	Tue Aug 18 16:34:44 2009
@@ -1,5 +1,5 @@
 
-from pypy.rpython.lltypesystem import lltype
+from pypy.rpython.lltypesystem import lltype, llmemory
 
 from pypy.jit.metainterp.test.oparser import parse
 from pypy.jit.metainterp.resoperation import rop
@@ -101,3 +101,13 @@
     loop = parse(x, None, {}, boxkinds={'sum': BoxInt})
     b = loop.getboxes()
     assert isinstance(b.sum0, BoxInt)
+    
+def test_getvar_const_ptr():
+    x = '''
+    []
+    call(ConstPtr(func_ptr))
+    '''
+    TP = lltype.GcArray(lltype.Signed)
+    NULL = lltype.cast_opaque_ptr(llmemory.GCREF, lltype.nullptr(TP))
+    loop = parse(x, None, {'func_ptr' : NULL})
+    assert loop.operations[0].args[0].value == NULL

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_optimizefindnode.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_optimizefindnode.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_optimizefindnode.py	Tue Aug 18 16:34:44 2009
@@ -50,6 +50,7 @@
                                      ('other', lltype.Ptr(NODE)))
     node = lltype.malloc(NODE)
     nodebox = BoxPtr(lltype.cast_opaque_ptr(llmemory.GCREF, node))
+    myptr = nodebox.value
     nodebox2 = BoxPtr(lltype.cast_opaque_ptr(llmemory.GCREF, node))
     nodesize = cpu.sizeof(NODE)
     nodesize2 = cpu.sizeof(NODE2)
@@ -87,6 +88,7 @@
 
     node = ootype.new(NODE)
     nodebox = BoxObj(ootype.cast_to_object(node))
+    myptr = nodebox.value
     nodebox2 = BoxObj(ootype.cast_to_object(node))
     valuedescr = cpu.fielddescrof(NODE, 'value')
     nextdescr = cpu.fielddescrof(NODE, 'next')

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_optimizeopt.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_optimizeopt.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_optimizeopt.py	Tue Aug 18 16:34:44 2009
@@ -97,9 +97,9 @@
                             expected.operations,
                             remap)
 
-    def optimize_loop(self, ops, spectext, optops,
-                      boxkinds=None, checkspecnodes=True, **values):
-        loop = self.parse(ops, boxkinds=boxkinds)
+    def optimize_loop(self, ops, spectext, optops, checkspecnodes=True,
+                      **values):
+        loop = self.parse(ops)
         loop.setvalues(**values)
         #
         if checkspecnodes:
@@ -118,7 +118,7 @@
         #
         optimize_loop_1(self.cpu, loop)
         #
-        expected = self.parse(optops, boxkinds=boxkinds)
+        expected = self.parse(optops)
         self.assert_equal(loop, expected)
 
     def test_simple(self):
@@ -346,8 +346,8 @@
             fail()
         jump()
         """
-        self.optimize_loop(ops, '', ops, p1=self.nodebox.value,
-                           boxkinds={'myptr': self.nodebox.value})
+        self.optimize_loop(ops, '', ops, p1=self.nodebox.value)
+
 
     def test_p123_simple(self):
         ops = """
@@ -708,8 +708,7 @@
         [i0]
         jump(0)
         """
-        self.optimize_loop(ops, 'Not', expected, p2=self.nodebox.value,
-                           i1=0, boxkinds={'myptr': self.nodebox.value})
+        self.optimize_loop(ops, 'Not', expected, p2=self.nodebox.value, i1=0)
 
     def test_nonvirtual_1(self):
         ops = """
@@ -792,8 +791,7 @@
         [i]
         jump(5)
         """
-        self.optimize_loop(ops, 'Not', expected, i1=5,
-                           boxkinds={'myptr': self.nodebox.value})
+        self.optimize_loop(ops, 'Not', expected, i1=5)
 
     def test_getfield_gc_nonpure_2(self):
         ops = """
@@ -802,8 +800,7 @@
         jump(i1)
         """
         expected = ops
-        self.optimize_loop(ops, 'Not', expected, i1=5,
-                           boxkinds={'myptr': self.nodebox.value})
+        self.optimize_loop(ops, 'Not', expected, i1=5)
 
     def test_varray_1(self):
         ops = """