Author: Brian Kearns <[email protected]>
Branch:
Changeset: r69547:dcb7660cb5f5
Date: 2014-02-28 09:08 -0500
http://bitbucket.org/pypy/pypy/changeset/dcb7660cb5f5/
Log: move 58c3d8552833 to branch
diff --git a/rpython/jit/metainterp/optimizeopt/optimizer.py
b/rpython/jit/metainterp/optimizeopt/optimizer.py
--- a/rpython/jit/metainterp/optimizeopt/optimizer.py
+++ b/rpython/jit/metainterp/optimizeopt/optimizer.py
@@ -628,6 +628,13 @@
def optimize_DEBUG_MERGE_POINT(self, op):
self.emit_operation(op)
+ def optimize_GETARRAYITEM_GC_PURE(self, op):
+ indexvalue = self.getvalue(op.getarg(1))
+ if indexvalue.is_constant():
+ arrayvalue = self.getvalue(op.getarg(0))
+ arrayvalue.make_len_gt(MODE_ARRAY, op.getdescr(),
indexvalue.box.getint())
+ self.optimize_default(op)
+
def optimize_STRGETITEM(self, op):
indexvalue = self.getvalue(op.getarg(1))
if indexvalue.is_constant():
diff --git a/rpython/jit/metainterp/optimizeopt/pure.py
b/rpython/jit/metainterp/optimizeopt/pure.py
--- a/rpython/jit/metainterp/optimizeopt/pure.py
+++ b/rpython/jit/metainterp/optimizeopt/pure.py
@@ -110,6 +110,11 @@
def produce_potential_short_preamble_ops(self, sb):
for op in self.emitted_pure_operations:
+ if op.getopnum() == rop.GETARRAYITEM_GC_PURE or \
+ op.getopnum() == rop.STRGETITEM or \
+ op.getopnum() == rop.UNICODEGETITEM:
+ if not self.getvalue(op.getarg(1)).is_constant():
+ continue
sb.add_potential(op)
dispatch_opt = make_dispatcher_method(OptPure, 'optimize_',
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
b/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
@@ -6128,12 +6128,13 @@
i5 = int_add(i1, i3)
i4 = strgetitem(p1, i5)
escape(i4)
- jump(p1, i1, i2, i3, i4)
- """
- expected = """
- [p1, i1, i2, i3, i4]
+ jump(p1, i1, i2, i3, i5)
+ """
+ expected = """
+ [p1, i1, i2, i3, i5]
+ i4 = strgetitem(p1, i5)
escape(i4)
- jump(p1, i1, i2, i3, i4)
+ jump(p1, i1, i2, i3, i5)
"""
self.optimize_strunicode_loop(ops, expected, preamble)
@@ -6194,6 +6195,7 @@
"""
expected = """
[p0, i0]
+ i1 = strgetitem(p0, i0)
jump(p0, i0)
"""
self.optimize_loop(ops, expected)
@@ -6209,6 +6211,7 @@
"""
expected = """
[p0, i0]
+ i1 = unicodegetitem(p0, i0)
jump(p0, i0)
"""
self.optimize_loop(ops, expected)
@@ -7180,12 +7183,7 @@
call(i843, descr=nonwritedescr)
jump(p9, i1)
"""
- expected = """
- [p9, i1, i843]
- call(i843, descr=nonwritedescr)
- jump(p9, i1, i843)
- """
- self.optimize_loop(ops, expected)
+ self.optimize_loop(ops, ops)
def test_loopinvariant_unicodelen(self):
ops = """
@@ -7208,12 +7206,7 @@
call(i843, descr=nonwritedescr)
jump(p9, i1)
"""
- expected = """
- [p9, i1, i843]
- call(i843, descr=nonwritedescr)
- jump(p9, i1, i843)
- """
- self.optimize_loop(ops, expected)
+ self.optimize_loop(ops, ops)
def test_loopinvariant_arraylen(self):
ops = """
@@ -7339,12 +7332,7 @@
call(i843, descr=nonwritedescr)
jump(p9, i1)
"""
- expected = """
- [p9, i1, i843]
- call(i843, descr=nonwritedescr)
- jump(p9, i1, i843)
- """
- self.optimize_loop(ops, expected)
+ self.optimize_loop(ops, ops)
def test_loopinvariant_constant_getarrayitem_pure(self):
ops = """
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
