[pypy-commit] pypy core-only-tracing: rename 'fast' mode to 'core-only'

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: core-only-tracing
Changeset: r51533:94130878552c
Date: 2012-01-20 15:05 +0100
http://bitbucket.org/pypy/pypy/changeset/94130878552c/

Log:	rename 'fast' mode to 'core-only'

diff --git a/pypy/jit/metainterp/pyjitpl.py b/pypy/jit/metainterp/pyjitpl.py
--- a/pypy/jit/metainterp/pyjitpl.py
+++ b/pypy/jit/metainterp/pyjitpl.py
@@ -779,7 +779,7 @@
         return ConstInt(result)
 
     def perform_call_maybe(self, jitcode, argboxes):
-        core_only_mode = (self.metainterp.jitdriver_sd.warmstate.jitmode == 'fast')
+        core_only_mode = (self.metainterp.jitdriver_sd.warmstate.jitmode == 'core-only')
         # in core_only_mode, don't inline calls from core to non-core graphs
         if core_only_mode and self.jitcode.is_core and not jitcode.is_core:
             funcbox = ConstInt(jitcode.get_fnaddr_as_int())
diff --git a/pypy/jit/metainterp/test/test_ajit.py b/pypy/jit/metainterp/test/test_ajit.py
--- a/pypy/jit/metainterp/test/test_ajit.py
+++ b/pypy/jit/metainterp/test/test_ajit.py
@@ -2962,7 +2962,7 @@
                 res = a(x) + b(x, res) + c(x, -x, -x) # at the end, it's like doing x+res :-)
                 y -= 1
             return res
-        res = self.meta_interp(f, [6, 7], policy=MyPolicy(), jitmode='fast') # fast == trace only core graphs
+        res = self.meta_interp(f, [6, 7], policy=MyPolicy(), jitmode='core-only')
         assert res == 42
         self.check_trace_count(1)
         # this is suboptimal because we get a call_may_force instead of a
@@ -2996,7 +2996,7 @@
                 y -= 1
                 res += f(x)
             return res
-        res = self.meta_interp(f, [5, 7], policy=MyPolicy(), jitmode='fast') # fast == trace only core graphs
+        res = self.meta_interp(f, [5, 7], policy=MyPolicy(), jitmode='core-only')
         assert res == 43
         self.check_trace_count(1)
         self.check_resops({'jump': 1, 'int_gt': 2, 'guard_true': 2, 'int_sub': 2,
@@ -3021,7 +3021,7 @@
                 res = a(res, x)
                 y -= 1
             return res
-        res = self.meta_interp(f, [6, 7], policy=MyPolicy(), jitmode='fast') # fast == trace only core graphs
+        res = self.meta_interp(f, [6, 7], policy=MyPolicy(), jitmode='core-only')
         assert res == 42
         self.check_trace_count(1)
         self.check_resops({'jump': 1, 'int_gt': 2, 'guard_true': 2, 'int_sub': 2,
diff --git a/pypy/rlib/jit.py b/pypy/rlib/jit.py
--- a/pypy/rlib/jit.py
+++ b/pypy/rlib/jit.py
@@ -402,7 +402,7 @@
     'retrace_limit': 'how many times we can try retracing before giving up',
     'max_retrace_guards': 'number of extra guards a retrace can cause',
     'max_unroll_loops': 'number of extra unrollings a loop can cause',
-    'jitmode': '"full" (default) or "fast"',
+    'jitmode': '"full" (default) or "core-only"',
     'enable_opts': 'optimizations to enable or all, INTERNAL USE ONLY'
     }