Author: Carl Friedrich Bolz-Tereick <[email protected]>
Branch: py3.5
Changeset: r94179:47bcad155e44
Date: 2018-03-29 20:23 +0200
http://bitbucket.org/pypy/pypy/changeset/47bcad155e44/
Log: merge default
diff --git a/pypy/module/pypyjit/hooks.py b/pypy/module/pypyjit/hooks.py
--- a/pypy/module/pypyjit/hooks.py
+++ b/pypy/module/pypyjit/hooks.py
@@ -7,12 +7,20 @@
WrappedOp, W_JitLoopInfo, wrap_oplist)
class PyPyJitIface(JitHookInterface):
+ def are_hooks_enabled(self):
+ space = self.space
+ cache = space.fromcache(Cache)
+ return (cache.w_compile_hook is not None or
+ cache.w_abort_hook is not None or
+ cache.w_trace_too_long_hook is not None)
+
+
def on_abort(self, reason, jitdriver, greenkey, greenkey_repr, logops,
operations):
space = self.space
cache = space.fromcache(Cache)
if cache.in_recursion:
return
- if space.is_true(cache.w_abort_hook):
+ if cache.w_abort_hook is not None:
cache.in_recursion = True
oplist_w = wrap_oplist(space, logops, operations)
try:
@@ -33,7 +41,7 @@
cache = space.fromcache(Cache)
if cache.in_recursion:
return
- if space.is_true(cache.w_trace_too_long_hook):
+ if cache.w_trace_too_long_hook is not None:
cache.in_recursion = True
try:
try:
@@ -62,7 +70,7 @@
cache = space.fromcache(Cache)
if cache.in_recursion:
return
- if space.is_true(cache.w_compile_hook):
+ if cache.w_compile_hook is not None:
w_debug_info = W_JitLoopInfo(space, debug_info, is_bridge,
cache.compile_hook_with_ops)
cache.in_recursion = True
diff --git a/pypy/module/pypyjit/interp_resop.py
b/pypy/module/pypyjit/interp_resop.py
--- a/pypy/module/pypyjit/interp_resop.py
+++ b/pypy/module/pypyjit/interp_resop.py
@@ -21,9 +21,10 @@
no = 0
def __init__(self, space):
- self.w_compile_hook = space.w_None
- self.w_abort_hook = space.w_None
- self.w_trace_too_long_hook = space.w_None
+ self.w_compile_hook = None
+ self.w_abort_hook = None
+ self.w_trace_too_long_hook = None
+ self.compile_hook_with_ops = False
def getno(self):
self.no += 1
@@ -58,7 +59,8 @@
jit hook won't be called for that.
"""
cache = space.fromcache(Cache)
- assert w_hook is not None
+ if space.is_w(w_hook, space.w_None):
+ w_hook = None
cache.w_compile_hook = w_hook
cache.compile_hook_with_ops = bool(operations)
cache.in_recursion = NonConstant(False)
@@ -77,7 +79,8 @@
as attributes on JitLoopInfo object.
"""
cache = space.fromcache(Cache)
- assert w_hook is not None
+ if space.is_w(w_hook, space.w_None):
+ w_hook = None
cache.w_abort_hook = w_hook
cache.in_recursion = NonConstant(False)
@@ -92,14 +95,15 @@
hook(jitdriver_name, greenkey)
"""
cache = space.fromcache(Cache)
- assert w_hook is not None
+ if space.is_w(w_hook, space.w_None):
+ w_hook = None
cache.w_trace_too_long_hook = w_hook
cache.in_recursion = NonConstant(False)
def wrap_oplist(space, logops, operations, ops_offset=None):
# this function is called from the JIT
from rpython.jit.metainterp.resoperation import rop
-
+
l_w = []
jitdrivers_sd = logops.metainterp_sd.jitdrivers_sd
for op in operations:
diff --git a/pypy/module/pypyjit/test/test_jit_hook.py
b/pypy/module/pypyjit/test/test_jit_hook.py
--- a/pypy/module/pypyjit/test/test_jit_hook.py
+++ b/pypy/module/pypyjit/test/test_jit_hook.py
@@ -86,18 +86,22 @@
def interp_on_compile():
di_loop.oplist = cls.oplist
- pypy_hooks.after_compile(di_loop)
+ if pypy_hooks.are_hooks_enabled():
+ pypy_hooks.after_compile(di_loop)
def interp_on_compile_bridge():
- pypy_hooks.after_compile_bridge(di_bridge)
+ if pypy_hooks.are_hooks_enabled():
+ pypy_hooks.after_compile_bridge(di_bridge)
def interp_on_optimize():
- di_loop_optimize.oplist = cls.oplist
- pypy_hooks.before_compile(di_loop_optimize)
+ if pypy_hooks.are_hooks_enabled():
+ di_loop_optimize.oplist = cls.oplist
+ pypy_hooks.before_compile(di_loop_optimize)
def interp_on_abort():
- pypy_hooks.on_abort(Counters.ABORT_TOO_LONG, pypyjitdriver,
- greenkey, 'blah', Logger(MockSD), [])
+ if pypy_hooks.are_hooks_enabled():
+ pypy_hooks.on_abort(Counters.ABORT_TOO_LONG, pypyjitdriver,
+ greenkey, 'blah', Logger(MockSD), [])
space = cls.space
cls.w_on_compile = space.wrap(interp2app(interp_on_compile))
diff --git a/rpython/jit/codewriter/policy.py b/rpython/jit/codewriter/policy.py
--- a/rpython/jit/codewriter/policy.py
+++ b/rpython/jit/codewriter/policy.py
@@ -11,9 +11,6 @@
self.supports_floats = False
self.supports_longlong = False
self.supports_singlefloats = False
- if jithookiface is None:
- from rpython.rlib.jit import JitHookInterface
- jithookiface = JitHookInterface()
self.jithookiface = jithookiface
def set_supports_floats(self, flag):
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
@@ -545,15 +545,17 @@
show_procedures(metainterp_sd, loop)
loop.check_consistency()
+ debug_info = None
+ hooks = None
if metainterp_sd.warmrunnerdesc is not None:
hooks = metainterp_sd.warmrunnerdesc.hooks
- debug_info = JitDebugInfo(jitdriver_sd, metainterp_sd.logger_ops,
- original_jitcell_token, loop.operations,
- type, greenkey)
- hooks.before_compile(debug_info)
- else:
- debug_info = None
- hooks = None
+ if hooks.are_hooks_enabled():
+ debug_info = JitDebugInfo(jitdriver_sd, metainterp_sd.logger_ops,
+ original_jitcell_token, loop.operations,
+ type, greenkey)
+ hooks.before_compile(debug_info)
+ else:
+ hooks = None
operations = get_deep_immutable_oplist(loop.operations)
metainterp_sd.profiler.start_backend()
debug_start("jit-backend")
@@ -597,15 +599,17 @@
show_procedures(metainterp_sd)
seen = dict.fromkeys(inputargs)
TreeLoop.check_consistency_of_branch(operations, seen)
+ debug_info = None
+ hooks = None
if metainterp_sd.warmrunnerdesc is not None:
hooks = metainterp_sd.warmrunnerdesc.hooks
- debug_info = JitDebugInfo(jitdriver_sd, metainterp_sd.logger_ops,
- original_loop_token, operations, 'bridge',
- fail_descr=faildescr)
- hooks.before_compile_bridge(debug_info)
- else:
- hooks = None
- debug_info = None
+ if hooks.are_hooks_enabled():
+ debug_info = JitDebugInfo(jitdriver_sd, metainterp_sd.logger_ops,
+ original_loop_token, operations,
'bridge',
+ fail_descr=faildescr)
+ hooks.before_compile_bridge(debug_info)
+ else:
+ hooks = None
operations = get_deep_immutable_oplist(operations)
metainterp_sd.profiler.start_backend()
debug_start("jit-backend")
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
@@ -2365,7 +2365,9 @@
greenkey = None # we're in the bridge
else:
greenkey = self.current_merge_points[0][0][:jd_sd.num_green_args]
- self.staticdata.warmrunnerdesc.hooks.on_abort(reason,
+ hooks = self.staticdata.warmrunnerdesc.hooks
+ if hooks.are_hooks_enabled():
+ hooks.on_abort(reason,
jd_sd.jitdriver, greenkey,
jd_sd.warmstate.get_location_str(greenkey),
self.staticdata.logger_ops._make_log_operations(
@@ -2374,9 +2376,10 @@
if self.aborted_tracing_jitdriver is not None:
jd_sd = self.aborted_tracing_jitdriver
greenkey = self.aborted_tracing_greenkey
- self.staticdata.warmrunnerdesc.hooks.on_trace_too_long(
- jd_sd.jitdriver, greenkey,
- jd_sd.warmstate.get_location_str(greenkey))
+ if hooks.are_hooks_enabled():
+ hooks.on_trace_too_long(
+ jd_sd.jitdriver, greenkey,
+ jd_sd.warmstate.get_location_str(greenkey))
# no ops for now
self.aborted_tracing_jitdriver = None
self.aborted_tracing_greenkey = None
diff --git a/rpython/jit/metainterp/test/test_jitiface.py
b/rpython/jit/metainterp/test/test_jitiface.py
--- a/rpython/jit/metainterp/test/test_jitiface.py
+++ b/rpython/jit/metainterp/test/test_jitiface.py
@@ -238,7 +238,7 @@
hashes = Hashes()
- class Hooks(object):
+ class Hooks(JitHookInterface):
def before_compile(self, debug_info):
pass
@@ -279,6 +279,44 @@
self.meta_interp(main, [1, 1], policy=JitPolicy(hooks))
assert len(hashes.t) == 1
+
+ def test_are_hooks_enabled(self):
+ reasons = []
+
+ class MyJitIface(JitHookInterface):
+ def are_hooks_enabled(self):
+ return False
+
+ def on_abort(self, reason, jitdriver, greenkey, greenkey_repr,
logops, ops):
+ reasons.append(reason)
+
+ iface = MyJitIface()
+
+ myjitdriver = JitDriver(greens=['foo'], reds=['x', 'total'],
+ get_printable_location=lambda *args: 'blah')
+
+ class Foo:
+ _immutable_fields_ = ['a?']
+
+ def __init__(self, a):
+ self.a = a
+
+ def f(a, x):
+ foo = Foo(a)
+ total = 0
+ while x > 0:
+ myjitdriver.jit_merge_point(foo=foo, x=x, total=total)
+ total += foo.a
+ foo.a += 1
+ x -= 1
+ return total
+ #
+ assert f(100, 7) == 721
+ res = self.meta_interp(f, [100, 7], policy=JitPolicy(iface))
+ assert res == 721
+ assert reasons == []
+
+
class LLJitHookInterfaceTests(JitHookInterfaceTests):
# use this for any backend, instead of the super class
@@ -320,7 +358,6 @@
# this so far does not work because of the way setup_once is done,
# but fine, it's only about untranslated version anyway
#self.meta_interp(main, [False], ProfilerClass=Profiler)
-
class TestJitHookInterface(JitHookInterfaceTests, LLJitMixin):
pass
diff --git a/rpython/jit/metainterp/warmspot.py
b/rpython/jit/metainterp/warmspot.py
--- a/rpython/jit/metainterp/warmspot.py
+++ b/rpython/jit/metainterp/warmspot.py
@@ -220,6 +220,15 @@
stats.check_consistency()
# ____________________________________________________________
+# always disabled hooks interface
+
+from rpython.rlib.jit import JitHookInterface
+
+class NoHooksInterface(JitHookInterface):
+ def are_hooks_enabled(self):
+ return False
+
+# ____________________________________________________________
class WarmRunnerDesc(object):
@@ -259,7 +268,7 @@
else:
self.jitcounter = counter.DeterministicJitCounter()
#
- self.hooks = policy.jithookiface
+ self.make_hooks(policy.jithookiface)
self.make_virtualizable_infos()
self.make_driverhook_graphs()
self.make_enter_functions()
@@ -498,6 +507,12 @@
self.metainterp_sd.opencoder_model = Model
self.stats.metainterp_sd = self.metainterp_sd
+ def make_hooks(self, hooks):
+ if hooks is None:
+ # interface not overridden, use a special one that is never enabled
+ hooks = NoHooksInterface()
+ self.hooks = hooks
+
def make_virtualizable_infos(self):
vinfos = {}
for jd in self.jitdrivers_sd:
diff --git a/rpython/rlib/jit.py b/rpython/rlib/jit.py
--- a/rpython/rlib/jit.py
+++ b/rpython/rlib/jit.py
@@ -1087,7 +1087,8 @@
""" This is the main connector between the JIT and the interpreter.
Several methods on this class will be invoked at various stages
of JIT running like JIT loops compiled, aborts etc.
- An instance of this class will be available as policy.jithookiface.
+ An instance of this class has to be passed into the JitPolicy constructor
+ (and will then be available as policy.jithookiface).
"""
# WARNING: You should make a single prebuilt instance of a subclass
# of this class. You can, before translation, initialize some
@@ -1097,6 +1098,13 @@
# of the program! A line like ``pypy_hooks.foo = ...`` must not
# appear inside your interpreter's RPython code.
+ def are_hooks_enabled(self):
+ """ A hook that is called to check whether the interpreter's hooks are
+ enabled at all. Only if this function returns True, are the other hooks
+ called. Otherwise, nothing happens. This is done because constructing
+ some of the hooks' arguments is expensive, so we'd rather not do it."""
+ return True
+
def on_abort(self, reason, jitdriver, greenkey, greenkey_repr, logops,
operations):
""" A hook called each time a loop is aborted with jitdriver and
greenkey where it started, reason is a string why it got aborted
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
