Author: Ronan Lamy <[email protected]>
Branch: optimizeopt-cleanup
Changeset: r96583:40e26f9f4337
Date: 2019-05-07 19:48 +0100
http://bitbucket.org/pypy/pypy/changeset/40e26f9f4337/
Log: cleanup
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
@@ -1024,7 +1024,6 @@
"""Try to compile a new bridge leading from the beginning of the history
to some existing place.
"""
-
from rpython.jit.metainterp.optimizeopt import optimize_trace
# The history contains new operations to attach as the code for the
@@ -1035,11 +1034,6 @@
metainterp_sd = metainterp.staticdata
jitdriver_sd = metainterp.jitdriver_sd
- #
- jd_name = jitdriver_sd.jitdriver.name
- metainterp_sd.jitlog.start_new_trace(metainterp_sd,
- faildescr=resumekey, entry_bridge=False, jd_name=jd_name)
- #
if isinstance(resumekey, ResumeAtPositionDescr):
inline_short_preamble = False
else:
@@ -1048,10 +1042,14 @@
trace = metainterp.history.trace
jitdriver_sd = metainterp.jitdriver_sd
enable_opts = jitdriver_sd.warmstate.enable_opts
-
call_pure_results = metainterp.call_pure_results
resumestorage = resumekey.get_resumestorage()
+ trace.tracing_done()
+ metainterp_sd.jitlog.start_new_trace(metainterp_sd,
+ faildescr=resumekey, entry_bridge=False,
+ jd_name=jitdriver_sd.jitdriver.name)
+
if metainterp.history.ends_with_jump:
data = BridgeCompileData(trace, runtime_boxes, resumestorage,
call_pure_results=call_pure_results,
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
@@ -2771,7 +2771,6 @@
self.history.record(rop.JUMP, live_arg_boxes[num_green_args:], None,
descr=ptoken)
self.history.ends_with_jump = True
- self.history.trace.tracing_done()
try:
target_token = compile.compile_trace(self, self.resumekey,
live_arg_boxes[num_green_args:])
@@ -2781,7 +2780,6 @@
self.raise_if_successful(live_arg_boxes, target_token)
def compile_done_with_this_frame(self, exitbox):
- # temporarily put a JUMP to a pseudo-loop
self.store_token_in_vable()
sd = self.staticdata
result_type = self.jitdriver_sd.result_type
@@ -2800,9 +2798,7 @@
token = sd.done_with_this_frame_descr_float
else:
assert False
- # FIXME: can we call compile_trace?
self.history.record(rop.FINISH, exits, None, descr=token)
- self.history.trace.tracing_done()
target_token = compile.compile_trace(self, self.resumekey, exits)
if target_token is not token:
compile.giveup()
@@ -2828,7 +2824,6 @@
sd = self.staticdata
token = sd.exit_frame_with_exception_descr_ref
self.history.record(rop.FINISH, [valuebox], None, descr=token)
- self.history.trace.tracing_done()
target_token = compile.compile_trace(self, self.resumekey, [valuebox])
if target_token is not token:
compile.giveup()
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
