Author: Alex Gaynor <[email protected]>
Branch:
Changeset: r44959:769b2baef6b7
Date: 2011-06-15 07:35 -0700
http://bitbucket.org/pypy/pypy/changeset/769b2baef6b7/
Log: Constant fold f0 * 1.0 and the reverse in the JIT.
diff --git a/pypy/jit/metainterp/optimizeopt/rewrite.py
b/pypy/jit/metainterp/optimizeopt/rewrite.py
--- a/pypy/jit/metainterp/optimizeopt/rewrite.py
+++ b/pypy/jit/metainterp/optimizeopt/rewrite.py
@@ -184,6 +184,18 @@
else:
self.emit_operation(op)
+ def optimize_FLOAT_MUL(self, op):
+ v1 = self.getvalue(op.getarg(0))
+ v2 = self.getvalue(op.getarg(1))
+
+ # Constant fold f0 * 1.0, this works in all cases, including NaN and
inf
+ if v1.is_constant() and v1.box.getfloat() == 1.0:
+ self.make_equal_to(op.result, v2)
+ elif v2.is_constant() and v2.box.getfloat() == 1.0:
+ self.make_equal_to(op.result, v1)
+ else:
+ self.emit_operation(op)
+
def optimize_CALL_PURE(self, op):
arg_consts = []
for i in range(op.numargs()):
diff --git a/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
b/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
--- a/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
+++ b/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
@@ -2126,6 +2126,33 @@
"""
self.optimize_loop(ops, expected)
+ def test_fold_constant_partial_ops_float(self):
+ ops = """
+ [f0]
+ f1 = float_mul(f0, 1.0)
+ f2 = escape(f1)
+ jump(f2)
+ """
+ expected = """
+ [f0]
+ f2 = escape(f0)
+ jump(f2)
+ """
+ self.optimize_loop(ops, expected)
+
+ ops = """
+ [f0]
+ f1 = float_mul(1.0, f0)
+ f2 = escape(f1)
+ jump(f2)
+ """
+ expected = """
+ [f0]
+ f2 = escape(f0)
+ jump(f2)
+ """
+ self.optimize_loop(ops, expected)
+
# ----------
def make_fail_descr(self):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
