Author: Armin Rigo <[email protected]>
Branch: jit-counter
Changeset: r67775:fa73334ff040
Date: 2013-10-31 13:05 +0100
http://bitbucket.org/pypy/pypy/changeset/fa73334ff040/

Log:    Call decay_all_counters() in the first case promized by its
        documentation.

diff --git a/rpython/jit/metainterp/counter.py 
b/rpython/jit/metainterp/counter.py
--- a/rpython/jit/metainterp/counter.py
+++ b/rpython/jit/metainterp/counter.py
@@ -129,3 +129,7 @@
     def get_index(self, hash):
         "NOT_RPYTHON"
         return hash
+
+    def decay_all_counters(self):
+        "NOT_RPYTHON"
+        pass
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
@@ -162,7 +162,6 @@
 
 
 class WarmEnterState(object):
-    THRESHOLD_LIMIT = sys.maxint // 2
 
     def __init__(self, warmrunnerdesc, jitdriver_sd):
         "NOT_RPYTHON"
@@ -316,6 +315,7 @@
         def bound_reached(index, cell, *args):
             if not confirm_enter_jit(*args):
                 return
+            jitcounter.decay_all_counters()
             # start tracing
             from rpython.jit.metainterp.pyjitpl import MetaInterp
             metainterp = MetaInterp(metainterp_sd, jitdriver_sd)
diff --git a/rpython/rlib/jit.py b/rpython/rlib/jit.py
--- a/rpython/rlib/jit.py
+++ b/rpython/rlib/jit.py
@@ -456,7 +456,7 @@
 PARAMETERS = {'threshold': 1039, # just above 1024, prime
               'function_threshold': 1619, # slightly more than one above, also 
prime
               'trace_eagerness': 200,
-              'decay': 100,
+              'decay': 25,
               'trace_limit': 6000,
               'inlining': 1,
               'loop_longevity': 1000,
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to