Tests: Imply make_main=>0 on --main tests

This commit is contained in:
Wilson Snyder 2024-01-20 10:17:35 -05:00
parent c30b9d04a8
commit fef0502d50
85 changed files with 23 additions and 102 deletions

View File

@ -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 = ();

View File

@ -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(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -14,7 +14,6 @@ top_filename("t/t_clocking_timing.v");
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -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(

View File

@ -16,7 +16,6 @@ compile(
verilator_flags2 => ['--binary --timing --trace'],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(vlt => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(linter => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
threads => 1,
);

View File

@ -19,7 +19,6 @@ compile(
verilator_flags2 => ['--binary'],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
make_main => 0,
);
execute(

View File

@ -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',
);

View File

@ -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},
);

View File

@ -16,7 +16,6 @@ compile(
"--exe", "--main", "--stats", "--build"],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
# issue #4471 - remove this
verilator_make_gmake => 0,
);

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing -Wall"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --no-timing -Wall"],
make_main => 0,
);
execute(

View File

@ -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(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing -Wall"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
v_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing -Wall"],
make_main => 0,
);
execute(

View File

@ -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(

View File

@ -14,7 +14,6 @@ compile(
verilator_flags2 => ['--binary --debug-stack-check'],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
make_main => 0,
);
execute();

View File

@ -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);

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(linter => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(vlt => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(vlt => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing -Wno-MINTYPMAXDLY"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -14,7 +14,6 @@ top_filename("t/t_timing_sched.v");
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -14,7 +14,6 @@ top_filename("t/t_timing_class.v");
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(vlt => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -20,7 +20,6 @@ compile(
compile(
verilator_flags2 => ["--exe --main --timing -Wno-UNOPTFLAT"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -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(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -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(

View File

@ -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,
);

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -19,7 +19,6 @@ else {
compile(
verilator_flags2 => ["--exe --main --timing --protect-ids",
"--protect-key SECRET_KEY"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing --trace -Wno-MINTYPMAXDLY"],
make_main => 0,
);
execute(

View File

@ -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(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing -Wno-WAITCONST"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -17,7 +17,6 @@ compile(
verilator_flags2 => ['--binary --trace'],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
make_main => 0,
);
execute(

View File

@ -19,7 +19,6 @@ compile(
verilator_flags2 => ['--binary'],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --trace -GPOVERRODE=31"],
make_main => 0,
);
execute(

View File

@ -18,7 +18,6 @@ compile(
"-LDFLAGS -fsanitize=address,undefined"],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
make_main => 0,
);
execute(

View File

@ -12,7 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(

View File

@ -13,7 +13,6 @@ scenarios(simulator => 1);
compile(
v_flags2 => ["--binary"],
verilator_make_gmake => 0,
make_main => 0,
);
execute(

View File

@ -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(

View File

@ -12,7 +12,6 @@ scenarios(linter => 1);
compile(
verilator_flags2 => ["--exe --main --timing"],
make_main => 0,
);
execute(