diff --git a/test_regress/driver.pl b/test_regress/driver.pl index 5d4f6c4a6..af6cb9854 100755 --- a/test_regress/driver.pl +++ b/test_regress/driver.pl @@ -633,10 +633,6 @@ sub compile { $self->skip("Test requires SystemC; ignore error since not installed\n"); return 1; } - elsif ($self->{coverage} && !$Have_System_Perl) { - $self->skip("Test requires SystemPerl; ignore error since not installed\n"); - return 1; - } if (!$param{fails} && $param{verilator_make_gcc} && $param{make_main}) { diff --git a/test_regress/t/t_assert_basic_cover.pl b/test_regress/t/t_assert_basic_cover.pl index e10bc2ed7..a14ea162d 100755 --- a/test_regress/t/t_assert_basic_cover.pl +++ b/test_regress/t/t_assert_basic_cover.pl @@ -10,7 +10,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di top_filename("t/t_assert_basic.v"); compile ( - verilator_flags2 => ['--assert --sp --coverage-user'], + verilator_flags2 => ['--assert --cc --coverage-user'], ); execute ( diff --git a/test_regress/t/t_assert_cover.pl b/test_regress/t/t_assert_cover.pl index f20a45b66..9b33acb48 100755 --- a/test_regress/t/t_assert_cover.pl +++ b/test_regress/t/t_assert_cover.pl @@ -10,7 +10,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di top_filename("t/t_assert_cover.v"); compile ( - verilator_flags2 => ['--assert --sp --coverage-user'], + verilator_flags2 => ['--assert --cc --coverage-user'], nc_flags2 => ["+nccovoverwrite +nccoverage+all +nccovtest+$Self->{name}"] ); diff --git a/test_regress/t/t_cover_sva_notflat.pl b/test_regress/t/t_cover_sva_notflat.pl index 5d55d601e..9ee0511c3 100755 --- a/test_regress/t/t_cover_sva_notflat.pl +++ b/test_regress/t/t_cover_sva_notflat.pl @@ -8,7 +8,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Version 2.0. compile ( - verilator_flags2 => ['--assert --sp --coverage-user'], + verilator_flags2 => ['--assert --cc --coverage-user'], ); execute ( diff --git a/test_regress/t/t_cover_toggle.pl b/test_regress/t/t_cover_toggle.pl index 9b6805861..274713088 100755 --- a/test_regress/t/t_cover_toggle.pl +++ b/test_regress/t/t_cover_toggle.pl @@ -8,7 +8,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Version 2.0. compile ( - verilator_flags2 => ['--sp --coverage-toggle --stats'], + verilator_flags2 => ['--cc --coverage-toggle --stats'], ); execute ( diff --git a/test_regress/t/t_flag_werror_bad2.pl b/test_regress/t/t_flag_werror_bad2.pl index 41c91e2e8..c6786b573 100755 --- a/test_regress/t/t_flag_werror_bad2.pl +++ b/test_regress/t/t_flag_werror_bad2.pl @@ -12,7 +12,7 @@ top_filename("t/t_flag_werror.v"); compile ( v_flags2 => ["--lint-only"], fails=>$Self->{v3}, - verilator_flags=> [qw(-sp -Werror-WIDTH)], + verilator_flags=> [qw(-cc -Werror-WIDTH)], expect=> q{%Error-WIDTH: t/t_flag_werror.v:\d+: Operator ASSIGNW expects 4 bits on the Assign RHS, but Assign RHS.s CONST '6'h2e' generates 6 bits. %Error: Exiting due to}, diff --git a/test_regress/t/t_inst_overwide.pl b/test_regress/t/t_inst_overwide.pl index d5af5378b..2d0bd83ee 100755 --- a/test_regress/t/t_inst_overwide.pl +++ b/test_regress/t/t_inst_overwide.pl @@ -9,7 +9,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di compile ( make_top_shell=>0, - verilator_flags2 => [qw(-sp -Wno-WIDTH)], + verilator_flags2 => [qw(-sc -Wno-WIDTH)], verilator_make_gcc=>0, ); diff --git a/test_regress/t/t_inst_overwide_bad.pl b/test_regress/t/t_inst_overwide_bad.pl index 4a2e845a6..6e0b9ae94 100755 --- a/test_regress/t/t_inst_overwide_bad.pl +++ b/test_regress/t/t_inst_overwide_bad.pl @@ -12,7 +12,7 @@ top_filename("t/t_inst_overwide.v"); compile ( v_flags2 => ["--lint-only"], make_top_shell=>0, - verilator_flags=> [qw(-sp)], + verilator_flags=> [qw(-cc)], verilator_make_gcc=>0, fails=>$Self->{v3}, expect=> diff --git a/test_regress/t/t_mem_multidim_trace.pl b/test_regress/t/t_mem_multidim_trace.pl index 05a99688c..b8a04271d 100755 --- a/test_regress/t/t_mem_multidim_trace.pl +++ b/test_regress/t/t_mem_multidim_trace.pl @@ -10,7 +10,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di top_filename("t/t_mem_multidim.v"); compile ( - verilator_flags2 => ['--sp --trace'], + verilator_flags2 => ['--cc --trace'], ); execute (