forked from github/verilator
Remove always true cfg_with_threaded from test driver
This commit is contained in:
parent
1bb6433649
commit
383e384739
@ -1110,11 +1110,6 @@ sub compile {
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($self->{vltmt} && !$self->cfg_with_threaded) {
|
|
||||||
$self->skip("Test requires Verilator configured with threads\n");
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($param{verilator_make_cmake} && !$self->have_cmake) {
|
if ($param{verilator_make_cmake} && !$self->have_cmake) {
|
||||||
$self->skip("Test requires CMake; ignore error since not available or version too old\n");
|
$self->skip("Test requires CMake; ignore error since not available or version too old\n");
|
||||||
return 1;
|
return 1;
|
||||||
@ -2340,10 +2335,6 @@ sub cxx_version {
|
|||||||
return $_Cxx_Version;
|
return $_Cxx_Version;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub cfg_with_threaded {
|
|
||||||
return 1; # C++11 now always required
|
|
||||||
}
|
|
||||||
|
|
||||||
our $_Cfg_with_ccache;
|
our $_Cfg_with_ccache;
|
||||||
|
|
||||||
sub cfg_with_ccache {
|
sub cfg_with_ccache {
|
||||||
|
@ -17,10 +17,8 @@ compile(
|
|||||||
verilator_flags2 => ["--cc",
|
verilator_flags2 => ["--cc",
|
||||||
"--coverage-toggle --coverage-line --coverage-user",
|
"--coverage-toggle --coverage-line --coverage-user",
|
||||||
"--trace --vpi ",
|
"--trace --vpi ",
|
||||||
($Self->cfg_with_threaded
|
"--threads 2",
|
||||||
? "--threads 2 $root/include/verilated_threads.cpp" : ""),
|
"--trace-threads 1",
|
||||||
($Self->cfg_with_threaded
|
|
||||||
? "--trace-threads 1" : ""),
|
|
||||||
"--prof-exec", "--prof-pgo",
|
"--prof-exec", "--prof-pgo",
|
||||||
"$root/include/verilated_save.cpp"],
|
"$root/include/verilated_save.cpp"],
|
||||||
);
|
);
|
||||||
@ -58,7 +56,7 @@ foreach my $file (sort keys %hit) {
|
|||||||
&& $file !~ /_sc/
|
&& $file !~ /_sc/
|
||||||
&& $file !~ /_fst/
|
&& $file !~ /_fst/
|
||||||
&& $file !~ /_heavy/
|
&& $file !~ /_heavy/
|
||||||
&& ($file !~ /_thread/ || $Self->cfg_with_threaded)) {
|
&& ($file !~ /_thread/)) {
|
||||||
error("Include file not covered by t_verilated_all test: ", $file);
|
error("Include file not covered by t_verilated_all test: ", $file);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user