Merge branch 'fix_stream_dump_format' into develop

Author: shtaxxx

tests/extension/thread_/stream_fixed/thread_stream_fixed.py

@@ -19,7 +19,7 @@ def mkLed():
 
     datawidth = 32
     addrwidth = 10
-    point = 4
+    point = 32
     myaxi = vthread.AXIM(m, 'myaxi', clk, rst, datawidth)
     ram_a = vthread.FixedRAM(m, 'ram_a', clk, rst, datawidth, addrwidth,
                              point=point)
@@ -32,14 +32,14 @@ def mkLed():
     a = strm.source('a', point=point)
     b = strm.source('b', point=point)
     const = strm.constant('const', point=point)
-    c = a * b + const
+    c = a + b + const
     strm.sink(c, 'c')
 
     def comp_stream(size, offset):
         strm.set_source('a', ram_a, offset, size)
         strm.set_source('b', ram_b, offset, size)
         strm.set_sink('c', ram_c, offset, size)
-        const = vthread.fixed.FixedConst(3.5, point=point)
+        const = vthread.fixed.FixedConst(0.0, point=point)
         strm.set_constant('const', const)
         strm.run()
         strm.join()
@@ -48,10 +48,10 @@ def comp_sequential(size, offset):
         for i in range(size):
             a = ram_a.read(i + offset)
             b = ram_b.read(i + offset)
-            const = vthread.fixed.FixedConst(3.5, point=point)
-            c = a * b + const
+            const = vthread.fixed.FixedConst(0.0, point=point)
+            c = a + b + const
             ram_c.write(i + offset, c)
-            print('a = %f, b = %f, const = %f, c =  %f' % (a, b, const, c))
+            #print('a = %f, b = %f, const = %f, c =  %f' % (a, b, const, c))
 
     def check(size, offset_stream, offset_seq):
         all_ok = True

veriloggen/stream/stream.py

@@ -272,7 +272,7 @@ def get_name(obj):
                     self.dump_mode == 'input' or
                     self.dump_mode == 'inout' or
                     (self.dump_mode == 'selective' and
-                     hasattr(input_var, 'dump') and input_var.dump)):
+                        hasattr(input_var, 'dump') and input_var.dump)):
                 continue
 
             name = get_name(input_var.sig_data)
@@ -285,7 +285,7 @@ def get_name(obj):
             if not (self.dump_mode == 'all' or
                     self.dump_mode == 'stream' or
                     (self.dump_mode == 'selective' and
-                     hasattr(var, 'dump') and var.dump)):
+                        hasattr(var, 'dump') and var.dump)):
                 continue
 
             name = get_name(var.sig_data)
@@ -298,7 +298,7 @@ def get_name(obj):
                     self.dump_mode == 'output' or
                     self.dump_mode == 'inout' or
                     (self.dump_mode == 'selective' and
-                     hasattr(output_var, 'dump') and output_var.dump)):
+                        hasattr(output_var, 'dump') and output_var.dump)):
                 continue
 
             name = get_name(output_var.output_sig_data)
@@ -317,8 +317,10 @@ def get_name(obj):
 
             base = (var.dump_base if hasattr(var, 'dump_base') else
                     self.dump_base)
-            length = int(math.ceil(bit_length / math.log(base, 2)))
-            longest_var_len = max(longest_var_len, length)
+            total_length = int(math.ceil(bit_length / math.log(base, 2)))
+            point_length = int(math.ceil(var.point / math.log(base, 2)))
+            point_length = max(point_length, 8)
+            longest_var_len = max(longest_var_len, total_length, point_length)
 
         for input_var in sorted(input_vars, key=lambda x: x.object_id):
 
@@ -334,7 +336,13 @@ def get_name(obj):
                       '  ' if base == 10 else
                       '0x')
 
-            fmt_list = [prefix, '%', '%d' % (longest_var_len + 1), base_char]
+            if base_char == 'f':
+                point_length = int(math.ceil(input_var.point / math.log(base, 2)))
+                point_length = max(point_length, 8)
+                fmt_list = [prefix, '%',
+                            '%d.%d' % (longest_var_len + 1, point_length), base_char]
+            else:
+                fmt_list = [prefix, '%', '%d' % (longest_var_len + 1), base_char]
 
             if input_var not in all_vars:
                 fmt_list.append(' (unused)')
