diff options
| author |   Armin Rigo <arigo@tunes.org> | 2009-11-01 18:57:20 +0000 |
|---|---|---|
| committer | Armin Rigo <arigo@tunes.org> | 2009-11-01 18:57:20 +0000 |
| commit | 172def9e1a21ffc8dc50acd27d1a674a7644c9e5 (patch) | |
| tree | 092ff983a4e6b15b36ec97d1aed6e3c4fba8c451 /pypy/jit/tool | |
| parent | Remove the py.test.xfail and replace it with a skip. It took me a while (diff) | |
| download | pypy-172def9e1a21ffc8dc50acd27d1a674a7644c9e5.tar.gz pypy-172def9e1a21ffc8dc50acd27d1a674a7644c9e5.tar.bz2 pypy-172def9e1a21ffc8dc50acd27d1a674a7644c9e5.zip | |
Merge the 'logging2' branch. Add a general way to record logging events
to pypy.rlib.debug. In addition to debug_print() there is now
debug_start() and debug_stop() to mark the start/stop of a category.
svn merge -r68854:68901 svn+ssh://codespeak.net/svn/pypy/branch/logging2
Use it in the GC (replaces the gcconfig.debugprint config option) and in
the JIT (similar to jitprof.py, which is not dead yet but obsoleting).
To enable logging run the compiled program with 'PYPYLOG=:file'. To
enable lightweight logging only, suitable for profiling, run it with
'PYPYLOG=file'. See translator/c/src/debug.h for more options.
To turn the profiling logs into nice graphics, see pypy/tool/logparser.py.
Diffstat (limited to 'pypy/jit/tool')
| -rw-r--r-- | pypy/jit/tool/jitoutput.py | 6 | ||||
| -rw-r--r-- | pypy/jit/tool/test/test_jitoutput.py | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pypy/jit/tool/jitoutput.py b/pypy/jit/tool/jitoutput.py index 6fc26e3a03..fad4f10e7a 100644 --- a/pypy/jit/tool/jitoutput.py +++ b/pypy/jit/tool/jitoutput.py @@ -10,9 +10,9 @@ import re REGEXES = [ (('tracing_no', 'tracing_time'), '^Tracing:\s+([\d.]+)\s+([\d.]+)$'), (('backend_no', 'backend_time'), '^Backend:\s+([\d.]+)\s+([\d.]+)$'), - (('asm_no', 'asm_time'), '^Running asm:\s+([\d.]+)\s+([\d.]+)$'), - (('blackhole_no', 'blackhole_time'), - '^Blackhole:\s+([\d.]+)\s+([\d.]+)$'), + (('asm_no',), '^Running asm:\s+([\d.]+)$'), + (('blackhole_no',), + '^Blackhole:\s+([\d.]+)$'), (None, '^TOTAL.*$'), (('ops.total',), '^ops:\s+(\d+)$'), (('ops.calls',), '^\s+calls:\s+(\d+)$'), diff --git a/pypy/jit/tool/test/test_jitoutput.py b/pypy/jit/tool/test/test_jitoutput.py index 093f406599..0b9306acdd 100644 --- a/pypy/jit/tool/test/test_jitoutput.py +++ b/pypy/jit/tool/test/test_jitoutput.py @@ -51,8 +51,8 @@ def test_really_run(): DATA = '''Tracing: 1 0.006992 Backend: 1 0.000525 -Running asm: 1 0.016957 -Blackhole: 1 0.000233 +Running asm: 1 +Blackhole: 1 TOTAL: 0.025532 ops: 2 calls: 1 @@ -75,9 +75,7 @@ def test_parse(): assert info.tracing_no == 1 assert info.tracing_time == 0.006992 assert info.asm_no == 1 - assert info.asm_time == 0.016957 assert info.blackhole_no == 1 - assert info.blackhole_time == 0.000233 assert info.backend_no == 1 assert info.backend_time == 0.000525 assert info.ops.total == 2 |