Author: Maciej Fijalkowski <fij...@gmail.com> Branch: share-guard-info Changeset: r79853:ac8ca7d0b4c5 Date: 2015-09-26 13:09 +0200 http://bitbucket.org/pypy/pypy/changeset/ac8ca7d0b4c5/
Log: make it cleaner diff --git a/rpython/jit/metainterp/jitprof.py b/rpython/jit/metainterp/jitprof.py --- a/rpython/jit/metainterp/jitprof.py +++ b/rpython/jit/metainterp/jitprof.py @@ -141,9 +141,9 @@ self._print_intline("recorded ops", cnt[Counters.RECORDED_OPS]) self._print_intline(" calls", calls) self._print_intline("guards", cnt[Counters.GUARDS]) - self._print_intline("guards_shared", cnt[Counters.GUARDS_SHARED]) self._print_intline("opt ops", cnt[Counters.OPT_OPS]) self._print_intline("opt guards", cnt[Counters.OPT_GUARDS]) + self._print_intline("opt guards shared", cnt[Counters.OPT_GUARDS_SHARED]) self._print_intline("forcings", cnt[Counters.OPT_FORCINGS]) self._print_intline("abort: trace too long", cnt[Counters.ABORT_TOO_LONG]) diff --git a/rpython/jit/metainterp/optimizeopt/optimizer.py b/rpython/jit/metainterp/optimizeopt/optimizer.py --- a/rpython/jit/metainterp/optimizeopt/optimizer.py +++ b/rpython/jit/metainterp/optimizeopt/optimizer.py @@ -600,7 +600,7 @@ if (self._last_guard_op and guard_op.getdescr() is None and opnum != rop.GUARD_VALUE): self.metainterp_sd.profiler.count_ops(opnum, - jitprof.Counters.GUARDS_SHARED) + jitprof.Counters.OPT_GUARDS_SHARED) op = self._copy_resume_data_from(guard_op, self._last_guard_op) else: @@ -722,8 +722,6 @@ raise AssertionError("uh?") newop = self.replace_op_with(op, opnum, [op.getarg(0)], descr) return newop - # a real GUARD_VALUE. Make it use one counter per value. - descr.make_a_counter_per_value(op) return op def optimize_default(self, op): diff --git a/rpython/rlib/jit.py b/rpython/rlib/jit.py --- a/rpython/rlib/jit.py +++ b/rpython/rlib/jit.py @@ -1150,9 +1150,9 @@ OPS RECORDED_OPS GUARDS - GUARDS_SHARED OPT_OPS OPT_GUARDS + OPT_GUARDS_SHARED OPT_FORCINGS ABORT_TOO_LONG ABORT_BRIDGE _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit