Author: Ronan Lamy <ronan.l...@gmail.com>
Branch:
Changeset: r78428:75d199ee1dc7
Date: 2015-07-04 19:23 +0200
http://bitbucket.org/pypy/pypy/changeset/75d199ee1dc7/
Log: fix test after changes in 36a1899115e0
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
@@ -14,42 +14,45 @@
assert len(log.loops) == 1
loop = log._filter(log.loops[0])
assert loop.match("""
- guard_class(p0, #, descr=...)
- p4 = getfield_gc_pure(p0, descr=<FieldP
pypy.module.micronumpy.iterators.ArrayIter.inst_array \d+>)
- i5 = getfield_gc(p2, descr=<FieldS
pypy.module.micronumpy.iterators.IterState.inst_offset \d+>)
+ guard_class(p1, #, descr=...)
+ p4 = getfield_gc_pure(p1, descr=<FieldP
pypy.module.micronumpy.iterators.ArrayIter.inst_array \d+>)
+ i5 = getfield_gc(p0, descr=<FieldS
pypy.module.micronumpy.iterators.IterState.inst_offset \d+>)
p6 = getfield_gc_pure(p4, descr=<FieldP
pypy.module.micronumpy.concrete.BaseConcreteArray.inst_dtype \d+>)
p7 = getfield_gc_pure(p6, descr=<FieldP
pypy.module.micronumpy.descriptor.W_Dtype.inst_itemtype \d+>)
guard_class(p7, ConstClass(Float64), descr=...)
i9 = getfield_gc_pure(p4, descr=<FieldU
pypy.module.micronumpy.concrete.BaseConcreteArray.inst_storage \d+>)
- f10 = raw_load(i9, i5, descr=<ArrayF \d+>)
- i11 = getfield_gc_pure(p7, descr=<FieldU
pypy.module.micronumpy.types.BaseType.inst_native \d+>)
- guard_true(i11, descr=...)
+ i10 = getfield_gc_pure(p6, descr=<FieldU
pypy.module.micronumpy.descriptor.W_Dtype.inst_byteorder \d+>)
+ i12 = int_eq(i10, 61)
+ i14 = int_eq(i10, 60)
+ i15 = int_or(i12, i14)
+ f16 = raw_load(i9, i5, descr=<ArrayF \d+>)
+ guard_true(i15, descr=...)
guard_not_invalidated(descr=...)
- i12 = cast_float_to_int(f10)
- i14 = int_and(i12, 255)
- guard_true(i14, descr=...)
- i15 = getfield_gc_pure(p1, descr=<FieldU
pypy.module.micronumpy.boxes.W_BoolBox.inst_value \d+>)
- i16 = int_is_true(i15)
- guard_false(i16, descr=...)
- i20 = getfield_gc(p2, descr=<FieldS
pypy.module.micronumpy.iterators.IterState.inst_index \d+>)
- i21 = getfield_gc_pure(p0, descr=<FieldU
pypy.module.micronumpy.iterators.ArrayIter.inst_track_index \d+>)
- guard_true(i21, descr=...)
- i23 = int_add(i20, 1)
- p24 = getfield_gc_pure(p2, descr=<FieldP
pypy.module.micronumpy.iterators.IterState.inst__indices \d+>)
- i25 = getfield_gc_pure(p0, descr=<FieldS
pypy.module.micronumpy.iterators.ArrayIter.inst_contiguous \d+>)
- i26 = int_is_true(i25)
- guard_true(i26, descr=...)
- i27 = getfield_gc_pure(p6, descr=<FieldS
pypy.module.micronumpy.descriptor.W_Dtype.inst_elsize \d+>)
- i28 = int_add(i5, i27)
- i29 = getfield_gc_pure(p0, descr=<FieldS
pypy.module.micronumpy.iterators.ArrayIter.inst_size \d+>)
- i30 = int_ge(i23, i29)
- guard_false(i30, descr=...)
- p32 = new_with_vtable(#)
+ i17 = cast_float_to_int(f16)
+ i19 = int_and(i17, 255)
+ guard_true(i19, descr=...)
+ i20 = getfield_gc_pure(p2, descr=<FieldU
pypy.module.micronumpy.boxes.W_BoolBox.inst_value \d+>)
+ i21 = int_is_true(i20)
+ guard_false(i21, descr=...)
+ i22 = getfield_gc(p0, descr=<FieldS
pypy.module.micronumpy.iterators.IterState.inst_index \d+>)
+ i23 = getfield_gc_pure(p1, descr=<FieldU
pypy.module.micronumpy.iterators.ArrayIter.inst_track_index \d+>)
+ guard_true(i23, descr=...)
+ i25 = int_add(i22, 1)
+ p26 = getfield_gc_pure(p0, descr=<FieldP
pypy.module.micronumpy.iterators.IterState.inst__indices \d+>)
+ i27 = getfield_gc_pure(p1, descr=<FieldS
pypy.module.micronumpy.iterators.ArrayIter.inst_contiguous \d+>)
+ i28 = int_is_true(i27)
+ guard_true(i28, descr=...)
+ i29 = getfield_gc_pure(p6, descr=<FieldS
pypy.module.micronumpy.descriptor.W_Dtype.inst_elsize \d+>)
+ i30 = int_add(i5, i29)
+ i31 = getfield_gc_pure(p1, descr=<FieldS
pypy.module.micronumpy.iterators.ArrayIter.inst_size \d+>)
+ i32 = int_ge(i25, i31)
+ guard_false(i32, descr=...)
+ p34 = new_with_vtable(#)
{{{
- setfield_gc(p32, i23, descr=<FieldS
pypy.module.micronumpy.iterators.IterState.inst_index \d+>)
- setfield_gc(p32, p24, descr=<FieldP
pypy.module.micronumpy.iterators.IterState.inst__indices \d+>)
- setfield_gc(p32, i28, descr=<FieldS
pypy.module.micronumpy.iterators.IterState.inst_offset \d+>)
- setfield_gc(p32, p0, descr=<FieldP
pypy.module.micronumpy.iterators.IterState.inst_iterator \d+>)
+ setfield_gc(p34, p1, descr=<FieldP
pypy.module.micronumpy.iterators.IterState.inst_iterator \d+>)
+ setfield_gc(p34, i25, descr=<FieldS
pypy.module.micronumpy.iterators.IterState.inst_index \d+>)
+ setfield_gc(p34, p26, descr=<FieldP
pypy.module.micronumpy.iterators.IterState.inst__indices \d+>)
+ setfield_gc(p34, i30, descr=<FieldS
pypy.module.micronumpy.iterators.IterState.inst_offset \d+>)
}}}
jump(..., descr=...)
""")
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
