[pypy-commit] pypy all_ordered_dicts: Fix, and tweak the tests with comments.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: all_ordered_dicts
Changeset: r75056:6c2e77d6ceb6
Date: 2014-12-22 13:41 +0100
http://bitbucket.org/pypy/pypy/changeset/6c2e77d6ceb6/

Log:	Fix, and tweak the tests with comments.

diff --git a/rpython/jit/metainterp/optimizeopt/heap.py b/rpython/jit/metainterp/optimizeopt/heap.py
--- a/rpython/jit/metainterp/optimizeopt/heap.py
+++ b/rpython/jit/metainterp/optimizeopt/heap.py
@@ -2,7 +2,7 @@
 
 from rpython.jit.codewriter.effectinfo import EffectInfo
 from rpython.jit.metainterp.optimizeopt.util import args_dict
-from rpython.jit.metainterp.history import Const
+from rpython.jit.metainterp.history import Const, ConstInt
 from rpython.jit.metainterp.jitexc import JitException
 from rpython.jit.metainterp.optimizeopt.optimizer import Optimization, MODE_ARRAY, LEVEL_KNOWNCLASS, REMOVED
 from rpython.jit.metainterp.optimizeopt.util import make_dispatcher_method
@@ -307,6 +307,9 @@
         self.emit_operation(op)
 
     def _optimize_CALL_DICT_LOOKUP(self, op):
+        from rpython.rtyper.lltypesystem.rordereddict import FLAG_LOOKUP
+        if not op.getarg(4).same_box(ConstInt(FLAG_LOOKUP)):
+            return False
         descrs = op.getdescr().get_extra_info().extradescrs
         assert descrs        # translation hint
         descr1 = descrs[0]
diff --git a/rpython/jit/metainterp/test/test_dict.py b/rpython/jit/metainterp/test/test_dict.py
--- a/rpython/jit/metainterp/test/test_dict.py
+++ b/rpython/jit/metainterp/test/test_dict.py
@@ -181,15 +181,21 @@
                 n = d[y]
             return d[Wrapper(str(n + 1))]
 
+        # XXX <arigo> unsure I see the point of this test: the repeated
+        # dict lookup is *not* elided so far, and the test happens to
+        # check this...  with rdict.py, it's a write followed by a read,
+        # where the dict cache is thrown away after the first lookup
+        # (correctly: we don't want the two lookups to return the exact
+        # same result!).  With rordereddict.py, FLAG_STORE lookups are
+        # not cached anyway.
         res = self.meta_interp(f, [100], listops=True)
         assert res == f(50)
         self.check_resops({'new_array_clear': 2, 'getfield_gc': 2,
-                           'guard_true': 2, 'jump': 1,
+                           'guard_true': 4, 'jump': 1,
                            'new_with_vtable': 2, 'getinteriorfield_gc': 2,
-                           'setfield_gc': 8, 'int_gt': 2, 'int_sub': 2,
-                           'call': 10, 'int_and': 2,
-                           'guard_no_exception': 8, 'new': 2,
-                           'guard_false': 2, 'int_is_true': 2})
+                           'setfield_gc': 14, 'int_gt': 2, 'int_sub': 2,
+                           'call': 10, 'int_ne': 2,
+                           'guard_no_exception': 8, 'new': 2})
 
     def test_unrolling_of_dict_iter(self):
         driver = JitDriver(greens = [], reds = ['n'])
@@ -223,7 +229,7 @@
             return s
 
         self.meta_interp(f, [10])
-        # XXX should be one getinteriorfield_gc
+        # XXX should be one getinteriorfield_gc.  At least it's one call.
         self.check_simple_loop(call=1, getinteriorfield_gc=2,
                                guard_no_exception=1)
 
@@ -244,7 +250,7 @@
             return s
 
         self.meta_interp(f, [10])
-        # XXX should be one getinteriorfield_gc
+        # XXX should be one getinteriorfield_gc.  At least it's one call.
         self.check_simple_loop(call=1, getinteriorfield_gc=2,
                                guard_no_exception=1)
 
@@ -259,7 +265,7 @@
                 driver.jit_merge_point()
                 index = indexes[n & 1]
                 s += d[index]
-                d['aa'] += 1 # this will invalidate the index
+                d['aa'] = 13 # this will invalidate the index
                 s += d[index]
                 n -= 1
             return s
@@ -291,6 +297,10 @@
         self.check_simple_loop(call=7)
 
     def test_dict_double_lookup_2(self):
+        py.test.skip("xxx reimplement me")
+        # one read and one write at the same key should be jitted as only
+        # one lookup, but it's a bit harder now with rordereddict.py
+
         driver = JitDriver(greens = [], reds = 'auto')
         indexes = ['aa', 'b', 'cc']
 
@@ -355,7 +365,8 @@
                     if n in mdict:
                         raise Exception
         self.meta_interp(f, [10])
-        self.check_simple_loop(call_may_force=0, call=3)
+        self.check_simple_loop(call_may_force=0, call=4)
+          # XXX should be call=3, same reason as test_dict_double_lookup_2
 
     def test_dict_virtual(self):
         myjitdriver = JitDriver(greens = [], reds = 'auto')
diff --git a/rpython/rtyper/lltypesystem/rordereddict.py b/rpython/rtyper/lltypesystem/rordereddict.py
--- a/rpython/rtyper/lltypesystem/rordereddict.py
+++ b/rpython/rtyper/lltypesystem/rordereddict.py
@@ -42,6 +42,7 @@
 #
 
 @jit.look_inside_iff(lambda d, key, hash, flag: jit.isvirtual(d))
+ at jit.oopspec('ordereddict.lookup(d, key, hash, flag)')
 def ll_call_lookup_function(d, key, hash, flag):
     fun = d.lookup_function_no
     if fun == FUNC_BYTE: