[pypy-commit] pypy jit-leaner-frontend: removed statements that copy rd_* on guard descr. test_vector passing
plan_rich
pypy.commits at gmail.com
Tue Mar 22 05:00:55 EDT 2016
Author: Richard Plangger <planrichi at gmail.com>
Branch: jit-leaner-frontend
Changeset: r83242:721744197b8f
Date: 2016-03-22 09:59 +0100
http://bitbucket.org/pypy/pypy/changeset/721744197b8f/
Log: removed statements that copy rd_* on guard descr. test_vector
passing
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
@@ -287,9 +287,8 @@
return None
if ((warmstate.vec and jitdriver_sd.vec) or warmstate.vec_all):
- assert False, "vectorization disabled"
from rpython.jit.metainterp.optimizeopt.vector import optimize_vector
- loop_info, loop_ops = optimize_vector(metainterp_sd,
+ loop_info, loop_ops = optimize_vector(trace, metainterp_sd,
jitdriver_sd, warmstate,
loop_info, loop_ops,
jitcell_token)
diff --git a/rpython/jit/metainterp/optimizeopt/guard.py b/rpython/jit/metainterp/optimizeopt/guard.py
--- a/rpython/jit/metainterp/optimizeopt/guard.py
+++ b/rpython/jit/metainterp/optimizeopt/guard.py
@@ -119,9 +119,9 @@
descr = myop.getdescr()
descr.copy_all_attributes_from(other.op.getdescr())
- myop.rd_frame_info_list = otherop.rd_frame_info_list
+ # TODO myop.rd_frame_info_list = otherop.rd_frame_info_list
myop.setfailargs(otherop.getfailargs()[:])
- myop.rd_snapshot = otherop.rd_snapshot
+ # TODO myop.rd_snapshot = otherop.rd_snapshot
def emit_varops(self, opt, var, old_arg):
assert isinstance(var, IndexVar)
diff --git a/rpython/jit/metainterp/optimizeopt/renamer.py b/rpython/jit/metainterp/optimizeopt/renamer.py
--- a/rpython/jit/metainterp/optimizeopt/renamer.py
+++ b/rpython/jit/metainterp/optimizeopt/renamer.py
@@ -17,7 +17,7 @@
if op.is_guard():
assert isinstance(op, resoperation.GuardResOp)
- op.rd_snapshot = self.rename_rd_snapshot(op.rd_snapshot, clone=True)
+ # TODO op.rd_snapshot = self.rename_rd_snapshot(op.rd_snapshot, clone=True)
failargs = self.rename_failargs(op, clone=True)
op.setfailargs(failargs)
diff --git a/rpython/jit/metainterp/optimizeopt/schedule.py b/rpython/jit/metainterp/optimizeopt/schedule.py
--- a/rpython/jit/metainterp/optimizeopt/schedule.py
+++ b/rpython/jit/metainterp/optimizeopt/schedule.py
@@ -498,7 +498,7 @@
newarg = unpack_from_vector(state, newarg, 0, 1)
args[i] = newarg
vecop.setfailargs(args)
- vecop.rd_snapshot = left.rd_snapshot
+ # TODO vecop.rd_snapshot = left.rd_snapshot
@always_inline
def crop_vector(state, oprestrict, restrict, pack, args, i):
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
@@ -111,7 +111,7 @@
loop.prefix_label = prefix_label
return loop
-def optimize_vector(metainterp_sd, jitdriver_sd, warmstate,
+def optimize_vector(trace, metainterp_sd, jitdriver_sd, warmstate,
loop_info, loop_ops, jitcell_token=None):
""" Enter the world of SIMD. Bails if it cannot transform the trace. """
user_code = not jitdriver_sd.vec and warmstate.vec_all
@@ -190,7 +190,7 @@
if warmstate.vec_ratio > 0.0:
# blacklist
- if op.is_call() or op.is_call_assembler():
+ if op.is_call() or rop.is_call_assembler(op):
return True
if op.is_guard():
More information about the pypy-commit
mailing list