[pypy-commit] pypy default: update test_pypy_c for iterator optimizations

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: 
Changeset: r73854:09a7faf2a960
Date: 2014-10-08 21:59 -0400
http://bitbucket.org/pypy/pypy/changeset/09a7faf2a960/

Log:	update test_pypy_c for iterator optimizations

diff --git a/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py b/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py
--- a/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py
@@ -96,29 +96,9 @@
             guard_true(i125, descr=...)
             i126 = int_lt(i117, i50)
             guard_true(i126, descr=...)
-            i127 = int_floordiv(i117, i61)
-            i128 = int_mul(i127, i61)
-            i129 = int_sub(i117, i128)
-            i130 = int_rshift(i129, 63)
-            i131 = int_add(i127, i130)
-            i132 = int_mul(i131, i71)
-            i133 = int_add(i55, i132)
-            i134 = int_mod(i117, i61)
-            i135 = int_rshift(i134, 63)
-            i136 = int_and(i61, i135)
-            i137 = int_add(i134, i136)
-            i138 = int_floordiv(i137, i80)
-            i139 = int_mul(i138, i80)
-            i140 = int_sub(i137, i139)
-            i141 = int_rshift(i140, 63)
-            i142 = int_add(i138, i141)
-            i143 = int_mul(i142, i88)
-            i144 = int_add(i133, i143)
-            i145 = int_mod(i137, i80)
-            i146 = int_rshift(i145, 63)
-            i147 = int_and(i80, i146)
-            i148 = int_add(i145, i147)
-            f149 = raw_load(i100, i144, descr=<ArrayF 8>)
+            i128 = int_mul(i117, i59)
+            i129 = int_add(i55, i128)
+            f149 = raw_load(i100, i129, descr=<ArrayF 8>)
             p150 = getfield_gc_pure(p123, descr=<FieldP pypy.module.micronumpy.iterators.IterState.inst_indices 16>)
             i151 = int_add(i117, 1)
             setarrayitem_gc(p150, 1, 0, descr=<ArrayS 8>)
@@ -128,14 +108,12 @@
             i155 = int_lt(i154, 0)
             guard_false(i155, descr=...)
             p156 = new_with_vtable(...)
+            setfield_gc(p156, p49, descr=<FieldP pypy.module.micronumpy.iterators.IterState.inst_iterator 24>)
             setfield_gc(p156, i55, descr=<FieldS pypy.module.micronumpy.iterators.IterState.inst_offset 32>)
             setfield_gc(p156, 0, descr=<FieldS pypy.module.micronumpy.iterators.IterState.inst_index 8>)
             setfield_gc(p156, p150, descr=<FieldP pypy.module.micronumpy.iterators.IterState.inst_indices 16>)
-            setfield_gc(p156, p49, descr=<FieldP pypy.module.micronumpy.iterators.IterState.inst_iterator 24>)
             setfield_gc(p16, p156, descr=<FieldP pypy.module.micronumpy.flatiter.W_FlatIterator.inst_state 56>)
-            i157 = arraylen_gc(p60, descr=<ArrayS 8>)
-            i158 = arraylen_gc(p70, descr=<ArrayS 8>)
-            jump(p0, p1, p3, p6, p7, p12, p14, p16, i151, f149, p26, i44, i50, i61, i71, i55, i80, i88, i100, p156, p49, p60, p70, descr=...)
+            jump(p0, p1, p3, p6, p7, p12, p14, p16, i151, f149, p26, i44, i50, i59, i55, i100, p156, p49, descr=...)
         """)
 
     def test_array_flatiter_setitem_single(self):
@@ -156,30 +134,10 @@
             guard_true(i128, descr=...)
             i129 = int_lt(i120, i48)
             guard_true(i129, descr=...)
-            i130 = int_floordiv(i120, i59)
-            i131 = int_mul(i130, i59)
-            i132 = int_sub(i120, i131)
-            i133 = int_rshift(i132, 63)
-            i134 = int_add(i130, i133)
-            i135 = int_mul(i134, i69)
-            i136 = int_add(i53, i135)
-            i137 = int_mod(i120, i59)
-            i138 = int_rshift(i137, 63)
-            i139 = int_and(i59, i138)
-            i140 = int_add(i137, i139)
-            i141 = int_floordiv(i140, i78)
-            i142 = int_mul(i141, i78)
-            i143 = int_sub(i140, i142)
-            i144 = int_rshift(i143, 63)
-            i145 = int_add(i141, i144)
-            i146 = int_mul(i145, i86)
-            i147 = int_add(i136, i146)
-            i148 = int_mod(i140, i78)
-            i149 = int_rshift(i148, 63)
-            i150 = int_and(i78, i149)
-            i151 = int_add(i148, i150)
+            i131 = int_mul(i120, i57)
+            i132 = int_add(i53, i131)
             guard_not_invalidated(descr=...)
-            raw_store(i103, i147, 42.000000, descr=<ArrayF 8>)
+            raw_store(i103, i132, 42.000000, descr=<ArrayF 8>)
             p152 = getfield_gc_pure(p126, descr=<FieldP pypy.module.micronumpy.iterators.IterState.inst_indices 16>)
             i153 = int_add(i120, 1)
             i154 = getfield_raw(ticker_address, descr=<FieldS pypysig_long_struct.c_value 0>)
@@ -188,12 +146,10 @@
             i157 = int_lt(i154, 0)
             guard_false(i157, descr=...)
             p158 = new_with_vtable(...)
+            setfield_gc(p158, p47, descr=<FieldP pypy.module.micronumpy.iterators.IterState.inst_iterator 24>)
             setfield_gc(p158, i53, descr=<FieldS pypy.module.micronumpy.iterators.IterState.inst_offset 32>)
             setfield_gc(p158, 0, descr=<FieldS pypy.module.micronumpy.iterators.IterState.inst_index 8>)
             setfield_gc(p158, p152, descr=<FieldP pypy.module.micronumpy.iterators.IterState.inst_indices 16>)
-            setfield_gc(p158, p47, descr=<FieldP pypy.module.micronumpy.iterators.IterState.inst_iterator 24>)
             setfield_gc(p16, p158, descr=<FieldP pypy.module.micronumpy.flatiter.W_FlatIterator.inst_state 56>)
-            i159 = arraylen_gc(p58, descr=<ArrayS 8>)
-            i160 = arraylen_gc(p68, descr=<ArrayS 8>)
-            jump(p0, p1, p3, p6, p7, p12, p14, p16, i153, i42, i48, i59, i69, i53, i78, i86, p47, i103, p158, p58, p68, descr=...)
+            jump(p0, p1, p3, p6, p7, p12, p14, p16, i153, i42, i48, i57, i53, p47, i103, p158, descr=...)
         """)