Author: Hakan Ardo <ha...@debian.org>
Branch: jit-targets
Changeset: r49382:01ed1de7dd3e
Date: 2011-11-13 13:49 +0100
http://bitbucket.org/pypy/pypy/changeset/01ed1de7dd3e/
Log: fix tests
diff --git a/pypy/jit/metainterp/test/test_recursive.py
b/pypy/jit/metainterp/test/test_recursive.py
--- a/pypy/jit/metainterp/test/test_recursive.py
+++ b/pypy/jit/metainterp/test/test_recursive.py
@@ -577,7 +577,7 @@
self.meta_interp(g, [10], backendopt=True)
self.check_aborted_count(1)
self.check_resops(call=0, call_assembler=2)
- self.check_tree_loop_count(3)
+ self.check_jitcell_token_count(2)
def test_directly_call_assembler(self):
driver = JitDriver(greens = ['codeno'], reds = ['i'],
@@ -1211,11 +1211,11 @@
portal(c, i, v)
self.meta_interp(main, [10, 10, False, False], inline=True)
- self.check_tree_loop_count(1)
- self.check_loop_count(0)
+ self.check_jitcell_token_count(1)
+ self.check_trace_count(1)
self.meta_interp(main, [3, 10, True, False], inline=True)
- self.check_tree_loop_count(0)
- self.check_loop_count(0)
+ self.check_jitcell_token_count(0)
+ self.check_trace_count(0)
def test_trace_from_start_does_not_prevent_inlining(self):
driver = JitDriver(greens = ['c', 'bc'], reds = ['i'])
diff --git a/pypy/jit/metainterp/test/test_tl.py
b/pypy/jit/metainterp/test/test_tl.py
--- a/pypy/jit/metainterp/test/test_tl.py
+++ b/pypy/jit/metainterp/test/test_tl.py
@@ -72,7 +72,7 @@
res = self.meta_interp(main, [0, 6], listops=True,
backendopt=True)
assert res == 5040
- self.check_resops({'jump': 2, 'int_le': 2, 'guard_value': 1,
+ self.check_resops({'jump': 1, 'int_le': 2, 'guard_value': 1,
'int_mul': 2, 'guard_false': 2, 'int_sub': 2})
def test_tl_2(self):
@@ -80,7 +80,7 @@
res = self.meta_interp(main, [1, 10], listops=True,
backendopt=True)
assert res == main(1, 10)
- self.check_resops({'int_le': 2, 'int_sub': 2, 'jump': 2,
+ self.check_resops({'int_le': 2, 'int_sub': 2, 'jump': 1,
'guard_false': 2, 'guard_value': 1})
def test_tl_call(self, listops=True, policy=None):
diff --git a/pypy/jit/metainterp/test/test_virtualizable.py
b/pypy/jit/metainterp/test/test_virtualizable.py
--- a/pypy/jit/metainterp/test/test_virtualizable.py
+++ b/pypy/jit/metainterp/test/test_virtualizable.py
@@ -582,7 +582,7 @@
res = self.meta_interp(f, [123], policy=StopAtXPolicy(g))
assert res == f(123)
self.check_aborted_count(2)
- self.check_tree_loop_count(0)
+ self.check_jitcell_token_count(0)
def test_external_read_with_exception(self):
jitdriver = JitDriver(greens = [], reds = ['frame'],
@@ -621,7 +621,7 @@
res = self.meta_interp(f, [123], policy=StopAtXPolicy(g))
assert res == f(123)
self.check_aborted_count(2)
- self.check_tree_loop_count(0)
+ self.check_jitcell_token_count(0)
def test_external_write(self):
jitdriver = JitDriver(greens = [], reds = ['frame'],
@@ -653,7 +653,7 @@
res = self.meta_interp(f, [240], policy=StopAtXPolicy(g))
assert res == f(240)
self.check_aborted_count(3)
- self.check_tree_loop_count(0)
+ self.check_jitcell_token_count(0)
def test_external_read_sometimes(self):
jitdriver = JitDriver(greens = [], reds = ['frame'],
diff --git a/pypy/jit/metainterp/test/test_virtualref.py
b/pypy/jit/metainterp/test/test_virtualref.py
--- a/pypy/jit/metainterp/test/test_virtualref.py
+++ b/pypy/jit/metainterp/test/test_virtualref.py
@@ -321,7 +321,7 @@
assert res == 13
self.check_resops(new_with_vtable=2, # the vref, but not XY()
new_array=0) # and neither next1/2/3
- self.check_loop_count(1)
+ self.check_trace_count(1)
self.check_aborted_count(0)
def test_blackhole_forces(self):
@@ -363,7 +363,7 @@
assert res == 13
self.check_resops(new_with_vtable=0, # all virtualized in the n!=13
loop
new_array=0)
- self.check_loop_count(1)
+ self.check_trace_count(1)
self.check_aborted_count(0)
def test_bridge_forces(self):
@@ -410,7 +410,7 @@
#
res = self.meta_interp(f, [72])
assert res == 6
- self.check_loop_count(2) # the loop and the bridge
+ self.check_trace_count(2) # the loop and the bridge
self.check_resops(new_with_vtable=2, # loop: nothing; bridge: vref, xy
new_array=2) # bridge: next4, next5
self.check_aborted_count(0)
diff --git a/pypy/jit/metainterp/test/test_warmspot.py
b/pypy/jit/metainterp/test/test_warmspot.py
--- a/pypy/jit/metainterp/test/test_warmspot.py
+++ b/pypy/jit/metainterp/test/test_warmspot.py
@@ -203,7 +203,7 @@
m -= 1
self.meta_interp(f2, [i2])
try:
- self.check_tree_loop_count(1)
+ self.check_jitcell_token_count(1)
break
except AssertionError:
print "f2: no loop generated for i2==%d" % i2
@@ -218,7 +218,7 @@
m -= 1
self.meta_interp(f1, [i1])
try:
- self.check_tree_loop_count(1)
+ self.check_jitcell_token_count(1)
break
except AssertionError:
print "f1: no loop generated for i1==%d" % i1
@@ -238,8 +238,8 @@
self.meta_interp(f1, [8])
# it should generate one "loop" only, which ends in a FINISH
# corresponding to the return from f2.
- self.check_tree_loop_count(1)
- self.check_loop_count(0)
+ self.check_trace_count(1)
+ self.check_resops(jump=0)
def test_simple_loop(self):
mydriver = JitDriver(greens=[], reds=['m'])
@@ -248,8 +248,8 @@
mydriver.jit_merge_point(m=m)
m = m - 1
self.meta_interp(f1, [8])
- self.check_loop_count(1)
- self.check_resops({'jump': 2, 'guard_true': 2, 'int_gt': 2,
+ self.check_trace_count(1)
+ self.check_resops({'jump': 1, 'guard_true': 2, 'int_gt': 2,
'int_sub': 2})
def test_void_red_variable(self):
diff --git a/pypy/jit/metainterp/test/test_warmstate.py
b/pypy/jit/metainterp/test/test_warmstate.py
--- a/pypy/jit/metainterp/test/test_warmstate.py
+++ b/pypy/jit/metainterp/test/test_warmstate.py
@@ -192,12 +192,12 @@
class FakeLoopToken(object):
pass
looptoken = FakeLoopToken()
- state.attach_unoptimized_bridge_from_interp([ConstInt(5),
- constfloat(2.25)],
- looptoken)
+ state.attach_procedure_to_interp([ConstInt(5),
+ constfloat(2.25)],
+ looptoken)
cell1 = get_jitcell(True, 5, 2.25)
assert cell1.counter < 0
- assert cell1.get_entry_loop_token() is looptoken
+ assert cell1.get_procedure_token() is looptoken
def test_make_jitdriver_callbacks_1():
class FakeWarmRunnerDesc:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
