[pypy-svn] r65922 - pypy/branch/pyjitpl5/pypy/jit/metainterp/test
arigo at codespeak.net
arigo at codespeak.net
Wed Jun 24 17:28:54 CEST 2009
Author: arigo
Date: Wed Jun 24 17:28:53 2009
New Revision: 65922
Modified:
pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_virtualizable.py
Log:
Clean up all the tests that don't make much sense any more
(basically combinations of virtuals and virtualizable).
We are left with two failing tests, external reads and
external writes.
Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_virtualizable.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_virtualizable.py (original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_virtualizable.py Wed Jun 24 17:28:53 2009
@@ -423,210 +423,12 @@
self.check_loops(getfield_gc=0, setfield_gc=0)
- def test_virtualizable_with_list(self):
- py.test.skip("redo or fix")
- myjitdriver = JitDriver(greens = [], reds = ['n', 'frame', 'x'],
- virtualizables = ['frame'])
-
-
- class Frame(object):
- _virtualizable2_ = True
-
- def __init__(self, l, s):
- self.l = l
- self.s = s
-
- def f(n, a):
- frame = Frame([a,a+1,a+2,a+3], 0)
- x = 0
- while n > 0:
- myjitdriver.can_enter_jit(frame=frame, n=n, x=x)
- myjitdriver.jit_merge_point(frame=frame, n=n, x=x)
- frame.s = hint(frame.s, promote=True)
- n -= 1
- x += frame.l[frame.s]
- frame.s += 1
- x += frame.l[frame.s]
- frame.l[frame.s] += 1
- frame.s -= 1
- return x
-
- res = self.meta_interp(f, [10, 1], listops=True)
- assert res == f(10, 1)
- self.check_loops(setarrayitem_gc=1)
-
- def test_virtual_on_virtualizable(self):
- py.test.skip("redo or fix")
- myjitdriver = JitDriver(greens = [], reds = ['frame', 'n'],
- virtualizables = ['frame'])
-
- class Stuff(object):
- def __init__(self, x):
- self.x = x
-
- class Stuff2(Stuff):
- pass
-
- class Frame(object):
- _virtualizable2_ = True
-
- _always_virtual_ = ['stuff']
-
- def __init__(self, x):
- self.stuff = Stuff(x)
-
- def f(n):
- frame = Frame(n/10)
- while n > 0:
- myjitdriver.can_enter_jit(frame=frame, n=n)
- myjitdriver.jit_merge_point(frame=frame, n=n)
- if isinstance(frame.stuff, Stuff2):
- return 2
- n -= frame.stuff.x
- return n
-
- res = self.meta_interp(f, [30])
- assert res == f(30)
- self.check_loops(getfield_gc=0)
-
-
- def test_no_virtual_on_virtualizable(self):
- py.test.skip("redo or fix")
- myjitdriver = JitDriver(greens = [], reds = ['frame', 'n'],
- virtualizables = ['frame'])
-
- class Stuff(object):
- def __init__(self, x):
- self.x = x
-
- class Stuff2(Stuff):
- pass
-
- class Frame(object):
- _virtualizable2_ = True
-
- def __init__(self, x):
- self.stuff = Stuff(x)
-
- def f(n):
- frame = Frame(n/10)
- while n > 0:
- myjitdriver.can_enter_jit(frame=frame, n=n)
- myjitdriver.jit_merge_point(frame=frame, n=n)
- if isinstance(frame.stuff, Stuff2):
- return 2
- n -= frame.stuff.x
- return n
-
- res = self.meta_interp(f, [30])
- assert res == f(30)
- self.check_loops(getfield_gc=1)
-
- def test_unequal_list_lengths_cannot_be_virtual(self):
- py.test.skip("redo or fix")
- jitdriver = JitDriver(greens = [], reds = ['frame', 'n'],
- virtualizables = ['frame'])
-
- class Frame(object):
- _virtualizable2_ = True
- def __init__(self):
- self.l = []
-
- def f(n):
- frame = Frame()
- while n > 0:
- jitdriver.can_enter_jit(n=n, frame=frame)
- jitdriver.jit_merge_point(n=n, frame=frame)
- frame.l.append(n)
- n -= 1
- sum = 0
- for i in range(len(frame.l)):
- sum += frame.l[i]
- return sum
-
- res = self.meta_interp(f, [20])
- assert res == f(20)
-
- def test_virtualizable_hierarchy(self):
- py.test.skip("redo or fix")
- jitdriver = JitDriver(greens = [], reds = ['frame', 'n'],
- virtualizables = ['frame'])
-
- class BaseFrame(object):
- _virtualizable2_ = True
-
- def __init__(self, x):
- self.x = x
-
- class Frame(BaseFrame):
- pass
-
- class Stuff(object):
- def __init__(self, x):
- self.x = x
-
- def f(n):
- frame = Frame(Stuff(3))
-
- while n > 0:
- jitdriver.can_enter_jit(frame=frame, n=n)
- jitdriver.jit_merge_point(n=n, frame=frame)
- frame.x = Stuff(frame.x.x + 1)
- n -= 1
- return frame.x.x
-
- res = self.meta_interp(f, [20])
- assert res == f(20)
- self.check_loops(getfield_gc=0, setfield_gc=0)
-
- def test_non_virtual_on_always_virtual(self):
- py.test.skip("redo or fix")
- jitdriver = JitDriver(greens = [], reds = ['frame', 'n'],
- virtualizables = ['frame'])
-
- class Frame(object):
- _virtualizable2_ = True
-
- _always_virtual_ = ['node']
-
- def __init__(self, node):
- self.node = node
-
- class Node(object):
- def __init__(self, node):
- self.node = node
-
- class SubNode(object):
- def __init__(self, x):
- self.x = x
-
- def g(node):
- pass
-
- def f(n):
- frame = Frame(Node(SubNode(1)))
-
- while n > 0:
- jitdriver.can_enter_jit(frame=frame, n=n)
- jitdriver.jit_merge_point(frame=frame, n=n)
- node = frame.node
- subnode = node.node
- g(subnode)
- frame.node.node = SubNode(subnode.x + 1)
- n -= 1
- return n
-
- res = self.meta_interp(f, [10], policy=StopAtXPolicy(g))
- self.check_loops(getfield_gc=1)
- assert res == 0
-
def test_external_pass(self):
- py.test.skip("redo or fix")
jitdriver = JitDriver(greens = [], reds = ['frame', 'n', 'z'],
virtualizables = ['frame'])
class BaseFrame(object):
- _virtualizable2_ = True
+ _virtualizable2_ = ['x[*]']
def __init__(self, x):
self.x = x
@@ -634,172 +436,31 @@
class Frame(BaseFrame):
pass
- def g(x):
- return x[1] == 1
+ def g(frame):
+ return frame.x[1] == 1
def f(n):
+ BaseFrame([]) # hack to force 'x' to be in BaseFrame
frame = Frame([1,2,3])
z = 0
while n > 0:
jitdriver.can_enter_jit(frame=frame, n=n, z=z)
jitdriver.jit_merge_point(frame=frame, n=n, z=z)
- z += g(frame.x)
+ z += g(frame)
n -= 1
return z
res = self.meta_interp(f, [10], policy=StopAtXPolicy(g))
assert res == f(10)
- def test_always_virtual_with_origfields(self):
- py.test.skip("redo or fix")
- jitdriver = JitDriver(greens = [], reds = ['frame', 'n'],
- virtualizables = ['frame'])
-
- class Frame(object):
- _virtualizable2_ = True
-
- _always_virtual_ = ['l']
-
- def __init__(self, l):
- self.l = l
-
- def f(n):
- frame = Frame([1,2,3])
- while n > 0:
- jitdriver.can_enter_jit(frame=frame, n=n)
- jitdriver.jit_merge_point(frame=frame, n=n)
- n -= frame.l[0]
- return frame.l[1]
-
- res = self.meta_interp(f, [10], listops=True)
- assert res == 2
-
- def test_pass_always_virtual_to_bridge(self):
- py.test.skip("redo or fix")
- jitdriver = JitDriver(greens = [], reds = ['frame', 'n'],
- virtualizables = ['frame'])
-
- class Frame(object):
- _virtualizable2_ = True
-
- _always_virtual_ = ['l']
-
- def __init__(self, l):
- self.l = l
-
- def f(n):
- frame = Frame([1,1,3])
- while n > 0:
- jitdriver.can_enter_jit(frame=frame, n=n)
- jitdriver.jit_merge_point(frame=frame, n=n)
- if n % 2:
- n -= frame.l[0]
- else:
- n -= frame.l[1]
- return frame.l[2]
-
- res = self.meta_interp(f, [30], listops=True)
- self.check_loops(setarrayitem_gc=0)
- self.check_loop_count(2) # -- this is hard to predict right now:
- # what occurs is that one path through the loop is compiled,
- # then exits; then later when we compile again we see the other
- # path of the loop by chance, then exits; then finally we see
- # again one loop or the other, and this time we make a bridge.
- # So dependening on details we may or may not compile the other
- # path as an independent loop.
- assert res == 3
- if self.basic:
- for loop in get_stats().loops:
- for op in loop._all_operations():
- if op.getopname() == "int_sub":
- assert isinstance(op.args[0], history.BoxInt)
- assert isinstance(op.args[1], history.BoxInt)
-
- def test_virtual_obj_on_always_virtual(self):
- py.test.skip("redo or fix")
- py.test.skip("Bugs!")
- jitdriver = JitDriver(greens = [], reds = ['frame', 'n', 's'],
- virtualizables = ['frame'])
-
- class Frame(object):
- _virtualizable2_ = True
-
- _always_virtual_ = ['l']
-
- def __init__(self, l):
- self.l = l
-
- class Stuff(object):
- def __init__(self, elem):
- self.elem = elem
-
- def f(n):
- frame = Frame([Stuff(3), Stuff(4)])
- s = 0
- while n > 0:
- jitdriver.can_enter_jit(frame=frame, n=n, s=s)
- jitdriver.jit_merge_point(frame=frame, n=n, s=s)
- if n % 2:
- s += frame.l[0].elem
- frame.l[0] = Stuff(n)
- else:
- s += frame.l[1].elem
- frame.l[1] = Stuff(n)
- n -= 1
- return (frame.l[0].elem << 16) + frame.l[1].elem
-
- res = self.meta_interp(f, [30], listops=True)
- self.check_loops(getfield_gc=0)
- assert res == f(30)
-
-
- def test_virtual_obj_on_always_virtual_more_bridges(self):
- py.test.skip("redo or fix")
- py.test.skip("Bugs!")
- jitdriver = JitDriver(greens = [], reds = ['frame', 'n', 's'],
- virtualizables = ['frame'])
-
- class Frame(object):
- _virtualizable2_ = True
-
- _always_virtual_ = ['l']
-
- def __init__(self, l):
- self.l = l
-
- class Stuff(object):
- def __init__(self, elem):
- self.elem = elem
-
- def f(n):
- frame = Frame([Stuff(3), Stuff(4)])
- s = 0
- while n > 0:
- jitdriver.can_enter_jit(frame=frame, n=n, s=s)
- jitdriver.jit_merge_point(frame=frame, n=n, s=s)
- if n % 2:
- s += frame.l[0].elem
- frame.l[0] = Stuff(n)
- elif n % 3:
- s += 1
- else:
- s += frame.l[1].elem
- frame.l[1] = Stuff(n)
- n -= 1
- return (frame.l[0].elem << 16) + frame.l[1].elem
-
- res = self.meta_interp(f, [60], listops=True)
- self.check_loops(getfield_gc=0)
- assert res == f(60)
def test_external_read(self):
- py.test.skip("redo or fix")
py.test.skip("Fails")
jitdriver = JitDriver(greens = [], reds = ['frame'],
virtualizables = ['frame'])
class Frame(object):
- _virtualizable2_ = True
+ _virtualizable2_ = ['x', 'y']
class SomewhereElse:
pass
somewhere_else = SomewhereElse()
@@ -825,11 +486,11 @@
assert res == f(123)
self.check_loops(getfield_gc=0, setfield_gc=0)
+
def test_external_write(self):
- py.test.skip("redo or fix")
py.test.skip("Fails")
class Frame(object):
- _virtualizable2_ = True
+ _virtualizable2_ = ['x', 'y']
class SomewhereElse:
pass
somewhere_else = SomewhereElse()
@@ -854,42 +515,6 @@
assert res == f(240)
self.check_loops(getfield_gc=0, setfield_gc=0)
- def test_list_implicit(self):
- py.test.skip("redo or fix")
- py.test.skip("in-progress")
- class Frame(object):
- _virtualizable2_ = True
-
- def f(n):
- frame = Frame()
- while n > 0:
- frame.lst = []
- frame.lst.append(n - 10)
- n = frame.lst[-1]
- return n + len(frame.lst)
-
- res = self.meta_interp(f, [53], exceptions=False)
- assert res == -6
- self.check_loops(getfield_gc=0, setfield_gc=0, call=0)
-
- def test_single_list_implicit(self):
- py.test.skip("redo or fix")
- py.test.skip("in-progress")
- class Frame(object):
- _virtualizable2_ = True
-
- def f(n):
- frame = Frame()
- frame.lst = [100, n]
- while n > 0:
- n = frame.lst.pop()
- frame.lst.append(n - 10)
- return frame.lst.pop()
-
- res = self.meta_interp(f, [53], exceptions=False)
- assert res == -17
- self.check_loops(getfield_gc=0, setfield_gc=0, call=0)
-
class TestOOtype(#ExplicitVirtualizableTests,
ImplicitVirtualizableTests,
More information about the Pypy-commit
mailing list