Author: Carl Friedrich Bolz <cfb...@gmx.de>
Branch:
Changeset: r65863:8cf2c459003e
Date: 2013-07-31 14:12 +0200
http://bitbucket.org/pypy/pypy/changeset/8cf2c459003e/
Log: similarly, make specifying a jitpolicy in the target optional: apart
from PyPy, almost all targets use the default policy.
diff --git a/rpython/jit/tl/targettlc.py b/rpython/jit/tl/targettlc.py
--- a/rpython/jit/tl/targettlc.py
+++ b/rpython/jit/tl/targettlc.py
@@ -2,7 +2,6 @@
import py
py.path.local(__file__)
from rpython.jit.tl.tlc import interp, interp_nonjit, ConstantPool
-from rpython.jit.codewriter.policy import JitPolicy
from rpython.jit.backend.hlinfo import highleveljitinfo
@@ -54,14 +53,10 @@
return decode_program(f.readall())
def target(driver, args):
- return entry_point, None
+ return entry_point
# ____________________________________________________________
-def jitpolicy(driver):
- """Returns the JIT policy to use when translating."""
- return JitPolicy()
-
if __name__ == '__main__':
import sys
sys.exit(entry_point(sys.argv))
diff --git a/rpython/jit/tl/targettlr.py b/rpython/jit/tl/targettlr.py
--- a/rpython/jit/tl/targettlr.py
+++ b/rpython/jit/tl/targettlr.py
@@ -29,15 +29,10 @@
return bytecode
def target(driver, args):
- return entry_point, None
+ return entry_point
# ____________________________________________________________
-from rpython.jit.codewriter.policy import JitPolicy
-
-def jitpolicy(driver):
- return JitPolicy()
-
if __name__ == '__main__':
import sys
sys.exit(entry_point(sys.argv))
diff --git a/rpython/jit/tl/tla/targettla.py b/rpython/jit/tl/tla/targettla.py
--- a/rpython/jit/tl/tla/targettla.py
+++ b/rpython/jit/tl/tla/targettla.py
@@ -28,9 +28,6 @@
def target(driver, args):
return entry_point, None
-def jitpolicy(driver):
- from rpython.jit.codewriter.policy import JitPolicy
- return JitPolicy()
# ____________________________________________________________
diff --git a/rpython/translator/driver.py b/rpython/translator/driver.py
--- a/rpython/translator/driver.py
+++ b/rpython/translator/driver.py
@@ -354,8 +354,12 @@
""" Generate bytecodes for JIT and flow the JIT helper functions
lltype version
"""
- get_policy = self.extra['jitpolicy']
- self.jitpolicy = get_policy(self)
+ from rpython.jit.codewriter.policy import JitPolicy
+ get_policy = self.extra.get('jitpolicy', None)
+ if get_policy is None:
+ self.jitpolicy = JitPolicy()
+ else:
+ self.jitpolicy = get_policy(self)
#
from rpython.jit.metainterp.warmspot import apply_jit
apply_jit(self.translator, policy=self.jitpolicy,
diff --git a/rpython/translator/goal/targetjitstandalone.py
b/rpython/translator/goal/targetjitstandalone.py
--- a/rpython/translator/goal/targetjitstandalone.py
+++ b/rpython/translator/goal/targetjitstandalone.py
@@ -3,7 +3,6 @@
"""
from rpython.rlib import jit
-from rpython.jit.codewriter.policy import JitPolicy
driver = jit.JitDriver(greens = [], reds = 'auto')
driver2 = jit.JitDriver(greens = [], reds = 'auto')
@@ -40,7 +39,4 @@
return 0
def target(*args):
- return entry_point, None
-
-def jitpolicy(driver):
- return JitPolicy()
+ return entry_point
diff --git a/rpython/translator/goal/translate.py
b/rpython/translator/goal/translate.py
--- a/rpython/translator/goal/translate.py
+++ b/rpython/translator/goal/translate.py
@@ -284,8 +284,6 @@
default_goal='compile')
log_config(translateconfig, "translate.py configuration")
if config.translation.jit:
- if 'jitpolicy' not in targetspec_dic:
- raise Exception('target has no jitpolicy defined.')
if (translateconfig.goals != ['annotate'] and
translateconfig.goals != ['rtype']):
drv.set_extra_goals(['pyjitpl'])
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
