[pypy-svn] r75108 - in pypy/branch/blackhole-improvement/pypy/jit: metainterp tool tool/test

[arigo at codespeak.net]

Author: arigo
Date: Fri Jun  4 16:10:38 2010
New Revision: 75108

Modified:
   pypy/branch/blackhole-improvement/pypy/jit/metainterp/jitprof.py
   pypy/branch/blackhole-improvement/pypy/jit/tool/jitoutput.py
   pypy/branch/blackhole-improvement/pypy/jit/tool/test/test_jitoutput.py
Log:
Fix for test_jitoutput.


Modified: pypy/branch/blackhole-improvement/pypy/jit/metainterp/jitprof.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/metainterp/jitprof.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/metainterp/jitprof.py	Fri Jun  4 16:10:38 2010
@@ -34,7 +34,7 @@
     ncounters = len(names)
 _setup()
 
-JITPROF_LINES = ncounters + 1 + 5 # one for TOTAL, 5 for calls, update if needed
+JITPROF_LINES = ncounters + 1 + 4 # one for TOTAL, 4 for calls, update if needed
 
 class BaseProfiler(object):
     pass

Modified: pypy/branch/blackhole-improvement/pypy/jit/tool/jitoutput.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/tool/jitoutput.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/tool/jitoutput.py	Fri Jun  4 16:10:38 2010
@@ -21,8 +21,6 @@
     (('recorded_ops.calls',), '^\s+calls:\s+(\d+)$'),
     (('recorded_ops.pure_calls',), '^\s+pure calls:\s+(\d+)$'),
     (('guards',), '^guards:\s+(\d+)$'),
-    (('blackholed_ops.total',), '^blackholed ops:\s+(\d+)$'),
-    (('blackholed_ops.pure_calls',), '^\s+pure calls:\s+(\d+)$'),
     (('opt_ops',), '^opt ops:\s+(\d+)$'),
     (('opt_guards',), '^opt guards:\s+(\d+)$'),
     (('forcings',), '^forcings:\s+(\d+)$'),
@@ -62,7 +60,6 @@
     def __init__(self):
         self.ops = Ops()
         self.recorded_ops = Ops()
-        self.blackholed_ops = Ops()
         self.abort = Aborts()
 
 def parse_prof(output):

Modified: pypy/branch/blackhole-improvement/pypy/jit/tool/test/test_jitoutput.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/tool/test/test_jitoutput.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/tool/test/test_jitoutput.py	Fri Jun  4 16:10:38 2010
@@ -59,8 +59,6 @@
   calls:                3
   pure calls:           2
 guards:                 1
-blackholed ops:         5
-  pure calls:           3
 opt ops:                6
 opt guards:             1
 forcings:               1
@@ -87,8 +85,6 @@
     assert info.recorded_ops.calls == 3
     assert info.recorded_ops.pure_calls == 2
     assert info.guards == 1
-    assert info.blackholed_ops.total == 5
-    assert info.blackholed_ops.pure_calls == 3
     assert info.opt_ops == 6
     assert info.opt_guards == 1
     assert info.forcings == 1