Author: Maciej Fijalkowski <[email protected]>
Branch:
Changeset: r62448:b596c6158bb6
Date: 2013-03-18 22:44 -0700
http://bitbucket.org/pypy/pypy/changeset/b596c6158bb6/
Log: fix a bunch of overly specific tests
diff --git a/pypy/module/pypyjit/test_pypy_c/test_00_model.py
b/pypy/module/pypyjit/test_pypy_c/test_00_model.py
--- a/pypy/module/pypyjit/test_pypy_c/test_00_model.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_00_model.py
@@ -496,7 +496,7 @@
i10 = getfield_raw(..., descr=<.* pypysig_long_struct.c_value .*>)
i14 = int_lt(i10, 0)
guard_false(i14, descr=...)
- jump(p0, p1, p2, p3, i8, descr=...)
+ jump(..., descr=...)
""")
#
assert loop.match("""
@@ -504,7 +504,7 @@
guard_true(i6, descr=...)
i8 = int_add(i4, 1)
--TICK--
- jump(p0, p1, p2, p3, i8, descr=...)
+ jump(..., descr=...)
""")
#
py.test.raises(InvalidMatch, loop.match, """
@@ -512,7 +512,7 @@
guard_true(i6)
i8 = int_add(i5, 1) # variable mismatch
--TICK--
- jump(p0, p1, p2, p3, i8, descr=...)
+ jump(..., descr=...)
""")
def test_match_by_id(self):
diff --git a/pypy/module/pypyjit/test_pypy_c/test_array.py
b/pypy/module/pypyjit/test_pypy_c/test_array.py
--- a/pypy/module/pypyjit/test_pypy_c/test_array.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_array.py
@@ -22,7 +22,7 @@
guard_true(i7, descr=...)
i9 = int_add(i5, 1)
--TICK--
- jump(p0, p1, p2, p3, p4, i9, i6, descr=...)
+ jump(..., descr=...)
""")
def test_array_sum(self):
@@ -47,7 +47,7 @@
guard_no_overflow(descr=...)
i18 = int_add(i7, 1)
--TICK--
- jump(p0, p1, p2, p3, p4, p5, i18, i16, p8, i9, i10, descr=...)
+ jump(..., descr=...)
""")
def test_array_intimg(self):
@@ -85,7 +85,7 @@
setarrayitem_raw(i11, i8, _, descr=<ArrayS .>)
i28 = int_add(i8, 1)
--TICK--
- jump(p0, p1, p2, p3, p4, p5, p6, i28, i15, p9, i10, i11, descr=...)
+ jump(..., descr=...)
""")
def test_array_of_doubles(self):
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
@@ -101,7 +101,7 @@
i15 = int_add_ovf(i12, 1)
guard_no_overflow(descr=...)
--TICK--
- jump(p0, p1, p2, p3, p4, i15, i6, p7, p8, descr=...)
+ jump(..., descr=...)
""")
def test_method_call(self):
@@ -144,7 +144,7 @@
i19 = int_add_ovf(i10, i17)
guard_no_overflow(descr=...)
--TICK--
- jump(p0, p1, p2, p3, p4, p5, i19, p7, i17, i9, i10, p11, p12, p13,
descr=...)
+ jump(..., descr=...)
""")
def test_static_classmethod_call(self):
@@ -369,12 +369,12 @@
assert loop.match_by_id('call', opcode='CALL_FUNCTION',
expected_src="""
# make sure that the "block" is not allocated
...
- i20 = force_token()
+ p20 = force_token()
p22 = new_with_vtable(...)
p24 = new_array(1, descr=<ArrayP .>)
p26 = new_with_vtable(ConstClass(W_ListObject))
{{{
- setfield_gc(p0, i20, descr=<FieldS .*PyFrame.vable_token .*>)
+ setfield_gc(p0, p20, descr=<FieldP .*PyFrame.vable_token .*>)
setfield_gc(p22, 1, descr=<FieldU
pypy.interpreter.argument.Arguments.inst__jit_few_keywords .*>)
setfield_gc(p26, ConstPtr(ptr22), descr=<FieldP
pypy.objspace.std.listobject.W_ListObject.inst_strategy .*>)
setarrayitem_gc(p24, 0, p26, descr=<ArrayP .>)
@@ -467,7 +467,7 @@
p22 = new_with_vtable(ConstClass(W_IntObject))
setfield_gc(p22, i13, descr=<FieldS
pypy.objspace.std.intobject.W_IntObject.inst_intval .*>)
setfield_gc(p4, p22, descr=<FieldP
pypy.interpreter.nestedscope.Cell.inst_w_value .*>)
- jump(p0, p1, p2, p3, p4, p7, p22, p7, descr=...)
+ jump(..., descr=...)
""")
def test_kwargs_virtual(self):
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
@@ -115,7 +115,7 @@
i35 = int_add_ovf(i5, i34)
guard_no_overflow(descr=...)
--TICK--
- jump(p0, p1, p2, p3, p4, i35, p13, i7, descr=...)
+ jump(..., descr=...)
""")
def test_floatlist_unpack_without_calls(self):
diff --git a/pypy/module/pypyjit/test_pypy_c/test_instance.py
b/pypy/module/pypyjit/test_pypy_c/test_instance.py
--- a/pypy/module/pypyjit/test_pypy_c/test_instance.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_instance.py
@@ -27,7 +27,7 @@
i9 = int_add_ovf(i5, 2)
guard_no_overflow(descr=...)
--TICK--
- jump(p0, p1, p2, p3, p4, i9, i6, descr=...)
+ jump(..., descr=...)
""")
def test_load_attr(self):
@@ -52,7 +52,7 @@
i10 = int_add_ovf(i5, i7)
guard_no_overflow(descr=...)
--TICK--
- jump(p0, p1, p2, p3, p4, i10, i6, i7, p8, descr=...)
+ jump(..., descr=...)
""")
def test_getattr_with_dynamic_attribute(self):
@@ -127,7 +127,7 @@
p20 = new_with_vtable(ConstClass(W_IntObject))
setfield_gc(p20, i11, descr=<FieldS.*W_IntObject.inst_intval .*>)
setfield_gc(ConstPtr(ptr21), p20, descr=<FieldP
.*TypeCell.inst_w_value .*>)
- jump(p0, p1, p2, p3, p4, p20, p6, i7, p20, descr=...)
+ jump(..., descr=...)
""")
def test_oldstyle_newstyle_mix(self):
diff --git a/pypy/module/pypyjit/test_pypy_c/test_intbound.py
b/pypy/module/pypyjit/test_pypy_c/test_intbound.py
--- a/pypy/module/pypyjit/test_pypy_c/test_intbound.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_intbound.py
@@ -97,7 +97,7 @@
guard_no_overflow(descr=...)
i17 = int_add(i8, 1)
--TICK--
- jump(p0, p1, p2, p3, p4, i14, i12, i17, p8, i9, descr=...)
+ jump(..., descr=...)
""")
def test_intbound_sub_lt(self):
@@ -121,7 +121,7 @@
guard_no_overflow(descr=...)
i13 = int_add(i5, 1)
--TICK--
- jump(p0, p1, p2, p3, i11, i13, descr=...)
+ jump(..., descr=...)
""")
def test_intbound_addsub_ge(self):
@@ -150,7 +150,7 @@
guard_no_overflow(descr=...)
i19 = int_add(i8, 1)
--TICK--
- jump(p0, p1, p2, p3, p4, i16, i14, i19, p8, i9, descr=...)
+ jump(..., descr=...)
""")
def test_intbound_addmul_ge(self):
@@ -178,7 +178,7 @@
guard_no_overflow(descr=...)
i21 = int_add(i8, 1)
--TICK--
- jump(p0, p1, p2, p3, p4, i18, i14, i21, p8, descr=...)
+ jump(..., descr=...)
""")
def test_intbound_eq(self):
@@ -210,7 +210,7 @@
guard_no_overflow(descr=...)
i16 = int_add(i8, 1)
--TICK--
- jump(p0, p1, p2, p3, p4, p6, i14, i16, p8, descr=...)
+ jump(..., descr=...)
""")
def test_intbound_mul(self):
@@ -236,7 +236,7 @@
guard_no_overflow(descr=...)
i14 = int_add(i6, 1)
--TICK--
- jump(p0, p1, p2, p3, p4, i12, i14, descr=...)
+ jump(..., descr=...)
""")
def test_assert(self):
@@ -257,7 +257,7 @@
guard_no_overflow(descr=...)
i12 = int_add(i6, 1)
--TICK--
- jump(p0, p1, p2, p3, p4, i10, i12, descr=...)
+ jump(..., descr=...)
""")
def test_xor(self):
diff --git a/pypy/module/pypyjit/test_pypy_c/test_min_max.py
b/pypy/module/pypyjit/test_pypy_c/test_min_max.py
--- a/pypy/module/pypyjit/test_pypy_c/test_min_max.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_min_max.py
@@ -22,7 +22,7 @@
guard_no_overflow(descr=...)
i11 = int_add(i4, 1)
--TICK--
- jump(p0, p1, p2, p3, i11, i9, descr=...)
+ jump(..., descr=...)
""")
diff --git a/pypy/module/pypyjit/test_pypy_c/test_misc.py
b/pypy/module/pypyjit/test_pypy_c/test_misc.py
--- a/pypy/module/pypyjit/test_pypy_c/test_misc.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_misc.py
@@ -31,7 +31,7 @@
i13 = int_add_ovf(i6, i12)
guard_no_overflow(descr=...)
--TICK--
- jump(p0, p1, p2, p3, p4, p5, i13, i11, i8, descr=...)
+ jump(..., descr=...)
"""
assert loop0.match(expected)
# XXX: The retracing fails to form a loop since j
@@ -56,7 +56,7 @@
guard_no_overflow(descr=...)
i10 = int_sub(i4, 1)
--TICK--
- jump(p0, p1, p2, p3, i10, i8, descr=...)
+ jump(..., descr=...)
""")
#
log = self.run(fact, [25], threshold=20)
@@ -71,7 +71,7 @@
guard_no_exception(descr=...)
i13 = int_sub(i4, 1)
--TICK--
- jump(p0, p1, p2, p3, i13, p11, descr=...)
+ jump(..., descr=...)
""")
@@ -91,7 +91,7 @@
guard_true(i9, descr=...)
f10 = float_add(f8, f5)
--TICK--
- jump(p0, p1, p2, p3, p4, f10, p6, f7, f8, descr=...)
+ jump(..., descr=...)
""")
@@ -252,7 +252,7 @@
i28 = int_add_ovf(i10, i25)
guard_no_overflow(descr=...)
--TICK--
- jump(p0, p1, p2, p3, p4, p5, p6, i28, i25, p9, p10, p11, p12, i19,
descr=...)
+ jump(..., descr=...)
""")
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
@@ -49,7 +49,7 @@
guard_true(i32, descr=...)
i34 = int_add(i6, 1)
--TICK--
- jump(p0, p1, p2, p3, p4, p5, i34, p7, p8, i9, i10, p11, i12, p13,
descr=...)
+ jump(..., descr=...)
""" % (-sys.maxint-1, SHIFT))
def test_long(self):
@@ -115,7 +115,7 @@
i58 = int_add_ovf(i6, i57)
guard_no_overflow(descr=...)
--TICK--
- jump(p0, p1, p2, p3, p4, p5, i58, i7, descr=...)
+ jump(..., descr=...)
""" % (-sys.maxint-1, SHIFT))
def test_str_mod(self):
@@ -164,7 +164,7 @@
guard_no_overflow(descr=...)
i40 = int_sub(i4, 1)
--TICK--
- jump(p0, p1, p2, p3, i40, i38, descr=...)
+ jump(..., descr=...)
""")
def test_getattr_promote(self):
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
@@ -46,5 +46,5 @@
guard_no_overflow(descr=...)
--TICK--
i58 = arraylen_gc(p43, descr=...)
- jump(p0, p1, p3, p5, p10, p12, p14, i54, i27, i47, p45, p43,
descr=...)
+ jump(..., descr=...)
""")
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
