Skip to content

Commit 07ac5db

Browse files
shtaxxxshtaxxx
committed
%f -> %g
1 parent 3e95e31 commit 07ac5db

File tree

2 files changed

+59
-43
lines changed

2 files changed

+59
-43
lines changed

‎veriloggen/stream/stream.py‎

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,10 @@ def get_name(obj):
318318
base = (var.dump_base if hasattr(var, 'dump_base') else
319319
self.dump_base)
320320
total_length = int(math.ceil(bit_length / math.log(base, 2)))
321-
point_length = int(math.ceil(var.point / math.log(base, 2)))
322-
point_length = max(point_length, 8)
323-
longest_var_len = max(longest_var_len, total_length, point_length)
321+
#point_length = int(math.ceil(var.point / math.log(base, 2)))
322+
#point_length = max(point_length, 8)
323+
#longest_var_len = max(longest_var_len, total_length, point_length)
324+
longest_var_len = max(longest_var_len, total_length)
324325

325326
for input_var in sorted(input_vars, key=lambda x: x.object_id):
326327

@@ -329,18 +330,21 @@ def get_name(obj):
329330
base_char = ('b' if base == 2 else
330331
'o' if base == 8 else
331332
'd' if base == 10 and input_var.point == 0 else
332-
'f' if base == 10 and input_var.point > 0 else
333+
#'f' if base == 10 and input_var.point > 0 else
334+
'g' if base == 10 and input_var.point > 0 else
333335
'x')
334336
prefix = ('0b' if base == 2 else
335337
'0o' if base == 8 else
336338
' ' if base == 10 else
337339
'0x')
338340

339-
if base_char == 'f':
340-
point_length = int(math.ceil(input_var.point / math.log(base, 2)))
341-
point_length = max(point_length, 8)
342-
fmt_list = [prefix, '%',
343-
'%d.%d' % (longest_var_len + 1, point_length), base_char]
341+
#if base_char == 'f':
342+
# point_length = int(math.ceil(input_var.point / math.log(base, 2)))
343+
# point_length = max(point_length, 8)
344+
# fmt_list = [prefix, '%',
345+
# '%d.%d' % (longest_var_len + 1, point_length), base_char]
346+
if base_char == 'g':
347+
fmt_list = [prefix, '%', base_char]
344348
else:
345349
fmt_list = [prefix, '%', '%d' % (longest_var_len + 1), base_char]
346350

@@ -356,18 +360,21 @@ def get_name(obj):
356360
base_char = ('b' if base == 2 else
357361
'o' if base == 8 else
358362
'd' if base == 10 and output_var.point == 0 else
359-
'f' if base == 10 and output_var.point > 0 else
363+
#'f' if base == 10 and output_var.point > 0 else
364+
'g' if base == 10 and output_var.point > 0 else
360365
'x')
361366
prefix = ('0b' if base == 2 else
362367
'0o' if base == 8 else
363368
' ' if base == 10 else
364369
'0x')
365370

366-
if base_char == 'f':
367-
point_length = int(math.ceil(output_var.point / math.log(base, 2)))
368-
point_length = max(point_length, 8)
369-
fmt_list = [prefix, '%',
370-
'%d.%d' % (longest_var_len + 1, point_length), base_char]
371+
#if base_char == 'f':
372+
# point_length = int(math.ceil(output_var.point / math.log(base, 2)))
373+
# point_length = max(point_length, 8)
374+
# fmt_list = [prefix, '%',
375+
# '%d.%d' % (longest_var_len + 1, point_length), base_char]
376+
if base_char == 'g':
377+
fmt_list = [prefix, '%', base_char]
371378
else:
372379
fmt_list = [prefix, '%', '%d' % (longest_var_len + 1), base_char]
373380

@@ -385,18 +392,21 @@ def get_name(obj):
385392
base_char = ('b' if base == 2 else
386393
'o' if base == 8 else
387394
'd' if base == 10 and var.point == 0 else
388-
'f' if base == 10 and var.point > 0 else
395+
#'f' if base == 10 and var.point > 0 else
396+
'g' if base == 10 and var.point > 0 else
389397
'x')
390398
prefix = ('0b' if base == 2 else
391399
'0o' if base == 8 else
392400
' ' if base == 10 else
393401
'0x')
394402

