Author: Alex Gaynor <[email protected]>
Branch:
Changeset: r48570:11d7ea62944e
Date: 2011-10-28 11:44 -0400
http://bitbucket.org/pypy/pypy/changeset/11d7ea62944e/
Log: more tests for array of structs
diff --git a/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
b/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
--- a/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
+++ b/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
@@ -976,6 +976,29 @@
"""
self.optimize_loop(ops, expected)
+ def test_virtual_array_of_struct_forced(self):
+ ops = """
+ [f0, f1]
+ p0 = new_array(1, descr=complexarraydescr)
+ setinteriorfield_gc(p0, 0, f0, descr=complexrealdescr)
+ setinteriorfield_gc(p0, 0, f1, descr=compleximagdescr)
+ f2 = getinteriorfield_gc(p0, 0, descr=complexrealdescr)
+ f3 = getinteriorfield_gc(p0, 0, descr=compleximagdescr)
+ f4 = float_mul(f2, f3)
+ i0 = escape(f4, p0)
+ finish(i0)
+ """
+ expected = """
+ [f0, f1]
+ f2 = float_mul(f0, f1)
+ p0 = new_array(1, descr=complexarraydescr)
+ setinteriorfield_gc(p0, 0, f0, descr=complexrealdescr)
+ setinteriorfield_gc(p0, 0, f1, descr=compleximagdescr)
+ i0 = escape(f2, p0)
+ finish(i0)
+ """
+ self.optimize_loop(ops, expected)
+
def test_nonvirtual_1(self):
ops = """
[i]
diff --git a/pypy/module/pypyjit/test_pypy_c/test_containers.py
b/pypy/module/pypyjit/test_pypy_c/test_containers.py
--- a/pypy/module/pypyjit/test_pypy_c/test_containers.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_containers.py
@@ -69,4 +69,51 @@
i9 = int_add(i5, 1)
--TICK--
jump(..., descr=...)
+ """)
+
+ def test_non_virtual_dict(self):
+ def main(n):
+ i = 0
+ while i < n:
+ d = {str(i): i}
+ i += d[str(i)] - i + 1
+ return i
+
+ log = self.run(main, [1000])
+ assert log.result == main(1000)
+ loop, = log.loops_by_filename(self.filepath)
+ assert loop.match("""
+ i8 = int_lt(i5, i7)
+ guard_true(i8, descr=...)
+ guard_not_invalidated(descr=...)
+ p10 = call(ConstClass(ll_int_str), i5, descr=<GcPtrCallDescr>)
+ guard_no_exception(descr=...)
+ i12 = call(ConstClass(ll_strhash), p10, descr=<SignedCallDescr>)
+ p13 = new(descr=...)
+ p15 = new_array(8, descr=<dictentryArrayDescr>)
+ setfield_gc(p13, p15, descr=<GcPtrFieldDescr dicttable.entries .*>)
+ i17 = call(ConstClass(ll_dict_lookup_trampoline), p13, p10, i12,
descr=<SignedCallDescr>)
+ setfield_gc(p13, 16, descr=<SignedFieldDescr
dicttable.resize_counter 16>)
+ guard_no_exception(descr=...)
+ p20 = new_with_vtable(ConstClass(W_IntObject))
+ call(ConstClass(_ll_dict_setitem_lookup_done_trampoline), p13,
p10, p20, i12, i17, descr=<VoidCallDescr>)
+ setfield_gc(p20, i5, descr=<SignedFieldDescr
.*W_IntObject.inst_intval .*>)
+ guard_no_exception(descr=...)
+ i23 = call(ConstClass(ll_dict_lookup_trampoline), p13, p10, i12,
descr=<SignedCallDescr>)
+ guard_no_exception(descr=...)
+ i26 = int_and(i23, .*)
+ i27 = int_is_true(i26)
+ guard_false(i27, descr=...)
+ p28 = getfield_gc(p13, descr=<GcPtrFieldDescr dicttable.entries
.*>)
+ p29 = getinteriorfield_gc(p28, i23, descr=<InteriorFieldDescr
<GcPtrFieldDescr dictentry.value .*>>)
+ guard_nonnull_class(p29, ConstClass(W_IntObject), descr=...)
+ i31 = getfield_gc_pure(p29, descr=<SignedFieldDescr
.*W_IntObject.inst_intval .*>)
+ i32 = int_sub_ovf(i31, i5)
+ guard_no_overflow(descr=...)
+ i34 = int_add_ovf(i32, 1)
+ guard_no_overflow(descr=...)
+ i35 = int_add_ovf(i5, i34)
+ guard_no_overflow(descr=...)
+ --TICK--
+ jump(p0, p1, p2, p3, p4, i35, p13, i7, descr=<Loop0>)
""")
\ No newline at end of file
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
