[pypy-commit] pypy optresult: fix test_logger

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: optresult
Changeset: r74592:b318f6fe9576
Date: 2014-11-19 11:31 +0200
http://bitbucket.org/pypy/pypy/changeset/b318f6fe9576/

Log:	fix test_logger

diff --git a/rpython/jit/metainterp/logger.py b/rpython/jit/metainterp/logger.py
--- a/rpython/jit/metainterp/logger.py
+++ b/rpython/jit/metainterp/logger.py
@@ -114,20 +114,20 @@
                 if name:
                     return 'ConstClass(' + name + ')'
             return str(arg.value)
-        elif isinstance(arg, BoxInt):
-            return 'i' + str(mv)
         elif isinstance(arg, self.ts.ConstRef):
             if arg.value:
                 return 'ConstPtr(ptr' + str(mv) + ')'
             return 'ConstPtr(null)'
-        elif isinstance(arg, self.ts.BoxRef):
-            return 'p' + str(mv)
         elif isinstance(arg, ConstFloat):
-            return str(arg.getfloat())
-        elif isinstance(arg, BoxFloat):
-            return 'f' + str(mv)
+            return str(arg.getfloatstorage())
         elif arg is None:
             return 'None'
+        elif arg.type == 'i':
+            return 'i' + str(mv)
+        elif arg.type == 'r':
+            return 'p' + str(mv)
+        elif arg.type == 'f':
+            return 'f' + str(mv)
         else:
             return '?'
 
@@ -155,10 +155,10 @@
             s_offset = "+%d: " % offset
         args = ", ".join([self.repr_of_arg(op.getarg(i)) for i in range(op.numargs())])
 
-        #if op.result is not None:
-        #    res = self.repr_of_arg(op.result) + " = "
-        #else:
-        res = ""
+        if op.type != 'v':
+            res = self.repr_of_arg(op) + " = "
+        else:
+            res = ""
         is_guard = op.is_guard()
         if op.getdescr() is not None:
             descr = op.getdescr()
diff --git a/rpython/jit/metainterp/test/test_logger.py b/rpython/jit/metainterp/test/test_logger.py
--- a/rpython/jit/metainterp/test/test_logger.py
+++ b/rpython/jit/metainterp/test/test_logger.py
@@ -76,8 +76,11 @@
         output = logger.log_loop(loop, namespace)
         oloop = pure_parse(output, namespace=namespace)
         if check_equal:
-            equaloplists(loop.operations, oloop.operations)
-            assert oloop.inputargs == loop.inputargs
+            remap = {}
+            for box1, box2 in zip(loop.inputargs, oloop.inputargs):
+                assert box1.__class__ == box2.__class__
+                remap[box2] = box1
+            equaloplists(loop.operations, oloop.operations, remap=remap)
         return logger, loop, oloop
 
     def test_simple(self):
@@ -154,7 +157,11 @@
         f1 = float_add(3.5, f0)
         '''
         _, loop, oloop = self.reparse(inp)
-        equaloplists(loop.operations, oloop.operations)
+        remap = {}
+        for box1, box2 in zip(loop.inputargs, oloop.inputargs):
+            assert box1.__class__ == box2.__class__
+            remap[box2] = box1
+        equaloplists(loop.operations, oloop.operations, remap=remap)
 
     def test_jump(self):
         namespace = {'target': JitCellToken()}