Author: Antonio Cuni <[email protected]>
Branch:
Changeset: r44795:56376304dfc1
Date: 2011-06-07 15:49 +0200
http://bitbucket.org/pypy/pypy/changeset/56376304dfc1/
Log: move intbound tests to their own test file
diff --git a/pypy/module/pypyjit/test_pypy_c/test_intbound.py
b/pypy/module/pypyjit/test_pypy_c/test_intbound.py
new file mode 100644
--- /dev/null
+++ b/pypy/module/pypyjit/test_pypy_c/test_intbound.py
@@ -0,0 +1,261 @@
+import py
+from pypy.module.pypyjit.test_pypy_c.test_model import BaseTestPyPyC
+
+class TestIntbound(BaseTestPyPyC):
+
+ def test_intbound_simple(self):
+ """
+ This test only checks that we get the expected result, not that any
+ optimization has been applied.
+ """
+ ops = ('<', '>', '<=', '>=', '==', '!=')
+ nbr = (3, 7)
+ for o1 in ops:
+ for o2 in ops:
+ for n1 in nbr:
+ for n2 in nbr:
+ src = '''
+ def f(i):
+ a, b = 3, 3
+ if i %s %d:
+ a = 0
+ else:
+ a = 1
+ if i %s %d:
+ b = 0
+ else:
+ b = 1
+ return a + b * 2
+
+ def main():
+ res = [0] * 4
+ idx = []
+ for i in range(15):
+ idx.extend([i] * 15)
+ for i in idx:
+ res[f(i)] += 1
+ return res
+
+ ''' % (o1, n1, o2, n2)
+ self.run_and_check(src, threshold=200)
+
+ def test_intbound_addsub_mix(self):
+ """
+ This test only checks that we get the expected result, not that any
+ optimization has been applied.
+ """
+ tests = ('i > 4', 'i > 2', 'i + 1 > 2', '1 + i > 4',
+ 'i - 1 > 1', '1 - i > 1', '1 - i < -3',
+ 'i == 1', 'i == 5', 'i != 1', '-2 * i < -4')
+ for t1 in tests:
+ for t2 in tests:
+ src = '''
+ def f(i):
+ a, b = 3, 3
+ if %s:
+ a = 0
+ else:
+ a = 1
+ if %s:
+ b = 0
+ else:
+ b = 1
+ return a + b * 2
+
+ def main():
+ res = [0] * 4
+ idx = []
+ for i in range(15):
+ idx.extend([i] * 15)
+ for i in idx:
+ res[f(i)] += 1
+ return res
+
+ ''' % (t1, t2)
+ self.run_and_check(src, threshold=200)
+
+ def test_intbound_gt(self):
+ def main(n):
+ i, a, b = 0, 0, 0
+ while i < n:
+ if i > -1:
+ a += 1
+ if i > -2:
+ b += 1
+ i += 1
+ return (a, b)
+ #
+ log = self.run(main, [300], threshold=200)
+ assert log.result == (300, 300)
+ loop, = log.loops_by_filename(self.filepath)
+ assert loop.match("""
+ i10 = int_lt(i8, i9)
+ guard_true(i10, descr=...)
+ i12 = int_add_ovf(i7, 1)
+ guard_no_overflow(descr=...)
+ i14 = int_add_ovf(i6, 1)
+ guard_no_overflow(descr=...)
+ i17 = int_add(i8, 1)
+ --TICK--
+ jump(p0, p1, p2, p3, p4, p5, i14, i12, i17, i9, descr=<Loop0>)
+ """)
+
+ def test_intbound_sub_lt(self):
+ def main():
+ i, a = 0, 0
+ while i < 300:
+ if i - 10 < 295:
+ a += 1
+ i += 1
+ return a
+ #
+ log = self.run(main, [], threshold=200)
+ assert log.result == 300
+ loop, = log.loops_by_filename(self.filepath)
+ assert loop.match("""
+ i7 = int_lt(i5, 300)
+ guard_true(i7, descr=...)
+ i9 = int_sub_ovf(i5, 10)
+ guard_no_overflow(descr=...)
+ i11 = int_add_ovf(i4, 1)
+ guard_no_overflow(descr=...)
+ i13 = int_add(i5, 1)
+ --TICK--
+ jump(p0, p1, p2, p3, i11, i13, descr=<Loop0>)
+ """)
+
+ def test_intbound_addsub_ge(self):
+ def main(n):
+ i, a, b = 0, 0, 0
+ while i < n:
+ if i + 5 >= 5:
+ a += 1
+ if i - 1 >= -1:
+ b += 1
+ i += 1
+ return (a, b)
+ #
+ log = self.run(main, [300], threshold=200)
+ assert log.result == (300, 300)
+ loop, = log.loops_by_filename(self.filepath)
+ assert loop.match("""
+ i10 = int_lt(i8, i9)
+ guard_true(i10, descr=...)
+ i12 = int_add_ovf(i8, 5)
+ guard_no_overflow(descr=...)
+ i14 = int_add_ovf(i7, 1)
+ guard_no_overflow(descr=...)
+ i16 = int_add_ovf(i6, 1)
+ guard_no_overflow(descr=...)
+ i19 = int_add(i8, 1)
+ --TICK--
+ jump(p0, p1, p2, p3, p4, p5, i16, i14, i19, i9, descr=<Loop0>)
+ """)
+
+ def test_intbound_addmul_ge(self):
+ def main(n):
+ i, a, b = 0, 0, 0
+ while i < 300:
+ if i + 5 >= 5:
+ a += 1
+ if 2 * i >= 0:
+ b += 1
+ i += 1
+ return (a, b)
+ #
+ log = self.run(main, [300], threshold=200)
+ assert log.result == (300, 300)
+ loop, = log.loops_by_filename(self.filepath)
+ assert loop.match("""
+ i10 = int_lt(i8, 300)
+ guard_true(i10, descr=...)
+ i12 = int_add(i8, 5)
+ i14 = int_add_ovf(i7, 1)
+ guard_no_overflow(descr=...)
+ i16 = int_lshift(i8, 1)
+ i18 = int_add_ovf(i6, 1)
+ guard_no_overflow(descr=...)
+ i21 = int_add(i8, 1)
+ --TICK--
+ jump(p0, p1, p2, p3, p4, p5, i18, i14, i21, descr=<Loop0>)
+ """)
+
+ def test_intbound_eq(self):
+ def main(a, n):
+ i, s = 0, 0
+ while i < 300:
+ if a == 7:
+ s += a + 1
+ elif i == 10:
+ s += i
+ else:
+ s += 1
+ i += 1
+ return s
+ #
+ log = self.run(main, [7, 300], threshold=200)
+ assert log.result == main(7, 300)
+ log = self.run(main, [10, 300], threshold=200)
+ assert log.result == main(10, 300)
+ log = self.run(main, [42, 300], threshold=200)
+ assert log.result == main(42, 300)
+ loop, = log.loops_by_filename(self.filepath)
+ assert loop.match("""
+ i10 = int_lt(i8, 300)
+ guard_true(i10, descr=...)
+ i12 = int_eq(i8, 10)
+ guard_false(i12, descr=...)
+ i14 = int_add_ovf(i7, 1)
+ guard_no_overflow(descr=...)
+ i16 = int_add(i8, 1)
+ --TICK--
+ jump(p0, p1, p2, p3, p4, p5, p6, i14, i16, descr=<Loop0>)
+ """)
+
+ def test_intbound_mul(self):
+ def main(a):
+ i, s = 0, 0
+ while i < 300:
+ assert i >= 0
+ if 2 * i < 30000:
+ s += 1
+ else:
+ s += a
+ i += 1
+ return s
+ #
+ log = self.run(main, [7], threshold=200)
+ assert log.result == 300
+ loop, = log.loops_by_filename(self.filepath)
+ assert loop.match("""
+ i8 = int_lt(i6, 300)
+ guard_true(i8, descr=...)
+ i10 = int_lshift(i6, 1)
+ i12 = int_add_ovf(i5, 1)
+ guard_no_overflow(descr=...)
+ i14 = int_add(i6, 1)
+ --TICK--
+ jump(p0, p1, p2, p3, p4, i12, i14, descr=<Loop0>)
+ """)
+
+ def test_assert(self):
+ def main(a):
+ i, s = 0, 0
+ while i < 300:
+ assert a == 7
+ s += a + 1
+ i += 1
+ return s
+ log = self.run(main, [7], threshold=200)
+ assert log.result == 300*8
+ loop, = log.loops_by_filename(self.filepath)
+ assert loop.match("""
+ i8 = int_lt(i6, 300)
+ guard_true(i8, descr=...)
+ i10 = int_add_ovf(i5, 8)
+ guard_no_overflow(descr=...)
+ i12 = int_add(i6, 1)
+ --TICK--
+ jump(p0, p1, p2, p3, p4, i10, i12, descr=<Loop0>)
+ """)
+
diff --git a/pypy/module/pypyjit/test_pypy_c/test_pypy_c_new.py
b/pypy/module/pypyjit/test_pypy_c/test_pypy_c_new.py
--- a/pypy/module/pypyjit/test_pypy_c/test_pypy_c_new.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_pypy_c_new.py
@@ -1,9 +1,4 @@
-import py, sys, re
-import subprocess
-from lib_pypy import disassembler
-from pypy.tool.udir import udir
-from pypy.tool import logparser
-from pypy.module.pypyjit.test_pypy_c.model import Log
+import py, sys
from pypy.module.pypyjit.test_pypy_c.test_model import BaseTestPyPyC
@@ -1159,262 +1154,6 @@
""")
- def test_intbound_simple(self):
- """
- This test only checks that we get the expected result, not that any
- optimization has been applied.
- """
- ops = ('<', '>', '<=', '>=', '==', '!=')
- nbr = (3, 7)
- for o1 in ops:
- for o2 in ops:
- for n1 in nbr:
- for n2 in nbr:
- src = '''
- def f(i):
- a, b = 3, 3
- if i %s %d:
- a = 0
- else:
- a = 1
- if i %s %d:
- b = 0
- else:
- b = 1
- return a + b * 2
-
- def main():
- res = [0] * 4
- idx = []
- for i in range(15):
- idx.extend([i] * 15)
- for i in idx:
- res[f(i)] += 1
- return res
-
- ''' % (o1, n1, o2, n2)
- self.run_and_check(src, threshold=200)
-
- def test_intbound_addsub_mix(self):
- """
- This test only checks that we get the expected result, not that any
- optimization has been applied.
- """
- tests = ('i > 4', 'i > 2', 'i + 1 > 2', '1 + i > 4',
- 'i - 1 > 1', '1 - i > 1', '1 - i < -3',
- 'i == 1', 'i == 5', 'i != 1', '-2 * i < -4')
- for t1 in tests:
- for t2 in tests:
- src = '''
- def f(i):
- a, b = 3, 3
- if %s:
- a = 0
- else:
- a = 1
- if %s:
- b = 0
- else:
- b = 1
- return a + b * 2
-
- def main():
- res = [0] * 4
- idx = []
- for i in range(15):
- idx.extend([i] * 15)
- for i in idx:
- res[f(i)] += 1
- return res
-
- ''' % (t1, t2)
- self.run_and_check(src, threshold=200)
-
- def test_intbound_gt(self):
- def main(n):
- i, a, b = 0, 0, 0
- while i < n:
- if i > -1:
- a += 1
- if i > -2:
- b += 1
- i += 1
- return (a, b)
- #
- log = self.run(main, [300], threshold=200)
- assert log.result == (300, 300)
- loop, = log.loops_by_filename(self.filepath)
- assert loop.match("""
- i10 = int_lt(i8, i9)
- guard_true(i10, descr=...)
- i12 = int_add_ovf(i7, 1)
- guard_no_overflow(descr=...)
- i14 = int_add_ovf(i6, 1)
- guard_no_overflow(descr=...)
- i17 = int_add(i8, 1)
- --TICK--
- jump(p0, p1, p2, p3, p4, p5, i14, i12, i17, i9, descr=<Loop0>)
- """)
-
- def test_intbound_sub_lt(self):
- def main():
- i, a = 0, 0
- while i < 300:
- if i - 10 < 295:
- a += 1
- i += 1
- return a
- #
- log = self.run(main, [], threshold=200)
- assert log.result == 300
- loop, = log.loops_by_filename(self.filepath)
- assert loop.match("""
- i7 = int_lt(i5, 300)
- guard_true(i7, descr=...)
- i9 = int_sub_ovf(i5, 10)
- guard_no_overflow(descr=...)
- i11 = int_add_ovf(i4, 1)
- guard_no_overflow(descr=...)
- i13 = int_add(i5, 1)
- --TICK--
- jump(p0, p1, p2, p3, i11, i13, descr=<Loop0>)
- """)
-
- def test_intbound_addsub_ge(self):
- def main(n):
- i, a, b = 0, 0, 0
- while i < n:
- if i + 5 >= 5:
- a += 1
- if i - 1 >= -1:
- b += 1
- i += 1
- return (a, b)
- #
- log = self.run(main, [300], threshold=200)
- assert log.result == (300, 300)
- loop, = log.loops_by_filename(self.filepath)
- assert loop.match("""
- i10 = int_lt(i8, i9)
- guard_true(i10, descr=...)
- i12 = int_add_ovf(i8, 5)
- guard_no_overflow(descr=...)
- i14 = int_add_ovf(i7, 1)
- guard_no_overflow(descr=...)
- i16 = int_add_ovf(i6, 1)
- guard_no_overflow(descr=...)
- i19 = int_add(i8, 1)
- --TICK--
- jump(p0, p1, p2, p3, p4, p5, i16, i14, i19, i9, descr=<Loop0>)
- """)
-
- def test_intbound_addmul_ge(self):
- def main(n):
- i, a, b = 0, 0, 0
- while i < 300:
- if i + 5 >= 5:
- a += 1
- if 2 * i >= 0:
- b += 1
- i += 1
- return (a, b)
- #
- log = self.run(main, [300], threshold=200)
- assert log.result == (300, 300)
- loop, = log.loops_by_filename(self.filepath)
- assert loop.match("""
- i10 = int_lt(i8, 300)
- guard_true(i10, descr=...)
- i12 = int_add(i8, 5)
- i14 = int_add_ovf(i7, 1)
- guard_no_overflow(descr=...)
- i16 = int_lshift(i8, 1)
- i18 = int_add_ovf(i6, 1)
- guard_no_overflow(descr=...)
- i21 = int_add(i8, 1)
- --TICK--
- jump(p0, p1, p2, p3, p4, p5, i18, i14, i21, descr=<Loop0>)
- """)
-
- def test_intbound_eq(self):
- def main(a, n):
- i, s = 0, 0
- while i < 300:
- if a == 7:
- s += a + 1
- elif i == 10:
- s += i
- else:
- s += 1
- i += 1
- return s
- #
- log = self.run(main, [7, 300], threshold=200)
- assert log.result == main(7, 300)
- log = self.run(main, [10, 300], threshold=200)
- assert log.result == main(10, 300)
- log = self.run(main, [42, 300], threshold=200)
- assert log.result == main(42, 300)
- loop, = log.loops_by_filename(self.filepath)
- assert loop.match("""
- i10 = int_lt(i8, 300)
- guard_true(i10, descr=...)
- i12 = int_eq(i8, 10)
- guard_false(i12, descr=...)
- i14 = int_add_ovf(i7, 1)
- guard_no_overflow(descr=...)
- i16 = int_add(i8, 1)
- --TICK--
- jump(p0, p1, p2, p3, p4, p5, p6, i14, i16, descr=<Loop0>)
- """)
-
- def test_intbound_mul(self):
- def main(a):
- i, s = 0, 0
- while i < 300:
- assert i >= 0
- if 2 * i < 30000:
- s += 1
- else:
- s += a
- i += 1
- return s
- #
- log = self.run(main, [7], threshold=200)
- assert log.result == 300
- loop, = log.loops_by_filename(self.filepath)
- assert loop.match("""
- i8 = int_lt(i6, 300)
- guard_true(i8, descr=...)
- i10 = int_lshift(i6, 1)
- i12 = int_add_ovf(i5, 1)
- guard_no_overflow(descr=...)
- i14 = int_add(i6, 1)
- --TICK--
- jump(p0, p1, p2, p3, p4, i12, i14, descr=<Loop0>)
- """)
-
- def test_assert(self):
- def main(a):
- i, s = 0, 0
- while i < 300:
- assert a == 7
- s += a + 1
- i += 1
- return s
- log = self.run(main, [7], threshold=200)
- assert log.result == 300*8
- loop, = log.loops_by_filename(self.filepath)
- assert loop.match("""
- i8 = int_lt(i6, 300)
- guard_true(i8, descr=...)
- i10 = int_add_ovf(i5, 8)
- guard_no_overflow(descr=...)
- i12 = int_add(i6, 1)
- --TICK--
- jump(p0, p1, p2, p3, p4, i10, i12, descr=<Loop0>)
- """)
-
def test_zeropadded(self):
def main():
from array import array
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
