[pypy-svn] jitviewer default: kill adjust_bridges, use the one in jitlogparser

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: 
Changeset: r94:c638d97d3b8c
Date: 2011-02-25 14:34 +0100
http://bitbucket.org/pypy/jitviewer/changeset/c638d97d3b8c/

Log:	kill adjust_bridges, use the one in jitlogparser

diff --git a/bin/jitviewer.py b/bin/jitviewer.py
--- a/bin/jitviewer.py
+++ b/bin/jitviewer.py
@@ -20,11 +20,12 @@
 import flask
 import inspect
 from pypy.tool.logparser import parse_log_file, extract_category
-from _jitviewer.parser import (parse, FunctionHtml, adjust_bridges,
-                   parse_log_counts)
+from pypy.tool.jitlogparser.storage import LoopStorage
+from pypy.tool.jitlogparser.parser import adjust_bridges
+#
+from _jitviewer.parser import parse, FunctionHtml, parse_log_counts
 from _jitviewer.display import CodeRepr, CodeReprNoFile
 import _jitviewer
-from pypy.tool.jitlogparser.storage import LoopStorage
 
 from pygments import highlight
 from pygments.lexers import PythonLexer

diff --git a/_jitviewer/parser.py b/_jitviewer/parser.py
--- a/_jitviewer/parser.py
+++ b/_jitviewer/parser.py
@@ -143,21 +143,3 @@
 def parse(input):
     return ParserWithHtmlRepr(input, None, {}, 'lltype', None,
                               nonstrict=True).parse()
-
-def adjust_bridges(loop, bridges):
-    """ Slice given loop according to given bridges to follow. Returns a plain
-    list of operations.
-    """
-    ops = loop.operations
-    res = []
-    i = 0
-    while i < len(ops):
-        op = ops[i]
-        if op.is_guard() and bridges.get('loop-' + str(op.guard_no), None):
-            res.append(op)
-            i = 0
-            ops = op.bridge.operations
-        else:
-            res.append(op)
-            i += 1
-    return res

diff --git a/_jitviewer/test/test_parser.py b/_jitviewer/test/test_parser.py
--- a/_jitviewer/test/test_parser.py
+++ b/_jitviewer/test/test_parser.py
@@ -2,7 +2,7 @@
 from pypy.jit.metainterp.resoperation import ResOperation, rop
 from pypy.jit.metainterp.history import ConstInt, Const
 from _jitviewer.parser import parse, TraceForOpcodeHtml, FunctionHtml,\
-     adjust_bridges, parse_log_counts, cssclass
+     parse_log_counts, cssclass
 import py
 
 def test_parse():
@@ -153,21 +153,6 @@
     assert loops[0].operations[0].bridge.no == 18
     assert loops[0].operations[0].percentage == 30
 
-def test_adjust_bridges():
-    main = parse('''
-    [v0]
-    guard_false(v0, descr=<Guard13>)
-    guard_true(v0, descr=<Guard5>)
-    ''')
-    bridge = parse('''
-    # bridge out of Guard 13
-    []
-    int_add(0, 1)
-    ''')
-    loops = LoopStorage().reconnect_loops([main, bridge])
-    assert adjust_bridges(main, {})[1].name == 'guard_true'
-    assert adjust_bridges(main, {'loop-13': True})[1].name == 'int_add'
-
 def test_parsing_strliteral():
     loop = parse("""
     debug_merge_point('StrLiteralSearch at 11/51 [17, 8, 3, 1, 1, 1, 1, 51, 0, 19, 51, 1]', 0)