Author: Antonio Cuni <[email protected]>
Branch:
Changeset: r44800:35d163124b66
Date: 2011-06-07 16:26 +0200
http://bitbucket.org/pypy/pypy/changeset/35d163124b66/
Log: move tests about applevel calls into their own file
diff --git a/pypy/module/pypyjit/test_pypy_c/test_call.py
b/pypy/module/pypyjit/test_pypy_c/test_call.py
new file mode 100644
--- /dev/null
+++ b/pypy/module/pypyjit/test_pypy_c/test_call.py
@@ -0,0 +1,381 @@
+import py
+from pypy.module.pypyjit.test_pypy_c.test_model import BaseTestPyPyC
+
+class TestCall(BaseTestPyPyC):
+
+ def test_recursive_call(self):
+ def fn():
+ def rec(n):
+ if n == 0:
+ return 0
+ return 1 + rec(n-1)
+ #
+ # this loop is traced and then aborted, because the trace is too
+ # long. But then "rec" is marked as "don't inline"
+ i = 0
+ j = 0
+ while i < 20:
+ i += 1
+ j += rec(100)
+ #
+ # next time we try to trace "rec", instead of inlining we compile
+ # it separately and generate a call_assembler
+ i = 0
+ j = 0
+ while i < 20:
+ i += 1
+ j += rec(100) # ID: call_rec
+ a = 0
+ return j
+ #
+ log = self.run(fn, [], threshold=18)
+ loop, = log.loops_by_filename(self.filepath)
+ assert loop.match_by_id('call_rec', """
+ ...
+ p53 = call_assembler(..., descr=...)
+ guard_not_forced(descr=...)
+ guard_no_exception(descr=...)
+ ...
+ """)
+
+ def test_simple_call(self):
+ src = """
+ OFFSET = 0
+ def f(i):
+ return i + 1 + OFFSET # ID: add
+ def main(n):
+ i = 0
+ while i < n+OFFSET: # ID: cond
+ i = f(f(i)) # ID: call
+ a = 0
+ return i
+ """
+ log = self.run(src, [1000])
+ assert log.result == 1000
+ # first, we test what is inside the entry bridge
+ # -----------------------------------------------
+ entry_bridge, = log.loops_by_id('call', is_entry_bridge=True)
+ # LOAD_GLOBAL of OFFSET
+ ops = entry_bridge.ops_by_id('cond', opcode='LOAD_GLOBAL')
+ assert log.opnames(ops) == ["guard_value",
+ "getfield_gc", "guard_value",
+ "getfield_gc", "guard_isnull",
+ "getfield_gc", "guard_nonnull_class"]
+ # LOAD_GLOBAL of OFFSET but in different function partially folded
+ # away
+ # XXX could be improved
+ ops = entry_bridge.ops_by_id('add', opcode='LOAD_GLOBAL')
+ assert log.opnames(ops) == ["guard_value", "getfield_gc",
"guard_isnull"]
+ #
+ # two LOAD_GLOBAL of f, the second is folded away
+ ops = entry_bridge.ops_by_id('call', opcode='LOAD_GLOBAL')
+ assert log.opnames(ops) == ["getfield_gc", "guard_nonnull_class"]
+ #
+ assert entry_bridge.match_by_id('call', """
+ p29 = getfield_gc(ConstPtr(ptr28), descr=<GcPtrFieldDescr
pypy.objspace.std.celldict.ModuleCell.inst_w_value .*>)
+ guard_nonnull_class(p29, ConstClass(Function), descr=<Guard18>)
+ p33 = getfield_gc(p29, descr=<GcPtrFieldDescr
pypy.interpreter.function.Function.inst_code .*>)
+ guard_value(p33, ConstPtr(ptr34), descr=<Guard19>)
+ p35 = getfield_gc(p29, descr=<GcPtrFieldDescr
pypy.interpreter.function.Function.inst_w_func_globals .*>)
+ p36 = getfield_gc(p29, descr=<GcPtrFieldDescr
pypy.interpreter.function.Function.inst_closure .*>)
+ p38 = call(ConstClass(getexecutioncontext), descr=<GcPtrCallDescr>)
+ p39 = getfield_gc(p38, descr=<GcPtrFieldDescr
pypy.interpreter.executioncontext.ExecutionContext.inst_topframeref .*>)
+ i40 = force_token()
+ p41 = getfield_gc(p38, descr=<GcPtrFieldDescr
pypy.interpreter.executioncontext.ExecutionContext.inst_w_tracefunc .*>)
+ guard_isnull(p41, descr=<Guard20>)
+ i42 = getfield_gc(p38, descr=<NonGcPtrFieldDescr
pypy.interpreter.executioncontext.ExecutionContext.inst_profilefunc .*>)
+ i43 = int_is_zero(i42)
+ guard_true(i43, descr=<Guard21>)
+ i50 = force_token()
+ """)
+ #
+ # then, we test the actual loop
+ # -----------------------------
+ loop, = log.loops_by_id('call')
+ assert loop.match("""
+ i12 = int_lt(i5, i6)
+ guard_true(i12, descr=<Guard3>)
+ i13 = force_token()
+ i15 = int_add(i5, 1)
+ i16 = int_add_ovf(i15, i7)
+ guard_no_overflow(descr=<Guard4>)
+ i18 = force_token()
+ i20 = int_add_ovf(i16, 1)
+ guard_no_overflow(descr=<Guard5>)
+ i21 = int_add_ovf(i20, i7)
+ guard_no_overflow(descr=<Guard6>)
+ --TICK--
+ jump(p0, p1, p2, p3, p4, i21, i6, i7, p8, p9, p10, p11,
descr=<Loop0>)
+ """)
+
+ def test_method_call(self):
+ def fn(n):
+ class A(object):
+ def __init__(self, a):
+ self.a = a
+ def f(self, i):
+ return self.a + i
+ i = 0
+ a = A(1)
+ while i < n:
+ x = a.f(i) # ID: meth1
+ i = a.f(x) # ID: meth2
+ return i
+ #
+ log = self.run(fn, [1000])
+ assert log.result == 1000
+ #
+ # first, we test the entry bridge
+ # -------------------------------
+ entry_bridge, = log.loops_by_filename(self.filepath,
is_entry_bridge=True)
+ ops = entry_bridge.ops_by_id('meth1', opcode='LOOKUP_METHOD')
+ assert log.opnames(ops) == ['guard_value', 'getfield_gc',
'guard_value',
+ 'guard_not_invalidated']
+ # the second LOOKUP_METHOD is folded away
+ assert list(entry_bridge.ops_by_id('meth2', opcode='LOOKUP_METHOD'))
== []
+ #
+ # then, the actual loop
+ # ----------------------
+ loop, = log.loops_by_filename(self.filepath)
+ assert loop.match("""
+ i15 = int_lt(i6, i9)
+ guard_true(i15, descr=<Guard3>)
+ guard_not_invalidated(descr=<Guard4>)
+ i16 = force_token()
+ i17 = int_add_ovf(i10, i6)
+ guard_no_overflow(descr=<Guard5>)
+ i18 = force_token()
+ i19 = int_add_ovf(i10, i17)
+ guard_no_overflow(descr=<Guard6>)
+ --TICK--
+ jump(p0, p1, p2, p3, p4, p5, i19, p7, i17, i9, i10, p11, p12, p13,
descr=<Loop0>)
+ """)
+
+ def test_static_classmethod_call(self):
+ def fn(n):
+ class A(object):
+ @classmethod
+ def f(cls, i):
+ return i + (cls is A) + 1
+ @staticmethod
+ def g(i):
+ return i - 1
+ #
+ i = 0
+ a = A()
+ while i < n:
+ x = a.f(i)
+ i = a.g(x)
+ return i
+ #
+ log = self.run(fn, [1000])
+ assert log.result == 1000
+ loop, = log.loops_by_filename(self.filepath)
+ assert loop.match("""
+ i14 = int_lt(i6, i9)
+ guard_true(i14, descr=<Guard3>)
+ guard_not_invalidated(descr=<Guard4>)
+ i15 = force_token()
+ i17 = int_add_ovf(i8, 1)
+ guard_no_overflow(descr=<Guard5>)
+ i18 = force_token()
+ --TICK--
+ jump(p0, p1, p2, p3, p4, p5, i8, p7, i17, i9, p10, p11, p12,
descr=<Loop0>)
+ """)
+
+ def test_default_and_kw(self):
+ def main(n):
+ def f(i, j=1):
+ return i + j
+ #
+ i = 0
+ while i < n:
+ i = f(f(i), j=1) # ID: call
+ a = 0
+ return i
+ #
+ log = self.run(main, [1000])
+ assert log.result == 1000
+ loop, = log.loops_by_id('call')
+ assert loop.match_by_id('call', """
+ i14 = force_token()
+ i16 = force_token()
+ """)
+
+ def test_kwargs(self):
+ # this is not a very precise test, could be improved
+ def main(x):
+ def g(**args):
+ return len(args)
+ #
+ s = 0
+ d = {}
+ for i in range(x):
+ s += g(**d) # ID: call
+ d[str(i)] = i
+ if i % 100 == 99:
+ d = {}
+ return s
+ #
+ log = self.run(main, [1000])
+ assert log.result == 49500
+ loop, = log.loops_by_id('call')
+ ops = log.opnames(loop.ops_by_id('call'))
+ guards = [ops for ops in ops if ops.startswith('guard')]
+ assert len(guards) <= 5
+
+ def test_stararg_virtual(self):
+ def main(x):
+ def g(*args):
+ return len(args)
+ def h(a, b, c):
+ return c
+ #
+ s = 0
+ for i in range(x):
+ l = [i, x, 2]
+ s += g(*l) # ID: g1
+ s += h(*l) # ID: h1
+ s += g(i, x, 2) # ID: g2
+ a = 0
+ for i in range(x):
+ l = [x, 2]
+ s += g(i, *l) # ID: g3
+ s += h(i, *l) # ID: h2
+ a = 0
+ return s
+ #
+ log = self.run(main, [1000])
+ assert log.result == 13000
+ loop0, = log.loops_by_id('g1')
+ assert loop0.match_by_id('g1', """
+ i20 = force_token()
+ setfield_gc(p4, i19, descr=<.*W_AbstractSeqIterObject.inst_index
.*>)
+ i22 = int_add_ovf(i8, 3)
+ guard_no_overflow(descr=<Guard4>)
+ """)
+ assert loop0.match_by_id('h1', """
+ i20 = force_token()
+ i22 = int_add_ovf(i8, 2)
+ guard_no_overflow(descr=<Guard5>)
+ """)
+ assert loop0.match_by_id('g2', """
+ i27 = force_token()
+ i29 = int_add_ovf(i26, 3)
+ guard_no_overflow(descr=<Guard6>)
+ """)
+ #
+ loop1, = log.loops_by_id('g3')
+ assert loop1.match_by_id('g3', """
+ i21 = force_token()
+ setfield_gc(p4, i20, descr=<.*
.*W_AbstractSeqIterObject.inst_index .*>)
+ i23 = int_add_ovf(i9, 3)
+ guard_no_overflow(descr=<Guard37>)
+ """)
+ assert loop1.match_by_id('h2', """
+ i25 = force_token()
+ i27 = int_add_ovf(i23, 2)
+ guard_no_overflow(descr=<Guard38>)
+ """)
+
+ def test_stararg(self):
+ def main(x):
+ def g(*args):
+ return args[-1]
+ def h(*args):
+ return len(args)
+ #
+ s = 0
+ l = []
+ i = 0
+ while i < x:
+ l.append(1)
+ s += g(*l) # ID: g
+ i = h(*l) # ID: h
+ a = 0
+ return s
+ #
+ log = self.run(main, [1000])
+ assert log.result == 1000
+ loop, = log.loops_by_id('g')
+ ops_g = log.opnames(loop.ops_by_id('g'))
+ ops_h = log.opnames(loop.ops_by_id('h'))
+ ops = ops_g + ops_h
+ assert 'new_with_vtable' not in ops
+ assert 'call_may_force' not in ops
+
+ def test_call_builtin_function(self):
+ def main(n):
+ i = 2
+ l = []
+ while i < n:
+ i += 1
+ l.append(i) # ID: append
+ a = 0
+ return i, len(l)
+ #
+ log = self.run(main, [1000])
+ assert log.result == (1000, 998)
+ loop, = log.loops_by_filename(self.filepath)
+ assert loop.match_by_id('append', """
+ i13 = getfield_gc(p8, descr=<SignedFieldDescr list.length .*>)
+ i15 = int_add(i13, 1)
+ call(ConstClass(_ll_list_resize_ge__listPtr_Signed), p8, i15,
descr=<VoidCallDescr>)
+ guard_no_exception(descr=<Guard4>)
+ p17 = getfield_gc(p8, descr=<GcPtrFieldDescr list.items .*>)
+ p19 = new_with_vtable(ConstClass(W_IntObject))
+ setfield_gc(p19, i12, descr=<SignedFieldDescr
.*W_IntObject.inst_intval .*>)
+ setarrayitem_gc(p17, i13, p19, descr=<GcPtrArrayDescr>)
+ """)
+
+ def test_blockstack_virtualizable(self):
+ def main(n):
+ from pypyjit import residual_call
+ i = 0
+ while i < n:
+ try:
+ residual_call(len, []) # ID: call
+ except:
+ pass
+ i += 1
+ return i
+ #
+ log = self.run(main, [500])
+ assert log.result == 500
+ loop, = log.loops_by_id('call')
+ assert loop.match_by_id('call', opcode='CALL_FUNCTION',
expected_src="""
+ # make sure that the "block" is not allocated
+ ...
+ i20 = force_token()
+ setfield_gc(p0, i20, descr=<SignedFieldDescr .*PyFrame.vable_token
.*>)
+ p22 = new_with_vtable(19511408)
+ p24 = new_array(1, descr=<GcPtrArrayDescr>)
+ p26 = new_with_vtable(ConstClass(W_ListObject))
+ p27 = new(descr=<SizeDescr .*>)
+ p29 = new_array(0, descr=<GcPtrArrayDescr>)
+ setfield_gc(p27, p29, descr=<GcPtrFieldDescr list.items .*>)
+ setfield_gc(p26, p27, descr=<.* .*W_ListObject.inst_wrappeditems
.*>)
+ setarrayitem_gc(p24, 0, p26, descr=<GcPtrArrayDescr>)
+ setfield_gc(p22, p24, descr=<GcPtrFieldDescr
.*Arguments.inst_arguments_w .*>)
+ p32 = call_may_force(11376960, p18, p22, descr=<GcPtrCallDescr>)
+ ...
+ """)
+
+ def test_func_defaults(self):
+ def main(n):
+ i = 1
+ while i < n:
+ i += len(xrange(i+1)) - i
+ return i
+
+ log = self.run(main, [10000])
+ assert log.result == 10000
+ loop, = log.loops_by_filename(self.filepath)
+ assert loop.match("""
+ i10 = int_lt(i5, i6)
+ guard_true(i10, descr=<Guard3>)
+ i120 = int_add(i5, 1)
+ guard_not_invalidated(descr=<Guard4>)
+ --TICK--
+ jump(..., 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
@@ -71,41 +71,6 @@
""")
- def test_recursive_call(self):
- def fn():
- def rec(n):
- if n == 0:
- return 0
- return 1 + rec(n-1)
- #
- # this loop is traced and then aborted, because the trace is too
- # long. But then "rec" is marked as "don't inline"
- i = 0
- j = 0
- while i < 20:
- i += 1
- j += rec(100)
- #
- # next time we try to trace "rec", instead of inlining we compile
- # it separately and generate a call_assembler
- i = 0
- j = 0
- while i < 20:
- i += 1
- j += rec(100) # ID: call_rec
- a = 0
- return j
- #
- log = self.run(fn, [], threshold=18)
- loop, = log.loops_by_filename(self.filepath)
- assert loop.match_by_id('call_rec', """
- ...
- p53 = call_assembler(..., descr=...)
- guard_not_forced(descr=...)
- guard_no_exception(descr=...)
- ...
- """)
-
def test_cmp_exc(self):
def f1(n):
# So we don't get a LOAD_GLOBAL op
@@ -124,271 +89,6 @@
ops = list(loop.ops_by_id("except", opcode="COMPARE_OP"))
assert ops == []
- def test_simple_call(self):
- src = """
- OFFSET = 0
- def f(i):
- return i + 1 + OFFSET # ID: add
- def main(n):
- i = 0
- while i < n+OFFSET: # ID: cond
- i = f(f(i)) # ID: call
- a = 0
- return i
- """
- log = self.run(src, [1000])
- assert log.result == 1000
- # first, we test what is inside the entry bridge
- # -----------------------------------------------
- entry_bridge, = log.loops_by_id('call', is_entry_bridge=True)
- # LOAD_GLOBAL of OFFSET
- ops = entry_bridge.ops_by_id('cond', opcode='LOAD_GLOBAL')
- assert log.opnames(ops) == ["guard_value",
- "getfield_gc", "guard_value",
- "getfield_gc", "guard_isnull",
- "getfield_gc", "guard_nonnull_class"]
- # LOAD_GLOBAL of OFFSET but in different function partially folded
- # away
- # XXX could be improved
- ops = entry_bridge.ops_by_id('add', opcode='LOAD_GLOBAL')
- assert log.opnames(ops) == ["guard_value", "getfield_gc",
"guard_isnull"]
- #
- # two LOAD_GLOBAL of f, the second is folded away
- ops = entry_bridge.ops_by_id('call', opcode='LOAD_GLOBAL')
- assert log.opnames(ops) == ["getfield_gc", "guard_nonnull_class"]
- #
- assert entry_bridge.match_by_id('call', """
- p29 = getfield_gc(ConstPtr(ptr28), descr=<GcPtrFieldDescr
pypy.objspace.std.celldict.ModuleCell.inst_w_value .*>)
- guard_nonnull_class(p29, ConstClass(Function), descr=<Guard18>)
- p33 = getfield_gc(p29, descr=<GcPtrFieldDescr
pypy.interpreter.function.Function.inst_code .*>)
- guard_value(p33, ConstPtr(ptr34), descr=<Guard19>)
- p35 = getfield_gc(p29, descr=<GcPtrFieldDescr
pypy.interpreter.function.Function.inst_w_func_globals .*>)
- p36 = getfield_gc(p29, descr=<GcPtrFieldDescr
pypy.interpreter.function.Function.inst_closure .*>)
- p38 = call(ConstClass(getexecutioncontext), descr=<GcPtrCallDescr>)
- p39 = getfield_gc(p38, descr=<GcPtrFieldDescr
pypy.interpreter.executioncontext.ExecutionContext.inst_topframeref .*>)
- i40 = force_token()
- p41 = getfield_gc(p38, descr=<GcPtrFieldDescr
pypy.interpreter.executioncontext.ExecutionContext.inst_w_tracefunc .*>)
- guard_isnull(p41, descr=<Guard20>)
- i42 = getfield_gc(p38, descr=<NonGcPtrFieldDescr
pypy.interpreter.executioncontext.ExecutionContext.inst_profilefunc .*>)
- i43 = int_is_zero(i42)
- guard_true(i43, descr=<Guard21>)
- i50 = force_token()
- """)
- #
- # then, we test the actual loop
- # -----------------------------
- loop, = log.loops_by_id('call')
- assert loop.match("""
- i12 = int_lt(i5, i6)
- guard_true(i12, descr=<Guard3>)
- i13 = force_token()
- i15 = int_add(i5, 1)
- i16 = int_add_ovf(i15, i7)
- guard_no_overflow(descr=<Guard4>)
- i18 = force_token()
- i20 = int_add_ovf(i16, 1)
- guard_no_overflow(descr=<Guard5>)
- i21 = int_add_ovf(i20, i7)
- guard_no_overflow(descr=<Guard6>)
- --TICK--
- jump(p0, p1, p2, p3, p4, i21, i6, i7, p8, p9, p10, p11,
descr=<Loop0>)
- """)
-
- def test_method_call(self):
- def fn(n):
- class A(object):
- def __init__(self, a):
- self.a = a
- def f(self, i):
- return self.a + i
- i = 0
- a = A(1)
- while i < n:
- x = a.f(i) # ID: meth1
- i = a.f(x) # ID: meth2
- return i
- #
- log = self.run(fn, [1000])
- assert log.result == 1000
- #
- # first, we test the entry bridge
- # -------------------------------
- entry_bridge, = log.loops_by_filename(self.filepath,
is_entry_bridge=True)
- ops = entry_bridge.ops_by_id('meth1', opcode='LOOKUP_METHOD')
- assert log.opnames(ops) == ['guard_value', 'getfield_gc',
'guard_value',
- 'guard_not_invalidated']
- # the second LOOKUP_METHOD is folded away
- assert list(entry_bridge.ops_by_id('meth2', opcode='LOOKUP_METHOD'))
== []
- #
- # then, the actual loop
- # ----------------------
- loop, = log.loops_by_filename(self.filepath)
- assert loop.match("""
- i15 = int_lt(i6, i9)
- guard_true(i15, descr=<Guard3>)
- guard_not_invalidated(descr=<Guard4>)
- i16 = force_token()
- i17 = int_add_ovf(i10, i6)
- guard_no_overflow(descr=<Guard5>)
- i18 = force_token()
- i19 = int_add_ovf(i10, i17)
- guard_no_overflow(descr=<Guard6>)
- --TICK--
- jump(p0, p1, p2, p3, p4, p5, i19, p7, i17, i9, i10, p11, p12, p13,
descr=<Loop0>)
- """)
-
- def test_static_classmethod_call(self):
- def fn(n):
- class A(object):
- @classmethod
- def f(cls, i):
- return i + (cls is A) + 1
- @staticmethod
- def g(i):
- return i - 1
- #
- i = 0
- a = A()
- while i < n:
- x = a.f(i)
- i = a.g(x)
- return i
- #
- log = self.run(fn, [1000])
- assert log.result == 1000
- loop, = log.loops_by_filename(self.filepath)
- assert loop.match("""
- i14 = int_lt(i6, i9)
- guard_true(i14, descr=<Guard3>)
- guard_not_invalidated(descr=<Guard4>)
- i15 = force_token()
- i17 = int_add_ovf(i8, 1)
- guard_no_overflow(descr=<Guard5>)
- i18 = force_token()
- --TICK--
- jump(p0, p1, p2, p3, p4, p5, i8, p7, i17, i9, p10, p11, p12,
descr=<Loop0>)
- """)
-
- def test_default_and_kw(self):
- def main(n):
- def f(i, j=1):
- return i + j
- #
- i = 0
- while i < n:
- i = f(f(i), j=1) # ID: call
- a = 0
- return i
- #
- log = self.run(main, [1000])
- assert log.result == 1000
- loop, = log.loops_by_id('call')
- assert loop.match_by_id('call', """
- i14 = force_token()
- i16 = force_token()
- """)
-
- def test_kwargs(self):
- # this is not a very precise test, could be improved
- def main(x):
- def g(**args):
- return len(args)
- #
- s = 0
- d = {}
- for i in range(x):
- s += g(**d) # ID: call
- d[str(i)] = i
- if i % 100 == 99:
- d = {}
- return s
- #
- log = self.run(main, [1000])
- assert log.result == 49500
- loop, = log.loops_by_id('call')
- ops = log.opnames(loop.ops_by_id('call'))
- guards = [ops for ops in ops if ops.startswith('guard')]
- assert len(guards) <= 5
-
- def test_stararg_virtual(self):
- def main(x):
- def g(*args):
- return len(args)
- def h(a, b, c):
- return c
- #
- s = 0
- for i in range(x):
- l = [i, x, 2]
- s += g(*l) # ID: g1
- s += h(*l) # ID: h1
- s += g(i, x, 2) # ID: g2
- a = 0
- for i in range(x):
- l = [x, 2]
- s += g(i, *l) # ID: g3
- s += h(i, *l) # ID: h2
- a = 0
- return s
- #
- log = self.run(main, [1000])
- assert log.result == 13000
- loop0, = log.loops_by_id('g1')
- assert loop0.match_by_id('g1', """
- i20 = force_token()
- setfield_gc(p4, i19, descr=<.*W_AbstractSeqIterObject.inst_index
.*>)
- i22 = int_add_ovf(i8, 3)
- guard_no_overflow(descr=<Guard4>)
- """)
- assert loop0.match_by_id('h1', """
- i20 = force_token()
- i22 = int_add_ovf(i8, 2)
- guard_no_overflow(descr=<Guard5>)
- """)
- assert loop0.match_by_id('g2', """
- i27 = force_token()
- i29 = int_add_ovf(i26, 3)
- guard_no_overflow(descr=<Guard6>)
- """)
- #
- loop1, = log.loops_by_id('g3')
- assert loop1.match_by_id('g3', """
- i21 = force_token()
- setfield_gc(p4, i20, descr=<.*
.*W_AbstractSeqIterObject.inst_index .*>)
- i23 = int_add_ovf(i9, 3)
- guard_no_overflow(descr=<Guard37>)
- """)
- assert loop1.match_by_id('h2', """
- i25 = force_token()
- i27 = int_add_ovf(i23, 2)
- guard_no_overflow(descr=<Guard38>)
- """)
-
- def test_stararg(self):
- def main(x):
- def g(*args):
- return args[-1]
- def h(*args):
- return len(args)
- #
- s = 0
- l = []
- i = 0
- while i < x:
- l.append(1)
- s += g(*l) # ID: g
- i = h(*l) # ID: h
- a = 0
- return s
- #
- log = self.run(main, [1000])
- assert log.result == 1000
- loop, = log.loops_by_id('g')
- ops_g = log.opnames(loop.ops_by_id('g'))
- ops_h = log.opnames(loop.ops_by_id('h'))
- ops = ops_g + ops_h
- assert 'new_with_vtable' not in ops
- assert 'call_may_force' not in ops
def test_virtual_instance(self):
def main(n):
@@ -461,29 +161,6 @@
jump(p0, p1, p2, p3, p4, f10, p6, f7, f8, descr=<Loop0>)
""")
- def test_call_builtin_function(self):
- def main(n):
- i = 2
- l = []
- while i < n:
- i += 1
- l.append(i) # ID: append
- a = 0
- return i, len(l)
- #
- log = self.run(main, [1000])
- assert log.result == (1000, 998)
- loop, = log.loops_by_filename(self.filepath)
- assert loop.match_by_id('append', """
- i13 = getfield_gc(p8, descr=<SignedFieldDescr list.length .*>)
- i15 = int_add(i13, 1)
- call(ConstClass(_ll_list_resize_ge__listPtr_Signed), p8, i15,
descr=<VoidCallDescr>)
- guard_no_exception(descr=<Guard4>)
- p17 = getfield_gc(p8, descr=<GcPtrFieldDescr list.items .*>)
- p19 = new_with_vtable(ConstClass(W_IntObject))
- setfield_gc(p19, i12, descr=<SignedFieldDescr
.*W_IntObject.inst_intval .*>)
- setarrayitem_gc(p17, i13, p19, descr=<GcPtrArrayDescr>)
- """)
def test_range_iter(self):
def main(n):
@@ -641,38 +318,6 @@
loops = log.loops_by_filename(self.filepath)
assert len(loops) == 1
- def test_blockstack_virtualizable(self):
- def main(n):
- from pypyjit import residual_call
- i = 0
- while i < n:
- try:
- residual_call(len, []) # ID: call
- except:
- pass
- i += 1
- return i
- #
- log = self.run(main, [500])
- assert log.result == 500
- loop, = log.loops_by_id('call')
- assert loop.match_by_id('call', opcode='CALL_FUNCTION',
expected_src="""
- # make sure that the "block" is not allocated
- ...
- i20 = force_token()
- setfield_gc(p0, i20, descr=<SignedFieldDescr .*PyFrame.vable_token
.*>)
- p22 = new_with_vtable(19511408)
- p24 = new_array(1, descr=<GcPtrArrayDescr>)
- p26 = new_with_vtable(ConstClass(W_ListObject))
- p27 = new(descr=<SizeDescr .*>)
- p29 = new_array(0, descr=<GcPtrArrayDescr>)
- setfield_gc(p27, p29, descr=<GcPtrFieldDescr list.items .*>)
- setfield_gc(p26, p27, descr=<.* .*W_ListObject.inst_wrappeditems
.*>)
- setarrayitem_gc(p24, 0, p26, descr=<GcPtrArrayDescr>)
- setfield_gc(p22, p24, descr=<GcPtrFieldDescr
.*Arguments.inst_arguments_w .*>)
- p32 = call_may_force(11376960, p18, p22, descr=<GcPtrCallDescr>)
- ...
- """)
def test_import_in_function(self):
def main(n):
@@ -946,24 +591,6 @@
""" % (e1, e2)
yield self.run_and_check, src
- def test_func_defaults(self):
- def main(n):
- i = 1
- while i < n:
- i += len(xrange(i+1)) - i
- return i
-
- log = self.run(main, [10000])
- assert log.result == 10000
- loop, = log.loops_by_filename(self.filepath)
- assert loop.match("""
- i10 = int_lt(i5, i6)
- guard_true(i10, descr=<Guard3>)
- i120 = int_add(i5, 1)
- guard_not_invalidated(descr=<Guard4>)
- --TICK--
- jump(..., descr=<Loop0>)
- """)
def test__ffi_call_releases_gil(self):
from pypy.rlib.test.test_libffi import get_libc_name
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
