Set 'threads' in tests via parameter to compile

This is in preparation to #3454.

test_regress/driver.pl

@@ -578,6 +578,7 @@ sub new {
         make_pli => 0,          # need to compile pli
         sc_time_resolution => "SC_PS",  # Keep - PS is SystemC default
         sim_time => 1100,
+        threads => -1,          # --threads (negative means auto based on scenario)
         benchmark => $opt_benchmark,
         verbose => $opt_verbose,
         run_env => '',
@@ -902,6 +903,7 @@ sub compile_vlt_flags {
                           @{$param{verilator_flags}},
                           @{$param{verilator_flags2}},
                           @{$param{verilator_flags3}});
+    die "%Error: specify threads via 'threads =>' argument, not as a command line option" unless ($checkflags !~ /(^|\s)-?-threads\s/ && $checkflags !~ /(^|\s)-?-no-threads($|\s)/);
     $self->{sc} = 1 if ($checkflags =~ /-sc\b/);
     $self->{trace} = ($opt_trace || $checkflags =~ /-trace\b/
                       || $checkflags =~ /-trace-fst\b/);
@@ -920,8 +922,7 @@ sub compile_vlt_flags {
     unshift @verilator_flags, "--rr" if $opt_rr;
     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 $param{threads}" if $param{threads} >= 0;
-    unshift @verilator_flags, "--threads $threads" if $param{vltmt} && $checkflags !~ /-threads /;
     unshift @verilator_flags, "--trace-threads 2" if $param{vltmt} && $checkflags =~ /-trace-fst /;
     unshift @verilator_flags, "--debug-partition" if $param{vltmt};
     unshift @verilator_flags, "-CFLAGS -ggdb -LDFLAGS -ggdb" if $opt_gdbsim;
@@ -972,6 +973,9 @@ sub compile {
     return 1 if $self->errors || $self->skips || $self->unsupporteds;
     $self->oprint("Compile\n") if $self->{verbose};
 
+    die "%Error: 'threads =>' argument must be <= 1 for vlt scenario" if $param{vlt} && $param{threads} > 1;
+    $param{threads} = ::calc_threads($Vltmt_threads) if ($param{threads} < 0 && $param{vltmt});
+
     compile_vlt_cmd(%param);
 
     if (!$param{make_top_shell}) {

test_regress/t/t_depth_flop.pl

@@ -11,7 +11,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 scenarios(vltmt => 1);  # Note issue shows up with --threads
 
 compile(
-    verilator_flags2 => ['--compiler clang --threads 2 -Wno-UNOPTTHREADS'],
+    verilator_flags2 => ['--compiler clang -Wno-UNOPTTHREADS'],
+    threads => 2
     );
 
 ok(1);

test_regress/t/t_dotfiles.pl

@@ -14,7 +14,8 @@ scenarios(vltmt => 1);
 top_filename("t/t_gen_alw.v");
 
 compile(
-    v_flags2 => ["--debug --debugi 5 --threads 2"]
+    v_flags2 => ["--debug --debugi 5"],
+    threads => 2
     );
 
 foreach my $dotname ("linkcells", "task_call", "gate_simp", "gate_opt",

test_regress/t/t_embed1.pl

@@ -22,6 +22,7 @@ mkdir $child_dir;
         (VM_PREFIX => "$Self->{VM_PREFIX}_child",
          top_filename => "$Self->{name}_child.v",
          verilator_flags => ["-cc", "-Mdir", "${child_dir}", "--debug-check"],
+         threads => $Self->{vltmt} ? $Self->get_default_vltmt_threads() : 0
         );
 
     run(logfile => "${child_dir}/vlt_compile.log",

test_regress/t/t_gantt.pl

@@ -18,8 +18,9 @@ scenarios(vlt_all => 1);
 top_filename("t/t_gen_alw.v");
 
 compile(
+    v_flags2 => ["--prof-exec"],
     # Checks below care about thread count, so use 2 (minimum reasonable)
-    v_flags2 => ["--prof-exec",  ($Self->{vltmt} ? "--threads 2" : "")]
+    threads => $Self->{vltmt} ? 2 : 0
     );
 
 execute(

test_regress/t/t_hier_block.pl

@@ -18,11 +18,12 @@ scenarios(vlt_all => 1);
 
 compile(
     v_flags2 => ['t/t_hier_block.cpp'],
-    verilator_flags2 => ['--stats', ($Self->{vltmt} ? ' --threads 6' : ''),
+    verilator_flags2 => ['--stats',
                          '--hierarchical',
                          '--Wno-TIMESCALEMOD',
                          '--CFLAGS', '"-pipe -DCPP_MACRO=cplusplus"'
     ],
+    threads => $Self->{vltmt} ? 6 : 0
     );
 
 execute(

test_regress/t/t_hier_block_nohier.pl

@@ -23,8 +23,8 @@ compile(
     v_flags2 => ['t/t_hier_block.cpp'],
     verilator_flags2 => ['--stats',
                          '+define+USE_VLT', 't/t_hier_block_vlt.vlt',
-                         '--CFLAGS', '"-pipe -DCPP_MACRO=cplusplus"',
+                         '--CFLAGS', '"-pipe -DCPP_MACRO=cplusplus"'],
-                         ($Self->{vltmt} ? ' --threads 6' : '')],
+    threads => $Self->{vltmt} ? 6 : 0
     );
 
 execute(

test_regress/t/t_hier_block_sc.pl

@@ -22,9 +22,9 @@ compile(
     verilator_flags2 => ['--sc',
                          '--stats',
                          '--hierarchical',
-                         ($Self->{vltmt} ? ' --threads 6' : ''),
                          '--CFLAGS', '"-pipe -DCPP_MACRO=cplusplus"'
     ],
+    threads => $Self->{vltmt} ? 6 : 0
     );
 
 execute(

test_regress/t/t_hier_block_sc_trace_fst.pl

@@ -22,11 +22,11 @@ compile(
     verilator_flags2 => ['--sc',
                          '--stats',
                          '--hierarchical',
-                         ($Self->{vltmt} ? ' --threads 6' : ''),
                          '--CFLAGS', '"-pipe -DCPP_MACRO=cplusplus"',
                          "--CFLAGS", '"-O0 -ggdb"',
                          "--trace-fst"
     ],
+    threads => $Self->{vltmt} ? 6 : 0
     );
 
 execute(

test_regress/t/t_hier_block_sc_trace_vcd.pl

@@ -22,11 +22,11 @@ compile(
     verilator_flags2 => ['--sc',
                          '--stats',
                          '--hierarchical',
-                         ($Self->{vltmt} ? ' --threads 6' : ''),
                          '--CFLAGS', '"-pipe -DCPP_MACRO=cplusplus"',
                          "--CFLAGS", '"-O0 -ggdb"',
                          "--trace"
     ],
+    threads => $Self->{vltmt} ? 6 : 0
     );
 
 execute(

test_regress/t/t_hier_block_trace_fst.pl

@@ -17,12 +17,12 @@ top_filename("t/t_hier_block.v");
 
 compile(
     v_flags2 => ['t/t_hier_block.cpp'],
-    verilator_flags2 => [($Self->{vltmt} ? ' --threads 6' : ''),
+    verilator_flags2 => ['--hierarchical',
-                         '--hierarchical',
                          '--Wno-TIMESCALEMOD',
                          '--trace-fst',
                          '--no-trace-underscore',  # To avoid handle mismatches
     ],
+    threads => $Self->{vltmt} ? 6 : 0
     );
 
 execute(

test_regress/t/t_hier_block_trace_vcd.pl

@@ -17,12 +17,12 @@ top_filename("t/t_hier_block.v");
 
 compile(
     v_flags2 => ['t/t_hier_block.cpp'],
-    verilator_flags2 => [($Self->{vltmt} ? ' --threads 6' : ''),
+    verilator_flags2 => ['--hierarchical',
-                         '--hierarchical',
                          '--Wno-TIMESCALEMOD',
                          '--trace',
                          '--no-trace-underscore',  # To avoid handle mismatches
     ],
+    threads => $Self->{vltmt} ? 6 : 0
     );
 
 execute(

test_regress/t/t_hier_block_vlt.pl

@@ -22,8 +22,8 @@ compile(
                          '--hierarchical',
                          '+define+SHOW_TIMESCALE',
                          '+define+USE_VLT', 't/t_hier_block_vlt.vlt',
-                         '--CFLAGS', '"-pipe -DCPP_MACRO=cplusplus"',
+                         '--CFLAGS', '"-pipe -DCPP_MACRO=cplusplus"'],
-                         ($Self->{vltmt} ? ' --threads 6' : '')],
+    threads => $Self->{vltmt} ? 6 : 0
     );
 
 execute(

test_regress/t/t_inst_tree_inl0_pub1.pl

@@ -14,9 +14,9 @@ top_filename("t/t_inst_tree.v");
 
 my $default_vltmt_threads = $Self->get_default_vltmt_threads();
 compile(
-    verilator_flags2 => ['--stats', "$Self->{t_dir}/$Self->{name}.vlt",
+    verilator_flags2 => ['--stats', "$Self->{t_dir}/$Self->{name}.vlt"],
-                         # Force 3 threads even if we have fewer cores
+    # Force 3 threads even if we have fewer cores
-                         $Self->{vltmt} ? "--threads $default_vltmt_threads" : ""]
+    threads => $Self->{vltmt} ? $default_vltmt_threads : 0
     );
 
 sub checkRelativeRefs {

test_regress/t/t_lib_prot_shared.pl

@@ -56,10 +56,10 @@ while (1) {
 
     compile(
         verilator_flags2 => ["$secret_dir/secret.sv",
-                             ($Self->{vltmt} ? ' --threads 1' : ''),
                              "-LDFLAGS",
                              "'-Wl,-rpath,$abs_secret_dir -L$abs_secret_dir -l$secret_prefix'"],
         xsim_flags2 => ["$secret_dir/secret.sv"],
+        threads => $Self->{vltmt} ? 1 : 0
         );
 
     execute(

test_regress/t/t_pgo_profoutofdate_bad.pl

@@ -11,7 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 scenarios(vltmt => 1);
 
 compile(
-    v_flags2 => ["--threads 2"],
+    threads => 2,
     fails => 1,
     expect_filename => $Self->{golden_filename},
     );

test_regress/t/t_pgo_threads.pl

@@ -14,7 +14,8 @@ scenarios(vltmt => 1);
 top_filename("t/t_gen_alw.v");
 
 compile(
-    v_flags2 => ["--prof-pgo --threads 2"]
+    v_flags2 => ["--prof-pgo"],
+    threads => 2
     );
 
 execute(
@@ -30,8 +31,8 @@ file_grep("$Self->{obj_dir}/profile.vlt", qr/profile_data/i);
 compile(
     # Intentinally no --prof-pgo here to make sure profile data can be read in
     # without it (that is: --prof-pgo has no effect on profile_data hash names)
-    v_flags2 => ["--threads 2",
+    v_flags2 => [" $Self->{obj_dir}/profile.vlt"],
-                 " $Self->{obj_dir}/profile.vlt"],
+    threads => 2
     );
 
 execute(

test_regress/t/t_split_var_0.pl

@@ -14,8 +14,8 @@ scenarios(simulator => 1);
 # %Warning-UNOPTTHREADS: Thread scheduler is unable to provide requested parallelism; consider asking for fewer threads.
 # So use 6 threads here though it's not optimal in performace wise, but ok.
 compile(
-    verilator_flags2 => ['--stats' . ($Self->{vltmt} ? ' --threads 6' : ''),
+    verilator_flags2 => ['--stats', "$Self->{t_dir}/t_split_var_0.vlt"],
-                         "$Self->{t_dir}/t_split_var_0.vlt"],
+    threads => $Self->{vltmt} ? 6 : 0
     );
 
 execute(

test_regress/t/t_split_var_2_trace.pl

@@ -15,8 +15,8 @@ top_filename("t/t_split_var_0.v");
 # %Warning-UNOPTTHREADS: Thread scheduler is unable to provide requested parallelism; consider asking for fewer threads.
 # So use 6 threads here though it's not optimal in performace wise, but ok.
 compile(
-    verilator_flags2 => ['--cc --trace --stats' . ($Self->{vltmt} ? ' --threads 6' : ''),
+    verilator_flags2 => ['--cc --trace --stats +define+TEST_ATTRIBUTES'],
-                         '+define+TEST_ATTRIBUTES'],
+    threads => $Self->{vltmt} ? 6 : 0
     );
 
 execute(

test_regress/t/t_threads_counter_0.pl

@@ -13,7 +13,8 @@ scenarios(simulator => 1);
 top_filename("t/t_threads_counter.v");
 
 compile(
-    verilator_flags2 => ['--cc --no-threads'],
+    verilator_flags2 => ['--cc'],
+    threads => 0,
     );
 
 execute(

test_regress/t/t_threads_counter_1.pl

@@ -13,7 +13,8 @@ scenarios(vltmt => 1);
 top_filename("t/t_threads_counter.v");
 
 compile(
-    verilator_flags2 => ['--cc --threads 1'],
+    verilator_flags2 => ['--cc'],
+    threads => 1
     );
 
 execute(

test_regress/t/t_threads_counter_2.pl

@@ -13,7 +13,8 @@ scenarios(vltmt => 1);
 top_filename("t/t_threads_counter.v");
 
 compile(
-    verilator_flags2 => ['--cc --threads 2'],
+    verilator_flags2 => ['--cc'],
+    threads => 2
     );
 
 execute(

test_regress/t/t_threads_counter_4.pl

@@ -13,7 +13,8 @@ scenarios(vltmt => 1);
 top_filename("t/t_threads_counter.v");
 
 compile(
-    verilator_flags2 => ['--cc --threads 4'],
+    verilator_flags2 => ['--cc'],
+    threads => 4
     );
 
 execute(

test_regress/t/t_threads_crazy.pl

@@ -15,7 +15,8 @@ if ($Self->cfg_with_m32) {
 }
 
 compile(
-    verilator_flags2 => ['--cc --threads 1024'],
+    verilator_flags2 => ['--cc'],
+    threads => 1024
     );
 
 execute(

test_regress/t/t_threads_nondeterminism.pl

@@ -13,7 +13,8 @@ scenarios(vltmt => 1);
 top_filename("t/t_threads_counter.v");
 
 compile(
-    verilator_flags2 => ['--cc --threads 2 --debug-nondeterminism --no-skip-identical'],
+    verilator_flags2 => ['--cc --debug-nondeterminism --no-skip-identical'],
+    threads => 2
     );
 
 execute(

test_regress/t/t_trace_litendian.pl

@@ -14,8 +14,8 @@ scenarios(simulator => 1);
 # %Warning-UNOPTTHREADS: Thread scheduler is unable to provide requested parallelism; consider asking for fewer threads.
 # Strangely, asking for more threads makes it go away.
 compile(
-    verilator_flags2 => ['--cc --trace --trace-params -Wno-LITENDIAN',
+    verilator_flags2 => ['--cc --trace --trace-params -Wno-LITENDIAN'],
-                        ($Self->{vltmt} ? '--threads 6' : '')],
+    threads => $Self->{vltmt} ? 6 : 0
     );
 
 execute(

test_regress/t/t_trace_litendian_fst.pl

@@ -16,8 +16,8 @@ top_filename("t/t_trace_litendian.v");
 # %Warning-UNOPTTHREADS: Thread scheduler is unable to provide requested parallelism; consider asking for fewer threads.
 # Strangely, asking for more threads makes it go away.
 compile(
-    verilator_flags2 => ['--cc --trace-fst --trace-params -Wno-LITENDIAN',
+    verilator_flags2 => ['--cc --trace-fst --trace-params -Wno-LITENDIAN'],
-                        ($Self->{vltmt} ?  '--threads 6' : '')],
+    threads => $Self->{vltmt} ? 6 : 0
     );
 
 execute(

test_regress/t/t_trace_litendian_fst_sc.pl

@@ -20,8 +20,8 @@ else {
     # %Warning-UNOPTTHREADS: Thread scheduler is unable to provide requested parallelism; consider asking for fewer threads.
     # Strangely, asking for more threads makes it go away.
     compile(
-        verilator_flags2 => ['--sc --trace-fst --trace-params -Wno-LITENDIAN',
+        verilator_flags2 => ['--sc --trace-fst --trace-params -Wno-LITENDIAN'],
-                            ($Self->{vltmt} ?  '--threads 6' : '')],
+        threads => $Self->{vltmt} ? 6 : 0
         );
 
     execute(

test_regress/t/t_verilated_all.pl

@@ -8,7 +8,7 @@ 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
 
-scenarios(vlt => 1);
+scenarios(vltmt => 1);
 
 my $root = "..";
 
@@ -17,10 +17,10 @@ compile(
     verilator_flags2 => ["--cc",
                          "--coverage-toggle --coverage-line --coverage-user",
                          "--trace --vpi ",
-                         "--threads 2",
                          "--trace-threads 1",
                          "--prof-exec", "--prof-pgo",
                          "$root/include/verilated_save.cpp"],
+    threads => 2
     );
 
 execute(

test_regress/t/t_verilated_threaded.pl

@@ -16,7 +16,8 @@ my $root = "..";
 
 compile(
     # Can't use --coverage and --savable together, so cheat and compile inline
-    verilator_flags2 => ["--cc --coverage-toggle --coverage-line --coverage-user --trace --threads 1 --vpi $root/include/verilated_save.cpp"],
+    verilator_flags2 => ["--cc --coverage-toggle --coverage-line --coverage-user --trace --vpi $root/include/verilated_save.cpp"],
+    threads => 1
     );
 
 execute(

test_regress/t/t_wrapper_context.pl

@@ -14,8 +14,9 @@ compile(
     make_top_shell => 0,
     make_main => 0,
     # link threads library, add custom .cpp code, add tracing & coverage support
-    verilator_flags2 => ["-threads 1 --exe $Self->{t_dir}/$Self->{name}.cpp",
+    verilator_flags2 => ["--exe $Self->{t_dir}/$Self->{name}.cpp",
                          "--trace --coverage -cc"],
+    threads => 1,
     make_flags => 'CPPFLAGS_ADD=-DVL_NO_LEGACY',
     );
 

test_regress/t/t_wrapper_context_fst.pl

@@ -16,8 +16,9 @@ compile(
     make_top_shell => 0,
     make_main => 0,
     # link threads library, add custom .cpp code, add tracing & coverage support
-    verilator_flags2 => ["-threads 1 --exe $Self->{t_dir}/t_wrapper_context.cpp",
+    verilator_flags2 => ["--exe $Self->{t_dir}/t_wrapper_context.cpp",
                          "--trace-fst --coverage -cc"],
+    threads => 1,
     make_flags => 'CPPFLAGS_ADD=-DVL_NO_LEGACY',
     );
 

test_regress/t/t_wrapper_context_seq.pl

@@ -16,8 +16,9 @@ compile(
     make_top_shell => 0,
     make_main => 0,
     # link threads library, add custom .cpp code, add tracing & coverage support
-    verilator_flags2 => ["-threads 1 --exe $Self->{t_dir}/t_wrapper_context.cpp",
+    verilator_flags2 => ["--exe $Self->{t_dir}/t_wrapper_context.cpp",
                          "--trace --coverage -cc"],
+    threads => 1,
     make_flags => 'CPPFLAGS_ADD=-DVL_NO_LEGACY',
     );