Author: Armin Rigo <[email protected]>
Branch: py3.5
Changeset: r88772:804de614b905
Date: 2016-11-30 15:11 +0000
http://bitbucket.org/pypy/pypy/changeset/804de614b905/
Log: fix tests
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
@@ -247,6 +247,13 @@
""")
def test_dont_trace_every_iteration(self):
+ def reference(a, b):
+ i = sa = 0
+ while i < 300:
+ sa += a % b
+ i += 1
+ return sa
+ #
def main(a, b):
i = sa = 0
while i < 300:
@@ -258,9 +265,12 @@
i += 1
return sa
#
+ log_ref = self.run(reference, [10, 20])
+ assert log_ref.result == 300 * (10 % 20)
+ #
log = self.run(main, [10, 20])
assert log.result == 300 * (10 % 20)
- assert log.jit_summary.tracing_no == 1
+ assert log.jit_summary.tracing_no == log_ref.jit_summary.tracing_no
loop, = log.loops_by_filename(self.filepath)
assert loop.match("""
i11 = int_lt(i7, 300)
@@ -274,7 +284,7 @@
#
log = self.run(main, [-10, -20])
assert log.result == 300 * (-10 % -20)
- assert log.jit_summary.tracing_no == 1
+ assert log.jit_summary.tracing_no == log_ref.jit_summary.tracing_no
def test_overflow_checking(self):
"""
@@ -297,6 +307,7 @@
self.run_and_check(main, [])
def test_global(self):
+ # check that the global read is removed even from the entry bridge
log = self.run("""
i = 0
globalinc = 1
@@ -308,7 +319,10 @@
""", [1000])
loop, = log.loops_by_id("globalread", is_entry_bridge=True)
- assert len(loop.ops_by_id("globalread")) == 0
+ assert loop.match_by_id("globalread", """
+ # only a dead read
+ p26 = getfield_gc_r(ConstPtr(ptr25), descr=<FieldP
pypy.objspace.std.unicodeobject.W_UnicodeObject.inst__utf8 .>)
+ """)
def test_eval(self):
def main():
@@ -349,7 +363,8 @@
def test_long_comparison(self):
def main(n):
while n:
- 12345L > 123L # ID: long_op
+ x = 12345678901234567890123456
+ x > 1231231231231231231231231 # ID: long_op
n -= 1
log = self.run(main, [300])
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