@@ -355,7 +363,13 @@ def get_name(obj):
                       '  ' if base == 10 else
                       '0x')
 
-            fmt_list = [prefix, '%', '%d' % (longest_var_len + 1), base_char]
+            if base_char == 'f':
+                point_length = int(math.ceil(output_var.point / math.log(base, 2)))
+                point_length = max(point_length, 8)
+                fmt_list = [prefix, '%',
+                            '%d.%d' % (longest_var_len + 1, point_length), base_char]
+            else:
+                fmt_list = [prefix, '%', '%d' % (longest_var_len + 1), base_char]
 
             if output_var not in all_vars:
                 fmt_list.append(' (unused)')
@@ -378,7 +392,14 @@ def get_name(obj):
                       '  ' if base == 10 else
                       '0x')
 
-            fmt_list = [prefix, '%', '%d' % (longest_var_len + 1), base_char]
+            if base_char == 'f':
+                point_length = int(math.ceil(var.point / math.log(base, 2)))
+                point_length = max(point_length, 8)
+                fmt_list = [prefix, '%',
+                            '%d.%d' % (longest_var_len + 1, point_length), base_char]
+            else:
+                fmt_list = [prefix, '%', '%d' % (longest_var_len + 1), base_char]
+
             var.dump_fmt = ''.join(fmt_list)
 
         enables = []
@@ -388,7 +409,7 @@ def get_name(obj):
                     self.dump_mode == 'input' or
                     self.dump_mode == 'inout' or
                     (self.dump_mode == 'selective' and
-                     hasattr(input_var, 'dump') and input_var.dump)):
+                        hasattr(input_var, 'dump') and input_var.dump)):
                 continue
 
             vfmt = input_var.dump_fmt
@@ -422,7 +443,7 @@ def get_name(obj):
             if not (self.dump_mode == 'all' or
                     self.dump_mode == 'stream' or
                     (self.dump_mode == 'selective' and
-                     hasattr(var, 'dump') and var.dump)):
+                        hasattr(var, 'dump') and var.dump)):
                 continue
 
             vfmt = var.dump_fmt
@@ -455,7 +476,7 @@ def get_name(obj):
                     self.dump_mode == 'output' or
                     self.dump_mode == 'inout' or
                     (self.dump_mode == 'selective' and
-                     hasattr(output_var, 'dump') and output_var.dump)):
+                        hasattr(output_var, 'dump') and output_var.dump)):
                 continue
 
             vfmt = output_var.dump_fmt

veriloggen/thread/stream.py

@@ -1240,7 +1240,16 @@ def _setup_source_ram_dump(self, ram, var, read_enable, read_data):
                        '0o' if data_base == 8 else
                        '  ' if data_base == 10 else
                        '0x')
-        data_vfmt = ''.join([data_prefix, '%', data_base_char])
+        if data_base_char == 'f':
+            point_len = int(math.ceil(ram.point / math.log(10, 2)))
+            point_len = max(point_len, 8)
+            total_len = int(math.ceil(ram.datawidth / math.log(10, 2)))
+            total_len = max(total_len, point_len)
+            data_vfmt = ''.join([data_prefix, '%',
+                                 '%d.%d' % (total_len + 1, point_len),
+                                 data_base_char])
+        else:
+            data_vfmt = ''.join([data_prefix, '%', data_base_char])
 
         name = ram.name
         fmt = ''.join(['(', self.name, ' step:%d, ',
@@ -1688,7 +1697,16 @@ def _setup_sink_ram_dump(self, ram, var, write_enable):
                        '0o' if data_base == 8 else
                        '  ' if data_base == 10 else
                        '0x')
-        data_vfmt = ''.join([data_prefix, '%', data_base_char])
+        if data_base_char == 'f':
+            point_len = int(math.ceil(ram.point / math.log(10, 2)))
+            point_len = max(point_len, 8)
+            total_len = int(math.ceil(ram.datawidth / math.log(10, 2)))
+            total_len = max(total_len, point_len)
+            data_vfmt = ''.join([data_prefix, '%',
+                                 '%d.%d' % (total_len + 1, point_len),
+                                 data_base_char])
+        else:
+            data_vfmt = ''.join([data_prefix, '%', data_base_char])
 
         name = ram.name
         fmt = ''.join(['(', self.name, ' step:%d, ',