Commits

Maciej Fijalkowski  committed b596c61

fix a bunch of overly specific tests

  • Participants
  • Parent commits b81a1cf

Comments (0)

Files changed (10)

File pypy/module/pypyjit/test_pypy_c/test_00_model.py

             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("""
             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, """
             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):

File pypy/module/pypyjit/test_pypy_c/test_array.py

             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):
             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):
             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):

File pypy/module/pypyjit/test_pypy_c/test_call.py

             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):
             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):
         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 .>)
             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):

File pypy/module/pypyjit/test_pypy_c/test_containers.py

             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):

File pypy/module/pypyjit/test_pypy_c/test_instance.py

             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):
             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):
             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):

File pypy/module/pypyjit/test_pypy_c/test_intbound.py

             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):
             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):
             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):
             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):
             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):
             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):
             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):

File pypy/module/pypyjit/test_pypy_c/test_min_max.py

             guard_no_overflow(descr=...)
             i11 = int_add(i4, 1)
             --TICK--
-            jump(p0, p1, p2, p3, i11, i9, descr=...)
+            jump(..., descr=...)
         """)
         
 

File pypy/module/pypyjit/test_pypy_c/test_misc.py

             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
             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)
             guard_no_exception(descr=...)
             i13 = int_sub(i4, 1)
             --TICK--
-            jump(p0, p1, p2, p3, i13, p11, descr=...)
+            jump(..., descr=...)
         """)
 
 
             guard_true(i9, descr=...)
             f10 = float_add(f8, f5)
             --TICK--
-            jump(p0, p1, p2, p3, p4, f10, p6, f7, f8, descr=...)
+            jump(..., descr=...)
         """)
 
 
             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=...)
         """)
 
 

File pypy/module/pypyjit/test_pypy_c/test_string.py

             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):
             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):
             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):

File pypy/module/pypyjit/test_pypy_c/test_thread.py

             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=...)
         """)