[pypy-commit] pypy default: kill exported_state as a thing living on a label, instead pass it explicitely
fijal
noreply at buildbot.pypy.org
Fri Dec 12 16:35:30 CET 2014
Author: Maciej Fijalkowski <fijall at gmail.com>
Branch:
Changeset: r74898:99e731e67c69
Date: 2014-12-12 17:34 +0200
http://bitbucket.org/pypy/pypy/changeset/99e731e67c69/
Log: kill exported_state as a thing living on a label, instead pass it
explicitely when it's necessary (when unrolling *or* retracing)
diff --git a/rpython/jit/metainterp/compile.py b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -74,7 +74,6 @@
# for a CALL_ASSEMBLER: record it as a potential jump.
if descr is not original_jitcell_token:
original_jitcell_token.record_jump_to(descr)
- descr.exported_state = None
op.cleardescr() # clear reference, mostly for tests
elif isinstance(descr, TargetToken):
# for a JUMP: record it as a potential jump.
@@ -84,10 +83,6 @@
if descr.original_jitcell_token is not original_jitcell_token:
assert descr.original_jitcell_token is not None
original_jitcell_token.record_jump_to(descr.original_jitcell_token)
- # exported_state is clear by optimizeopt when the short preamble is
- # constrcucted. if that did not happen the label should not show up
- # in a trace that will be used
- assert descr.exported_state is None
if not we_are_translated():
op._descr_wref = weakref.ref(op._descr)
op.cleardescr() # clear reference to prevent the history.Stats
@@ -133,7 +128,7 @@
[ResOperation(rop.LABEL, jumpargs, None, descr=jitcell_token)]
try:
- optimize_trace(metainterp_sd, part, enable_opts)
+ start_state = optimize_trace(metainterp_sd, part, enable_opts)
except InvalidLoop:
return None
target_token = part.operations[0].getdescr()
@@ -160,7 +155,8 @@
jumpargs = part.operations[-1].getarglist()
try:
- optimize_trace(metainterp_sd, part, enable_opts)
+ optimize_trace(metainterp_sd, part, enable_opts,
+ start_state=start_state)
except InvalidLoop:
return None
@@ -187,7 +183,7 @@
def compile_retrace(metainterp, greenkey, start,
inputargs, jumpargs,
- partial_trace, resumekey):
+ partial_trace, resumekey, start_state):
"""Try to compile a new procedure by closing the current history back
to the first operation.
"""
@@ -212,18 +208,19 @@
orignial_label = label.clone()
assert label.getopnum() == rop.LABEL
try:
- optimize_trace(metainterp_sd, part, jitdriver_sd.warmstate.enable_opts)
+ optimize_trace(metainterp_sd, part, jitdriver_sd.warmstate.enable_opts,
+ start_state=start_state)
except InvalidLoop:
# Fall back on jumping to preamble
target_token = label.getdescr()
assert isinstance(target_token, TargetToken)
- assert target_token.exported_state
part.operations = [orignial_label] + \
[ResOperation(rop.JUMP, inputargs[:],
None, descr=loop_jitcell_token)]
try:
- optimize_trace(metainterp_sd, part, jitdriver_sd.warmstate.enable_opts,
- inline_short_preamble=False)
+ optimize_trace(metainterp_sd, part,
+ jitdriver_sd.warmstate.enable_opts,
+ inline_short_preamble=False, start_state=start_state)
except InvalidLoop:
return None
assert part.operations[-1].getopnum() != rop.LABEL
@@ -792,7 +789,7 @@
else:
inline_short_preamble = True
try:
- optimize_trace(metainterp_sd, new_trace, state.enable_opts, inline_short_preamble)
+ state = optimize_trace(metainterp_sd, new_trace, state.enable_opts, inline_short_preamble)
except InvalidLoop:
debug_print("compile_new_bridge: got an InvalidLoop")
# XXX I am fairly convinced that optimize_bridge cannot actually raise
@@ -808,7 +805,7 @@
record_loop_or_bridge(metainterp_sd, new_trace)
return target_token
else:
- metainterp.retrace_needed(new_trace)
+ metainterp.retrace_needed(new_trace, state)
return None
# ____________________________________________________________
diff --git a/rpython/jit/metainterp/history.py b/rpython/jit/metainterp/history.py
--- a/rpython/jit/metainterp/history.py
+++ b/rpython/jit/metainterp/history.py
@@ -617,7 +617,6 @@
self.original_jitcell_token = None
self.virtual_state = None
- self.exported_state = None
self.short_preamble = None
def repr_of_descr(self):
diff --git a/rpython/jit/metainterp/logger.py b/rpython/jit/metainterp/logger.py
--- a/rpython/jit/metainterp/logger.py
+++ b/rpython/jit/metainterp/logger.py
@@ -178,13 +178,6 @@
fail_args = ''
return s_offset + res + op.getopname() + '(' + args + ')' + fail_args
- def _log_inputarg_setup_ops(self, op):
- target_token = op.getdescr()
- if isinstance(target_token, TargetToken):
- if target_token.exported_state:
- for op in target_token.exported_state.inputarg_setup_ops:
- debug_print(' ' + self.repr_of_resop(op))
-
def _log_operations(self, inputargs, operations, ops_offset):
if not have_debug_prints():
return
@@ -194,10 +187,10 @@
args = ", ".join([self.repr_of_arg(arg) for arg in inputargs])
debug_print('[' + args + ']')
for i in range(len(operations)):
- op = operations[i]
+ #op = operations[i]
debug_print(self.repr_of_resop(operations[i], ops_offset))
- if op.getopnum() == rop.LABEL:
- self._log_inputarg_setup_ops(op)
+ #if op.getopnum() == rop.LABEL:
+ # self._log_inputarg_setup_ops(op)
if ops_offset and None in ops_offset:
offset = ops_offset[None]
debug_print("+%d: --end of the loop--" % offset)
diff --git a/rpython/jit/metainterp/optimizeopt/__init__.py b/rpython/jit/metainterp/optimizeopt/__init__.py
--- a/rpython/jit/metainterp/optimizeopt/__init__.py
+++ b/rpython/jit/metainterp/optimizeopt/__init__.py
@@ -47,7 +47,8 @@
return optimizations, unroll
-def optimize_trace(metainterp_sd, loop, enable_opts, inline_short_preamble=True):
+def optimize_trace(metainterp_sd, loop, enable_opts,
+ inline_short_preamble=True, start_state=None):
"""Optimize loop.operations to remove internal overheadish operations.
"""
@@ -57,7 +58,8 @@
loop.operations)
optimizations, unroll = build_opt_chain(metainterp_sd, enable_opts)
if unroll:
- optimize_unroll(metainterp_sd, loop, optimizations, inline_short_preamble)
+ return optimize_unroll(metainterp_sd, loop, optimizations,
+ inline_short_preamble, start_state)
else:
optimizer = Optimizer(metainterp_sd, loop, optimizations)
optimizer.propagate_all_forward()
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_multilabel.py b/rpython/jit/metainterp/optimizeopt/test/test_multilabel.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_multilabel.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_multilabel.py
@@ -32,6 +32,7 @@
if op.getopnum()==rop.LABEL]
prv = 0
last_label = []
+ state = None
for nxt in labels + [len(loop.operations)]:
assert prv != nxt
operations = last_label + loop.operations[prv:nxt]
@@ -44,7 +45,7 @@
part.operations = operations
self.add_guard_future_condition(part)
- self._do_optimize_loop(part, None)
+ state = self._do_optimize_loop(part, None, state)
if part.operations[-1].getopnum() == rop.LABEL:
last_label = [part.operations.pop()]
else:
@@ -496,7 +497,7 @@
class BaseTestOptimizerRenamingBoxes(BaseTestMultiLabel):
- def _do_optimize_loop(self, loop, call_pure_results):
+ def _do_optimize_loop(self, loop, call_pure_results, state):
from rpython.jit.metainterp.optimizeopt.unroll import optimize_unroll
from rpython.jit.metainterp.optimizeopt.util import args_dict
from rpython.jit.metainterp.optimizeopt.pure import OptPure
@@ -504,7 +505,7 @@
self.loop = loop
loop.call_pure_results = args_dict()
metainterp_sd = FakeMetaInterpStaticData(self.cpu)
- optimize_unroll(metainterp_sd, loop, [OptRewrite(), OptRenameStrlen(), OptHeap(), OptPure()], True)
+ return optimize_unroll(metainterp_sd, loop, [OptRewrite(), OptRenameStrlen(), OptHeap(), OptPure()], True, state)
def test_optimizer_renaming_boxes1(self):
ops = """
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_util.py b/rpython/jit/metainterp/optimizeopt/test/test_util.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_util.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_util.py
@@ -390,7 +390,7 @@
assert equaloplists(optimized.operations,
expected.operations, False, remap, text_right)
- def _do_optimize_loop(self, loop, call_pure_results):
+ def _do_optimize_loop(self, loop, call_pure_results, start_state=None):
from rpython.jit.metainterp.optimizeopt import optimize_trace
from rpython.jit.metainterp.optimizeopt.util import args_dict
@@ -405,7 +405,8 @@
if hasattr(self, 'callinfocollection'):
metainterp_sd.callinfocollection = self.callinfocollection
#
- optimize_trace(metainterp_sd, loop, self.enable_opts)
+ return optimize_trace(metainterp_sd, loop, self.enable_opts,
+ start_state=start_state)
def unroll_and_optimize(self, loop, call_pure_results=None):
self.add_guard_future_condition(loop)
@@ -425,7 +426,7 @@
preamble.operations = [ResOperation(rop.LABEL, inputargs, None, descr=TargetToken(token))] + \
operations + \
[ResOperation(rop.LABEL, jump_args, None, descr=token)]
- self._do_optimize_loop(preamble, call_pure_results)
+ start_state = self._do_optimize_loop(preamble, call_pure_results)
assert preamble.operations[-1].getopnum() == rop.LABEL
@@ -439,7 +440,7 @@
assert loop.operations[0].getopnum() == rop.LABEL
loop.inputargs = loop.operations[0].getarglist()
- self._do_optimize_loop(loop, call_pure_results)
+ self._do_optimize_loop(loop, call_pure_results, start_state)
extra_same_as = []
while loop.operations[0].getopnum() != rop.LABEL:
extra_same_as.append(loop.operations[0])
diff --git a/rpython/jit/metainterp/optimizeopt/unroll.py b/rpython/jit/metainterp/optimizeopt/unroll.py
--- a/rpython/jit/metainterp/optimizeopt/unroll.py
+++ b/rpython/jit/metainterp/optimizeopt/unroll.py
@@ -15,10 +15,11 @@
# FIXME: Introduce some VirtualOptimizer super class instead
-def optimize_unroll(metainterp_sd, loop, optimizations, inline_short_preamble=True):
+def optimize_unroll(metainterp_sd, loop, optimizations,
+ inline_short_preamble=True, start_state=None):
opt = UnrollOptimizer(metainterp_sd, loop, optimizations)
opt.inline_short_preamble = inline_short_preamble
- opt.propagate_all_forward()
+ return opt.propagate_all_forward(start_state)
class UnrollableOptimizer(Optimizer):
@@ -69,7 +70,7 @@
prev = self.fix_snapshot(jump_args, snapshot.prev)
return Snapshot(prev, new_snapshot_args)
- def propagate_all_forward(self):
+ def propagate_all_forward(self, starting_state):
loop = self.optimizer.loop
self.optimizer.clear_newoperations()
@@ -94,7 +95,7 @@
else:
jumpop = None
- self.import_state(start_label)
+ self.import_state(start_label, starting_state)
self.optimizer.propagate_all_forward(clear=False)
if not jumpop:
@@ -147,8 +148,9 @@
KillHugeIntBounds(self.optimizer).apply()
loop.operations = self.optimizer.get_newoperations()
- self.export_state(stop_label)
+ final_state = self.export_state(stop_label)
loop.operations.append(stop_label)
+ return final_state
def jump_to_start_label(self, start_label, stop_label):
if not start_label or not stop_label:
@@ -202,10 +204,9 @@
box = op.result
exported_values[box] = self.optimizer.getvalue(box)
- target_token.exported_state = ExportedState(short_boxes, inputarg_setup_ops,
- exported_values)
+ return ExportedState(short_boxes, inputarg_setup_ops, exported_values)
- def import_state(self, targetop):
+ def import_state(self, targetop, exported_state):
if not targetop: # Trace did not start with a label
self.inputargs = self.optimizer.loop.inputargs
self.short = None
@@ -215,7 +216,6 @@
self.inputargs = targetop.getarglist()
target_token = targetop.getdescr()
assert isinstance(target_token, TargetToken)
- exported_state = target_token.exported_state
if not exported_state:
# No state exported, construct one without virtuals
self.short = None
@@ -413,7 +413,6 @@
if op.result:
op.result.forget_value()
target_token.short_preamble = self.short
- target_token.exported_state = None
def ensure_short_op_emitted(self, op, optimizer, seen):
if op is None:
@@ -561,7 +560,9 @@
try:
# NB: the short_preamble ends with a jump
- self._inline_short_preamble(target.short_preamble, inliner, patchguardop, target.assumed_classes)
+ self._inline_short_preamble(target.short_preamble, inliner,
+ patchguardop,
+ target.assumed_classes)
except InvalidLoop:
#debug_print("Inlining failed unexpectedly",
# "jumping to preamble instead")
@@ -572,7 +573,8 @@
debug_stop('jit-log-virtualstate')
return False
- def _inline_short_preamble(self, short_preamble, inliner, patchguardop, assumed_classes):
+ def _inline_short_preamble(self, short_preamble, inliner, patchguardop,
+ assumed_classes):
i = 1
# XXX this is intentiontal :-(. short_preamble can change during the
# loop in some cases
diff --git a/rpython/jit/metainterp/pyjitpl.py b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -1730,6 +1730,7 @@
class MetaInterp(object):
portal_call_depth = 0
cancel_count = 0
+ exported_state = None
def __init__(self, staticdata, jitdriver_sd):
self.staticdata = staticdata
@@ -1750,9 +1751,10 @@
self.call_ids = []
self.current_call_id = 0
- def retrace_needed(self, trace):
+ def retrace_needed(self, trace, exported_state):
self.partial_trace = trace
self.retracing_from = len(self.history.operations) - 1
+ self.exported_state = exported_state
self.heapcache.reset()
@@ -2249,7 +2251,9 @@
raise SwitchToBlackhole(Counters.ABORT_BAD_LOOP) # For now
# Found! Compile it as a loop.
# raises in case it works -- which is the common case
- self.compile_loop(original_boxes, live_arg_boxes, start)
+ self.compile_loop(original_boxes, live_arg_boxes, start,
+ exported_state=self.exported_state)
+ self.exported_state = None
# creation of the loop was cancelled!
self.cancel_count += 1
if self.staticdata.warmrunnerdesc:
@@ -2363,7 +2367,7 @@
return token
def compile_loop(self, original_boxes, live_arg_boxes, start,
- try_disabling_unroll=False):
+ try_disabling_unroll=False, exported_state=None):
num_green_args = self.jitdriver_sd.num_green_args
greenkey = original_boxes[:num_green_args]
if not self.partial_trace:
@@ -2377,7 +2381,8 @@
original_boxes[num_green_args:],
live_arg_boxes[num_green_args:],
self.partial_trace,
- self.resumekey)
+ self.resumekey,
+ exported_state)
else:
target_token = compile.compile_loop(self, greenkey, start,
original_boxes[num_green_args:],
More information about the pypy-commit
mailing list