[pypy-commit] pypy vecopt: commented the debugging timing calls
plan_rich
noreply at buildbot.pypy.org
Thu Jul 9 09:27:58 CEST 2015
Author: Richard Plangger <rich at pasra.at>
Branch: vecopt
Changeset: r78500:d70afeafa621
Date: 2015-07-09 09:27 +0200
http://bitbucket.org/pypy/pypy/changeset/d70afeafa621/
Log: commented the debugging timing calls
diff --git a/pypy/module/micronumpy/loop.py b/pypy/module/micronumpy/loop.py
--- a/pypy/module/micronumpy/loop.py
+++ b/pypy/module/micronumpy/loop.py
@@ -15,7 +15,7 @@
call2_driver = jit.JitDriver(
name='numpy_call2',
- greens=['shapelen', 'func', 'calc_dtype', 'res_dtype'],
+ greens=['shapelen', 'func', 'calc_dtype', 'res_dtype', 'left', 'right'],
reds='auto', vectorize=True)
def call2(space, shape, func, calc_dtype, w_lhs, w_rhs, out):
@@ -40,7 +40,9 @@
res_dtype = out.get_dtype()
while not out_iter.done(out_state):
call2_driver.jit_merge_point(shapelen=shapelen, func=func,
- calc_dtype=calc_dtype, res_dtype=res_dtype)
+ calc_dtype=calc_dtype, res_dtype=res_dtype,
+ left=left_iter is None,
+ right=right_iter is None)
if left_iter:
w_left = left_iter.getitem(left_state).convert_to(space, calc_dtype)
left_state = left_iter.next(left_state)
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
@@ -208,6 +208,7 @@
version.operations, jitcell_token)
versioned_loop.original_jitcell_token = jitcell_token
record_loop_or_bridge(metainterp_sd, versioned_loop)
+ loop.versions = None
def compile_retrace(metainterp, greenkey, start,
inputargs, jumpargs,
diff --git a/rpython/jit/metainterp/optimizeopt/vectorize.py b/rpython/jit/metainterp/optimizeopt/vectorize.py
--- a/rpython/jit/metainterp/optimizeopt/vectorize.py
+++ b/rpython/jit/metainterp/optimizeopt/vectorize.py
@@ -6,7 +6,7 @@
"""
import py
-import time
+#XXXimport time
from rpython.jit.metainterp.resume import Snapshot, AccumInfo
from rpython.jit.metainterp.jitexc import NotAVectorizeableLoop, NotAProfitableLoop
@@ -42,21 +42,18 @@
# it won't be possible to vectorize. There are too many
# guards that prevent parallel execution of instructions
return
- start = -1
- end = -1
try:
debug_start("vec-opt-loop")
metainterp_sd.logger_noopt.log_loop(loop.inputargs, loop.operations, -2, None, None, "pre vectorize")
metainterp_sd.profiler.count(Counters.OPT_VECTORIZE_TRY)
- start = time.clock()
+ #
+ #XXXstart = time.clock()
opt = VectorizingOptimizer(metainterp_sd, jitdriver_sd, loop, cost_threshold, orig_version)
opt.propagate_all_forward()
gso = GuardStrengthenOpt(opt.dependency_graph.index_vars)
gso.propagate_all_forward(opt.loop)
- end = time.clock()
-
- aligned_vector_version = LoopVersion(loop, aligned=True)
-
+ #XXXend = time.clock()
+ #
loop.versions = [orig_version]
metainterp_sd.profiler.count(Counters.OPT_VECTORIZED)
@@ -64,15 +61,15 @@
debug_stop("vec-opt-loop")
#
# XXX
- ns = int((end-start)*10.0**9)
- debug_start("xxx-clock")
- debug_print("vecopt unroll: %d gso count: %d opcount: (%d -> %d) took %dns" % \
- (opt.unroll_count+1,
- gso.strength_reduced,
- len(orig_ops),
- len(loop.operations),
- ns))
- debug_stop("xxx-clock")
+ #XXXns = int((end-start)*10.0**9)
+ #XXXdebug_start("xxx-clock")
+ #XXXdebug_print("vecopt unroll: %d gso count: %d opcount: (%d -> %d) took %dns" % \
+ #XXX (opt.unroll_count+1,
+ #XXX gso.strength_reduced,
+ #XXX len(orig_ops),
+ #XXX len(loop.operations),
+ #XXX ns))
+ #XXXdebug_stop("xxx-clock")
except NotAVectorizeableLoop:
debug_stop("vec-opt-loop")
# vectorization is not possible
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
@@ -32,35 +32,35 @@
import time
# XXX XXX XXX
-class XXXBench(object):
- def __init__(self, name, uid, vec):
- self.t = []
- if name is None:
- name = "<unkown>"
- if uid is None:
- uid = 0
- self.name = str(name)
- self.unique_id = hex(uid)
- self.vec = vec
-
- def xxx_clock_start(self):
- now = time.clock()
- self.t.append(now)
- debug_start("xxx-clock")
- debug_print("start name: %s id: %s clock: %f" % \
- (self.name, self.unique_id, now) )
- debug_stop("xxx-clock")
-
- def xxx_clock_stop(self, fail=False):
- end = time.clock()
- assert len(self.t) > 0
- start = 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" % \
- (self.name, self.unique_id, end, int(ns), int(fail), int(self.vec)))
- debug_stop("xxx-clock")
+#class XXXBench(object):
+# def __init__(self, name, uid, vec):
+# self.t = []
+# if name is None:
+# name = "<unkown>"
+# if uid is None:
+# uid = 0
+# self.name = str(name)
+# self.unique_id = hex(uid)
+# self.vec = vec
+#
+# def xxx_clock_start(self):
+# now = time.clock()
+# self.t.append(now)
+# debug_start("xxx-clock")
+# debug_print("start name: %s id: %s clock: %f" % \
+# (self.name, self.unique_id, now) )
+# debug_stop("xxx-clock")
+#
+# def xxx_clock_stop(self, fail=False):
+# end = time.clock()
+# assert len(self.t) > 0
+# start = 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" % \
+# (self.name, self.unique_id, end, int(ns), int(fail), int(self.vec)))
+# debug_stop("xxx-clock")
@@ -439,7 +439,7 @@
jd.result_type = history.getkind(jd.portal_graph.getreturnvar()
.concretetype)[0]
# XXX XXX XXX
- jd.xxxbench = XXXBench(jd.jitdriver.name, id(jd), jd.vectorize)
+ #jd.xxxbench = XXXBench(jd.jitdriver.name, id(jd), jd.vectorize)
# XXX XXX XXX
self.jitdrivers_sd.append(jd)
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
@@ -370,7 +370,7 @@
vinfo.clear_vable_token(virtualizable)
# XXX debug purpose only
- jitdriver_sd.xxxbench.xxx_clock_start()
+ #jitdriver_sd.xxxbench.xxx_clock_start()
# XXX debug purpose only end
deadframe = func_execute_token(loop_token, *args)
@@ -379,7 +379,7 @@
# 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(fail=True)
+ #jitdriver_sd.xxxbench.xxx_clock_stop(fail=True)
# XXX debug purpose only end
#
# Handle the failure
More information about the pypy-commit
mailing list