[pypy-svn] r78603 - in pypy/branch/jit-unroll-loops/pypy: jit/metainterp jit/metainterp/test jit/tl jit/tl/tla rlib

[cfbolz at codespeak.net]

Author: cfbolz
Date: Sun Oct 31 14:43:50 2010
New Revision: 78603

Modified:
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_loop_nounroll.py
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/warmstate.py
   pypy/branch/jit-unroll-loops/pypy/jit/tl/pypyjit_child.py
   pypy/branch/jit-unroll-loops/pypy/jit/tl/tla/test_tla.py
   pypy/branch/jit-unroll-loops/pypy/rlib/jit.py
Log:
rename OPTIMIZER_NO_PERFECTSPEC to OPTIMIZER_NO_UNROLL


Modified: pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_loop_nounroll.py
==============================================================================
--- pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_loop_nounroll.py	(original)
+++ pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_loop_nounroll.py	Sun Oct 31 14:43:50 2010
@@ -1,12 +1,12 @@
 
 from pypy.jit.metainterp.test import test_loop, test_send
 from pypy.jit.metainterp.warmspot import ll_meta_interp
-from pypy.rlib.jit import OPTIMIZER_NO_PERFECTSPEC
+from pypy.rlib.jit import OPTIMIZER_NO_UNROLL
 from pypy.jit.metainterp.test.test_basic import LLJitMixin, OOJitMixin
 
 class LoopNoPSpecTest(test_send.SendTests):
     def meta_interp(self, func, args, **kwds):
-        return ll_meta_interp(func, args, optimizer=OPTIMIZER_NO_PERFECTSPEC,
+        return ll_meta_interp(func, args, optimizer=OPTIMIZER_NO_UNROLL,
                               CPUClass=self.CPUClass, 
                               type_system=self.type_system,
                               **kwds)

Modified: pypy/branch/jit-unroll-loops/pypy/jit/metainterp/warmstate.py
==============================================================================
--- pypy/branch/jit-unroll-loops/pypy/jit/metainterp/warmstate.py	(original)
+++ pypy/branch/jit-unroll-loops/pypy/jit/metainterp/warmstate.py	Sun Oct 31 14:43:50 2010
@@ -8,7 +8,7 @@
 from pypy.rlib.nonconst import NonConstant
 from pypy.rlib.unroll import unrolling_iterable
 from pypy.rlib.jit import (PARAMETERS, OPTIMIZER_SIMPLE, OPTIMIZER_FULL,
-                           OPTIMIZER_NO_PERFECTSPEC)
+                           OPTIMIZER_NO_UNROLL)
 from pypy.rlib.jit import DEBUG_PROFILE
 from pypy.rlib.jit import BaseJitCell
 from pypy.rlib.debug import debug_start, debug_stop, debug_print
@@ -198,7 +198,7 @@
             from pypy.jit.metainterp import simple_optimize
             self.optimize_loop = simple_optimize.optimize_loop
             self.optimize_bridge = simple_optimize.optimize_bridge
-        elif optimizer == OPTIMIZER_NO_PERFECTSPEC:
+        elif optimizer == OPTIMIZER_NO_UNROLL:
             from pypy.jit.metainterp import nounroll_optimize
             self.optimize_loop = nounroll_optimize.optimize_loop
             self.optimize_bridge = nounroll_optimize.optimize_bridge

Modified: pypy/branch/jit-unroll-loops/pypy/jit/tl/pypyjit_child.py
==============================================================================
--- pypy/branch/jit-unroll-loops/pypy/jit/tl/pypyjit_child.py	(original)
+++ pypy/branch/jit-unroll-loops/pypy/jit/tl/pypyjit_child.py	Sun Oct 31 14:43:50 2010
@@ -2,7 +2,7 @@
 from pypy.rpython.lltypesystem import lltype
 from pypy.jit.metainterp import warmspot
 from pypy.module.pypyjit.policy import PyPyJitPolicy
-from pypy.rlib.jit import OPTIMIZER_FULL, OPTIMIZER_NO_PERFECTSPEC
+from pypy.rlib.jit import OPTIMIZER_FULL, OPTIMIZER_NO_UNROLL
 
 
 def run_child(glob, loc):
@@ -35,5 +35,5 @@
     warmspot.jittify_and_run(interp, graph, [], policy=policy,
                              listops=True, CPUClass=CPUClass,
                              backendopt=True, inline=False,
-                             optimizer=OPTIMIZER_NO_PERFECTSPEC)
+                             optimizer=OPTIMIZER_NO_UNROLL)
 

Modified: pypy/branch/jit-unroll-loops/pypy/jit/tl/tla/test_tla.py
==============================================================================
--- pypy/branch/jit-unroll-loops/pypy/jit/tl/tla/test_tla.py	(original)
+++ pypy/branch/jit-unroll-loops/pypy/jit/tl/tla/test_tla.py	Sun Oct 31 14:43:50 2010
@@ -156,7 +156,7 @@
 # ____________________________________________________________ 
 
 from pypy.jit.metainterp.test.test_basic import LLJitMixin
-from pypy.rlib.jit import OPTIMIZER_FULL, OPTIMIZER_NO_PERFECTSPEC
+from pypy.rlib.jit import OPTIMIZER_FULL, OPTIMIZER_NO_UNROLL
 
 class TestLLtype(LLJitMixin):
     def test_loop(self):
@@ -178,5 +178,5 @@
             assert isinstance(w_result, tla.W_IntObject)
             return w_result.intvalue
         res = self.meta_interp(interp_w, [42], listops=True,
-                               optimizer=OPTIMIZER_NO_PERFECTSPEC)
+                               optimizer=OPTIMIZER_NO_UNROLL)
         assert res == 0

Modified: pypy/branch/jit-unroll-loops/pypy/rlib/jit.py
==============================================================================
--- pypy/branch/jit-unroll-loops/pypy/rlib/jit.py	(original)
+++ pypy/branch/jit-unroll-loops/pypy/rlib/jit.py	Sun Oct 31 14:43:50 2010
@@ -248,7 +248,7 @@
     """Inconsistency in the JIT hints."""
 
 OPTIMIZER_SIMPLE = 0
-OPTIMIZER_NO_PERFECTSPEC = 1
+OPTIMIZER_NO_UNROLL = 1
 OPTIMIZER_FULL = 2
 
 DEBUG_OFF = 0
@@ -261,7 +261,7 @@
               'trace_limit': 10000,
               'inlining': False,
               'optimizer': OPTIMIZER_FULL,
-              #'optimizer': OPTIMIZER_NO_PERFECTSPEC,
+              #'optimizer': OPTIMIZER_NO_UNROLL,
               'debug' : DEBUG_STEPS,
               }
 unroll_parameters = unrolling_iterable(PARAMETERS.keys())