[pypy-svn] r74749 - pypy/branch/blackhole-improvement/pypy/jit/metainterp/test
arigo at codespeak.net
arigo at codespeak.net
Tue May 25 21:13:48 CEST 2010
Author: arigo
Date: Tue May 25 21:13:07 2010
New Revision: 74749
Modified:
pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_optimizeopt.py
pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_pyjitpl.py
pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_send.py
Log:
Fix (or kill) some tests.
Modified: pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_optimizeopt.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_optimizeopt.py (original)
+++ pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_optimizeopt.py Tue May 25 21:13:07 2010
@@ -35,7 +35,7 @@
def test_store_final_boxes_in_guard():
from pypy.jit.metainterp.compile import ResumeGuardDescr
- from pypy.jit.metainterp.resume import tag, TAGBOX, TYPEBARRIER
+ from pypy.jit.metainterp.resume import tag, TAGBOX
b0 = BoxInt()
b1 = BoxInt()
opt = optimizeopt.Optimizer(FakeMetaInterpStaticData(LLtypeMixin.cpu),
@@ -50,12 +50,12 @@
#
opt.store_final_boxes_in_guard(op)
if op.fail_args == [b0, b1]:
- assert fdescr.rd_numb.nums == [tag(1, TAGBOX), TYPEBARRIER]
- assert fdescr.rd_numb.prev.nums == [tag(0, TAGBOX), TYPEBARRIER]
+ assert fdescr.rd_numb.nums == [tag(1, TAGBOX)]
+ assert fdescr.rd_numb.prev.nums == [tag(0, TAGBOX)]
else:
assert op.fail_args == [b1, b0]
- assert fdescr.rd_numb.nums == [tag(0, TAGBOX), TYPEBARRIER]
- assert fdescr.rd_numb.prev.nums == [tag(1, TAGBOX), TYPEBARRIER]
+ assert fdescr.rd_numb.nums == [tag(0, TAGBOX)]
+ assert fdescr.rd_numb.prev.nums == [tag(1, TAGBOX)]
assert fdescr.rd_virtuals is None
assert fdescr.rd_consts == []
Modified: pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_pyjitpl.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_pyjitpl.py (original)
+++ pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_pyjitpl.py Tue May 25 21:13:07 2010
@@ -1,49 +1,20 @@
# some unit tests for the bytecode decoding
-from pypy.jit.metainterp import pyjitpl, codewriter, resoperation, history
+from pypy.jit.metainterp import pyjitpl
from pypy.jit.metainterp import jitprof
-from pypy.jit.metainterp.history import AbstractFailDescr, BoxInt, ConstInt
+from pypy.jit.metainterp.history import BoxInt, ConstInt
from pypy.jit.metainterp.history import History
from pypy.jit.metainterp.resoperation import ResOperation, rop
from pypy.jit.metainterp.test.test_optimizeopt import equaloplists
+from pypy.jit.codewriter.jitcode import JitCode
-def make_frame(code):
- bytecode = codewriter.JitCode("hello")
- bytecode.code = code
- bytecode.constants = None
- frame = pyjitpl.MIFrame(None, bytecode)
- frame.pc = 0
- return frame
-
-
-def test_decode_big_int():
- for code, value in [("\x80\x01", 128), ("\x81\x81\x01", 1 + (1 << 7) + (1 << 14))]:
- frame = make_frame(code)
- val = frame.load_int()
- assert val == value
-
-def test_decode_bool():
- frame = make_frame("\x00")
- assert not frame.load_bool()
-
- frame = make_frame("\x01")
- assert frame.load_bool()
-
-def test_simple_opimpl_exist():
- rop = resoperation.rop
- for opnum, opname in resoperation.opname.items():
- if opnum in (rop.SAME_AS, rop.CALL_PURE, rop.OOSEND_PURE,
- rop.FORCE_TOKEN):
- continue
- if rop._NOSIDEEFFECT_FIRST <= opnum <= rop._NOSIDEEFFECT_LAST:
- assert hasattr(pyjitpl.MIFrame, 'opimpl_' + opname.lower()), opname
def test_portal_trace_positions():
- jitcode = codewriter.JitCode("f")
- jitcode.code = jitcode.constants = None
- portal = codewriter.JitCode("portal")
- portal.code = portal.constants = None
+ jitcode = JitCode("f")
+ jitcode.setup(None)
+ portal = JitCode("portal")
+ portal.setup(None)
class FakeStaticData:
cpu = None
portal_code = portal
@@ -95,7 +66,7 @@
c3 = ConstInt(3)
boxes = [b1, b2, b1, c3]
dup = {}
- metainterp.remove_consts_and_duplicates(boxes, 0, 4, dup)
+ metainterp.remove_consts_and_duplicates(boxes, 4, dup)
assert boxes[0] is b1
assert boxes[1] is b2
assert is_another_box_like(boxes[2], b1)
@@ -108,55 +79,10 @@
#
del metainterp.history.operations[:]
b4 = BoxInt(4)
- boxes = ["something random", b2, b4, "something else"]
- metainterp.remove_consts_and_duplicates(boxes, 1, 3, dup)
- assert is_another_box_like(boxes[1], b2)
- assert boxes[2] is b4
+ boxes = [b2, b4, "something random"]
+ metainterp.remove_consts_and_duplicates(boxes, 2, dup)
+ assert is_another_box_like(boxes[0], b2)
+ assert boxes[1] is b4
assert equaloplists(metainterp.history.operations, [
- ResOperation(rop.SAME_AS, [b2], boxes[1]),
+ ResOperation(rop.SAME_AS, [b2], boxes[0]),
])
-
-def test_get_name_from_address():
- class FakeMetaInterpSd(pyjitpl.MetaInterpStaticData):
- def __init__(self):
- pass
- metainterp_sd = FakeMetaInterpSd()
- metainterp_sd.info_from_codewriter(None, None,
- [(123, "a"), (456, "b")],
- None)
- assert metainterp_sd.get_name_from_address(123) == 'a'
- assert metainterp_sd.get_name_from_address(456) == 'b'
- assert metainterp_sd.get_name_from_address(789) == ''
-
-def test_initialize_state_from_guard_failure():
- from pypy.jit.metainterp.typesystem import llhelper
- calls = []
-
- class FakeCPU:
- ts = llhelper
-
- def make_boxes_from_latest_values(self, faildescr):
- return [BoxInt(0), None, BoxInt(2), None, BoxInt(4)]
-
- class FakeStaticData:
- cpu = FakeCPU()
- profiler = jitprof.EmptyProfiler()
-
- metainterp = pyjitpl.MetaInterp(FakeStaticData())
-
- def rebuild_state_after_failure(descr, newboxes):
- calls.append(newboxes)
- metainterp.rebuild_state_after_failure = rebuild_state_after_failure
-
- class FakeResumeDescr:
- def must_compile(self, *args):
- return True
- resumedescr = FakeResumeDescr()
- metainterp.initialize_state_from_guard_failure(resumedescr)
-
- inp = metainterp.history.inputargs
- assert len(inp) == 3
- assert [box.value for box in inp] == [0, 2, 4]
- b0, b2, b4 = inp
- assert len(calls) == 1
- assert calls[0] == [b0, None, b2, None, b4]
Modified: pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_send.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_send.py (original)
+++ pypy/branch/blackhole-improvement/pypy/jit/metainterp/test/test_send.py Tue May 25 21:13:07 2010
@@ -374,7 +374,7 @@
self.check_loop_count(2)
def test_behavior_change_after_a_while(self):
- myjitdriver = JitDriver(greens = [], reds = ['x', 'y'])
+ myjitdriver = JitDriver(greens = [], reds = ['y', 'x'])
class Base:
def __init__(self, value):
self.value = value
@@ -454,7 +454,7 @@
self.check_tree_loop_count(2)
def test_bug1(self):
- myjitdriver = JitDriver(greens = [], reds = ['node', 'n'])
+ myjitdriver = JitDriver(greens = [], reds = ['n', 'node'])
class Base:
pass
class A(Base):
More information about the Pypy-commit
mailing list