[pypy-commit] pypy vecopt: moved timing functions into the execute assembler, commented out the guard as vec opt for this translation test

[plan_rich]

Author: Richard Plangger <rich at pasra.at>
Branch: vecopt
Changeset: r78307:f5d62531d777
Date: 2015-06-25 12:10 +0200
http://bitbucket.org/pypy/pypy/changeset/f5d62531d777/

Log:	moved timing functions into the execute assembler, commented out the
	guard as vec opt for this translation test

diff --git a/rpython/jit/metainterp/compile.py b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -530,9 +530,6 @@
             self.status = hash & self.ST_SHIFT_MASK
 
     def handle_fail(self, deadframe, metainterp_sd, jitdriver_sd):
-        # XXX debug purpose only
-        jitdriver_sd.xxxbench.xxx_clock_stop(fail=True)
-        # XXX debug purpose only end
         if self.must_compile(deadframe, metainterp_sd, jitdriver_sd):
             self.start_compiling()
             try:
diff --git a/rpython/jit/metainterp/resoperation.py b/rpython/jit/metainterp/resoperation.py
--- a/rpython/jit/metainterp/resoperation.py
+++ b/rpython/jit/metainterp/resoperation.py
@@ -814,8 +814,8 @@
     rop.CAST_FLOAT_TO_INT: rop.VEC_CAST_FLOAT_TO_INT,
 
     # guard
-    rop.GUARD_TRUE: rop.GUARD_TRUE,
-    rop.GUARD_FALSE: rop.GUARD_FALSE,
+    #rop.GUARD_TRUE: rop.GUARD_TRUE,
+    #rop.GUARD_FALSE: rop.GUARD_FALSE,
 }
 
 
diff --git a/rpython/jit/metainterp/warmspot.py b/rpython/jit/metainterp/warmspot.py
--- a/rpython/jit/metainterp/warmspot.py
+++ b/rpython/jit/metainterp/warmspot.py
@@ -53,11 +53,9 @@
 
     def xxx_clock_stop(self, fail=False):
         end = time.clock()
-        if len(self.t) == 0:
-            return
+        assert len(self.t) > 0
         start = self.t[-1]
-        if not fail:
-            del self.t[-1]
+        del self.t[-1]
         ns = (end - start) * 10**9
         debug_start("xxx-clock")
         debug_print("stop name: %s id: %s clock: %f exe time: %dns fail? %d vec? %d" % \
@@ -869,10 +867,6 @@
                     else:
                         value = cast_base_ptr_to_instance(Exception, value)
                         raise Exception, value
-                finally:
-                    # XXX debug purpose only
-                    jd.xxxbench.xxx_clock_stop(fail=False)
-                    # XXX debug purpose only end
 
 
         def handle_jitexception(e):
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
@@ -368,6 +368,7 @@
             if vinfo is not None:
                 virtualizable = args[index_of_virtualizable]
                 vinfo.clear_vable_token(virtualizable)
+
             # XXX debug purpose only
             jitdriver_sd.xxxbench.xxx_clock_start()
             # XXX debug purpose only end
@@ -377,6 +378,9 @@
             # Record in the memmgr that we just ran this loop,
             # so that it will keep it alive for a longer time
             warmrunnerdesc.memory_manager.keep_loop_alive(loop_token)
+            # XXX debug purpose only
+            jitdriver_sd.xxxbench.xxx_clock_stop()
+            # XXX debug purpose only end
             #
             # Handle the failure
             fail_descr = cpu.get_latest_descr(deadframe)