Author: Armin Rigo <[email protected]>
Branch:
Changeset: r68815:d3bab2233245
Date: 2014-01-21 15:04 +0100
http://bitbucket.org/pypy/pypy/changeset/d3bab2233245/
Log: Have "rpython -Ojit --jittest" work again, step 1
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
@@ -73,7 +73,7 @@
translator = interp.typer.annotator.translator
try:
translator.config.translation.gc = "boehm"
- except ConfigError:
+ except (ConfigError, TypeError):
pass
try:
translator.config.translation.list_comprehension_operations = True
diff --git a/rpython/jit/tl/jittest.py b/rpython/jit/tl/jittest.py
--- a/rpython/jit/tl/jittest.py
+++ b/rpython/jit/tl/jittest.py
@@ -4,20 +4,20 @@
only after the '---> Checkpoint' fork.
"""
-from rpython.conftest import option
+from rpython import conftest
from rpython.rtyper.lltypesystem import lltype
from rpython.rtyper.llinterp import LLInterpreter
from rpython.rtyper.annlowlevel import llstr
from rpython.jit.metainterp import warmspot
-from rpython.rlib.jit import OPTIMIZER_FULL
-ARGS = ["jittest", "100"]
+ARGS = ["--jit", "trace_eagerness=18,threshold=50", "-S",
+ "/home/arigo/pypysrc/32compiled/z.py"]
def jittest(driver):
- graph = driver.translator.graphs[0]
- interp = LLInterpreter(driver.translator.rtyper, malloc_check=False)
+ graph = driver.translator._graphof(driver.entry_point)
+ interp = LLInterpreter(driver.translator.rtyper)
def returns_null(T, *args, **kwds):
return lltype.nullptr(T)
@@ -32,12 +32,15 @@
def apply_jit(policy, interp, graph, CPUClass):
print 'warmspot.jittify_and_run() started...'
- option.view = True
+ if conftest.option is None:
+ class MyOpt:
+ pass
+ conftest.option = MyOpt()
+ conftest.option.view = True
LIST = graph.getargs()[0].concretetype
lst = LIST.TO.ll_newlist(len(ARGS))
for i, arg in enumerate(ARGS):
lst.ll_setitem_fast(i, llstr(arg))
warmspot.jittify_and_run(interp, graph, [lst], policy=policy,
listops=True, CPUClass=CPUClass,
- backendopt=True, inline=True,
- optimizer=OPTIMIZER_FULL)
+ backendopt=True, inline=True)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
