Author: Maciej Fijalkowski <[email protected]>
Branch: optresult-unroll
Changeset: r79542:141213dd9ccf
Date: 2015-09-08 15:02 +0200
http://bitbucket.org/pypy/pypy/changeset/141213dd9ccf/
Log: fix jit hooks
diff --git a/rpython/jit/metainterp/test/test_jitiface.py
b/rpython/jit/metainterp/test/test_jitiface.py
--- a/rpython/jit/metainterp/test/test_jitiface.py
+++ b/rpython/jit/metainterp/test/test_jitiface.py
@@ -12,8 +12,6 @@
class JitHookInterfaceTests(object):
# !!!note!!! - don't subclass this from the backend. Subclass the LL
# class later instead
- def setup_class(cls):
- py.test.skip("disabled")
def test_abort_quasi_immut(self):
reasons = []
@@ -120,43 +118,6 @@
self.meta_interp(loop, [1, 10], policy=JitPolicy(MyJitIface()))
assert called == ["compile", "before_compile_bridge", "compile_bridge"]
- def test_resop_interface(self):
- driver = JitDriver(greens = [], reds = ['i'])
-
- def loop(i):
- while i > 0:
- driver.jit_merge_point(i=i)
- i -= 1
-
- def main():
- loop(1)
- op = jit_hooks.resop_new(rop.INT_ADD,
- [jit_hooks.boxint_new(3),
- jit_hooks.boxint_new(4)],
- jit_hooks.boxint_new(1))
- assert hlstr(jit_hooks.resop_getopname(op)) == 'int_add'
- assert jit_hooks.resop_getopnum(op) == rop.INT_ADD
- box = jit_hooks.resop_getarg(op, 0)
- assert jit_hooks.box_getint(box) == 3
- box2 = jit_hooks.box_clone(box)
- assert box2 != box
- assert jit_hooks.box_getint(box2) == 3
- assert not jit_hooks.box_isconst(box2)
- box3 = jit_hooks.box_constbox(box)
- assert jit_hooks.box_getint(box) == 3
- assert jit_hooks.box_isconst(box3)
- box4 = jit_hooks.box_nonconstbox(box)
- assert not jit_hooks.box_isconst(box4)
- box5 = jit_hooks.boxint_new(18)
- jit_hooks.resop_setarg(op, 0, box5)
- assert jit_hooks.resop_getarg(op, 0) == box5
- box6 = jit_hooks.resop_getresult(op)
- assert jit_hooks.box_getint(box6) == 1
- jit_hooks.resop_setresult(op, box5)
- assert jit_hooks.resop_getresult(op) == box5
-
- self.meta_interp(main, [])
-
def test_get_stats(self):
driver = JitDriver(greens = [], reds = ['i', 's'])
diff --git a/rpython/rlib/jit_hooks.py b/rpython/rlib/jit_hooks.py
--- a/rpython/rlib/jit_hooks.py
+++ b/rpython/rlib/jit_hooks.py
@@ -63,11 +63,6 @@
res = None
return _cast_to_gcref(ResOperation(no, args, res))
-@register_helper(SomePtr(llmemory.GCREF))
-def boxint_new(no):
- from rpython.jit.metainterp.history import BoxInt
- return _cast_to_gcref(BoxInt(no))
-
@register_helper(annmodel.SomeInteger())
def resop_getopnum(llop):
return _cast_to_resop(llop).getopnum()
@@ -84,14 +79,6 @@
def resop_setarg(llop, no, llbox):
_cast_to_resop(llop).setarg(no, _cast_to_box(llbox))
-@register_helper(SomePtr(llmemory.GCREF))
-def resop_getresult(llop):
- return _cast_to_gcref(_cast_to_resop(llop).result)
-
-@register_helper(annmodel.s_None)
-def resop_setresult(llop, llbox):
- _cast_to_resop(llop).result = _cast_to_box(llbox)
-
@register_helper(annmodel.SomeInteger())
def box_getint(llbox):
return _cast_to_box(llbox).getint()
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
