Author: Maciej Fijalkowski <[email protected]>
Branch: resume-refactor
Changeset: r66708:b7fe194c1eb5
Date: 2013-08-31 11:50 +0100
http://bitbucket.org/pypy/pypy/changeset/b7fe194c1eb5/
Log: a test and a fix
diff --git a/rpython/jit/backend/llsupport/resumebuilder.py
b/rpython/jit/backend/llsupport/resumebuilder.py
--- a/rpython/jit/backend/llsupport/resumebuilder.py
+++ b/rpython/jit/backend/llsupport/resumebuilder.py
@@ -54,7 +54,7 @@
def _mark_visited(self, v, loc):
pos = loc.get_jitframe_position()
if (v not in self.frontend_liveness or
- self.frontend_liveness[v] > self.regalloc.rm.position):
+ self.frontend_liveness[v] < self.regalloc.rm.position):
return
if (v not in self.current_attachment or
self.current_attachment[v] != pos):
diff --git a/rpython/jit/backend/llsupport/test/test_resume.py
b/rpython/jit/backend/llsupport/test/test_resume.py
--- a/rpython/jit/backend/llsupport/test/test_resume.py
+++ b/rpython/jit/backend/llsupport/test/test_resume.py
@@ -91,16 +91,37 @@
def test_spill(self):
jitcode = JitCode("name")
jitcode.setup(num_regs_i=2, num_regs_r=0, num_regs_f=0)
- faildescr = BasicFailDescr(1)
+ faildescr1 = BasicFailDescr(1)
+ faildescr2 = BasicFailDescr(2)
loop = parse("""
- [i0, i1]
+ [i0]
enter_frame(-1, descr=jitcode)
- i2 = int_add(i0, i1)
+ i2 = int_add(i0, 1)
resume_put(i2, 0, 1)
+ guard_true(i0, descr=faildescr1)
force_spill(i2)
- guard_true(i0, descr=faildescr)
+ guard_true(i0, descr=faildescr2)
leave_frame()
- """, namespace={'jitcode':jitcode, 'faildescr':faildescr})
+ """, namespace={'jitcode':jitcode, 'faildescr1':faildescr1,
+ 'faildescr2':faildescr2})
looptoken = JitCellToken()
self.cpu.compile_loop(None, loop.inputargs, loop.operations,
looptoken)
+
+ expected_resume = parse("""
+ [i2]
+ enter_frame(-1, descr=jitcode)
+ resume_put(i2, 0, 1)
+ backend_attach(i2, 1)
+ backend_attach(i2, 29)
+ leave_frame()
+ """, namespace={'jitcode':jitcode})
+ descr1 = loop.operations[3].getdescr()
+ descr2 = loop.operations[5].getdescr()
+ assert descr1.rd_bytecode_position == 3
+ assert descr2.rd_bytecode_position == 4
+ i0 = descr1.rd_resume_bytecode.opcodes[1].getarg(0)
+ i0b = expected_resume.inputargs[0]
+ equaloplists(descr1.rd_resume_bytecode.opcodes,
+ expected_resume.operations,
+ remap={i0b:i0})
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
