[pypy-svn] r68916 - in pypy/trunk/pypy/jit: backend tool

[arigo at codespeak.net]

Author: arigo
Date: Mon Nov  2 16:21:31 2009
New Revision: 68916

Added:
   pypy/trunk/pypy/jit/tool/autopath.py
      - copied unchanged from r68910, pypy/trunk/pypy/jit/backend/autopath.py
   pypy/trunk/pypy/jit/tool/loopviewer.py
      - copied, changed from r68910, pypy/trunk/pypy/jit/backend/loopviewer.py
   pypy/trunk/pypy/jit/tool/showstats.py
      - copied, changed from r68910, pypy/trunk/pypy/jit/backend/showstats.py
Removed:
   pypy/trunk/pypy/jit/backend/loopviewer.py
   pypy/trunk/pypy/jit/backend/showstats.py
Log:
Move these tools to jit/tool/.  Fix them.


Copied: pypy/trunk/pypy/jit/tool/loopviewer.py (from r68910, pypy/trunk/pypy/jit/backend/loopviewer.py)
==============================================================================
--- pypy/trunk/pypy/jit/backend/loopviewer.py	(original)
+++ pypy/trunk/pypy/jit/tool/loopviewer.py	Mon Nov  2 16:21:31 2009
@@ -5,13 +5,14 @@
 import autopath
 import py
 import sys
-from pypy.jit.metainterp.test.oparser import parse, split_logs_into_loops
+from pypy.tool import logparser
+from pypy.jit.metainterp.test.oparser import parse
 from pypy.jit.metainterp.history import ConstInt
 from pypy.rpython.lltypesystem import llmemory, lltype
 
 def main(loopnum, loopfile):
-    data = py.path.local(loopfile).read()
-    loops = split_logs_into_loops(data)
+    log = logparser.parse_log_file(loopfile)
+    loops = logparser.extract_category(log, "jit-log-opt-")
     inp = loops[loopnum]
     loop = parse(inp, no_namespace=True)
     loop.show()

Copied: pypy/trunk/pypy/jit/tool/showstats.py (from r68910, pypy/trunk/pypy/jit/backend/showstats.py)
==============================================================================
--- pypy/trunk/pypy/jit/backend/showstats.py	(original)
+++ pypy/trunk/pypy/jit/tool/showstats.py	Mon Nov  2 16:21:31 2009
@@ -1,12 +1,14 @@
 #!/usr/bin/env python
 import autopath
 import sys, py
-from pypy.jit.metainterp.test.oparser import parse, split_logs_into_loops
+from pypy.tool import logparser
+from pypy.jit.metainterp.test.oparser import parse
 from pypy.jit.metainterp.resoperation import rop
 from pypy.rpython.lltypesystem import lltype, llmemory
 
 def main(argv):
-    parts = split_logs_into_loops(py.path.local(argv[0]).read())
+    log = logparser.parse_log_file(argv[0])
+    parts = logparser.extract_category(log, "jit-log-opt-")
     for oplist in parts:
         loop = parse(oplist, no_namespace=True)
         num_ops = 0