Author: Remi Meier <remi.me...@gmail.com>
Branch: stmgc-c4
Changeset: r65634:88858c31ce32
Date: 2013-07-25 09:40 +0200
http://bitbucket.org/pypy/pypy/changeset/88858c31ce32/
Log: make jitviewer work by ignoring thread numbers in log files
diff --git a/pypy/tool/jitlogparser/parser.py b/pypy/tool/jitlogparser/parser.py
--- a/pypy/tool/jitlogparser/parser.py
+++ b/pypy/tool/jitlogparser/parser.py
@@ -361,12 +361,19 @@
i += 1
return res
-
+def purge_thread_numbers(entry):
+ result = []
+ for line in entry.split('\n'):
+ line = line[line.find('#')+2:]
+ result.append(line)
+ return '\n'.join(result)
+
def import_log(logname, ParserCls=SimpleParser):
log = parse_log_file(logname)
hex_re = '0x(-?[\da-f]+)'
addrs = {}
for entry in extract_category(log, 'jit-backend-addr'):
+ entry = purge_thread_numbers(entry)
m = re.search('bootstrap ' + hex_re, entry)
if not m:
# a bridge
@@ -381,6 +388,7 @@
addrs.setdefault(addr, []).append(name)
dumps = {}
for entry in extract_category(log, 'jit-backend-dump'):
+ entry = purge_thread_numbers(entry)
backend, _, dump, _ = entry.split("\n")
_, addr, _, data = re.split(" +", dump)
backend_name = backend.split(" ")[1]
diff --git a/rpython/jit/backend/x86/assembler.py
b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -1203,15 +1203,13 @@
mc.MOV(ebp, mem(ecx, -WORD))
#
if gcrootmap and gcrootmap.is_stm:
-
-
if not hasattr(gc_ll_descr, 'P2Wdescr'):
raise Exception("unreachable code")
wbdescr = gc_ll_descr.P2Wdescr
self._stm_barrier_fastpath(mc, wbdescr, [ebp], is_frame=True,
align_stack=align_stack)
return
-
+ #
wbdescr = gc_ll_descr.write_barrier_descr
if gcrootmap and wbdescr:
# frame never uses card marking, so we enforce this is not
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
