Author: Maciej Fijalkowski <[email protected]>
Branch: optresult
Changeset: r77613:acfca723c438
Date: 2015-05-27 10:08 +0200
http://bitbucket.org/pypy/pypy/changeset/acfca723c438/
Log: comment out pieces of unrolling, we have to think what to do next
diff --git a/rpython/jit/metainterp/optimizeopt/generalize.py
b/rpython/jit/metainterp/optimizeopt/generalize.py
--- a/rpython/jit/metainterp/optimizeopt/generalize.py
+++ b/rpython/jit/metainterp/optimizeopt/generalize.py
@@ -11,11 +11,12 @@
class KillHugeIntBounds(GeneralizationStrategy):
def apply(self):
- for v in self.optimizer.values.values():
- if v.is_constant():
- continue
- if isinstance(v, IntOptValue):
- if v.intbound.lower < MININT / 2:
- v.intbound.lower = MININT
- if v.intbound.upper > MAXINT / 2:
- v.intbound.upper = MAXINT
+ pass
+ #for v in self.optimizer.values.values():
+ # if v.is_constant():
+ # continue
+ # if isinstance(v, IntOptValue):
+ # if v.intbound.lower < MININT / 2:
+ # v.intbound.lower = MININT
+ # if v.intbound.upper > MAXINT / 2:
+ # v.intbound.upper = MAXINT
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
@@ -202,9 +202,9 @@
ops = sb.optimizer._newoperations
for i, op in enumerate(ops):
if op.is_always_pure():
- sb.add_potential(op)
+ sb.add_potential(op, op)
if op.is_ovf() and ops[i + 1].getopnum() == rop.GUARD_NO_OVERFLOW:
- sb.add_potential(op)
+ sb.add_potential(op, op)
for i in self.call_pure_positions:
op = ops[i]
assert op.getopnum() == rop.CALL
diff --git a/rpython/jit/metainterp/optimizeopt/virtualstate.py
b/rpython/jit/metainterp/optimizeopt/virtualstate.py
--- a/rpython/jit/metainterp/optimizeopt/virtualstate.py
+++ b/rpython/jit/metainterp/optimizeopt/virtualstate.py
@@ -712,14 +712,14 @@
raise BoxNotProducable
def add_potential(self, key, op, synthetic=False):
- try:
- value = self.optimizer.values[key]
- if value in self.optimizer.opaque_pointers:
- classbox = value.get_constant_class(self.optimizer.cpu)
- if classbox:
- self.assumed_classes[key] = classbox
- except KeyError:
- pass
+ #try:
+ # value = self.optimizer.values[key]
+ # if value in self.optimizer.opaque_pointers:
+ # classbox = value.get_constant_class(self.optimizer.cpu)
+ # if classbox:
+ # self.assumed_classes[key] = classbox
+ #except KeyError:
+ # pass
if key not in self.potential_ops:
self.potential_ops[key] = op
else:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
