Author: Maciej Fijalkowski <fij...@gmail.com> Branch: Changeset: r46137:d41794f10532 Date: 2011-08-01 13:31 +0200 http://bitbucket.org/pypy/pypy/changeset/d41794f10532/
Log: rework naming of loops/bridges. jitviewer needs updating diff --git a/pypy/jit/backend/x86/assembler.py b/pypy/jit/backend/x86/assembler.py --- a/pypy/jit/backend/x86/assembler.py +++ b/pypy/jit/backend/x86/assembler.py @@ -56,7 +56,9 @@ self.exc = exc self.is_guard_not_invalidated = is_guard_not_invalidated -DEBUG_COUNTER = lltype.Struct('DEBUG_COUNTER', ('i', lltype.Signed)) +DEBUG_COUNTER = lltype.Struct('DEBUG_COUNTER', ('i', lltype.Signed), + ('bridge', lltype.Signed), # 0 or 1 + ('number', lltype.Signed)) class Assembler386(object): _regalloc = None @@ -155,9 +157,12 @@ def finish_once(self): if self._debug: debug_start('jit-backend-counts') - for i in range(len(self.loop_run_counters)): - struct = self.loop_run_counters[i] - debug_print(str(i) + ':' + str(struct.i)) + for struct in self.loop_run_counters: + if struct.bridge: + prefix = 'bridge ' + else: + prefix = 'loop ' + debug_print(prefix + str(struct.number) + ':' + str(struct.i)) debug_stop('jit-backend-counts') def _build_float_constants(self): @@ -404,7 +409,7 @@ self.setup(looptoken) self.currently_compiling_loop = looptoken if log: - self._register_counter() + self._register_counter(False, looptoken.number) operations = self._inject_debugging_code(looptoken, operations) regalloc = RegAlloc(self, self.cpu.translate_support_code) @@ -473,7 +478,7 @@ self.setup(original_loop_token) if log: - self._register_counter() + self._register_counter(True, descr_number) operations = self._inject_debugging_code(faildescr, operations) arglocs = self.rebuild_faillocs_from_descr(failure_recovery) @@ -570,7 +575,7 @@ return self.mc.materialize(self.cpu.asmmemmgr, allblocks, self.cpu.gc_ll_descr.gcrootmap) - def _register_counter(self): + def _register_counter(self, bridge, number): if self._debug: # YYY very minor leak -- we need the counters to stay alive # forever, just because we want to report them at the end @@ -578,6 +583,8 @@ struct = lltype.malloc(DEBUG_COUNTER, flavor='raw', track_allocation=False) struct.i = 0 + struct.bridge = int(bridge) + struct.number = number self.loop_run_counters.append(struct) def _find_failure_recovery_bytecode(self, faildescr): _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit