[pypy-commit] pypy jit-multilabel: rename start_resumedescr to resume_at_jump_descr
hakanardo
noreply at buildbot.pypy.org
Sat Dec 17 14:48:00 CET 2011
Author: Hakan Ardo <hakan at debian.org>
Branch: jit-multilabel
Changeset: r50615:2653c963abd8
Date: 2011-12-17 14:47 +0100
http://bitbucket.org/pypy/pypy/changeset/2653c963abd8/
Log: rename start_resumedescr to resume_at_jump_descr
diff --git a/pypy/jit/metainterp/compile.py b/pypy/jit/metainterp/compile.py
--- a/pypy/jit/metainterp/compile.py
+++ b/pypy/jit/metainterp/compile.py
@@ -105,7 +105,7 @@
def compile_loop(metainterp, greenkey, start,
inputargs, jumpargs,
- start_resumedescr, full_preamble_needed=True):
+ resume_at_jump_descr, full_preamble_needed=True):
"""Try to compile a new procedure by closing the current history back
to the first operation.
"""
@@ -126,7 +126,7 @@
part = create_empty_loop(metainterp)
part.inputargs = inputargs[:]
h_ops = history.operations
- part.start_resumedescr = start_resumedescr
+ part.resume_at_jump_descr = resume_at_jump_descr
part.operations = [ResOperation(rop.LABEL, inputargs, None, descr=TargetToken(jitcell_token))] + \
[h_ops[i].clone() for i in range(start, len(h_ops))] + \
[ResOperation(rop.JUMP, jumpargs, None, descr=jitcell_token)]
@@ -184,7 +184,7 @@
def compile_retrace(metainterp, greenkey, start,
inputargs, jumpargs,
- start_resumedescr, partial_trace, resumekey):
+ resume_at_jump_descr, partial_trace, resumekey):
"""Try to compile a new procedure by closing the current history back
to the first operation.
"""
@@ -200,7 +200,7 @@
part = create_empty_loop(metainterp)
part.inputargs = inputargs[:]
- part.start_resumedescr = start_resumedescr
+ part.resume_at_jump_descr = resume_at_jump_descr
h_ops = history.operations
part.operations = [partial_trace.operations[-1]] + \
@@ -750,7 +750,7 @@
metainterp_sd.stats.add_jitcell_token(jitcell_token)
-def compile_trace(metainterp, resumekey, start_resumedescr=None):
+def compile_trace(metainterp, resumekey, resume_at_jump_descr=None):
"""Try to compile a new bridge leading from the beginning of the history
to some existing place.
"""
@@ -766,7 +766,7 @@
# clone ops, as optimize_bridge can mutate the ops
new_trace.operations = [op.clone() for op in metainterp.history.operations]
- new_trace.start_resumedescr = start_resumedescr
+ new_trace.resume_at_jump_descr = resume_at_jump_descr
metainterp_sd = metainterp.staticdata
state = metainterp.jitdriver_sd.warmstate
if isinstance(resumekey, ResumeAtPositionDescr):
diff --git a/pypy/jit/metainterp/history.py b/pypy/jit/metainterp/history.py
--- a/pypy/jit/metainterp/history.py
+++ b/pypy/jit/metainterp/history.py
@@ -765,7 +765,7 @@
call_pure_results = None
logops = None
quasi_immutable_deps = None
- start_resumedescr = None
+ resume_at_jump_descr = None
def _token(*args):
raise Exception("TreeLoop.token is killed")
diff --git a/pypy/jit/metainterp/optimizeopt/test/test_multilabel.py b/pypy/jit/metainterp/optimizeopt/test/test_multilabel.py
--- a/pypy/jit/metainterp/optimizeopt/test/test_multilabel.py
+++ b/pypy/jit/metainterp/optimizeopt/test/test_multilabel.py
@@ -15,7 +15,7 @@
part = TreeLoop('part')
part.inputargs = loop.inputargs
- part.start_resumedescr = FakeDescrWithSnapshot()
+ part.resume_at_jump_descr = FakeDescrWithSnapshot()
token = loop.original_jitcell_token
optimized = TreeLoop('optimized')
diff --git a/pypy/jit/metainterp/optimizeopt/test/test_util.py b/pypy/jit/metainterp/optimizeopt/test/test_util.py
--- a/pypy/jit/metainterp/optimizeopt/test/test_util.py
+++ b/pypy/jit/metainterp/optimizeopt/test/test_util.py
@@ -430,7 +430,7 @@
preamble = TreeLoop('preamble')
preamble.inputargs = inputargs
- preamble.start_resumedescr = FakeDescrWithSnapshot()
+ preamble.resume_at_jump_descr = FakeDescrWithSnapshot()
token = JitCellToken()
preamble.operations = [ResOperation(rop.LABEL, inputargs, None, descr=TargetToken(token))] + \
@@ -441,7 +441,7 @@
assert preamble.operations[-1].getopnum() == rop.LABEL
inliner = Inliner(inputargs, jump_args)
- loop.start_resumedescr = preamble.start_resumedescr
+ loop.resume_at_jump_descr = preamble.resume_at_jump_descr
loop.operations = [preamble.operations[-1]] + \
[inliner.inline_op(op, clone=False) for op in cloned_operations] + \
[ResOperation(rop.JUMP, [inliner.inline_arg(a) for a in jump_args],
diff --git a/pypy/jit/metainterp/optimizeopt/unroll.py b/pypy/jit/metainterp/optimizeopt/unroll.py
--- a/pypy/jit/metainterp/optimizeopt/unroll.py
+++ b/pypy/jit/metainterp/optimizeopt/unroll.py
@@ -128,10 +128,10 @@
original_jump_args = targetop.getarglist()
jump_args = [self.getvalue(a).get_key_box() for a in original_jump_args]
- assert self.optimizer.loop.start_resumedescr
- start_resumedescr = self.optimizer.loop.start_resumedescr.clone_if_mutable()
- assert isinstance(start_resumedescr, ResumeGuardDescr)
- start_resumedescr.rd_snapshot = self.fix_snapshot(jump_args, start_resumedescr.rd_snapshot)
+ assert self.optimizer.loop.resume_at_jump_descr
+ resume_at_jump_descr = self.optimizer.loop.resume_at_jump_descr.clone_if_mutable()
+ assert isinstance(resume_at_jump_descr, ResumeGuardDescr)
+ resume_at_jump_descr.rd_snapshot = self.fix_snapshot(jump_args, resume_at_jump_descr.rd_snapshot)
modifier = VirtualStateAdder(self.optimizer)
virtual_state = modifier.get_virtual_state(jump_args)
@@ -156,7 +156,7 @@
targetop.initarglist(inputargs)
target_token.virtual_state = virtual_state
target_token.short_preamble = [ResOperation(rop.LABEL, short_inputargs, None)]
- target_token.start_resumedescr = start_resumedescr
+ target_token.resume_at_jump_descr = resume_at_jump_descr
exported_values = {}
for box in inputargs:
@@ -189,7 +189,7 @@
self.short_boxes = exported_state.short_boxes
self.inputargs = targetop.getarglist()
self.initial_virtual_state = target_token.virtual_state
- self.start_resumedescr = target_token.start_resumedescr
+ self.resume_at_jump_descr = target_token.resume_at_jump_descr
seen = {}
for box in self.inputargs:
@@ -345,7 +345,7 @@
if op.is_guard():
op = op.clone()
op.setfailargs(None)
- descr = target_token.start_resumedescr.clone_if_mutable()
+ descr = target_token.resume_at_jump_descr.clone_if_mutable()
op.setdescr(descr)
short[i] = op
@@ -364,8 +364,8 @@
for i in range(len(short)):
short[i] = inliner.inline_op(short[i])
- target_token.start_resumedescr = self.start_resumedescr.clone_if_mutable()
- inliner.inline_descr_inplace(target_token.start_resumedescr)
+ target_token.resume_at_jump_descr = self.resume_at_jump_descr.clone_if_mutable()
+ inliner.inline_descr_inplace(target_token.resume_at_jump_descr)
# Forget the values to allow them to be freed
for box in short[0].getarglist():
@@ -403,7 +403,7 @@
if not isinstance(a, Const) and a not in self.short_seen:
self.add_op_to_short(self.short_boxes.producer(a), emit, guards_needed)
if op.is_guard():
- descr = self.start_resumedescr.clone_if_mutable()
+ descr = self.resume_at_jump_descr.clone_if_mutable()
op.setdescr(descr)
if guards_needed and self.short_boxes.has_producer(op.result):
@@ -502,7 +502,7 @@
for guard in extra_guards:
if guard.is_guard():
- descr = target.start_resumedescr.clone_if_mutable()
+ descr = target.resume_at_jump_descr.clone_if_mutable()
inliner.inline_descr_inplace(descr)
guard.setdescr(descr)
self.optimizer.send_extra_operation(guard)
diff --git a/pypy/jit/metainterp/pyjitpl.py b/pypy/jit/metainterp/pyjitpl.py
--- a/pypy/jit/metainterp/pyjitpl.py
+++ b/pypy/jit/metainterp/pyjitpl.py
@@ -2062,7 +2062,7 @@
cell = self.jitdriver_sd.warmstate.jit_cell_at_key(greenkey)
return cell.get_procedure_token()
- def compile_loop(self, original_boxes, live_arg_boxes, start, start_resumedescr):
+ def compile_loop(self, original_boxes, live_arg_boxes, start, resume_at_jump_descr):
num_green_args = self.jitdriver_sd.num_green_args
greenkey = original_boxes[:num_green_args]
if not self.partial_trace:
@@ -2072,13 +2072,13 @@
target_token = compile.compile_retrace(self, greenkey, start,
original_boxes[num_green_args:],
live_arg_boxes[num_green_args:],
- start_resumedescr, self.partial_trace,
+ resume_at_jump_descr, self.partial_trace,
self.resumekey)
else:
target_token = compile.compile_loop(self, greenkey, start,
original_boxes[num_green_args:],
live_arg_boxes[num_green_args:],
- start_resumedescr)
+ resume_at_jump_descr)
if target_token is not None:
assert isinstance(target_token, TargetToken)
self.jitdriver_sd.warmstate.attach_procedure_to_interp(greenkey, target_token.targeting_jitcell_token)
@@ -2090,7 +2090,7 @@
jitcell_token = target_token.targeting_jitcell_token
self.raise_continue_running_normally(live_arg_boxes, jitcell_token)
- def compile_trace(self, live_arg_boxes, start_resumedescr):
+ def compile_trace(self, live_arg_boxes, resume_at_jump_descr):
num_green_args = self.jitdriver_sd.num_green_args
greenkey = live_arg_boxes[:num_green_args]
target_jitcell_token = self.get_procedure_token(greenkey)
@@ -2102,7 +2102,7 @@
self.history.record(rop.JUMP, live_arg_boxes[num_green_args:], None,
descr=target_jitcell_token)
try:
- target_token = compile.compile_trace(self, self.resumekey, start_resumedescr)
+ target_token = compile.compile_trace(self, self.resumekey, resume_at_jump_descr)
finally:
self.history.operations.pop() # remove the JUMP
if target_token is not None: # raise if it *worked* correctly
@@ -2111,7 +2111,7 @@
self.raise_continue_running_normally(live_arg_boxes, jitcell_token)
def compile_bridge_and_loop(self, original_boxes, live_arg_boxes, start,
- bridge_arg_boxes, start_resumedescr):
+ bridge_arg_boxes, resume_at_jump_descr):
num_green_args = self.jitdriver_sd.num_green_args
original_inputargs = self.history.inputargs
greenkey = original_boxes[:num_green_args]
@@ -2121,7 +2121,7 @@
greenkey = original_boxes[:num_green_args]
self.history.record(rop.JUMP, live_arg_boxes[num_green_args:], None)
loop_token = compile.compile_new_loop(self, [], greenkey, start,
- start_resumedescr, False)
+ resume_at_jump_descr, False)
self.history.operations.pop() # remove the JUMP
if loop_token is None:
self.history.inputargs = original_inputargs
diff --git a/pypy/jit/metainterp/test/test_virtualstate.py b/pypy/jit/metainterp/test/test_virtualstate.py
--- a/pypy/jit/metainterp/test/test_virtualstate.py
+++ b/pypy/jit/metainterp/test/test_virtualstate.py
@@ -449,7 +449,7 @@
if hasattr(self, 'callinfocollection'):
metainterp_sd.callinfocollection = self.callinfocollection
#
- bridge.start_resumedescr = FakeDescrWithSnapshot()
+ bridge.resume_at_jump_descr = FakeDescrWithSnapshot()
optimize_trace(metainterp_sd, bridge, self.enable_opts)
More information about the pypy-commit
mailing list