[pypy-svn] r77854 - pypy/branch/jit-unroll-loops/pypy/jit/metainterp/optimizeopt

[hakanardo at codespeak.net]

Author: hakanardo
Date: Tue Oct 12 19:51:20 2010
New Revision: 77854

Modified:
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/optimizeopt/rewrite.py
   pypy/branch/jit-unroll-loops/pypy/jit/metainterp/optimizeopt/unroll.py
Log:
cleanups

Modified: pypy/branch/jit-unroll-loops/pypy/jit/metainterp/optimizeopt/rewrite.py
==============================================================================
--- pypy/branch/jit-unroll-loops/pypy/jit/metainterp/optimizeopt/rewrite.py	(original)
+++ pypy/branch/jit-unroll-loops/pypy/jit/metainterp/optimizeopt/rewrite.py	Tue Oct 12 19:51:20 2010
@@ -209,9 +209,9 @@
             # the following assert should always be true for now,
             # because invalid loops that would fail it are detected
             # earlier, in optimizefindnode.py.
+            if realclassbox.same_constant(expectedclassbox):
+                return
             raise InvalidLoop
-            assert realclassbox.same_constant(expectedclassbox)
-            return
         emit_operation = True
         if value.last_guard_index != -1:
             # there already has been a guard_nonnull or guard_class or

Modified: pypy/branch/jit-unroll-loops/pypy/jit/metainterp/optimizeopt/unroll.py
==============================================================================
--- pypy/branch/jit-unroll-loops/pypy/jit/metainterp/optimizeopt/unroll.py	(original)
+++ pypy/branch/jit-unroll-loops/pypy/jit/metainterp/optimizeopt/unroll.py	Tue Oct 12 19:51:20 2010
@@ -19,7 +19,6 @@
         if op.getopnum() == rop.JUMP:
             loop = self.optimizer.loop
             loop.preamble.operations = self.optimizer.newoperations
-            print '\n'.join([str(o) for o in loop.preamble.operations])
             self.optimizer.newoperations = []
             jump_args = op.getarglist()
             op.initarglist([])
@@ -50,7 +49,6 @@
             for a in self.getvalue(arg).get_forced_boxes():
                 if not isinstance(a, Const):
                     inputargs.append(a)
-        print "Inputargs: ", inputargs
 
         for op in loop_operations:
             #import pdb; pdb.set_trace()
@@ -72,12 +70,10 @@
                     args.extend(self.getvalue(arg).get_forced_boxes())
                 newop.initarglist(args + inputargs[len(args):])
 
-            print "P: ", newop
             current = len(self.optimizer.newoperations)
             self.emit_operation(newop)
 
             for op in self.optimizer.newoperations[current:]:
-                print "E: ", op
                 if op.is_guard():
                     op.getdescr().rd_snapshot = None #FIXME: In the right place?
                 args = op.getarglist()
@@ -87,7 +83,6 @@
                     if not isinstance(a, Const) and a in self.optimizer.values:
                         v = self.getvalue(a)
                         if v.fromstart and a not in inputargs:
-                            print "Arg: ", a
                             inputargs.append(a)
                             if op.getopnum() == rop.JUMP:
                                 op.initarglist(op.getarglist() + [argmap[a]])