From 741bb5328eedb815beea879b2ef759e1e6cccc80 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Fri, 24 Sep 2021 21:11:15 -0400 Subject: [PATCH] verilator_gantt: Fix argument report omitting last digits --- bin/verilator_gantt | 4 ++-- src/V3Hasher.cpp | 2 +- test_regress/t/t_gantt.pl | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/bin/verilator_gantt b/bin/verilator_gantt index 500f4b2fa..1a3e07884 100755 --- a/bin/verilator_gantt +++ b/bin/verilator_gantt @@ -36,8 +36,8 @@ def read_data(filename): re_eval = re.compile(r'^VLPROF eval\sstart\s(\d+)\selapsed\s(\d+)') re_loop = re.compile( r'^VLPROF eval_loop\sstart\s(\d+)\selapsed\s(\d+)') - re_arg1 = re.compile(r'VLPROF arg\s+(\S+)\+([0-9.])\s*') - re_arg2 = re.compile(r'VLPROF arg\s+(\S+)\s+([0-9.])\s*$') + re_arg1 = re.compile(r'VLPROF arg\s+(\S+)\+([0-9.]*)\s*') + re_arg2 = re.compile(r'VLPROF arg\s+(\S+)\s+([0-9.]*)\s*$') re_stat = re.compile(r'VLPROF stat\s+(\S+)\s+([0-9.]+)') re_time = re.compile(r'rdtsc time = (\d+) ticks') re_proc_cpu = re.compile(r'VLPROFPROC processor\s*:\s*(\d+)\s*$') diff --git a/src/V3Hasher.cpp b/src/V3Hasher.cpp index b83f8386a..48aaee870 100644 --- a/src/V3Hasher.cpp +++ b/src/V3Hasher.cpp @@ -81,7 +81,7 @@ private: virtual void visit(AstNode* nodep) override { #if VL_DEBUG - UINFO(0, "%Warning: Hashing node as AstNode: " << nodep); + UINFO(0, "%Warning: Hashing node as AstNode: " << nodep << endl); #endif m_hash += hashNodeAndIterate(nodep, HASH_DTYPE, HASH_CHILDREN, [=]() {}); } diff --git a/test_regress/t/t_gantt.pl b/test_regress/t/t_gantt.pl index ffaf7eba6..04727b3ef 100755 --- a/test_regress/t/t_gantt.pl +++ b/test_regress/t/t_gantt.pl @@ -8,8 +8,6 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Version 2.0. # SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 -use IO::File; - # Test for bin/verilator_gantt, # # Only needed in multithreaded regression.