Author: Hakan Ardo <ha...@debian.org>
Branch: jit-targets
Changeset: r49706:71f16e839255
Date: 2011-11-23 20:00 +0100
http://bitbucket.org/pypy/pypy/changeset/71f16e839255/
Log: fix tests
diff --git a/pypy/jit/backend/x86/test/test_recompilation.py
b/pypy/jit/backend/x86/test/test_recompilation.py
--- a/pypy/jit/backend/x86/test/test_recompilation.py
+++ b/pypy/jit/backend/x86/test/test_recompilation.py
@@ -5,10 +5,11 @@
def test_compile_bridge_not_deeper(self):
ops = '''
[i0]
+ label(i0, descr=targettoken)
i1 = int_add(i0, 1)
i2 = int_lt(i1, 20)
guard_true(i2, descr=fdescr1) [i1]
- jump(i1)
+ jump(i1, descr=targettoken)
'''
loop = self.interpret(ops, [0])
assert self.getint(0) == 20
@@ -26,10 +27,11 @@
def test_compile_bridge_deeper(self):
ops = '''
[i0]
+ label(i0, descr=targettoken)
i1 = int_add(i0, 1)
i2 = int_lt(i1, 20)
guard_true(i2, descr=fdescr1) [i1]
- jump(i1)
+ jump(i1, descr=targettoken)
'''
loop = self.interpret(ops, [0])
previous = loop.token._x86_frame_depth
@@ -47,7 +49,7 @@
finish(i3, i4, i5, i6, i7, i8, i9, descr=fdescr2)
'''
bridge = self.attach_bridge(ops, loop, -2)
- descr = loop.operations[2].getdescr()
+ descr = loop.operations[3].getdescr()
new = descr._x86_bridge_frame_depth
assert descr._x86_bridge_param_depth == 0
# XXX: Maybe add enough ops to force stack on 64-bit as well?
@@ -64,21 +66,23 @@
def test_bridge_jump_to_other_loop(self):
loop = self.interpret('''
[i0, i10, i11, i12, i13, i14, i15, i16]
+ label(i0, i10, i11, i12, i13, i14, i15, i16, descr=targettoken)
i1 = int_add(i0, 1)
i2 = int_lt(i1, 20)
guard_true(i2, descr=fdescr1) [i1]
- jump(i1, i10, i11, i12, i13, i14, i15, i16)
+ jump(i1, i10, i11, i12, i13, i14, i15, i16, descr=targettoken)
''', [0])
other_loop = self.interpret('''
[i3]
+ label(i3, descr=targettoken2)
guard_false(i3, descr=fdescr2) [i3]
- jump(i3)
+ jump(i3, descr=targettoken2)
''', [1])
ops = '''
[i3]
- jump(i3, 1, 2, 3, 4, 5, 6, 7, descr=looptoken)
+ jump(i3, 1, 2, 3, 4, 5, 6, 7, descr=targettoken)
'''
- bridge = self.attach_bridge(ops, other_loop, 0, looptoken=loop.token)
+ bridge = self.attach_bridge(ops, other_loop, 1)
self.cpu.set_future_value_int(0, 1)
fail = self.run(other_loop)
assert fail.identifier == 1
@@ -86,6 +90,7 @@
def test_bridge_jumps_to_self_deeper(self):
loop = self.interpret('''
[i0, i1, i2, i31, i32, i33]
+ label(i0, i1, i2, i31, i32, i33, descr=targettoken)
i98 = same_as(0)
i99 = same_as(1)
i30 = int_add(i1, i2)
@@ -94,7 +99,7 @@
guard_false(i4) [i98, i3]
i5 = int_lt(i3, 20)
guard_true(i5) [i99, i3]
- jump(i3, i30, 1, i30, i30, i30)
+ jump(i3, i30, 1, i30, i30, i30, descr=targettoken)
''', [0])
assert self.getint(0) == 0
assert self.getint(1) == 1
@@ -106,10 +111,10 @@
i7 = int_add(i3, i6)
i12 = int_add(i7, i8)
i11 = int_add(i12, i6)
- jump(i3, i12, i11, i10, i6, i7, descr=looptoken)
+ jump(i3, i12, i11, i10, i6, i7, descr=targettoken)
'''
- bridge = self.attach_bridge(ops, loop, 5, looptoken=loop.token)
- guard_op = loop.operations[5]
+ bridge = self.attach_bridge(ops, loop, 6)
+ guard_op = loop.operations[6]
loop_frame_depth = loop.token._x86_frame_depth
assert loop.token._x86_param_depth == 0
# XXX: Maybe add enough ops to force stack on 64-bit as well?
@@ -126,6 +131,7 @@
def test_bridge_jumps_to_self_shallower(self):
loop = self.interpret('''
[i0, i1, i2]
+ label(i0, i1, i2, descr=targettoken)
i98 = same_as(0)
i99 = same_as(1)
i3 = int_add(i0, 1)
@@ -133,15 +139,15 @@
guard_false(i4) [i98, i3]
i5 = int_lt(i3, 20)
guard_true(i5) [i99, i3]
- jump(i3, i1, i2)
+ jump(i3, i1, i2, descr=targettoken)
''', [0])
assert self.getint(0) == 0
assert self.getint(1) == 1
ops = '''
[i97, i3]
- jump(i3, 0, 1, descr=looptoken)
+ jump(i3, 0, 1, descr=targettoken)
'''
- bridge = self.attach_bridge(ops, loop, 4, looptoken=loop.token)
+ bridge = self.attach_bridge(ops, loop, 5)
self.cpu.set_future_value_int(0, 0)
self.cpu.set_future_value_int(1, 0)
self.cpu.set_future_value_int(2, 0)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
