Merge pull request #397 from pllab/ascii-waveform

Improve binary wave form in Ascii trace render

Author: mdko

pyrtl/simulation.py

@@ -958,7 +958,7 @@ class AsciiWaveRenderer(_WaveRendererBase):
     _tick = '-'
     _up, _down = '/', '\\'
     _x, _low, _high = 'x', '_', '-'
-    _revstart, _revstop = ' ', ' '
+    _revstart, _revstop = '', ''
 
 
 def default_renderer():

tests/test_simulation.py

@@ -132,15 +132,16 @@ def test_reg_to_reg_simulation(self):
 class RenderTraceBase(unittest.TestCase):
     def setUp(self):
         pyrtl.reset_working_block()
-        a, b = pyrtl.input_list('a/8 b/8')
+        a, b, c = pyrtl.input_list('a/8 b/8 c/1')
         o = pyrtl.Output()
-        o <<= a + b
+        o <<= a + b - c
 
     def check_rendered_trace(self, expected, **kwargs):
         sim = pyrtl.Simulation()
         sim.step_multiple({
             'a': [1, 4, 9, 11, 12],
             'b': [2, 23, 43, 120, 0],
+            'c': [0, 1, 1, 0, 1]
         })
         buff = io.StringIO()
         sim.tracer.render_trace(file=buff, render_cls=pyrtl.simulation.AsciiWaveRenderer,
@@ -150,32 +151,36 @@ def check_rendered_trace(self, expected, **kwargs):
     def test_hex_trace(self):
         expected = (
             "  -0                       \n"
-            "a  0x1    x0x4   x0x9   x0xb   x0xc  \n"
-            "b  0x2    x0x17  x0x2b  x0x78  x0x0  \n"
+            "a 0x1  x0x4 x0x9 x0xb x0xc \n"
+            "b 0x2  x0x17x0x2bx0x78x0x0 \n"
+            "c _____/---------\\____/----\n"  # escaped backslash
         )
         self.check_rendered_trace(expected)
 
-    def test_hex_trace(self):
+    def test_oct_trace(self):
         expected = (
             "  -0                            \n"
-            "a  0o1     x0o4    x0o11   x0o13   x0o14  \n"
-            "b  0o2     x0o27   x0o53   x0o170  x0o0   \n"
+            "a 0o1   x0o4  x0o11 x0o13 x0o14 \n"
+            "b 0o2   x0o27 x0o53 x0o170x0o0  \n"
+            "c ______/-----------\\_____/-----\n"  # escaped backslash
         )
         self.check_rendered_trace(expected, repr_func=oct, symbol_len=None)
 
     def test_bin_trace(self):
         expected = (
             "  -0                                                \n"
-            "a  0b1         x0b100      x0b1001     x0b1011     x0b1100    \n"
-            "b  0b10        x0b10111    x0b101011   x0b1111000  x0b0       \n"
+            "a 0b1       x0b100    x0b1001   x0b1011   x0b1100   \n"
+            "b 0b10      x0b10111  x0b101011 x0b1111000x0b0      \n"
+            "c __________/-------------------\\_________/---------\n"  # escaped backslash
         )
         self.check_rendered_trace(expected, repr_func=bin, symbol_len=None)
 
     def test_decimal_trace(self):
         expected = (
             "  -0                  \n"
-            "a  1     x4    x9    x11   x12  \n"
-            "b  2     x23   x43   x120  x0   \n"
+            "a 1   x4  x9  x11 x12 \n"
+            "b 2   x23 x43 x120x0  \n"
+            "c ____/-------\\___/---\n"  # escaped backslash
         )
         self.check_rendered_trace(expected, repr_func=str, symbol_len=None)
 
@@ -217,9 +222,9 @@ class Foo(IntEnum):
                                 extra_line=None, repr_per_name={'state': Foo}, symbol_len=None)
         expected = (
             "      -0                            \n"
-            "    i  0x1     x0x2    x0x4    x0x8    x0x0   \n"
-            "    o  0x0             x0x1    x0x2    x0x3   \n"
-            "state  Foo.A           xFoo.B  xFoo.C  xFoo.D \n"
+            "    i 0x1   x0x2  x0x4  x0x8  x0x0  \n"
+            "    o 0x0         x0x1  x0x2  x0x3  \n"
+            "state Foo.A       xFoo.BxFoo.CxFoo.D\n"
         )
         self.assertEqual(buff.getvalue(), expected)