Author: Hakan Ardo <[email protected]>
Branch: jit-targets
Changeset: r49362:6a9c9a3e0c43
Date: 2011-11-12 13:08 +0100
http://bitbucket.org/pypy/pypy/changeset/6a9c9a3e0c43/
Log: kill insert_loop_token
diff --git a/pypy/jit/metainterp/compile.py b/pypy/jit/metainterp/compile.py
--- a/pypy/jit/metainterp/compile.py
+++ b/pypy/jit/metainterp/compile.py
@@ -167,29 +167,6 @@
record_loop_or_bridge(metainterp_sd, loop)
return all_target_tokens[0]
-
- if False: # FIXME: full_preamble_needed??
- if full_preamble_needed:
- send_loop_to_backend(greenkey, jitdriver_sd, metainterp_sd,
- loop.preamble, "entry bridge")
- insert_loop_token(old_loop_tokens, loop.preamble.token)
- jitdriver_sd.warmstate.attach_unoptimized_bridge_from_interp(
- greenkey, loop.preamble.token)
- record_loop_or_bridge(metainterp_sd, loop.preamble)
- elif token.short_preamble:
- short = token.short_preamble[-1]
- metainterp_sd.logger_ops.log_short_preamble(short.inputargs,
- short.operations)
- return token
- else:
- send_loop_to_backend(greenkey, jitdriver_sd, metainterp_sd, loop,
- "loop")
- insert_loop_token(old_loop_tokens, loop_token)
- jitdriver_sd.warmstate.attach_unoptimized_bridge_from_interp(
- greenkey, loop.token)
- record_loop_or_bridge(metainterp_sd, loop)
- return loop_token
-
def compile_retrace(metainterp, greenkey, start,
inputargs, jumpargs,
start_resumedescr, partial_trace, resumekey):
@@ -238,14 +215,6 @@
record_loop_or_bridge(metainterp_sd, loop)
return target_token
-def insert_loop_token(old_loop_tokens, loop_token):
- # Find where in old_loop_tokens we should insert this new loop_token.
- # The following algo means "as late as possible, but before another
- # loop token that would be more general and so completely mask off
- # the new loop_token".
- # XXX do we still need a list?
- old_loop_tokens.append(loop_token)
-
def send_loop_to_backend(greenkey, jitdriver_sd, metainterp_sd, loop, type):
original_jitcell_token = loop.original_jitcell_token
jitdriver_sd.on_compile(metainterp_sd.logger_ops, original_jitcell_token,
diff --git a/pypy/jit/metainterp/test/test_compile.py
b/pypy/jit/metainterp/test/test_compile.py
--- a/pypy/jit/metainterp/test/test_compile.py
+++ b/pypy/jit/metainterp/test/test_compile.py
@@ -1,7 +1,7 @@
from pypy.config.pypyoption import get_pypy_config
from pypy.jit.metainterp.history import TargetToken, ConstInt, History, Stats
from pypy.jit.metainterp.history import BoxInt, INT
-from pypy.jit.metainterp.compile import insert_loop_token, compile_loop
+from pypy.jit.metainterp.compile import compile_loop
from pypy.jit.metainterp.compile import ResumeGuardDescr
from pypy.jit.metainterp.compile import ResumeGuardCountersInt
from pypy.jit.metainterp.compile import compile_tmp_callback
@@ -10,23 +10,6 @@
from pypy.jit.tool.oparser import parse
from pypy.jit.metainterp.optimizeopt import ALL_OPTS_DICT
-def test_insert_loop_token():
- # XXX this test is a bit useless now that there are no specnodes
- lst = []
- #
- tok1 = LoopToken()
- insert_loop_token(lst, tok1)
- assert lst == [tok1]
- #
- tok2 = LoopToken()
- insert_loop_token(lst, tok2)
- assert lst == [tok1, tok2]
- #
- tok3 = LoopToken()
- insert_loop_token(lst, tok3)
- assert lst == [tok1, tok2, tok3]
-
-
class FakeCPU(object):
ts = typesystem.llhelper
def __init__(self):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
