From 0af0d3b17118356986e1feb122b0ef997ac6389e Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Mon, 17 Jan 2011 14:58:58 -0500 Subject: [PATCH] Cleanup CDC reports, remove TOP-> signal prefixes --- src/V3Ast.cpp | 1 + test_regress/t/t_cdc_async_bad.pl | 6 +++--- test_regress/t/t_lint_syncasyncnet_bad.pl | 2 +- test_regress/t/t_unopt_combo_bad.pl | 8 ++++---- test_regress/t/t_unopt_converge_unopt_bad.pl | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/V3Ast.cpp b/src/V3Ast.cpp index 4ebf3b166..456a3c996 100644 --- a/src/V3Ast.cpp +++ b/src/V3Ast.cpp @@ -192,6 +192,7 @@ string AstNode::prettyName(const string& namein) { } } if (pretty.substr(0,4) == "TOP.") pretty.replace(0,4,""); + if (pretty.substr(0,5) == "TOP->") pretty.replace(0,5,""); return pretty; } diff --git a/test_regress/t/t_cdc_async_bad.pl b/test_regress/t/t_cdc_async_bad.pl index b3bfd4d88..5878fd9d6 100755 --- a/test_regress/t/t_cdc_async_bad.pl +++ b/test_regress/t/t_cdc_async_bad.pl @@ -12,11 +12,11 @@ compile ( verilator_make_gcc => 0, fails => 1, expect=> -'%Warning-CDCRSTLOGIC: t/t_cdc_async_bad.v:\d+: Logic in path that feeds async reset, via signal: TOP->v.rst2_bad_n +'%Warning-CDCRSTLOGIC: t/t_cdc_async_bad.v:\d+: Logic in path that feeds async reset, via signal: v.rst2_bad_n %Warning-CDCRSTLOGIC: Use "/\* verilator lint_off CDCRSTLOGIC \*/" and lint_on around source to disable this message. %Warning-CDCRSTLOGIC: See details in obj_dir/t_cdc_async_bad/Vt_cdc_async_bad__cdc.txt -%Warning-CDCRSTLOGIC: t/t_cdc_async_bad.v:\d+: Logic in path that feeds async reset, via signal: TOP->v.rst6a_bad_n -%Warning-CDCRSTLOGIC: t/t_cdc_async_bad.v:\d+: Logic in path that feeds async reset, via signal: TOP->v.rst3_bad_n +%Warning-CDCRSTLOGIC: t/t_cdc_async_bad.v:\d+: Logic in path that feeds async reset, via signal: v.rst6a_bad_n +%Warning-CDCRSTLOGIC: t/t_cdc_async_bad.v:\d+: Logic in path that feeds async reset, via signal: v.rst3_bad_n %Error: Exiting due to.*', ); diff --git a/test_regress/t/t_lint_syncasyncnet_bad.pl b/test_regress/t/t_lint_syncasyncnet_bad.pl index 61c7eafe6..395782f25 100755 --- a/test_regress/t/t_lint_syncasyncnet_bad.pl +++ b/test_regress/t/t_lint_syncasyncnet_bad.pl @@ -14,7 +14,7 @@ compile ( make_top_shell => 0, make_main => 0, expect=> -'%Warning-SYNCASYNCNET: t/t_lint_syncasyncnet_bad.v:\d+: Signal flopped as both synchronous and async: TOP->rst_both_l +'%Warning-SYNCASYNCNET: t/t_lint_syncasyncnet_bad.v:\d+: Signal flopped as both synchronous and async: rst_both_l %Warning-SYNCASYNCNET: Use .* around source to disable this message. %Warning-SYNCASYNCNET: t/t_lint_syncasyncnet_bad.v:\d+: ... Location of async usage %Warning-SYNCASYNCNET: t/t_lint_syncasyncnet_bad.v:\d+: ... Location of sync usage diff --git a/test_regress/t/t_unopt_combo_bad.pl b/test_regress/t/t_unopt_combo_bad.pl index 8f2fc8e9f..230a41c3c 100755 --- a/test_regress/t/t_unopt_combo_bad.pl +++ b/test_regress/t/t_unopt_combo_bad.pl @@ -12,13 +12,13 @@ top_filename("t/t_unopt_combo.v"); compile ( fails=>$Self->{v3}, expect=> -'%Warning-UNOPTFLAT: t/t_unopt_combo.v:\d+: Signal unoptimizable: Feedback to clock or circular logic: TOP->v.c +'%Warning-UNOPTFLAT: t/t_unopt_combo.v:\d+: Signal unoptimizable: Feedback to clock or circular logic: v.c %Warning-UNOPTFLAT: Use "/\* verilator lint_off UNOPTFLAT \*/" and lint_on around source to disable this message. -%Warning-UNOPTFLAT: Example path: t/t_unopt_combo.v:\d+: TOP->v.c +%Warning-UNOPTFLAT: Example path: t/t_unopt_combo.v:\d+: v.c %Warning-UNOPTFLAT: Example path: t/t_unopt_combo.v:\d+: ALWAYS -%Warning-UNOPTFLAT: Example path: t/t_unopt_combo.v:\d+: TOP->v.b +%Warning-UNOPTFLAT: Example path: t/t_unopt_combo.v:\d+: v.b %Warning-UNOPTFLAT: Example path: t/t_unopt_combo.v:\d+: ALWAYS -%Warning-UNOPTFLAT: Example path: t/t_unopt_combo.v:\d+: TOP->v.c +%Warning-UNOPTFLAT: Example path: t/t_unopt_combo.v:\d+: v.c %Error: Exiting due to ' ); diff --git a/test_regress/t/t_unopt_converge_unopt_bad.pl b/test_regress/t/t_unopt_converge_unopt_bad.pl index 2ea9814a5..32c5dfc4c 100755 --- a/test_regress/t/t_unopt_converge_unopt_bad.pl +++ b/test_regress/t/t_unopt_converge_unopt_bad.pl @@ -11,7 +11,7 @@ top_filename("t/t_unopt_converge.v"); compile ( fails=>1, - expect=> '%Warning-UNOPT: t/t_unopt_converge.v:\d+: Signal unoptimizable: Feedback to public clock or circular logic: TOP->x + expect=> '%Warning-UNOPT: t/t_unopt_converge.v:\d+: Signal unoptimizable: Feedback to public clock or circular logic: x .* %Error: Exiting due to ' ) if $Self->{v3};