395-
if base_char == 'f':
396-
point_length = int(math.ceil(var.point / math.log(base, 2)))
397-
point_length = max(point_length, 8)
398-
fmt_list = [prefix, '%',
399-
'%d.%d' % (longest_var_len + 1, point_length), base_char]
403+
#if base_char == 'f':
404+
# point_length = int(math.ceil(var.point / math.log(base, 2)))
405+
# point_length = max(point_length, 8)
406+
# fmt_list = [prefix, '%',
407+
# '%d.%d' % (longest_var_len + 1, point_length), base_char]
408+
if base_char == 'g':
409+
fmt_list = [prefix, '%', base_char]
400410
else:
401411
fmt_list = [prefix, '%', '%d' % (longest_var_len + 1), base_char]
402412

‎veriloggen/thread/stream.py‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,23 +1233,26 @@ def _setup_source_ram_dump(self, ram, var, read_enable, read_data):
12331233
'o' if data_base == 8 else
12341234
'd' if (data_base == 10 and
12351235
(not hasattr(ram, 'point') or ram.point == 0)) else
1236-
'f' if (data_base == 10 and
1236+
#'f' if (data_base == 10 and
1237+
# hasattr(ram, 'point') and ram.point > 0) else
1238+
'g' if (data_base == 10 and
12371239
hasattr(ram, 'point') and ram.point > 0) else
12381240
'x')
12391241
data_prefix = ('0b' if data_base == 2 else
12401242
'0o' if data_base == 8 else
12411243
' ' if data_base == 10 else
12421244
'0x')
1243-
if data_base_char == 'f':
1244-
point_len = int(math.ceil(ram.point / math.log(10, 2)))
1245-
point_len = max(point_len, 8)
1246-
total_len = int(math.ceil(ram.datawidth / math.log(10, 2)))
1247-
total_len = max(total_len, point_len)
1248-
data_vfmt = ''.join([data_prefix, '%',
1249-
'%d.%d' % (total_len + 1, point_len),
1250-
data_base_char])
1251-
else:
1252-
data_vfmt = ''.join([data_prefix, '%', data_base_char])
1245+
#if data_base_char == 'f':
1246+
# point_len = int(math.ceil(ram.point / math.log(10, 2)))
1247+
# point_len = max(point_len, 8)
1248+
# total_len = int(math.ceil(ram.datawidth / math.log(10, 2)))
1249+
# total_len = max(total_len, point_len)
1250+
# data_vfmt = ''.join([data_prefix, '%',
1251+
# '%d.%d' % (total_len + 1, point_len),
1252+
# data_base_char])
1253+
#else:
1254+
# data_vfmt = ''.join([data_prefix, '%', data_base_char])
1255+
data_vfmt = ''.join([data_prefix, '%', data_base_char])
12531256

12541257
name = ram.name
12551258
fmt = ''.join(['(', self.name, ' step:%d, ',
@@ -1690,23 +1693,26 @@ def _setup_sink_ram_dump(self, ram, var, write_enable):
16901693
'o' if data_base == 8 else
16911694
'd' if (data_base == 10 and
16921695
(not hasattr(ram, 'point') or ram.point == 0)) else
1693-
'f' if (data_base == 10 and
1696+
#'f' if (data_base == 10 and
1697+
# hasattr(ram, 'point') and ram.point > 0) else
1698+
'g' if (data_base == 10 and
16941699
hasattr(ram, 'point') and ram.point > 0) else
16951700
'x')
16961701
data_prefix = ('0b' if data_base == 2 else
16971702
'0o' if data_base == 8 else
16981703
' ' if data_base == 10 else
16991704
'0x')
1700-
if data_base_char == 'f':
1701-
point_len = int(math.ceil(ram.point / math.log(10, 2)))
1702-
point_len = max(point_len, 8)
1703-
total_len = int(math.ceil(ram.datawidth / math.log(10, 2)))
1704-
total_len = max(total_len, point_len)
1705-
data_vfmt = ''.join([data_prefix, '%',
1706-
'%d.%d' % (total_len + 1, point_len),
1707-
data_base_char])
1708-
else:
1709-
data_vfmt = ''.join([data_prefix, '%', data_base_char])
1705+
#if data_base_char == 'f':
1706+
# point_len = int(math.ceil(ram.point / math.log(10, 2)))
1707+
# point_len = max(point_len, 8)
1708+
# total_len = int(math.ceil(ram.datawidth / math.log(10, 2)))
1709+
# total_len = max(total_len, point_len)
1710+
# data_vfmt = ''.join([data_prefix, '%',
1711+
# '%d.%d' % (total_len + 1, point_len),
1712+
# data_base_char])
1713+
#else:
1714+
# data_vfmt = ''.join([data_prefix, '%', data_base_char])
1715+
data_vfmt = ''.join([data_prefix, '%', data_base_char])
17101716

17111717
name = ram.name
17121718
fmt = ''.join(['(', self.name, ' step:%d, ',

0 commit comments

Comments
 (0)