Author: fijal
Branch: jit-leaner-frontend
Changeset: r83350:3de6e9371d12
Date: 2016-03-25 13:47 +0200
http://bitbucket.org/pypy/pypy/changeset/3de6e9371d12/
Log: merge
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
@@ -295,7 +295,6 @@
return None
if ((warmstate.vec and jitdriver_sd.vec) or warmstate.vec_all):
- assert False
from rpython.jit.metainterp.optimizeopt.vector import optimize_vector
loop_info, loop_ops = optimize_vector(trace, metainterp_sd,
jitdriver_sd, warmstate,
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_virtualstate.py
b/rpython/jit/metainterp/optimizeopt/test/test_virtualstate.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_virtualstate.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_virtualstate.py
@@ -828,7 +828,7 @@
if hasattr(self, 'callinfocollection'):
metainterp_sd.callinfocollection = self.callinfocollection
#
- trace = oparser.convert_loop_to_trace(bridge)
+ trace = oparser.convert_loop_to_trace(bridge, metainterp_sd)
runtime_boxes = self.convert_values(bridge.operations[-1].getarglist(),
values)
diff --git a/rpython/jit/metainterp/optimizeopt/vector.py
b/rpython/jit/metainterp/optimizeopt/vector.py
--- a/rpython/jit/metainterp/optimizeopt/vector.py
+++ b/rpython/jit/metainterp/optimizeopt/vector.py
@@ -177,7 +177,7 @@
guard_count = 0
at_least_one_array_access = True
for i,op in enumerate(loop.operations):
- if op.is_jit_debug():
+ if rop.is_jit_debug(op):
continue
if op.vector >= 0 and not op.is_guard():
@@ -190,7 +190,7 @@
if warmstate.vec_ratio > 0.0:
# blacklist
- if op.is_call() or rop.is_call_assembler(op):
+ if rop.is_call(op) or rop.is_call_assembler(op):
return True
if op.is_guard():
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
