[pypy-svn] r78593 - in pypy/branch/jit-unroll-loops/pypy/jit/metainterp: . test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Sun Oct 31 13:09:26 2010
New Revision: 78593

Added:
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/nounroll_optimize.py
      - copied, changed from r78588, pypy/branch/jit-unroll-loops/pypy/jit/metainterp/optimize_nopspec.py
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_loop_nounroll.py
      - copied unchanged from r78588, pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_loop_nopspec.py
Removed:
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/optimize_nopspec.py
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_loop_nopspec.py
Modified:
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_compile.py
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/warmstate.py
Log:
make optimize_nopspec not use unrolling


Copied: pypy/branch/jit-unroll-loops/pypy/jit/metainterp/nounroll_optimize.py (from r78588, pypy/branch/jit-unroll-loops/pypy/jit/metainterp/optimize_nopspec.py)
==============================================================================
--- pypy/branch/jit-unroll-loops/pypy/jit/metainterp/optimize_nopspec.py	(original)
+++ pypy/branch/jit-unroll-loops/pypy/jit/metainterp/nounroll_optimize.py	Sun Oct 31 13:09:26 2010
@@ -2,8 +2,6 @@
 from pypy.rlib.debug import debug_start, debug_stop
 from pypy.jit.metainterp.optimizeopt import optimize_loop_1, optimize_bridge_1
 
-# XXX this file should probably disable unrolling instead
-
 def optimize_loop(metainterp_sd, old_loop_tokens, loop):
     debug_start("jit-optimize")
     try:
@@ -16,7 +14,7 @@
     metainterp_sd.logger_noopt.log_loop(loop.inputargs, loop.operations)
     if old_loop_tokens:
         return old_loop_tokens[0]
-    optimize_loop_1(metainterp_sd, loop)
+    optimize_loop_1(metainterp_sd, loop, False)
     return None
 
 def optimize_bridge(metainterp_sd, old_loop_tokens, bridge):

Modified: pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_compile.py
==============================================================================
--- pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_compile.py	(original)
+++ pypy/branch/jit-unroll-loops/pypy/jit/metainterp/test/test_compile.py	Sun Oct 31 13:09:26 2010
@@ -4,7 +4,7 @@
 from pypy.jit.metainterp.compile import ResumeGuardDescr
 from pypy.jit.metainterp.compile import ResumeGuardCountersInt
 from pypy.jit.metainterp.compile import compile_tmp_callback
-from pypy.jit.metainterp import optimize_nopspec, jitprof, typesystem, compile
+from pypy.jit.metainterp import nounroll_optimize, jitprof, typesystem, compile
 from pypy.jit.metainterp.test.test_optimizeutil import LLtypeMixin
 from pypy.jit.tool.oparser import parse
 
@@ -38,7 +38,7 @@
         pass
 
 class FakeState:
-    optimize_loop = staticmethod(optimize_nopspec.optimize_loop)
+    optimize_loop = staticmethod(nounroll_optimize.optimize_loop)
     debug_level = 0
 
     def attach_unoptimized_bridge_from_interp(*args):

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 13:09:26 2010
@@ -199,9 +199,9 @@
             self.optimize_loop = simple_optimize.optimize_loop
             self.optimize_bridge = simple_optimize.optimize_bridge
         elif optimizer == OPTIMIZER_NO_PERFECTSPEC:
-            from pypy.jit.metainterp import optimize_nopspec
-            self.optimize_loop = optimize_nopspec.optimize_loop
-            self.optimize_bridge = optimize_nopspec.optimize_bridge
+            from pypy.jit.metainterp import nounroll_optimize
+            self.optimize_loop = nounroll_optimize.optimize_loop
+            self.optimize_bridge = nounroll_optimize.optimize_bridge
         elif optimizer == OPTIMIZER_FULL:
             from pypy.jit.metainterp import optimize
             self.optimize_loop = optimize.optimize_loop