Author: Armin Rigo <[email protected]>
Branch: jit-counter
Changeset: r67736:05ec1173e85d
Date: 2013-10-04 06:40 +0200
http://bitbucket.org/pypy/pypy/changeset/05ec1173e85d/
Log: Should carefully have no effect: split the double-meaning of the
'counter' on Cell objects in two fields. (transplanted from
0fe3cbf3f18d85e1819c52c03e265bb4ee19f0e7)
diff --git a/rpython/jit/metainterp/test/test_warmstate.py
b/rpython/jit/metainterp/test/test_warmstate.py
--- a/rpython/jit/metainterp/test/test_warmstate.py
+++ b/rpython/jit/metainterp/test/test_warmstate.py
@@ -4,6 +4,7 @@
from rpython.jit.metainterp.warmstate import wrap, unwrap, specialize_value
from rpython.jit.metainterp.warmstate import equal_whatever, hash_whatever
from rpython.jit.metainterp.warmstate import WarmEnterState, JitCell
+from rpython.jit.metainterp.warmstate import MODE_HAVE_PROC, MODE_TRACING
from rpython.jit.metainterp.history import BoxInt, BoxFloat, BoxPtr
from rpython.jit.metainterp.history import ConstInt, ConstFloat, ConstPtr
from rpython.jit.codewriter import longlong
@@ -162,7 +163,7 @@
constfloat(2.25)],
looptoken)
cell1 = get_jitcell(True, 5, 2.25)
- assert cell1.counter < 0
+ assert cell1.mode == MODE_HAVE_PROC
assert cell1.get_procedure_token() is looptoken
def test_make_jitdriver_callbacks_1():
@@ -299,17 +300,17 @@
#
for i in range(1, 20005):
cell = get_jitcell(True, i)
- cell.counter = -1
+ cell.mode = MODE_HAVE_PROC
cell.wref_procedure_token = None # or a dead weakref, equivalently
assert len(warmstate._jitcell_dict) == (i % 20000) + 1
#
- # Same test, with counter == -2 (rare case, kept alive)
+ # Same test, with mode == MODE_TRACING (rare case, kept alive)
warmstate = WarmEnterState(None, FakeJitDriverSD())
get_jitcell = warmstate._make_jitcell_getter_default()
cell = get_jitcell(True, -1)
- cell.counter = -2
+ cell.mode = MODE_TRACING
#
for i in range(1, 20005):
cell = get_jitcell(True, i)
- cell.counter = -2
+ cell.mode = MODE_TRACING
assert len(warmstate._jitcell_dict) == i + 1
diff --git a/rpython/jit/metainterp/warmstate.py
b/rpython/jit/metainterp/warmstate.py
--- a/rpython/jit/metainterp/warmstate.py
+++ b/rpython/jit/metainterp/warmstate.py
@@ -124,12 +124,13 @@
return rffi.cast(lltype.Signed, x)
+MODE_COUNTING = '\x00' # not yet traced, wait till threshold is reached
+MODE_TRACING = 'T' # tracing is currently going on for this cell
+MODE_HAVE_PROC = 'P' # there is an entry bridge for this cell
+
class JitCell(BaseJitCell):
- # the counter can mean the following things:
- # counter >= 0: not yet traced, wait till threshold is reached
- # counter == -1: there is an entry bridge for this cell
- # counter == -2: tracing is currently going on for this cell
- counter = 0
+ counter = 0 # when THRESHOLD_LIMIT is reached, start tracing
+ mode = MODE_COUNTING
dont_trace_here = False
extra_delay = chr(0)
wref_procedure_token = None
@@ -241,7 +242,7 @@
cell = self.jit_cell_at_key(greenkey)
old_token = cell.get_procedure_token()
cell.set_procedure_token(procedure_token)
- cell.counter = -1 # valid procedure bridge attached
+ cell.mode = MODE_HAVE_PROC # valid procedure bridge attached
if old_token is not None:
self.cpu.redirect_call_assembler(old_token, procedure_token)
# procedure_token is also kept alive by any loop that used
@@ -320,19 +321,19 @@
cell.extra_delay = curgen
return
#
+ cell.counter = 0
if not confirm_enter_jit(*args):
- cell.counter = 0
return
# start tracing
from rpython.jit.metainterp.pyjitpl import MetaInterp
metainterp = MetaInterp(metainterp_sd, jitdriver_sd)
- # set counter to -2, to mean "tracing in effect"
- cell.counter = -2
+ cell.mode = MODE_TRACING
try:
metainterp.compile_and_run_once(jitdriver_sd, *args)
finally:
- if cell.counter == -2:
+ if cell.mode == MODE_TRACING:
cell.counter = 0
+ cell.mode = MODE_COUNTING
def maybe_compile_and_run(threshold, *args):
"""Entry point to the JIT. Called at the point with the
@@ -341,8 +342,9 @@
# look for the cell corresponding to the current greenargs
greenargs = args[:num_green_args]
cell = get_jitcell(True, *greenargs)
+ mode = cell.mode
- if cell.counter >= 0:
+ if mode == MODE_COUNTING:
# update the profiling counter
n = cell.counter + threshold
if n <= self.THRESHOLD_LIMIT: # bound not reached
@@ -351,9 +353,10 @@
else:
bound_reached(cell, *args)
return
+
else:
- if cell.counter != -1:
- assert cell.counter == -2
+ if mode != MODE_HAVE_PROC:
+ assert mode == MODE_TRACING
# tracing already happening in some outer invocation of
# this function. don't trace a second time.
return
@@ -363,6 +366,7 @@
procedure_token = cell.get_procedure_token()
if procedure_token is None: # it was a weakref that has been
freed
cell.counter = 0
+ cell.mode = MODE_COUNTING
return
# extract and unspecialize the red arguments to pass to
# the assembler
@@ -459,11 +463,11 @@
minimum = self.THRESHOLD_LIMIT // 20 # minimum 5%
killme = []
for key, cell in jitcell_dict.iteritems():
- if cell.counter >= 0:
+ if cell.mode == MODE_COUNTING:
cell.counter = int(cell.counter * 0.92)
if cell.counter < minimum:
killme.append(key)
- elif (cell.counter == -1
+ elif (cell.mode == MODE_HAVE_PROC
and cell.get_procedure_token() is None):
killme.append(key)
for key in killme:
@@ -589,8 +593,11 @@
procedure_token = cell.get_procedure_token()
if procedure_token is None:
from rpython.jit.metainterp.compile import compile_tmp_callback
- if cell.counter == -1: # used to be a valid entry bridge,
- cell.counter = 0 # but was freed in the meantime.
+ if cell.mode == MODE_HAVE_PROC:
+ # used to be a valid entry bridge,
+ # but was freed in the meantime.
+ cell.counter = 0
+ cell.mode = MODE_COUNTING
memmgr = warmrunnerdesc.memory_manager
procedure_token = compile_tmp_callback(cpu, jd, greenkey,
redargtypes, memmgr)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
