github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-04-05 20:22:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Imply no driver.pl make when using --build. No functional change intended

Browse Source
This commit is contained in:
Wilson Snyder 2024-01-20 10:37:35 -05:00
parent 375a121377
commit a43fd06f85
23 changed files with 4 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test_regress/driver.pl
View File

@ -1023,6 +1023,10 @@ sub compile {
$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/);
if ($checkflags =~ / -?-build\b/ || $checkflags =~ / -?-binary\b/) {
$param{verilator_make_cmake} = 0;
$param{verilator_make_gmake} = 0;
}
$self->{threads} = $param{threads};
$self->{context_threads} = $param{context_threads};

2
test_regress/t/t_cxx_equal_to.pl
View File

@ -14,8 +14,6 @@ top_filename("t/t_cxx_equal_to.v");
compile(
verilator_flags2 => ['--binary --timing --trace'],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
);
execute(

4
test_regress/t/t_dfg_peephole.pl
View File

@ -59,8 +59,6 @@ close $wrFile;
compile(
verilator_flags2 => ["--stats", "--build", "-fno-dfg", "+incdir+$Self->{obj_dir}",
"-Mdir", "$Self->{obj_dir}/obj_ref", "--prefix", "Vref"],
verilator_make_gmake => 0,
verilator_make_cmake => 0
);
# Compile optimized - also builds executable
@ -72,8 +70,6 @@ compile(
"-CFLAGS \"-I .. -I ../obj_ref\"",
"../obj_ref/Vref__ALL.a",
"../../t/$Self->{name}.cpp"],
verilator_make_gmake => 0,
verilator_make_cmake => 0
);
# Execute test to check equivalence

2
test_regress/t/t_flag_binary.pl
View File

@ -17,8 +17,6 @@ compile(
"-Mdir $Self->{obj_dir}",
"--debug-check", ],
verilator_flags2 => ['--binary'],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
);
execute(

2
test_regress/t/t_flag_binary_parallel.pl
View File

@ -17,8 +17,6 @@ compile(
"-Mdir $Self->{obj_dir}",
"--debug-check", ],
verilator_flags2 => ['--binary', '--output-split 1'],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
make_main => 0,
);

2
test_regress/t/t_flag_build.pl
View File

