diff --git a/test_regress/driver.pl b/test_regress/driver.pl index 6bc4172de..7c7e5692d 100755 --- a/test_regress/driver.pl +++ b/test_regress/driver.pl @@ -910,6 +910,19 @@ sub clean_objs { system("rm", "-rf", glob("$self->{obj_dir}/*")); } +sub _checkflags { + my $self = shift; + my %param = (@_); + my $checkflags = (' '.join(' ', + @{$param{v_flags}}, + @{$param{v_flags2}}, + @{$param{verilator_flags}}, + @{$param{verilator_flags2}}, + @{$param{verilator_flags3}}) + .' '); + return $checkflags; +} + sub compile_vlt_cmd { my $self = (ref $_[0] ? shift : $Self); my %param = (%{$self}, # Default arguments are from $self @@ -918,7 +931,7 @@ sub compile_vlt_cmd { my @vlt_cmd = ( "perl", "$ENV{VERILATOR_ROOT}/bin/verilator", - $self->compile_vlt_flags(%param), + $self->_compile_vlt_flags(%param), $param{top_filename}, @{$param{v_other_filenames}}, $param{stdout_filename} ? "> " . $param{stdout_filename} : "" @@ -926,19 +939,12 @@ sub compile_vlt_cmd { return @vlt_cmd; } -sub compile_vlt_flags { - my $self = (ref $_[0] ? shift : $Self); - my %param = (%{$self}, # Default arguments are from $self - @_); # Supports arbitrary arguments +sub _compile_vlt_flags { + my $self = shift; + my %param = (@_); # Supports arbitrary arguments from compile_vlt_cmd return 1 if $self->errors || $self->skips; - my $checkflags = (' '.join(' ', - @{$param{v_flags}}, - @{$param{v_flags2}}, - @{$param{verilator_flags}}, - @{$param{verilator_flags2}}, - @{$param{verilator_flags3}}) - .' '); + my $checkflags = $self->_checkflags(%param); die "%Error: specify threads via 'threads =>' argument, not as a command line option" unless ($checkflags !~ /(^|\s)-?-threads\s/); $self->{coverage} = 1 if ($checkflags =~ /-coverage\b/); $self->{savable} = 1 if ($checkflags =~ /-savable\b/); @@ -1013,12 +1019,15 @@ sub compile { die "%Error: 'threads =>' argument must be <= 1 for vlt scenario" if $param{vlt} && $param{threads} > 1; # Compute automatic parameter values + my $checkflags = $self->_checkflags(%param); $param{threads} = ::calc_threads($Vltmt_threads) if $param{threads} < 0 && $param{vltmt}; $param{context_threads} = $param{threads} >= 1 ? $param{threads} : 1 if !$param{context_threads}; + $param{make_main} = 0 if ($checkflags =~ / -?-main\b/ || $checkflags =~ / -?-binary\b/); + $self->{threads} = $param{threads}; $self->{context_threads} = $param{context_threads}; - compile_vlt_cmd(%param); + $self->compile_vlt_cmd(%param); my $define_opt = defineOpt($self->{xsim}); if (join(' ', @{$self->{v_flags}}) !~ /TEST_DUMPFILE/) { @@ -1188,7 +1197,7 @@ sub compile { } if ($param{verilator_make_cmake}) { - my @vlt_args = $self->compile_vlt_flags(%param); + my @vlt_args = $self->_compile_vlt_flags(%param); $self->oprint("Running cmake\n") if $self->{verbose}; mkdir $self->{obj_dir}; my @csources = (); diff --git a/test_regress/t/t_assigndly_dynamic.pl b/test_regress/t/t_assigndly_dynamic.pl index 3576e3ffb..270c8b710 100755 --- a/test_regress/t/t_assigndly_dynamic.pl +++ b/test_regress/t/t_assigndly_dynamic.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( @@ -21,7 +20,6 @@ execute( compile( verilator_flags2 => ["--exe --main --timing +define+WITH_DELAY"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_clocking_empty_block.pl b/test_regress/t/t_clocking_empty_block.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_clocking_empty_block.pl +++ b/test_regress/t/t_clocking_empty_block.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_clocking_timing1.pl b/test_regress/t/t_clocking_timing1.pl index 671334c7d..fbcaf794f 100755 --- a/test_regress/t/t_clocking_timing1.pl +++ b/test_regress/t/t_clocking_timing1.pl @@ -14,7 +14,6 @@ top_filename("t/t_clocking_timing.v"); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_clocking_timing2.pl b/test_regress/t/t_clocking_timing2.pl index ad6f5308f..d5e2d9864 100755 --- a/test_regress/t/t_clocking_timing2.pl +++ b/test_regress/t/t_clocking_timing2.pl @@ -14,7 +14,6 @@ top_filename("t/t_clocking_timing.v"); compile( verilator_flags2 => ["--exe --main --timing -DTEST_INPUT_SKEW=12 -DTEST_OUTPUT_SKEW=16"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_cxx_equal_to.pl b/test_regress/t/t_cxx_equal_to.pl index efd6274f5..d0f124208 100755 --- a/test_regress/t/t_cxx_equal_to.pl +++ b/test_regress/t/t_cxx_equal_to.pl @@ -16,7 +16,6 @@ compile( verilator_flags2 => ['--binary --timing --trace'], verilator_make_cmake => 0, verilator_make_gmake => 0, - make_main => 0, ); execute( diff --git a/test_regress/t/t_delay_var.pl b/test_regress/t/t_delay_var.pl index 0b10f155d..c8f2eacfe 100755 --- a/test_regress/t/t_delay_var.pl +++ b/test_regress/t/t_delay_var.pl @@ -12,7 +12,6 @@ scenarios(vlt => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_disable_fork1.pl b/test_regress/t/t_disable_fork1.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_disable_fork1.pl +++ b/test_regress/t/t_disable_fork1.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_disable_fork2.pl b/test_regress/t/t_disable_fork2.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_disable_fork2.pl +++ b/test_regress/t/t_disable_fork2.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_disable_fork3.pl b/test_regress/t/t_disable_fork3.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_disable_fork3.pl +++ b/test_regress/t/t_disable_fork3.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_display_impure.pl b/test_regress/t/t_display_impure.pl index 61f6d3396..576ac0d3d 100755 --- a/test_regress/t/t_display_impure.pl +++ b/test_regress/t/t_display_impure.pl @@ -12,7 +12,6 @@ scenarios(linter => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_event_control_pass.pl b/test_regress/t/t_event_control_pass.pl index 2f8329791..0cb201e30 100755 --- a/test_regress/t/t_event_control_pass.pl +++ b/test_regress/t/t_event_control_pass.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, threads => 1, ); diff --git a/test_regress/t/t_flag_binary.pl b/test_regress/t/t_flag_binary.pl index e810b1eb6..bf2dc801d 100755 --- a/test_regress/t/t_flag_binary.pl +++ b/test_regress/t/t_flag_binary.pl @@ -19,7 +19,6 @@ compile( verilator_flags2 => ['--binary'], verilator_make_cmake => 0, verilator_make_gmake => 0, - make_main => 0, ); execute( diff --git a/test_regress/t/t_flag_main.pl b/test_regress/t/t_flag_main.pl index 57041562f..f279e8a2e 100755 --- a/test_regress/t/t_flag_main.pl +++ b/test_regress/t/t_flag_main.pl @@ -17,7 +17,6 @@ compile( verilator_flags2 => ['--exe --build --main'], verilator_make_cmake => 0, verilator_make_gmake => 0, - make_main => 0, # Check that code --main produces uses only most modern API features make_flags => 'CPPFLAGS_ADD=-DVL_NO_LEGACY', ); diff --git a/test_regress/t/t_flag_main_sc_bad.pl b/test_regress/t/t_flag_main_sc_bad.pl index 8c8eb97ca..94fd1dce7 100755 --- a/test_regress/t/t_flag_main_sc_bad.pl +++ b/test_regress/t/t_flag_main_sc_bad.pl @@ -14,7 +14,6 @@ compile( verilator_flags2 => ['--exe --build --main --sc'], verilator_make_cmake => 0, verilator_make_gmake => 0, - make_main => 0, fails => 1, expect_filename => $Self->{golden_filename}, ); diff --git a/test_regress/t/t_flag_prefix.pl b/test_regress/t/t_flag_prefix.pl index adcce742d..940ddc16b 100755 --- a/test_regress/t/t_flag_prefix.pl +++ b/test_regress/t/t_flag_prefix.pl @@ -16,7 +16,6 @@ compile( "--exe", "--main", "--stats", "--build"], verilator_make_cmake => 0, verilator_make_gmake => 0, - make_main => 0, ); execute( diff --git a/test_regress/t/t_fork_block_item_declaration.pl b/test_regress/t/t_fork_block_item_declaration.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_fork_block_item_declaration.pl +++ b/test_regress/t/t_fork_block_item_declaration.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_fork_dynscope.pl b/test_regress/t/t_fork_dynscope.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_fork_dynscope.pl +++ b/test_regress/t/t_fork_dynscope.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_fork_initial.pl b/test_regress/t/t_fork_initial.pl index c78ec8a58..7751e4fe8 100755 --- a/test_regress/t/t_fork_initial.pl +++ b/test_regress/t/t_fork_initial.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, # issue #4471 - remove this verilator_make_gmake => 0, ); diff --git a/test_regress/t/t_fork_join_none_class_cap.pl b/test_regress/t/t_fork_join_none_class_cap.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_fork_join_none_class_cap.pl +++ b/test_regress/t/t_fork_join_none_class_cap.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_fork_jumpblock.pl b/test_regress/t/t_fork_jumpblock.pl index bc632ee01..a1cdcff37 100755 --- a/test_regress/t/t_fork_jumpblock.pl +++ b/test_regress/t/t_fork_jumpblock.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_fork_none_var.pl b/test_regress/t/t_fork_none_var.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_fork_none_var.pl +++ b/test_regress/t/t_fork_none_var.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_fork_output_arg.pl b/test_regress/t/t_fork_output_arg.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_fork_output_arg.pl +++ b/test_regress/t/t_fork_output_arg.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_interface_virtual_timing.pl b/test_regress/t/t_interface_virtual_timing.pl index 0da9620d1..30ef08a9e 100755 --- a/test_regress/t/t_interface_virtual_timing.pl +++ b/test_regress/t/t_interface_virtual_timing.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_jumps_uninit_destructor_call.pl b/test_regress/t/t_jumps_uninit_destructor_call.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_jumps_uninit_destructor_call.pl +++ b/test_regress/t/t_jumps_uninit_destructor_call.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_lint_infinite.pl b/test_regress/t/t_lint_infinite.pl index 3364f1ed7..7964ebe90 100755 --- a/test_regress/t/t_lint_infinite.pl +++ b/test_regress/t/t_lint_infinite.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_mailbox.pl b/test_regress/t/t_mailbox.pl index 30306c8ce..41f6e2a53 100755 --- a/test_regress/t/t_mailbox.pl +++ b/test_regress/t/t_mailbox.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing -Wall"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_mailbox_notiming.pl b/test_regress/t/t_mailbox_notiming.pl index fb7f3e881..70368f851 100755 --- a/test_regress/t/t_mailbox_notiming.pl +++ b/test_regress/t/t_mailbox_notiming.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --no-timing -Wall"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_mailbox_std.pl b/test_regress/t/t_mailbox_std.pl index 31b9a5203..8f575f2f2 100755 --- a/test_regress/t/t_mailbox_std.pl +++ b/test_regress/t/t_mailbox_std.pl @@ -14,7 +14,6 @@ top_filename("t/t_mailbox.v"); compile( verilator_flags2 => ["--exe --main --timing -Wall --Wpedantic -DMAILBOX_T=std::mailbox"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_mailbox_unbounded.pl b/test_regress/t/t_mailbox_unbounded.pl index 30306c8ce..41f6e2a53 100755 --- a/test_regress/t/t_mailbox_unbounded.pl +++ b/test_regress/t/t_mailbox_unbounded.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing -Wall"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_process_propagation.pl b/test_regress/t/t_process_propagation.pl index 3364f1ed7..7964ebe90 100755 --- a/test_regress/t/t_process_propagation.pl +++ b/test_regress/t/t_process_propagation.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_process_task.pl b/test_regress/t/t_process_task.pl index 123e2f4fd..ef9cff8c5 100755 --- a/test_regress/t/t_process_task.pl +++ b/test_regress/t/t_process_task.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( v_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_semaphore.pl b/test_regress/t/t_semaphore.pl index 30306c8ce..41f6e2a53 100755 --- a/test_regress/t/t_semaphore.pl +++ b/test_regress/t/t_semaphore.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing -Wall"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_semaphore_std.pl b/test_regress/t/t_semaphore_std.pl index 47041497b..39236c3d4 100755 --- a/test_regress/t/t_semaphore_std.pl +++ b/test_regress/t/t_semaphore_std.pl @@ -14,7 +14,6 @@ top_filename("t/t_semaphore.v"); compile( verilator_flags2 => ["--exe --main --timing -Wall -DSEMAPHORE_T=std::semaphore"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_stack_check.pl b/test_regress/t/t_stack_check.pl index 8c196698f..0c61fa4eb 100755 --- a/test_regress/t/t_stack_check.pl +++ b/test_regress/t/t_stack_check.pl @@ -14,7 +14,6 @@ compile( verilator_flags2 => ['--binary --debug-stack-check'], verilator_make_cmake => 0, verilator_make_gmake => 0, - make_main => 0, ); execute(); diff --git a/test_regress/t/t_std_process_self.pl b/test_regress/t/t_std_process_self.pl index 5b73c5ff4..80841859b 100755 --- a/test_regress/t/t_std_process_self.pl +++ b/test_regress/t/t_std_process_self.pl @@ -12,12 +12,10 @@ scenarios(simulator => 1); lint( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); lint( verilator_flags2 => ["--exe --main --timing --DUSE_STD_PREFIX"], - make_main => 0, ); ok(1); diff --git a/test_regress/t/t_stream5.pl b/test_regress/t/t_stream5.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_stream5.pl +++ b/test_regress/t/t_stream5.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_time.pl b/test_regress/t/t_time.pl index 0db50fc52..47728df81 100755 --- a/test_regress/t/t_time.pl +++ b/test_regress/t/t_time.pl @@ -12,7 +12,6 @@ scenarios(linter => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_always.pl b/test_regress/t/t_timing_always.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_timing_always.pl +++ b/test_regress/t/t_timing_always.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_class.pl b/test_regress/t/t_timing_class.pl index 002312d88..ed3bac458 100755 --- a/test_regress/t/t_timing_class.pl +++ b/test_regress/t/t_timing_class.pl @@ -12,7 +12,6 @@ scenarios(vlt => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_class_static_delay.pl b/test_regress/t/t_timing_class_static_delay.pl index 002312d88..ed3bac458 100755 --- a/test_regress/t/t_timing_class_static_delay.pl +++ b/test_regress/t/t_timing_class_static_delay.pl @@ -12,7 +12,6 @@ scenarios(vlt => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_clkgen1.pl b/test_regress/t/t_timing_clkgen1.pl index edbe747b4..a4a48a187 100755 --- a/test_regress/t/t_timing_clkgen1.pl +++ b/test_regress/t/t_timing_clkgen1.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing -Wno-MINTYPMAXDLY"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_clkgen2.pl b/test_regress/t/t_timing_clkgen2.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_timing_clkgen2.pl +++ b/test_regress/t/t_timing_clkgen2.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_clkgen3.pl b/test_regress/t/t_timing_clkgen3.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_timing_clkgen3.pl +++ b/test_regress/t/t_timing_clkgen3.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_debug1.pl b/test_regress/t/t_timing_debug1.pl index 06be36082..61ae92cc7 100755 --- a/test_regress/t/t_timing_debug1.pl +++ b/test_regress/t/t_timing_debug1.pl @@ -14,7 +14,6 @@ top_filename("t/t_timing_sched.v"); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_debug2.pl b/test_regress/t/t_timing_debug2.pl index 4ff0b44ea..aa8ec9485 100755 --- a/test_regress/t/t_timing_debug2.pl +++ b/test_regress/t/t_timing_debug2.pl @@ -14,7 +14,6 @@ top_filename("t/t_timing_class.v"); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_delay_callstack.pl b/test_regress/t/t_timing_delay_callstack.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_timing_delay_callstack.pl +++ b/test_regress/t/t_timing_delay_callstack.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_dlyassign.pl b/test_regress/t/t_timing_dlyassign.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_timing_dlyassign.pl +++ b/test_regress/t/t_timing_dlyassign.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_dynscope.pl b/test_regress/t/t_timing_dynscope.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_timing_dynscope.pl +++ b/test_regress/t/t_timing_dynscope.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_events.pl b/test_regress/t/t_timing_events.pl index 002312d88..ed3bac458 100755 --- a/test_regress/t/t_timing_events.pl +++ b/test_regress/t/t_timing_events.pl @@ -12,7 +12,6 @@ scenarios(vlt => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_fork_comb.pl b/test_regress/t/t_timing_fork_comb.pl index ac0e116ba..c9e9158e8 100755 --- a/test_regress/t/t_timing_fork_comb.pl +++ b/test_regress/t/t_timing_fork_comb.pl @@ -20,7 +20,6 @@ compile( compile( verilator_flags2 => ["--exe --main --timing -Wno-UNOPTFLAT"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_fork_join.pl b/test_regress/t/t_timing_fork_join.pl index 3feb337e3..f686c3eec 100755 --- a/test_regress/t/t_timing_fork_join.pl +++ b/test_regress/t/t_timing_fork_join.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_fork_join_forkproc.pl b/test_regress/t/t_timing_fork_join_forkproc.pl index 61664fabe..e6d59ea75 100755 --- a/test_regress/t/t_timing_fork_join_forkproc.pl +++ b/test_regress/t/t_timing_fork_join_forkproc.pl @@ -14,7 +14,6 @@ top_filename("t/t_timing_fork_join.v"); compile( verilator_flags2 => ["--exe --main --timing --ftaskify-all-forked"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_fork_many.pl b/test_regress/t/t_timing_fork_many.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_timing_fork_many.pl +++ b/test_regress/t/t_timing_fork_many.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_fork_no_timing_ctrl.pl b/test_regress/t/t_timing_fork_no_timing_ctrl.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_timing_fork_no_timing_ctrl.pl +++ b/test_regress/t/t_timing_fork_no_timing_ctrl.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_fork_rec_method.pl b/test_regress/t/t_timing_fork_rec_method.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_timing_fork_rec_method.pl +++ b/test_regress/t/t_timing_fork_rec_method.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_fork_taskcall.pl b/test_regress/t/t_timing_fork_taskcall.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_timing_fork_taskcall.pl +++ b/test_regress/t/t_timing_fork_taskcall.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_intra_assign.pl b/test_regress/t/t_timing_intra_assign.pl index fabe5ebc4..f625618ab 100755 --- a/test_regress/t/t_timing_intra_assign.pl +++ b/test_regress/t/t_timing_intra_assign.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing -Wno-UNOPTFLAT"], - make_main => 0, ); execute( @@ -22,7 +21,6 @@ execute( compile( verilator_flags2 => ["--exe --main --timing -Wno-UNOPTFLAT -fno-localize"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_long.pl b/test_regress/t/t_timing_long.pl index 834a8c4f5..2c5c9595e 100755 --- a/test_regress/t/t_timing_long.pl +++ b/test_regress/t/t_timing_long.pl @@ -59,7 +59,6 @@ if ($Self->have_coroutines) { verilator_flags2 => ["--exe --build --main --tim" . "ing"], verilator_make_cmake => 0, verilator_make_gmake => 0, - make_main => 0, make_top => 1, ); @@ -72,7 +71,6 @@ compile( verilator_flags2 => ["--exe --build --main --no-timing -Wno-STMTDLY"], verilator_make_cmake => 0, verilator_make_gmake => 0, - make_main => 0, make_top => 1, ); diff --git a/test_regress/t/t_timing_nba.pl b/test_regress/t/t_timing_nba.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_timing_nba.pl +++ b/test_regress/t/t_timing_nba.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_off.pl b/test_regress/t/t_timing_off.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_timing_off.pl +++ b/test_regress/t/t_timing_off.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_pong.pl b/test_regress/t/t_timing_pong.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_timing_pong.pl +++ b/test_regress/t/t_timing_pong.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_protect.pl b/test_regress/t/t_timing_protect.pl index bd2ed322d..84a4c7ce0 100755 --- a/test_regress/t/t_timing_protect.pl +++ b/test_regress/t/t_timing_protect.pl @@ -19,7 +19,6 @@ else { compile( verilator_flags2 => ["--exe --main --timing --protect-ids", "--protect-key SECRET_KEY"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_reentry.pl b/test_regress/t/t_timing_reentry.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_timing_reentry.pl +++ b/test_regress/t/t_timing_reentry.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_sched.pl b/test_regress/t/t_timing_sched.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_timing_sched.pl +++ b/test_regress/t/t_timing_sched.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_sched_if.pl b/test_regress/t/t_timing_sched_if.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_timing_sched_if.pl +++ b/test_regress/t/t_timing_sched_if.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_sched_nba.pl b/test_regress/t/t_timing_sched_nba.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_timing_sched_nba.pl +++ b/test_regress/t/t_timing_sched_nba.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_strobe.pl b/test_regress/t/t_timing_strobe.pl index 3feb337e3..f686c3eec 100755 --- a/test_regress/t/t_timing_strobe.pl +++ b/test_regress/t/t_timing_strobe.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_timescale.pl b/test_regress/t/t_timing_timescale.pl index 3feb337e3..f686c3eec 100755 --- a/test_regress/t/t_timing_timescale.pl +++ b/test_regress/t/t_timing_timescale.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_trace.pl b/test_regress/t/t_timing_trace.pl index 73c643cee..e968634de 100755 --- a/test_regress/t/t_timing_trace.pl +++ b/test_regress/t/t_timing_trace.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing --trace -Wno-MINTYPMAXDLY"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_trace_fst.pl b/test_regress/t/t_timing_trace_fst.pl index 261ee5e84..2e8d5f1f5 100755 --- a/test_regress/t/t_timing_trace_fst.pl +++ b/test_regress/t/t_timing_trace_fst.pl @@ -14,7 +14,6 @@ top_filename("t/t_timing_trace.v"); compile( verilator_flags2 => ["--exe --main --timing --trace-fst -Wno-MINTYPMAXDLY"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_wait1.pl b/test_regress/t/t_timing_wait1.pl index 3508f0a14..3f4a19511 100755 --- a/test_regress/t/t_timing_wait1.pl +++ b/test_regress/t/t_timing_wait1.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing -Wno-WAITCONST"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_wait2.pl b/test_regress/t/t_timing_wait2.pl index 3feb337e3..f686c3eec 100755 --- a/test_regress/t/t_timing_wait2.pl +++ b/test_regress/t/t_timing_wait2.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_wait3.pl b/test_regress/t/t_timing_wait3.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_timing_wait3.pl +++ b/test_regress/t/t_timing_wait3.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_wait_long.pl b/test_regress/t/t_timing_wait_long.pl index 3feb337e3..f686c3eec 100755 --- a/test_regress/t/t_timing_wait_long.pl +++ b/test_regress/t/t_timing_wait_long.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_zerodly.pl b/test_regress/t/t_timing_zerodly.pl index bbc99cfb6..9d615c1c3 100755 --- a/test_regress/t/t_timing_zerodly.pl +++ b/test_regress/t/t_timing_zerodly.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_timing_zerodly_unsup.pl b/test_regress/t/t_timing_zerodly_unsup.pl index 2d852adb1..5439c7838 100755 --- a/test_regress/t/t_timing_zerodly_unsup.pl +++ b/test_regress/t/t_timing_zerodly_unsup.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_trace_binary.pl b/test_regress/t/t_trace_binary.pl index 8304613d5..321b41ed5 100755 --- a/test_regress/t/t_trace_binary.pl +++ b/test_regress/t/t_trace_binary.pl @@ -17,7 +17,6 @@ compile( verilator_flags2 => ['--binary --trace'], verilator_make_cmake => 0, verilator_make_gmake => 0, - make_main => 0, ); execute( diff --git a/test_regress/t/t_trace_binary_flag_off.pl b/test_regress/t/t_trace_binary_flag_off.pl index 6de81c2ca..4a099bdc7 100755 --- a/test_regress/t/t_trace_binary_flag_off.pl +++ b/test_regress/t/t_trace_binary_flag_off.pl @@ -19,7 +19,6 @@ compile( verilator_flags2 => ['--binary'], verilator_make_cmake => 0, verilator_make_gmake => 0, - make_main => 0, ); execute( diff --git a/test_regress/t/t_trace_param_override.pl b/test_regress/t/t_trace_param_override.pl index 4e2cf6e81..51a8874fe 100755 --- a/test_regress/t/t_trace_param_override.pl +++ b/test_regress/t/t_trace_param_override.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --trace -GPOVERRODE=31"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_trace_ub_misaligned_address.pl b/test_regress/t/t_trace_ub_misaligned_address.pl index 83dcf0fb4..bc08c02fe 100755 --- a/test_regress/t/t_trace_ub_misaligned_address.pl +++ b/test_regress/t/t_trace_ub_misaligned_address.pl @@ -18,7 +18,6 @@ compile( "-LDFLAGS -fsanitize=address,undefined"], verilator_make_cmake => 0, verilator_make_gmake => 0, - make_main => 0, ); execute( diff --git a/test_regress/t/t_var_extern_method_lifetime.pl b/test_regress/t/t_var_extern_method_lifetime.pl index b8493bd06..929ae897c 100755 --- a/test_regress/t/t_var_extern_method_lifetime.pl +++ b/test_regress/t/t_var_extern_method_lifetime.pl @@ -12,7 +12,6 @@ scenarios(simulator => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_virtual_interface_method.pl b/test_regress/t/t_virtual_interface_method.pl index 2d5085be1..9a53332e0 100755 --- a/test_regress/t/t_virtual_interface_method.pl +++ b/test_regress/t/t_virtual_interface_method.pl @@ -13,7 +13,6 @@ scenarios(simulator => 1); compile( v_flags2 => ["--binary"], verilator_make_gmake => 0, - make_main => 0, ); execute( diff --git a/test_regress/t/t_vlt_timing.pl b/test_regress/t/t_vlt_timing.pl index d816239d3..78679cf79 100755 --- a/test_regress/t/t_vlt_timing.pl +++ b/test_regress/t/t_vlt_timing.pl @@ -14,7 +14,6 @@ top_filename("t/t_timing_off.v"); compile( verilator_flags2 => ["--exe --main --timing t/t_vlt_timing.vlt"], - make_main => 0, ); execute( diff --git a/test_regress/t/t_wait_fork.pl b/test_regress/t/t_wait_fork.pl index 0db50fc52..47728df81 100755 --- a/test_regress/t/t_wait_fork.pl +++ b/test_regress/t/t_wait_fork.pl @@ -12,7 +12,6 @@ scenarios(linter => 1); compile( verilator_flags2 => ["--exe --main --timing"], - make_main => 0, ); execute(