Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r76745:2133c4325644
Date: 2015-04-08 09:43 +0200
http://bitbucket.org/pypy/pypy/changeset/2133c4325644/
Log: Fix tests: the EF numbers have shifted
diff --git a/pypy/module/pypyjit/test_pypy_c/test_buffers.py
b/pypy/module/pypyjit/test_pypy_c/test_buffers.py
--- a/pypy/module/pypyjit/test_pypy_c/test_buffers.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_buffers.py
@@ -42,7 +42,7 @@
assert loop.match_by_id('unpack', """
guard_not_invalidated(descr=...)
p90 = newstr(4)
- call(ConstClass(copy_raw_to_string), i55, p90, 0, 4, descr=<Callv
0 irii EF=4>)
+ call(ConstClass(copy_raw_to_string), i55, p90, 0, 4, descr=<Callv
0 irii EF=5>)
guard_no_exception(descr=...)
i91 = strgetitem(p90, 0)
i92 = strgetitem(p90, 1)
diff --git a/pypy/module/pypyjit/test_pypy_c/test_call.py
b/pypy/module/pypyjit/test_pypy_c/test_call.py
--- a/pypy/module/pypyjit/test_pypy_c/test_call.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_call.py
@@ -355,7 +355,7 @@
i17 = arraylen_gc(p15, descr=<ArrayS .>)
i18 = int_lt(i17, i15)
# a cond call to _ll_list_resize_hint_really_look_inside_iff
- cond_call(i18, _, p8, i15, 1, descr=<Callv 0 rii EF=4>)
+ cond_call(i18, _, p8, i15, 1, descr=<Callv 0 rii EF=5>)
guard_no_exception(descr=...)
p17 = getfield_gc(p8, descr=<FieldP list.items .*>)
setarrayitem_gc(p17, i13, i12, descr=<ArrayS .>)
@@ -395,7 +395,7 @@
setarrayitem_gc(p24, 0, p26, descr=<ArrayP .>)
setfield_gc(p22, p24, descr=<FieldP .*Arguments.inst_arguments_w
.*>)
}}}
- p32 = call_may_force(_, p18, p22, descr=<Callr . rr EF=6>)
+ p32 = call_may_force(_, p18, p22, descr=<Callr . rr EF=7>)
...
""")
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
@@ -74,7 +74,7 @@
setfield_gc(p13, p15, descr=<FieldP dicttable.indexes .+>)
setfield_gc(p13, ConstPtr(0), descr=<FieldP dicttable.entries .+>)
}}}
- i17 = call(ConstClass(ll_dict_lookup_trampoline), p13, p10, i12,
1, descr=<Calli . rrii EF=4 OS=4>)
+ i17 = call(ConstClass(ll_dict_lookup_trampoline), p13, p10, i12,
1, descr=<Calli . rrii EF=5 OS=4>)
{{{
setfield_gc(p13, 0, descr=<FieldS dicttable.lookup_function_no .+>)
setfield_gc(p13, 0, descr=<FieldS dicttable.num_live_items .+>)
@@ -82,10 +82,10 @@
}}}
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=<Callv 0 rrrii EF=4>)
+ call(ConstClass(_ll_dict_setitem_lookup_done_trampoline), p13,
p10, p20, i12, i17, descr=<Callv 0 rrrii EF=5>)
setfield_gc(p20, i5, descr=<FieldS .*W_IntObject.inst_intval .*>)
guard_no_exception(descr=...)
- i23 = call(ConstClass(ll_call_lookup_function), p13, p10, i12, 0,
descr=<Calli . rrii EF=4 OS=4>)
+ i23 = call(ConstClass(ll_call_lookup_function), p13, p10, i12, 0,
descr=<Calli . rrii EF=5 OS=4>)
guard_no_exception(descr=...)
i27 = int_lt(i23, 0)
guard_false(i27, descr=...)
diff --git a/pypy/module/pypyjit/test_pypy_c/test_ffi.py
b/pypy/module/pypyjit/test_pypy_c/test_ffi.py
--- a/pypy/module/pypyjit/test_pypy_c/test_ffi.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_ffi.py
@@ -35,7 +35,7 @@
guard_not_invalidated(descr=...)
i17 = force_token()
setfield_gc(p0, i17, descr=<.* .*PyFrame.vable_token .*>)
- f21 = call_release_gil(%s, 2.000000, 3.000000, descr=<Callf 8 ff
EF=6>)
+ f21 = call_release_gil(%s, 2.000000, 3.000000, descr=<Callf 8 ff
EF=7>)
guard_not_forced(descr=...)
guard_no_exception(descr=...)
""" % pow_addr)
@@ -202,7 +202,7 @@
assert loop.match_by_id('cfficall', """
p96 = force_token()
setfield_gc(p0, p96, descr=<FieldP
pypy.interpreter.pyframe.PyFrame.vable_token .>)
- f97 = call_release_gil(91, i59, 1.0, 3, descr=<Callf 8 fi EF=6
OS=62>)
+ f97 = call_release_gil(91, i59, 1.0, 3, descr=<Callf 8 fi EF=7
OS=62>)
guard_not_forced(descr=...)
guard_no_exception(descr=...)
""", ignore_ops=['guard_not_invalidated'])
@@ -266,7 +266,7 @@
loop, = log.loops_by_id('cfficall')
assert loop.match_by_id('cfficall', """
...
- f1 = call_release_gil(..., descr=<Calli 4 ii EF=6 OS=62>)
+ f1 = call_release_gil(..., descr=<Calli 4 ii EF=7 OS=62>)
...
""")
@@ -330,14 +330,14 @@
guard_value(p165, ConstPtr(ptr70), descr=...)
p166 = getfield_gc(p165, descr=<FieldP
pypy.objspace.std.dictmultiobject.W_DictMultiObject.inst_strategy .+>)
guard_value(p166, ConstPtr(ptr72), descr=...)
- p167 = call(ConstClass(_ll_0_alloc_with_del___), descr=<Callr . EF=4>)
+ p167 = call(ConstClass(_ll_0_alloc_with_del___), descr=<Callr . EF=5>)
guard_no_exception(descr=...)
i112 = int_signext(i160, 2)
setfield_gc(p167, ConstPtr(ptr85), descr=<FieldP
pypy.module._cffi_backend.cdataobj.W_CData.inst_ctype .+>)
i114 = int_ne(i160, i112)
guard_false(i114, descr=...)
--TICK--
- i119 = call(ConstClass(_ll_1_raw_malloc_varsize__Signed), 6,
descr=<Calli . i EF=4 OS=110>)
+ i119 = call(ConstClass(_ll_1_raw_malloc_varsize__Signed), 6,
descr=<Calli . i EF=5 OS=110>)
raw_store(i119, 0, i160, descr=<ArrayS 2>)
raw_store(i119, 2, i160, descr=<ArrayS 2>)
raw_store(i119, 4, i160, descr=<ArrayS 2>)
diff --git a/pypy/module/pypyjit/test_pypy_c/test_string.py
b/pypy/module/pypyjit/test_pypy_c/test_string.py
--- a/pypy/module/pypyjit/test_pypy_c/test_string.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_string.py
@@ -6,7 +6,7 @@
else:
SHIFT = 63
-# XXX review the <Call> descrs to replace some EF=4 with EF=3 (elidable)
+# XXX review the <Call> descrs to replace some EF=5 with EF=4 (elidable)
class TestString(BaseTestPyPyC):
@@ -80,12 +80,12 @@
i23 = strgetitem(p10, i19)
p25 = newstr(1)
strsetitem(p25, 0, i23)
- p93 = call(ConstClass(fromstr), p25, 16, descr=<Callr . ri EF=3>)
+ p93 = call(ConstClass(fromstr), p25, 16, descr=<Callr . ri EF=4>)
guard_no_exception(descr=...)
i95 = getfield_gc_pure(p93, descr=<FieldS
rpython.rlib.rbigint.rbigint.inst_size .*>)
i96 = int_gt(i95, #)
guard_false(i96, descr=...)
- i94 = call(ConstClass(rbigint._toint_helper), p93, descr=<Calli .
r EF=3>)
+ i94 = call(ConstClass(rbigint._toint_helper), p93, descr=<Calli .
r EF=4>)
guard_no_exception(descr=...)
i95 = int_add_ovf(i6, i94)
guard_no_overflow(descr=...)
@@ -119,21 +119,21 @@
setfield_gc(p86, 23, descr=<FieldS stringbuilder.current_end .+>)
setfield_gc(p86, 23, descr=<FieldS stringbuilder.total_size .+>)
}}}
- call(ConstClass(ll_append_res0__stringbuilderPtr_rpy_stringPtr),
p86, p80, descr=<Callv 0 rr EF=4>)
+ call(ConstClass(ll_append_res0__stringbuilderPtr_rpy_stringPtr),
p86, p80, descr=<Callv 0 rr EF=5>)
guard_no_exception(descr=...)
i89 = getfield_gc(p86, descr=<FieldS stringbuilder.current_pos .+>)
i90 = getfield_gc(p86, descr=<FieldS stringbuilder.current_end .+>)
i91 = int_eq(i89, i90)
- cond_call(i91, ConstClass(ll_grow_by__stringbuilderPtr_Signed),
p86, 1, descr=<Callv 0 ri EF=4>)
+ cond_call(i91, ConstClass(ll_grow_by__stringbuilderPtr_Signed),
p86, 1, descr=<Callv 0 ri EF=5>)
guard_no_exception(descr=...)
i92 = getfield_gc(p86, descr=<FieldS stringbuilder.current_pos .+>)
i93 = int_add(i92, 1)
p94 = getfield_gc(p86, descr=<FieldP stringbuilder.current_buf .+>)
strsetitem(p94, i92, 32)
setfield_gc(p86, i93, descr=<FieldS stringbuilder.current_pos .+>)
- call(ConstClass(ll_append_res0__stringbuilderPtr_rpy_stringPtr),
p86, p80, descr=<Callv 0 rr EF=4>)
+ call(ConstClass(ll_append_res0__stringbuilderPtr_rpy_stringPtr),
p86, p80, descr=<Callv 0 rr EF=5>)
guard_no_exception(descr=...)
- p95 = call(..., descr=<Callr . r EF=4>) # ll_build
+ p95 = call(..., descr=<Callr . r EF=5>) # ll_build
guard_no_exception(descr=...)
i96 = strlen(p95)
i97 = int_add_ovf(i71, i96)
@@ -248,7 +248,7 @@
i50 = int_add(i47, 1)
setfield_gc(p15, i50, descr=<FieldS
pypy.module.__builtin__.functional.W_XRangeIterator.inst_current 8>)
guard_not_invalidated(descr=...)
- p52 =
call(ConstClass(str_decode_ascii__raise_unicode_exception_decode),
ConstPtr(ptr38), 3, 1, descr=<Callr . rii EF=4>)
+ p52 =
call(ConstClass(str_decode_ascii__raise_unicode_exception_decode),
ConstPtr(ptr38), 3, 1, descr=<Callr . rii EF=5>)
guard_no_exception(descr=...)
p53 = getfield_gc_pure(p52, descr=<FieldP tuple2.item0 .>)
guard_nonnull(p53, descr=...)
diff --git a/pypy/module/pypyjit/test_pypy_c/test_thread.py
b/pypy/module/pypyjit/test_pypy_c/test_thread.py
--- a/pypy/module/pypyjit/test_pypy_c/test_thread.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_thread.py
@@ -64,7 +64,7 @@
guard_true(i56, descr=...)
p57 = force_token()
setfield_gc(p0, p57, descr=<FieldP
pypy.interpreter.pyframe.PyFrame.vable_token 8>)
- i58 = call_release_gil(0, _, i37, 1, descr=<Calli 4 ii EF=6>)
+ i58 = call_release_gil(0, _, i37, 1, descr=<Calli 4 ii EF=7>)
guard_not_forced(descr=...)
guard_no_exception(descr=...)
i58 = int_sub(i44, 1)
diff --git a/pypy/module/pypyjit/test_pypy_c/test_weakref.py
b/pypy/module/pypyjit/test_pypy_c/test_weakref.py
--- a/pypy/module/pypyjit/test_pypy_c/test_weakref.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_weakref.py
@@ -35,7 +35,7 @@
guard_nonnull_class(p66, ..., descr=...)
p67 = force_token()
setfield_gc(p0, p67, descr=<FieldP
pypy.interpreter.pyframe.PyFrame.vable_token \d+>)
- p68 =
call_may_force(ConstClass(WeakrefLifelineWithCallbacks.make_weakref_with_callback),
p66, ConstPtr(ptr50), p14, ConstPtr(ptr51), descr=<Callr \d rrrr EF=6>)
+ p68 =
call_may_force(ConstClass(WeakrefLifelineWithCallbacks.make_weakref_with_callback),
p66, ConstPtr(ptr50), p14, ConstPtr(ptr51), descr=<Callr \d rrrr EF=7>)
guard_not_forced(descr=...)
guard_no_exception(descr=...)
guard_nonnull_class(p68, ..., descr=...)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
