From 4361fb838fb21180af95905f2467dcb203078b26 Mon Sep 17 00:00:00 2001 From: Patrick Stewart Date: Thu, 10 Oct 2019 19:44:39 -0400 Subject: [PATCH] Tests: Minor testbench fixes to prepare for CMake. Signed-off-by: Wilson Snyder --- test_regress/driver.pl | 2 +- test_regress/t/t_initial_dlyass_bad.pl | 2 +- test_regress/t/t_trace_cat_renew.pl | 2 +- test_regress/t/t_trace_cat_reopen.pl | 2 +- test_regress/t/t_trace_complex_params.pl | 2 +- test_regress/t/t_trace_complex_params_fst.pl | 2 +- test_regress/t/t_trace_complex_structs.pl | 2 +- test_regress/t/t_trace_complex_structs_fst.pl | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test_regress/driver.pl b/test_regress/driver.pl index 391948790..19f3d1c71 100755 --- a/test_regress/driver.pl +++ b/test_regress/driver.pl @@ -776,7 +776,7 @@ sub compile_vlt_flags { unshift @verilator_flags, "--x-assign unique"; # More likely to be buggy unshift @verilator_flags, "--trace" if $opt_trace; my $threads = ::calc_threads($Vltmt_threads); - unshift @verilator_flags, "--threads $threads" if $param{vltmt}; + unshift @verilator_flags, "--threads $threads" if $param{vltmt} && $checkflags !~ /-threads /; unshift @verilator_flags, "--trace-fst-thread" if $param{vltmt} && $checkflags =~ /-trace-fst/; unshift @verilator_flags, "--debug-partition" if $param{vltmt}; if (defined $opt_optimize) { diff --git a/test_regress/t/t_initial_dlyass_bad.pl b/test_regress/t/t_initial_dlyass_bad.pl index 70a304e53..488051e6a 100755 --- a/test_regress/t/t_initial_dlyass_bad.pl +++ b/test_regress/t/t_initial_dlyass_bad.pl @@ -9,7 +9,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(linter => 1); -top_filename("t_initial_dlyass.v"); +top_filename("t/t_initial_dlyass.v"); lint( fails => 1, diff --git a/test_regress/t/t_trace_cat_renew.pl b/test_regress/t/t_trace_cat_renew.pl index 7ab142802..9242ce46e 100755 --- a/test_regress/t/t_trace_cat_renew.pl +++ b/test_regress/t/t_trace_cat_renew.pl @@ -9,7 +9,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt_all => 1); -top_filename("t_trace_cat.v"); +top_filename("t/t_trace_cat.v"); compile( make_top_shell => 0, diff --git a/test_regress/t/t_trace_cat_reopen.pl b/test_regress/t/t_trace_cat_reopen.pl index 7ab142802..9242ce46e 100755 --- a/test_regress/t/t_trace_cat_reopen.pl +++ b/test_regress/t/t_trace_cat_reopen.pl @@ -9,7 +9,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(vlt_all => 1); -top_filename("t_trace_cat.v"); +top_filename("t/t_trace_cat.v"); compile( make_top_shell => 0, diff --git a/test_regress/t/t_trace_complex_params.pl b/test_regress/t/t_trace_complex_params.pl index 7ee758cb7..9134b577b 100755 --- a/test_regress/t/t_trace_complex_params.pl +++ b/test_regress/t/t_trace_complex_params.pl @@ -9,7 +9,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(simulator => 1); -top_filename("t_trace_complex.v"); +top_filename("t/t_trace_complex.v"); compile( verilator_flags2 => ['--cc --trace --no-trace-structs --trace-params'], diff --git a/test_regress/t/t_trace_complex_params_fst.pl b/test_regress/t/t_trace_complex_params_fst.pl index 4c7feca6d..cd2aa2f9d 100755 --- a/test_regress/t/t_trace_complex_params_fst.pl +++ b/test_regress/t/t_trace_complex_params_fst.pl @@ -9,7 +9,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(simulator => 1); -top_filename("t_trace_complex.v"); +top_filename("t/t_trace_complex.v"); compile( verilator_flags2 => ['--cc --trace-fst --no-trace-structs --trace-params'], diff --git a/test_regress/t/t_trace_complex_structs.pl b/test_regress/t/t_trace_complex_structs.pl index 66a93a9c9..24d5e7d7d 100755 --- a/test_regress/t/t_trace_complex_structs.pl +++ b/test_regress/t/t_trace_complex_structs.pl @@ -9,7 +9,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(simulator => 1); -top_filename("t_trace_complex.v"); +top_filename("t/t_trace_complex.v"); compile( verilator_flags2 => ['--cc --trace --trace-structs --no-trace-params'], diff --git a/test_regress/t/t_trace_complex_structs_fst.pl b/test_regress/t/t_trace_complex_structs_fst.pl index 374f928a0..60f80c1cd 100755 --- a/test_regress/t/t_trace_complex_structs_fst.pl +++ b/test_regress/t/t_trace_complex_structs_fst.pl @@ -9,7 +9,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(simulator => 1); -top_filename("t_trace_complex.v"); +top_filename("t/t_trace_complex.v"); compile( verilator_flags2 => ['--cc --trace-fst --trace-structs --no-trace-params'],