Author: Hakan Ardo <[email protected]>
Branch: jit-targets
Changeset: r49053:3dde4cbdcf1b
Date: 2011-11-08 19:24 +0100
http://bitbucket.org/pypy/pypy/changeset/3dde4cbdcf1b/
Log: kill OptInlineShortPreamble
diff --git a/pypy/jit/metainterp/optimizeopt/__init__.py
b/pypy/jit/metainterp/optimizeopt/__init__.py
--- a/pypy/jit/metainterp/optimizeopt/__init__.py
+++ b/pypy/jit/metainterp/optimizeopt/__init__.py
@@ -4,7 +4,7 @@
from pypy.jit.metainterp.optimizeopt.virtualize import OptVirtualize
from pypy.jit.metainterp.optimizeopt.heap import OptHeap
from pypy.jit.metainterp.optimizeopt.vstring import OptString
-from pypy.jit.metainterp.optimizeopt.unroll import optimize_unroll,
OptInlineShortPreamble
+from pypy.jit.metainterp.optimizeopt.unroll import optimize_unroll
from pypy.jit.metainterp.optimizeopt.fficall import OptFfiCall
from pypy.jit.metainterp.optimizeopt.simplify import OptSimplify
from pypy.jit.metainterp.optimizeopt.pure import OptPure
diff --git a/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py
b/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py
--- a/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py
+++ b/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py
@@ -23,31 +23,31 @@
assert names == expected_names
#
metainterp_sd = FakeMetaInterpStaticData(None)
- chain, _ = build_opt_chain(metainterp_sd, "", inline_short_preamble=False)
+ chain, _ = build_opt_chain(metainterp_sd, "")
check(chain, ["OptSimplify"])
#
chain, _ = build_opt_chain(metainterp_sd, "")
- check(chain, ["OptInlineShortPreamble", "OptSimplify"])
+ check(chain, ["OptSimplify"])
#
chain, _ = build_opt_chain(metainterp_sd, "")
- check(chain, ["OptInlineShortPreamble", "OptSimplify"])
+ check(chain, ["OptSimplify"])
#
chain, _ = build_opt_chain(metainterp_sd, "heap:intbounds")
- check(chain, ["OptInlineShortPreamble", "OptIntBounds", "OptHeap",
"OptSimplify"])
+ check(chain, ["OptIntBounds", "OptHeap", "OptSimplify"])
#
chain, unroll = build_opt_chain(metainterp_sd, "unroll")
- check(chain, ["OptInlineShortPreamble", "OptSimplify"])
+ check(chain, ["OptSimplify"])
assert unroll
#
- chain, _ = build_opt_chain(metainterp_sd, "aaa:bbb",
inline_short_preamble=False)
+ chain, _ = build_opt_chain(metainterp_sd, "aaa:bbb")
check(chain, ["OptSimplify"])
#
- chain, _ = build_opt_chain(metainterp_sd, "ffi",
inline_short_preamble=False)
+ chain, _ = build_opt_chain(metainterp_sd, "ffi")
check(chain, ["OptFfiCall", "OptSimplify"])
#
metainterp_sd.config = get_pypy_config(translating=True)
assert not metainterp_sd.config.translation.jit_ffi
- chain, _ = build_opt_chain(metainterp_sd, "ffi",
inline_short_preamble=False)
+ chain, _ = build_opt_chain(metainterp_sd, "ffi")
check(chain, ["OptSimplify"])
diff --git a/pypy/jit/metainterp/optimizeopt/unroll.py
b/pypy/jit/metainterp/optimizeopt/unroll.py
--- a/pypy/jit/metainterp/optimizeopt/unroll.py
+++ b/pypy/jit/metainterp/optimizeopt/unroll.py
@@ -553,39 +553,6 @@
jumpop.setdescr(cell_token.target_tokens[0])
self.optimizer.send_extra_operation(jumpop)
return True
-
-
-
-# FIXME: kill
-class OptInlineShortPreamble(Optimization):
- def __init__(self, retraced):
- self.retraced = retraced
-
- def new(self):
- return OptInlineShortPreamble(self.retraced)
-
- def propagate_forward(self, op):
- ## # We should not be failing much anymore...
- ## if not procedure_token.failed_states:
- ## debug_print("Retracing (%d of %d)" % (retraced_count,
- ## limit))
- ## raise RetraceLoop
- ## for failed in loop_token.failed_states:
- ## if failed.generalization_of(virtual_state):
- ## # Retracing once more will most likely fail again
- ## break
- ## else:
- ## debug_print("Retracing (%d of %d)" % (retraced_count,
- ## limit))
-
- ## raise RetraceLoop
- ## else:
- ## if not loop_token.failed_states:
- ## loop_token.failed_states=[virtual_state]
- ## else:
- ## loop_token.failed_states.append(virtual_state)
- self.emit_operation(op)
-
class ValueImporter(object):
def __init__(self, unroll, value, op):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
