Author: Hakan Ardo <[email protected]>
Branch: jit-usable_retrace_2
Changeset: r51032:76eace813ed4
Date: 2012-01-04 20:08 +0100
http://bitbucket.org/pypy/pypy/changeset/76eace813ed4/
Log: fix tests, we no longer specialice retraces on constants
diff --git a/pypy/jit/metainterp/test/test_ajit.py
b/pypy/jit/metainterp/test/test_ajit.py
--- a/pypy/jit/metainterp/test/test_ajit.py
+++ b/pypy/jit/metainterp/test/test_ajit.py
@@ -2593,12 +2593,19 @@
def f(n, limit):
set_param(myjitdriver, 'retrace_limit', limit)
- sa = i = a = 0
+ sa = i = 0
+ a = []
while i < n:
myjitdriver.jit_merge_point(n=n, i=i, sa=sa, a=a)
- a = i/4
- a = hint(a, promote=True)
- sa += a
+ if i/4 == 0:
+ a = [1, 2, 3]
+ elif i/4 == 1:
+ a = [1, 2, 3, 4]
+ elif i/4 == 2:
+ a = [1, 2, 3, 4, 5]
+ elif i/4 == 3:
+ a = [1, 2, 3, 4, 5, 6]
+ sa += len(a)
i += 1
return sa
assert self.meta_interp(f, [20, 2]) == f(20, 2)
@@ -2614,12 +2621,19 @@
def f(n, limit):
set_param(myjitdriver, 'retrace_limit', 3)
set_param(myjitdriver, 'max_retrace_guards', limit)
- sa = i = a = 0
+ sa = i = 0
+ a = []
while i < n:
myjitdriver.jit_merge_point(n=n, i=i, sa=sa, a=a)
- a = i/4
- a = hint(a, promote=True)
- sa += a
+ if i/4 == 0:
+ a = [1, 2, 3]
+ elif i/4 == 1:
+ a = [1, 2, 3, 4]
+ elif i/4 == 2:
+ a = [1, 2, 3, 4, 5]
+ elif i/4 == 3:
+ a = [1, 2, 3, 4, 5, 6]
+ sa += len(a)
i += 1
return sa
assert self.meta_interp(f, [20, 1]) == f(20, 1)
@@ -2634,16 +2648,23 @@
'node'])
def f(n, limit):
set_param(myjitdriver, 'retrace_limit', limit)
- sa = i = a = 0
+ sa = i = 0
+ a = []
node = [1, 2, 3]
node[1] = n
while i < n:
myjitdriver.jit_merge_point(n=n, i=i, sa=sa, a=a, node=node)
- a = i/4
- a = hint(a, promote=True)
+ if i/4 == 0:
+ a = [1, 2, 3]
+ elif i/4 == 1:
+ a = [1, 2, 3, 4]
+ elif i/4 == 2:
+ a = [1, 2, 3, 4, 5]
+ elif i/4 == 3:
+ a = [1, 2, 3, 4, 5, 6]
if i&1 == 0:
sa += node[i%3]
- sa += a
+ sa += len(a)
i += 1
return sa
assert self.meta_interp(f, [20, 2]) == f(20, 2)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