@ -12,8 +12,6 @@ scenarios(simulator => 1);
top_filename("t/t_flag_make_cmake.v");
compile( # Don't call cmake nor gmake from driver.pl
verilator_make_cmake => 0,
verilator_make_gmake => 0,
verilator_flags2 => ['--exe --cc --build -j 2',
'../' . $Self->{main_filename},
'-MAKEFLAGS -p --trace'],

2
test_regress/t/t_flag_build_bad2.pl
View File

@ -12,8 +12,6 @@ scenarios(vlt => 1);
top_filename("t/t_flag_make_cmake.v");
compile(
verilator_make_cmake => 0,
verilator_make_gmake => 0,
# Need --no-print-directory so golden file doesn't compare directory names
verilator_flags2 => ["--build --MAKEFLAGS --no-print-directory"
." --MAKEFLAGS illegal-flag-to-fail-make"],

2
test_regress/t/t_flag_build_jobs_and_j.pl
View File

@ -12,8 +12,6 @@ scenarios(simulator => 1);
top_filename("t/t_flag_make_cmake.v");
compile(
verilator_make_cmake => 0,
verilator_make_gmake => 0,
verilator_flags2 => ['--exe --cc --build -j 10 --build-jobs 2 --stats',
'../' . $Self->{main_filename}],
);

2
test_regress/t/t_flag_main.pl
View File

@ -15,8 +15,6 @@ compile(
"-Mdir $Self->{obj_dir}",
"--debug-check", ],
verilator_flags2 => ['--exe --build --main'],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
# Check that code --main produces uses only most modern API features
make_flags => 'CPPFLAGS_ADD=-DVL_NO_LEGACY',
);

2
test_regress/t/t_flag_main_sc_bad.pl
View File

@ -12,8 +12,6 @@ scenarios(vlt => 1);
lint(
verilator_flags2 => ['--exe --build --main --sc'],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
fails => 1,
expect_filename => $Self->{golden_filename},
);

2
test_regress/t/t_flag_main_top_name.pl
View File

@ -15,8 +15,6 @@ top_filename("t/t_flag_main_top_name.v");
compile(
verilator_flags => ["-Mdir $Self->{obj_dir}", "--exe", "--build", "--main"],
verilator_flags2 => ["--top-module top", "--main-top-name ALTOP"],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
make_main => 0,
);

2
test_regress/t/t_flag_main_top_name_empty.pl
View File

@ -15,8 +15,6 @@ top_filename("t/t_flag_main_top_name.v");
compile(
verilator_flags => ["-Mdir $Self->{obj_dir}", "--exe", "--build", "--main"],
verilator_flags2 => ["--top-module top", "--main-top-name -", "-DMAIN_TOP_NAME_EMPTY"],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
make_main => 0,
);

2
test_regress/t/t_flag_only_bad.pl
View File

@ -12,8 +12,6 @@ scenarios(vlt => 1);
top_filename("t/t_flag_main.v");
lint(
verilator_make_cmake => 0,
verilator_make_gmake => 0,
verilator_flags2 => ["--binary -E --dpi-hdr-only --lint-only --xml-only -Wall"],
fails => 1,
expect_filename => $Self->{golden_filename},

2
test_regress/t/t_flag_only_bad2.pl
View File

@ -12,8 +12,6 @@ scenarios(vlt => 1);
top_filename("t/t_flag_main.v");
lint(
verilator_make_cmake => 0,
verilator_make_gmake => 0,
verilator_flags2 => ["--build -E -Wno-fatal --dpi-hdr-only --lint-only --xml-only"],
fails => 1,
expect_filename => $Self->{golden_filename},

2
test_regress/t/t_flag_verilate.pl
View File

@ -43,8 +43,6 @@ if ( ! -e $Self->{obj_dir} . '/Vt_flag_verilate.mk' ) {
# Just build, no Verilation. .tree must not be saved even with --dump-tree option.
compile( # Don't call cmake nor gmake from driver.pl. Just build here
verilator_make_cmake => 0,
verilator_make_gmake => 0,
verilator_flags2 => ['--exe --cc --build --no-verilate',
'../' . $Self->{main_filename},
'--debugi 1 --dump-tree --dump-tree-addrids'],

2
test_regress/t/t_stack_check.pl
View File

@ -12,8 +12,6 @@ scenarios(vlt => 1);
compile(
verilator_flags2 => ['--binary --debug-stack-check'],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
);
execute();

4
test_regress/t/t_timing_long.pl
View File

@ -57,8 +57,6 @@ gen($Self->{top_filename});
if ($Self->have_coroutines) {
compile(
verilator_flags2 => ["--exe --build --main --tim" . "ing"],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
make_top => 1,
);
@ -69,8 +67,6 @@ if ($Self->have_coroutines) {
compile(
verilator_flags2 => ["--exe --build --main --no-timing -Wno-STMTDLY"],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
make_top => 1,
);

2
test_regress/t/t_trace_binary.pl
View File

@ -15,8 +15,6 @@ compile(
"-Mdir $Self->{obj_dir}",
"--debug-check", ],
verilator_flags2 => ['--binary --trace'],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
);
execute(

2
test_regress/t/t_trace_binary_flag_off.pl
View File

@ -17,8 +17,6 @@ compile(
"-Mdir $Self->{obj_dir}",
"--debug-check", ],
verilator_flags2 => ['--binary'],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
);
execute(

2
test_regress/t/t_trace_timing1.pl
View File

@ -15,8 +15,6 @@ compile(
"-Mdir $Self->{obj_dir}",
"--debug-check", ],
verilator_flags2 => ['--binary --trace'],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
make_main => 0,
);

2
test_regress/t/t_trace_ub_misaligned_address.pl
View File

@ -16,8 +16,6 @@ compile(
verilator_flags2 => ["--binary --trace",
"-CFLAGS -fsanitize=address,undefined",
"-LDFLAGS -fsanitize=address,undefined"],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
);
execute(

3
test_regress/t/t_unroll_delay.pl
View File

@ -12,9 +12,6 @@ scenarios(simulator => 1);
compile(
verilator_flags2 => ['--binary --timing --trace'],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
make_main => 0,
);
execute(

3
test_regress/t/t_wait_const.pl
View File

@ -12,9 +12,6 @@ scenarios(vlt => 1);
compile(
verilator_flags2 => ["--binary"],
verilator_make_cmake => 0,
verilator_make_gmake => 0,
make_main => 0,
);
execute(