VeniVidiVici
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Format: perltidy spacing cleanup. No functional change.

This commit is contained in:
Wilson Snyder 2021-09-08 18:45:25 -04:00
parent f67637144f
commit f1b8b1d99b
75 changed files with 236 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bin/verilator
View File

@ -46,7 +46,7 @@ foreach my $sw (@ARGV) {
push @Opt_Verilator_Sw, $sw; push @Opt_Verilator_Sw, $sw;
} }
Getopt::Long::config("no_auto_abbrev","pass_through"); Getopt::Long::config("no_auto_abbrev", "pass_through");
if (! GetOptions( if (! GetOptions(
# Major operating modes # Major operating modes
"help" => \&usage, "help" => \&usage,
@ -106,11 +106,10 @@ if ($opt_gdb) {
. " -ex 'bt' -ex 'quit'"); . " -ex 'bt' -ex 'quit'");
} elsif ($Debug) { } elsif ($Debug) {
# Debug # Debug
run(aslr_off() run(aslr_off() . verilator_bin() . " " . join(' ', @quoted_sw));
. verilator_bin() . " " . join(' ',@quoted_sw));
} else { } else {
# Normal, non gdb # Normal, non gdb
run(verilator_bin() . " " . join(' ',@quoted_sw)); run(verilator_bin() . " " . join(' ', @quoted_sw));
} }
#---------------------------------------------------------------------- #----------------------------------------------------------------------
@ -163,11 +162,11 @@ sub verilator_bin {
sub gdb_works { sub gdb_works {
$! = undef; # Cleanup -x $! = undef; # Cleanup -x
system("gdb /bin/echo" system("gdb /bin/echo"
." --batch-silent --quiet --return-child-result" . " --batch-silent --quiet --return-child-result"
." -ex 'run -n'" # `echo -n` . " -ex 'run -n'" # `echo -n`
." -ex 'set width 0'" . " -ex 'set width 0'"
." -ex 'bt'" . " -ex 'bt'"
." -ex 'quit'"); . " -ex 'quit'");
my $status = $?; my $status = $?;
return $status == 0; return $status == 0;
} }
@ -201,13 +200,13 @@ sub run {
|| ($status & 127) == 8 # SIGFPA || ($status & 127) == 8 # SIGFPA
|| ($status & 127) == 11) { # SIGSEGV || ($status & 127) == 11) { # SIGSEGV
warn "%Error: Verilator internal fault, sorry. " warn "%Error: Verilator internal fault, sorry. "
."Suggest trying --debug --gdbbt\n" if !$Debug; . "Suggest trying --debug --gdbbt\n" if !$Debug;
} elsif (($status & 127) == 6) { # SIGABRT } elsif (($status & 127) == 6) { # SIGABRT
warn "%Error: Verilator aborted. " warn "%Error: Verilator aborted. "
."Suggest trying --debug --gdbbt\n" if !$Debug; . "Suggest trying --debug --gdbbt\n" if !$Debug;
} else { } else {
warn "%Error: Verilator threw signal $status. " warn "%Error: Verilator threw signal $status. "
."Suggest trying --debug --gdbbt\n" if !$Debug; . "Suggest trying --debug --gdbbt\n" if !$Debug;
} }
} }
if (!$opt_quiet_exit && ($status != 256 || $Debug)) { # i.e. not normal exit(1) if (!$opt_quiet_exit && ($status != 256 || $Debug)) { # i.e. not normal exit(1)

65
test_regress/driver.pl
View File

@ -380,7 +380,7 @@ sub one_test {
$self->{unsup_cnt}++; $self->{unsup_cnt}++;
} else { } else {
$test->oprint("FAILED: $test->{errors}\n"); $test->oprint("FAILED: $test->{errors}\n");
my $j = ($opt_jobs>1?" -j":""); my $j = ($opt_jobs > 1 ? " -j" : "");
my $makecmd = $ENV{VERILATOR_MAKE} || "$ENV{MAKE}$j &&"; my $makecmd = $ENV{VERILATOR_MAKE} || "$ENV{MAKE}$j &&";
my $upperdir = (Cwd::getcwd() =~ /test_regress/ my $upperdir = (Cwd::getcwd() =~ /test_regress/
? 'test_regress/' : ''); ? 'test_regress/' : '');
@ -590,9 +590,9 @@ sub new {
.($self->{t_dir} !~ m!/test_regress! # Don't include standard dir, only site's .($self->{t_dir} !~ m!/test_regress! # Don't include standard dir, only site's
? " +incdir+$self->{t_dir} -y $self->{t_dir}" : "") ? " +incdir+$self->{t_dir} -y $self->{t_dir}" : "")
. " " . $define_opt . "TEST_OBJ_DIR=$self->{obj_dir}" . " " . $define_opt . "TEST_OBJ_DIR=$self->{obj_dir}"
.($opt_verbose ? " " . $define_opt . "TEST_VERBOSE=1":"") .($opt_verbose ? " " . $define_opt . "TEST_VERBOSE=1" : "")
.($opt_benchmark ? " " . $define_opt . "TEST_BENCHMARK=$opt_benchmark":"") .($opt_benchmark ? " " . $define_opt . "TEST_BENCHMARK=$opt_benchmark" : "")
.($opt_trace ? " " . $define_opt . "WAVES=1":"") .($opt_trace ? " " . $define_opt . "WAVES=1" : "")
))], ))],
v_flags2 => [], # Overridden in some sim files v_flags2 => [], # Overridden in some sim files
v_other_filenames => [], # After the filename so we can spec multiple files v_other_filenames => [], # After the filename so we can spec multiple files
@ -601,14 +601,14 @@ sub new {
. (($^O eq "darwin" ) . (($^O eq "darwin" )
? " -Wl,-undefined,dynamic_lookup" ? " -Wl,-undefined,dynamic_lookup"
: " -export-dynamic") : " -export-dynamic")
. ($opt_verbose ? " -DTEST_VERBOSE=1":"") . ($opt_verbose ? " -DTEST_VERBOSE=1" : "")
. (cfg_with_m32() ? " -m32" : "") . (cfg_with_m32() ? " -m32" : "")
. " -o $self->{obj_dir}/libvpi.so"], . " -o $self->{obj_dir}/libvpi.so"],
tool_c_flags => [], tool_c_flags => [],
# ATSIM # ATSIM
atsim => 0, atsim => 0,
atsim_define => 'ATSIM', atsim_define => 'ATSIM',
atsim_flags => [split(/\s+/,"-c +sv +define+ATSIM"), atsim_flags => [split(/\s+/, "-c +sv +define+ATSIM"),
"+sv_dir+$self->{obj_dir}/.athdl_compile"], "+sv_dir+$self->{obj_dir}/.athdl_compile"],
atsim_flags2 => [], # Overridden in some sim files atsim_flags2 => [], # Overridden in some sim files
atsim_run_flags => [], atsim_run_flags => [],
@ -616,44 +616,44 @@ sub new {
ghdl => 0, ghdl => 0,
ghdl_define => 'GHDL', ghdl_define => 'GHDL',
ghdl_work_dir => "$self->{obj_dir}/ghdl_compile", ghdl_work_dir => "$self->{obj_dir}/ghdl_compile",
ghdl_flags => [($::Debug?"-v":""), ghdl_flags => [($::Debug ? "-v" : ""),
"--workdir=$self->{obj_dir}/ghdl_compile", ], "--workdir=$self->{obj_dir}/ghdl_compile", ],
ghdl_flags2 => [], # Overridden in some sim files ghdl_flags2 => [], # Overridden in some sim files
ghdl_run_flags => [], ghdl_run_flags => [],
# IV # IV
iv => 0, iv => 0,
iv_define => 'IVERILOG', iv_define => 'IVERILOG',
iv_flags => [split(/\s+/,"+define+IVERILOG -g2012 -o $self->{obj_dir}/simiv")], iv_flags => [split(/\s+/, "+define+IVERILOG -g2012 -o $self->{obj_dir}/simiv")],
iv_flags2 => [], # Overridden in some sim files iv_flags2 => [], # Overridden in some sim files
iv_pli => 0, # need to use pli iv_pli => 0, # need to use pli
iv_run_flags => [], iv_run_flags => [],
# VCS # VCS
vcs => 0, vcs => 0,
vcs_define => 'VCS', vcs_define => 'VCS',
vcs_flags => [split(/\s+/,"+vcs+lic+wait +cli -debug_access +define+VCS+1 -q -sverilog -CFLAGS '-DVCS' ")], vcs_flags => [split(/\s+/, "+vcs+lic+wait +cli -debug_access +define+VCS+1 -q -sverilog -CFLAGS '-DVCS' ")],
vcs_flags2 => [], # Overridden in some sim files vcs_flags2 => [], # Overridden in some sim files
vcs_run_flags => [split(/\s+/,"+vcs+lic_wait")], vcs_run_flags => [split(/\s+/, "+vcs+lic_wait")],
# NC # NC
nc => 0, nc => 0,
nc_define => 'NC', nc_define => 'NC',
nc_flags => [split(/\s+/,("+licqueue +nowarn+LIBNOU +define+NC=1 -q +assert +sv -c " nc_flags => [split(/\s+/, ("+licqueue +nowarn+LIBNOU +define+NC=1 -q +assert +sv -c "
.($opt_trace ? " +access+r":"")))], . ($opt_trace ? " +access+r" : "")))],
nc_flags2 => [], # Overridden in some sim files nc_flags2 => [], # Overridden in some sim files
nc_run_flags => [split(/\s+/,"+licqueue -q +assert +sv -R")], nc_run_flags => [split(/\s+/, "+licqueue -q +assert +sv -R")],
# ModelSim # ModelSim
ms => 0, ms => 0,
ms_define => 'MS', ms_define => 'MS',
ms_flags => [split(/\s+/, ("-sv -work $self->{obj_dir}/work +define+MS=1 -ccflags \"-DMS=1\""))], ms_flags => [split(/\s+/, ("-sv -work $self->{obj_dir}/work +define+MS=1 -ccflags \"-DMS=1\""))],
ms_flags2 => [], # Overridden in some sim files ms_flags2 => [], # Overridden in some sim files
ms_pli => 1, # need to use pli ms_pli => 1, # need to use pli
ms_run_flags => [split(/\s+/,"-lib $self->{obj_dir}/work -c -do 'run -all;quit' ")], ms_run_flags => [split(/\s+/, "-lib $self->{obj_dir}/work -c -do 'run -all;quit' ")],
# XSim # XSim
xsim => 0, xsim => 0,
xsim_define => 'XSIM', xsim_define => 'XSIM',
xsim_flags => [split(/\s+/,("--nolog --sv --define XSIM --work $self->{name}=$self->{obj_dir}/xsim"))], xsim_flags => [split(/\s+/, ("--nolog --sv --define XSIM --work $self->{name}=$self->{obj_dir}/xsim"))],
xsim_flags2 => [], # Overridden in some sim files xsim_flags2 => [], # Overridden in some sim files
xsim_run_flags => [split(/\s+/,("--nolog --runall --lib $self->{name}=$self->{obj_dir}/xsim" xsim_run_flags => [split(/\s+/, ("--nolog --runall --lib $self->{name}=$self->{obj_dir}/xsim"
.($opt_trace ? " --debug all":"")))], .($opt_trace ? " --debug all" : "")))],
xsim_run_flags2 => [], # Overridden in some sim files xsim_run_flags2 => [], # Overridden in some sim files
# Verilator # Verilator
vlt => 0, vlt => 0,
@ -1040,7 +1040,7 @@ sub compile {
cmd=>[($ENV{VERILATOR_VCS} || "vcs"), cmd=>[($ENV{VERILATOR_VCS} || "vcs"),
@{$param{vcs_flags}}, @{$param{vcs_flags}},
@{$param{vcs_flags2}}, @{$param{vcs_flags2}},
($opt_verbose ? " -CFLAGS -DTEST_VERBOSE=1":""), ($opt_verbose ? " -CFLAGS -DTEST_VERBOSE=1" : ""),
@{$param{v_flags}}, @{$param{v_flags}},
@{$param{v_flags2}}, @{$param{v_flags2}},
$param{top_filename}, $param{top_filename},
@ -1194,7 +1194,7 @@ sub compile {
"VM_PREFIX=$self->{VM_PREFIX}", "VM_PREFIX=$self->{VM_PREFIX}",
"TEST_OBJ_DIR=$self->{obj_dir}", "TEST_OBJ_DIR=$self->{obj_dir}",
"CPPFLAGS_DRIVER=-D" . uc($self->{name}), "CPPFLAGS_DRIVER=-D" . uc($self->{name}),
($self->{verbose} ? "CPPFLAGS_DRIVER2=-DTEST_VERBOSE=1":""), ($self->{verbose} ? "CPPFLAGS_DRIVER2=-DTEST_VERBOSE=1" : ""),
($param{benchmark} ? "" : "OPT_FAST=-O0"), ($param{benchmark} ? "" : "OPT_FAST=-O0"),
($param{benchmark} ? "" : "OPT_GLOBAL=-O0"), ($param{benchmark} ? "" : "OPT_GLOBAL=-O0"),
"$self->{VM_PREFIX}", # bypass default rule, as we don't need archive "$self->{VM_PREFIX}", # bypass default rule, as we don't need archive
@ -1207,7 +1207,7 @@ sub compile {
$self->_run(logfile => "$self->{obj_dir}/vlt_cmake_build.log", $self->_run(logfile => "$self->{obj_dir}/vlt_cmake_build.log",
cmd => ["cmake", cmd => ["cmake",
"--build", $self->{obj_dir}, "--build", $self->{obj_dir},
($self->{verbose}?"--verbose":""), ($self->{verbose} ? "--verbose" : ""),
]); ]);
} }
} }
@ -1572,6 +1572,7 @@ sub run {
my $self = (ref $_[0] ? shift : $Self); my $self = (ref $_[0] ? shift : $Self);
$self->_run(@_); $self->_run(@_);
} }
sub _run { sub _run {
my $self = (ref $_[0] ? shift : $Self); my $self = (ref $_[0] ? shift : $Self);
my %param = (tee => 1, my %param = (tee => 1,
@ -1803,7 +1804,7 @@ sub _make_main {
print $fh "extern int sc_main(int argc, char** argv);\n"; print $fh "extern int sc_main(int argc, char** argv);\n";
print $fh "int sc_main(int argc, char** argv) {\n"; print $fh "int sc_main(int argc, char** argv) {\n";
print $fh " sc_signal<bool> fastclk;\n" if $self->{inputs}{fastclk}; print $fh " sc_signal<bool> fastclk;\n" if $self->{inputs}{fastclk};
print $fh " sc_signal<bool> clk;\n" if $self->{inputs}{clk}; print $fh " sc_signal<bool> clk;\n" if $self->{inputs}{clk};
print $fh " sc_set_time_resolution(1, $Self->{sc_time_resolution});\n"; print $fh " sc_set_time_resolution(1, $Self->{sc_time_resolution});\n";
print $fh " sc_time sim_time($self->{sim_time}, $Self->{sc_time_resolution});\n"; print $fh " sc_time sim_time($self->{sim_time}, $Self->{sc_time_resolution});\n";
} else { } else {
@ -1846,6 +1847,7 @@ sub _make_main {
$fh->print(" std::unique_ptr<VerilatedVcdSc> tfp{new VerilatedVcdSc};\n") if $self->{trace_format} eq 'vcd-sc'; $fh->print(" std::unique_ptr<VerilatedVcdSc> tfp{new VerilatedVcdSc};\n") if $self->{trace_format} eq 'vcd-sc';
$fh->print(" topp->trace(tfp.get(), 99);\n"); $fh->print(" topp->trace(tfp.get(), 99);\n");
$fh->print(" tfp->open(\"" . $self->trace_filename . "\");\n"); $fh->print(" tfp->open(\"" . $self->trace_filename . "\");\n");
if ($self->{trace} && !$self->sc) { if ($self->{trace} && !$self->sc) {
$fh->print(" if (tfp) tfp->dump(contextp->time());\n"); $fh->print(" if (tfp) tfp->dump(contextp->time());\n");
} }
@ -2331,7 +2333,7 @@ sub _vcd_read {
push @hier, $hier[$#hier]->{$1}; push @hier, $hier[$#hier]->{$1};
$lasthier = $hier[$#hier]; $lasthier = $hier[$#hier];
} elsif ($line =~ /(\$var \S+\s+\d+\s+)\S+\s+(\S+)/) { } elsif ($line =~ /(\$var \S+\s+\d+\s+)\S+\s+(\S+)/) {
$hier[$#hier]->{$1.$2} ||= {}; $hier[$#hier]->{$1 . $2} ||= {};
$lasthier = $hier[$#hier]; $lasthier = $hier[$#hier];
} elsif ($line =~ /(\$attrbegin .* \$end)/) { } elsif ($line =~ /(\$attrbegin .* \$end)/) {
if ($lasthier) { $lasthier->{$1} ||= 1; } if ($lasthier) { $lasthier->{$1} ||= 1; }
@ -2347,6 +2349,7 @@ sub _vcd_read {
} }
our $_Cxx_Version; our $_Cxx_Version;
sub cxx_version { sub cxx_version {
$_Cxx_Version ||= `$ENV{MAKE} -C $ENV{VERILATOR_ROOT}/test_regress -f Makefile print-cxx-version`; $_Cxx_Version ||= `$ENV{MAKE} -C $ENV{VERILATOR_ROOT}/test_regress -f Makefile print-cxx-version`;
return $_Cxx_Version; return $_Cxx_Version;
@ -2357,12 +2360,14 @@ sub cfg_with_threaded {
} }
our $_Cfg_with_ccache; our $_Cfg_with_ccache;
sub cfg_with_ccache { sub cfg_with_ccache {
$_Cfg_with_ccache ||= `grep "OBJCACHE \?= ccache" "$ENV{VERILATOR_ROOT}/include/verilated.mk"` ne ""; $_Cfg_with_ccache ||= `grep "OBJCACHE \?= ccache" "$ENV{VERILATOR_ROOT}/include/verilated.mk"` ne "";
return $_Cfg_with_ccache; return $_Cfg_with_ccache;
} }
our $_Cfg_with_m32; our $_Cfg_with_m32;
sub cfg_with_m32 { sub cfg_with_m32 {
$_Cfg_with_m32 ||= `grep "CXX.*=.*-m32" "$ENV{VERILATOR_ROOT}/include/verilated.mk"` ne ""; $_Cfg_with_m32 ||= `grep "CXX.*=.*-m32" "$ENV{VERILATOR_ROOT}/include/verilated.mk"` ne "";
return $_Cfg_with_m32; return $_Cfg_with_m32;
@ -2506,7 +2511,7 @@ sub file_sed {
sub extract { sub extract {
my $self = (ref $_[0] ? shift : $Self); my $self = (ref $_[0] ? shift : $Self);
my %param = (#in =>, my %param = ( #in =>,
#out => #out =>
regexp => qr/.*/, regexp => qr/.*/,
lineno_adjust => -9999, lineno_adjust => -9999,
@ -2552,6 +2557,7 @@ sub extract {
$fhw->print(" :linenos:\n") if $lang && $#out > 0; $fhw->print(" :linenos:\n") if $lang && $#out > 0;
$fhw->print(" :emphasize-lines: ${emph}\n") if $emph; $fhw->print(" :emphasize-lines: ${emph}\n") if $emph;
$fhw->print("\n"); $fhw->print("\n");
foreach my $line (@out) { foreach my $line (@out) {
$fhw->print($line); $fhw->print($line);
} }
@ -2592,6 +2598,7 @@ sub new {
bless $self, $class; bless $self, $class;
return $self; return $self;
} }
sub schedule { sub schedule {
my $self = shift; my $self = shift;
my %params = (@_); my %params = (@_);
@ -2606,12 +2613,12 @@ sub schedule {
$params{run_on_finish}->($self); $params{run_on_finish}->($self);
return $self; return $self;
} }
sub max_proc {} sub max_proc { }
sub sig_child {} sub sig_child { }
sub kill_tree_all {} sub kill_tree_all { }
sub wait_all {} sub wait_all { }
sub ready {} sub ready { }
sub running {} sub running { }
sub is_any_left { return 0; } sub is_any_left { return 0; }
####################################################################### #######################################################################

2
test_regress/t/t_a4_examples.pl
View File

@ -14,7 +14,7 @@ $Self->{clean_command} = 'rm -rf ../examples/*/build ../examples/*/obj*';
my @examples = sort(glob("../examples/*")); my @examples = sort(glob("../examples/*"));
for my $example (@examples) { for my $example (@examples) {
run(cmd=>["$ENV{MAKE} -C $example"]); run(cmd => ["$ENV{MAKE} -C $example"]);
} }
ok(1); ok(1);

2
test_regress/t/t_assert_cover.pl
View File

@ -33,7 +33,7 @@ if ($Self->{nc}) {
} }
run(logfile => "$Self->{obj_dir}/${name}__nccover.log", run(logfile => "$Self->{obj_dir}/${name}__nccover.log",
tee => 0, tee => 0,
cmd => [($ENV{VERILATOR_ICCR}||'iccr'), cmd => [($ENV{VERILATOR_ICCR} || 'iccr'),
"-test ${name} ${cf}"]); "-test ${name} ${cf}"]);
} }

11
test_regress/t/t_benchmarksim.pl
View File

@ -16,7 +16,7 @@ top_filename("t/t_gen_alw.v");
init_benchmarksim(); init_benchmarksim();
# As an example, compile and simulate the top file with varying optimization level # As an example, compile and simulate the top file with varying optimization level
my @l_opt = (1,2,3); my @l_opt = (1, 2, 3);
foreach my $l_opt (@l_opt) { foreach my $l_opt (@l_opt) {
compile( compile(
@ -29,7 +29,7 @@ foreach my $l_opt (@l_opt) {
); );
} }
my $fh = IO::File->new("<".benchmarksim_filename()) or error("Benchmark data file not found"); my $fh = IO::File->new("<" . benchmarksim_filename()) or error("Benchmark data file not found");
my $lines = 0; my $lines = 0;
while (defined(my $line = $fh->getline)) { while (defined(my $line = $fh->getline)) {
if ($line =~ /^#/) { next; } if ($line =~ /^#/) { next; }
@ -37,16 +37,17 @@ while (defined(my $line = $fh->getline)) {
error("Expected header but found $line") if $line ne "evals, time[s]\n"; error("Expected header but found $line") if $line ne "evals, time[s]\n";
} else { } else {
my @data = grep {$_ != ""} ($line =~ /(\d*\.?\d*)/g); my @data = grep {$_ != ""} ($line =~ /(\d*\.?\d*)/g);
error("Expected 2 tokens on line ".$lines." but got ".scalar(@data)) if scalar(@data) != 2; error("Expected 2 tokens on line " . $lines . " but got " . scalar(@data)) if scalar(@data) != 2;
my $cycles = $data[0]; my $cycles = $data[0];
my $time = $data[1]; my $time = $data[1];
error("Invalid data on line ".$lines) if $cycles <= 0.0 || $time <= 0.0; error("Invalid data on line " . $lines) if $cycles <= 0.0 || $time <= 0.0;
} }
$lines += 1; $lines += 1;
} }
my $n_lines_expected = scalar(@l_opt) + 1; my $n_lines_expected = scalar(@l_opt) + 1;
error("Expected ".$n_lines_expected." lines but found ".$lines) if int($lines) != int($n_lines_expected); error("Expected " . $n_lines_expected . " lines but found " . $lines)
if int($lines) != int($n_lines_expected);
1; 1;
ok(1); ok(1);

4
test_regress/t/t_ccache_report.pl
View File

@ -11,13 +11,13 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(vlt => 1); scenarios(vlt => 1);
if (!$Self->cfg_with_ccache) { if (!$Self->cfg_with_ccache) {
skip("Requires configuring with ccache"); skip("Requires configuring with ccache");
} }
top_filename("t_a1_first_cc.v"); top_filename("t_a1_first_cc.v");
# This test requires rebuilding the object files to check the ccache log # This test requires rebuilding the object files to check the ccache log
foreach my $filename (glob ("$Self->{obj_dir}/*.o")) { foreach my $filename (glob("$Self->{obj_dir}/*.o")) {
print "rm $filename\n" if $Self->{verbose}; print "rm $filename\n" if $Self->{verbose};
unlink $filename; unlink $filename;
} }

2
test_regress/t/t_cellarray.pl
View File

@ -20,7 +20,7 @@ execute(
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/Optimizations, Gate assign merged\s+(\d+)/i, 28); file_grep($Self->{stats}, qr/Optimizations, Gate assign merged\s+(\d+)/i, 28);
}; }
ok(1); ok(1);
1; 1;

4
test_regress/t/t_class_extends_protect_ids.pl
View File

@ -12,8 +12,8 @@ scenarios(vlt_all => 1);
# This test makes randomly named .cpp/.h files, which tend to collect, so remove them first # This test makes randomly named .cpp/.h files, which tend to collect, so remove them first
foreach my $filename (glob ("$Self->{obj_dir}/*_PS*.cpp" foreach my $filename (glob ("$Self->{obj_dir}/*_PS*.cpp"
." $Self->{obj_dir}/*_PS*.h" . " $Self->{obj_dir}/*_PS*.h"
." $Self->{obj_dir}/*.d" )) { . " $Self->{obj_dir}/*.d" )) {
print "rm $filename\n" if $Self->{verbose}; print "rm $filename\n" if $Self->{verbose};
unlink $filename; unlink $filename;
} }

4
test_regress/t/t_class_extends_this_protect_ids.pl
View File

@ -12,8 +12,8 @@ scenarios(vlt_all => 1);
# This test makes randomly named .cpp/.h files, which tend to collect, so remove them first # This test makes randomly named .cpp/.h files, which tend to collect, so remove them first
foreach my $filename (glob ("$Self->{obj_dir}/*_PS*.cpp" foreach my $filename (glob ("$Self->{obj_dir}/*_PS*.cpp"
." $Self->{obj_dir}/*_PS*.h" . " $Self->{obj_dir}/*_PS*.h"
." $Self->{obj_dir}/*.d" )) { . " $Self->{obj_dir}/*.d" )) {
print "rm $filename\n" if $Self->{verbose}; print "rm $filename\n" if $Self->{verbose};
unlink $filename; unlink $filename;
} }

4
test_regress/t/t_class_local_protect_ids.pl
View File

@ -12,8 +12,8 @@ scenarios(vlt_all => 1);
# This test makes randomly named .cpp/.h files, which tend to collect, so remove them first # This test makes randomly named .cpp/.h files, which tend to collect, so remove them first
foreach my $filename (glob ("$Self->{obj_dir}/*_PS*.cpp" foreach my $filename (glob ("$Self->{obj_dir}/*_PS*.cpp"
." $Self->{obj_dir}/*_PS*.h" . " $Self->{obj_dir}/*_PS*.h"
." $Self->{obj_dir}/*.d" )) { . " $Self->{obj_dir}/*.d")) {
print "rm $filename\n" if $Self->{verbose}; print "rm $filename\n" if $Self->{verbose};
unlink $filename; unlink $filename;
} }

4
test_regress/t/t_class_static_method_protect_ids.pl
View File

@ -12,8 +12,8 @@ scenarios(vlt_all => 1);
# This test makes randomly named .cpp/.h files, which tend to collect, so remove them first # This test makes randomly named .cpp/.h files, which tend to collect, so remove them first
foreach my $filename (glob ("$Self->{obj_dir}/*_PS*.cpp" foreach my $filename (glob ("$Self->{obj_dir}/*_PS*.cpp"
." $Self->{obj_dir}/*_PS*.h" . " $Self->{obj_dir}/*_PS*.h"
." $Self->{obj_dir}/*.d" )) { . " $Self->{obj_dir}/*.d")) {
print "rm $filename\n" if $Self->{verbose}; print "rm $filename\n" if $Self->{verbose};
unlink $filename; unlink $filename;
} }

4
test_regress/t/t_class_virtual_protect_ids.pl
View File

@ -12,8 +12,8 @@ scenarios(vlt_all => 1);
# This test makes randomly named .cpp/.h files, which tend to collect, so remove them first # This test makes randomly named .cpp/.h files, which tend to collect, so remove them first
foreach my $filename (glob ("$Self->{obj_dir}/*_PS*.cpp" foreach my $filename (glob ("$Self->{obj_dir}/*_PS*.cpp"
." $Self->{obj_dir}/*_PS*.h" . " $Self->{obj_dir}/*_PS*.h"
." $Self->{obj_dir}/*.d" )) { . " $Self->{obj_dir}/*.d")) {
print "rm $filename\n" if $Self->{verbose}; print "rm $filename\n" if $Self->{verbose};
unlink $filename; unlink $filename;
} }

2
test_regress/t/t_clk_2in.pl
View File

@ -13,7 +13,7 @@ scenarios(simulator => 1);
compile( compile(
make_top_shell => 0, make_top_shell => 0,
make_main => 0, make_main => 0,
verilator_flags2 => ["--exe","$Self->{t_dir}/$Self->{name}.cpp"], verilator_flags2 => ["--exe", "$Self->{t_dir}/$Self->{name}.cpp"],
vcs_flags2 => ['-assert'], vcs_flags2 => ['-assert'],
); );

2
test_regress/t/t_cover_lib.pl
View File

@ -13,7 +13,7 @@ scenarios(vlt => 1);
compile( compile(
v_flags2 => ["--coverage t/t_cover_lib_c.cpp"], v_flags2 => ["--coverage t/t_cover_lib_c.cpp"],
verilator_flags2 => ["--exe -Wall -Wno-DECLFILENAME"], verilator_flags2 => ["--exe -Wall -Wno-DECLFILENAME"],
make_flags => 'CPPFLAGS_ADD=-DTEST_OBJ_DIR="'.$Self->{obj_dir}.'"', make_flags => 'CPPFLAGS_ADD=-DTEST_OBJ_DIR="' . $Self->{obj_dir} . '"',
make_top_shell => 0, make_top_shell => 0,
make_main => 0, make_main => 0,
); );

2
test_regress/t/t_cover_lib_legacy.pl
View File

@ -15,7 +15,7 @@ top_filename("t/t_cover_lib.v");
compile( compile(
v_flags2 => ["--coverage t/t_cover_lib_c.cpp"], v_flags2 => ["--coverage t/t_cover_lib_c.cpp"],
verilator_flags2 => ["--exe -Wall -Wno-DECLFILENAME"], verilator_flags2 => ["--exe -Wall -Wno-DECLFILENAME"],
make_flags => 'CPPFLAGS_ADD=-DTEST_OBJ_DIR="'.$Self->{obj_dir}.'"', make_flags => 'CPPFLAGS_ADD=-DTEST_OBJ_DIR="' . $Self->{obj_dir} . '"',
make_top_shell => 0, make_top_shell => 0,
make_main => 0, make_main => 0,
); );

2
test_regress/t/t_cover_sva_notflat.pl
View File

@ -24,7 +24,7 @@ execute(
# Check that the hierarchy doesn't include __PVT__ # Check that the hierarchy doesn't include __PVT__
# Otherwise our coverage reports would look really ugly # Otherwise our coverage reports would look really ugly
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{coverage_filename}, qr/(top\.t\.sub.*.cyc_eq_5)/) file_grep($Self->{coverage_filename}, qr/(top\.t\.sub.*.cyc_eq_5)/);
} }
ok(1); ok(1);

1
test_regress/t/t_dedupe_clk_gate.pl
View File

@ -21,6 +21,5 @@ if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/Optimizations, Gate sigs deduped\s+(\d+)/i, 4); file_grep($Self->{stats}, qr/Optimizations, Gate sigs deduped\s+(\d+)/i, 4);
} }
ok(1); ok(1);
1; 1;

2
test_regress/t/t_difftree.pl
View File

@ -11,7 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(dist => 1); scenarios(dist => 1);
run(cmd => ["cd $Self->{obj_dir} && $ENV{VERILATOR_ROOT}/bin/verilator_difftree" run(cmd => ["cd $Self->{obj_dir} && $ENV{VERILATOR_ROOT}/bin/verilator_difftree"
." $Self->{t_dir}/t_difftree.a.tree $Self->{t_dir}/t_difftree.b.tree > diff.log"], . " $Self->{t_dir}/t_difftree.a.tree $Self->{t_dir}/t_difftree.b.tree > diff.log"],
check_finished => 0); check_finished => 0);
files_identical("$Self->{obj_dir}/diff.log", $Self->{golden_filename}, 'logfile'); files_identical("$Self->{obj_dir}/diff.log", $Self->{golden_filename}, 'logfile');

6
test_regress/t/t_dist_contributors.pl
View File

@ -38,9 +38,9 @@ sub check {
print "Check: $author\n" if $Self->{verbose}; print "Check: $author\n" if $Self->{verbose};
if (!$Contributors{$author}) { if (!$Contributors{$author}) {
error("Certify your contribution by sorted-inserting '$author' into docs/CONTRIBUTORS.\n" error("Certify your contribution by sorted-inserting '$author' into docs/CONTRIBUTORS.\n"
." If '$author' is not your real name, please fix 'name=' in ~/.gitconfig\n" . " If '$author' is not your real name, please fix 'name=' in ~/.gitconfig\n"
." Also check your https://github.com account's Settings->Profile->Name\n" . " Also check your https://github.com account's Settings->Profile->Name\n"
." matches your ~/.gitconfig 'name='.\n"); . " matches your ~/.gitconfig 'name='.\n");
} }
} }
} }

2
test_regress/t/t_dist_error_format.pl
View File

@ -58,7 +58,7 @@ sub formats {
} }
else { else {
#print "FF $file $line\n"; #print "FF $file $line\n";
$warns{$file.":".$lineno} = $warns{$file . ":" . $lineno} =
"Non-standard warning/error: $file:$lineno: $line"; "Non-standard warning/error: $file:$lineno: $line";
} }
} }

2
test_regress/t/t_dist_install.pl
View File

@ -48,7 +48,7 @@ if (!-r "$root/.git") {
push @files, $file; push @files, $file;
} }
if ($#files >= 0) { if ($#files >= 0) {
error("Uninstall missed files: ", join(' ',@files)); error("Uninstall missed files: ", join(' ', @files));
} }
} }

4
test_regress/t/t_dpi_accessors.pl
View File

@ -14,8 +14,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(simulator => 1); scenarios(simulator => 1);
compile( compile(
make_top_shell => 0, make_top_shell => 0,
make_main => 0, make_main => 0,
verilator_flags2 => ["-Wno-BLKANDNBLK -language 1800-2005 --exe $Self->{t_dir}/$Self->{name}.cpp"], ); verilator_flags2 => ["-Wno-BLKANDNBLK -language 1800-2005 --exe $Self->{t_dir}/$Self->{name}.cpp"], );
execute( execute(

2
test_regress/t/t_dpi_vams.pl
View File

@ -13,7 +13,7 @@ scenarios(simulator => 1);
compile( compile(
make_top_shell => 0, make_top_shell => 0,
make_main => 0, make_main => 0,
verilator_flags2 => ["--exe","$Self->{t_dir}/$Self->{name}.cpp"], verilator_flags2 => ["--exe", "$Self->{t_dir}/$Self->{name}.cpp"],
); );
execute( execute(

2
test_regress/t/t_driver_random.pl
View File

@ -19,7 +19,7 @@ if (!$ENV{VERILATOR_TEST_RANDOM_FAILURE}) {
# Randomly fail to test driver.pl # Randomly fail to test driver.pl
my ($ign, $t) = Time::HiRes::gettimeofday(); my ($ign, $t) = Time::HiRes::gettimeofday();
if ($t % 2) { if ($t % 2) {
error("random failure ".$t); error("random failure " . $t);
} }
else { else {
ok(1); ok(1);

6
test_regress/t/t_embed1.pl
View File

@ -29,9 +29,9 @@ mkdir $child_dir;
run(logfile => "${child_dir}/vlt_gcc.log", run(logfile => "${child_dir}/vlt_gcc.log",
cmd => ["cd ${child_dir} && ", cmd => ["cd ${child_dir} && ",
$ENV{MAKE}, "-f".getcwd()."/Makefile_obj", $ENV{MAKE}, "-f" . getcwd() . "/Makefile_obj",
"CPPFLAGS_DRIVER=-D".uc($self->{name}), "CPPFLAGS_DRIVER=-D" . uc($self->{name}),
($opt_verbose ? "CPPFLAGS_DRIVER2=-DTEST_VERBOSE=1":""), ($opt_verbose ? "CPPFLAGS_DRIVER2=-DTEST_VERBOSE=1" : ""),
"VM_PREFIX=$self->{VM_PREFIX}_child", "VM_PREFIX=$self->{VM_PREFIX}_child",
"V$self->{name}_child__ALL.a", # bypass default rule, make archive "V$self->{name}_child__ALL.a", # bypass default rule, make archive
($param{make_flags}||""), ($param{make_flags}||""),

10
test_regress/t/t_emit_memb_limit.pl
View File

@ -22,17 +22,17 @@ sub gen {
$fh->print(" input clk;\n"); $fh->print(" input clk;\n");
$fh->print(" input i;\n"); $fh->print(" input i;\n");
$fh->print(" output logic o;\n"); $fh->print(" output logic o;\n");
for (my $i=0; $i<($n+1); ++$i) { for (my $i = 0; $i < ($n + 1); ++$i) {
$fh->print(" logic r$i;\n"); $fh->print(" logic r$i;\n");
} }
$fh->print(" always @ (posedge clk) begin\n"); $fh->print(" always @ (posedge clk) begin\n");
$fh->print(" r0 <= i;\n"); $fh->print(" r0 <= i;\n");
for (my $i=1; $i<$n; ++$i) { for (my $i = 1; $i < $n; ++$i) {
$fh->print(" r".($i+1)." <= r$i;\n"); $fh->print(" r" . ($i+1) . " <= r$i;\n");
} }
$fh->print(" o <= r$n;\n"); $fh->print(" o <= r$n;\n");
$fh->print(' $write("*-* All Finished *-*\n");',"\n"); $fh->print(' $write("*-* All Finished *-*\n");', "\n");
$fh->print(' $finish;',"\n"); $fh->print(' $finish;', "\n");
$fh->print(" end\n"); $fh->print(" end\n");
$fh->print("endmodule\n"); $fh->print("endmodule\n");
} }

1
test_regress/t/t_flag_build.pl
View File

@ -8,7 +8,6 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
# Version 2.0. # Version 2.0.
# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 # SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
scenarios(simulator => 1); scenarios(simulator => 1);
top_filename("t/t_flag_make_cmake.v"); top_filename("t/t_flag_make_cmake.v");

14
test_regress/t/t_flag_csplit.pl
View File

@ -29,13 +29,13 @@ while (1) {
run(logfile => "$Self->{obj_dir}/vlt_gcc.log", run(logfile => "$Self->{obj_dir}/vlt_gcc.log",
tee => $self->{verbose}, tee => $self->{verbose},
cmd=>[$ENV{MAKE}, cmd=>[$ENV{MAKE},
"-C ".$Self->{obj_dir}, "-C " . $Self->{obj_dir},
"-f $Self->{VM_PREFIX}.mk", "-f $Self->{VM_PREFIX}.mk",
"-j 4", "-j 4",
"VM_PREFIX=$Self->{VM_PREFIX}", "VM_PREFIX=$Self->{VM_PREFIX}",
"TEST_OBJ_DIR=$Self->{obj_dir}", "TEST_OBJ_DIR=$Self->{obj_dir}",
"CPPFLAGS_DRIVER=-D".uc($Self->{name}), "CPPFLAGS_DRIVER=-D".uc($Self->{name}),
($opt_verbose ? "CPPFLAGS_DRIVER2=-DTEST_VERBOSE=1":""), ($opt_verbose ? "CPPFLAGS_DRIVER2=-DTEST_VERBOSE=1" : ""),
"OPT_FAST=-O2", "OPT_FAST=-O2",
"OPT_SLOW=-O0", "OPT_SLOW=-O0",
"OPT_GLOBAL=-Os", "OPT_GLOBAL=-Os",
@ -86,7 +86,7 @@ sub check_cpp {
printf " File %6d %s\n", $size, $filename if $Self->{verbose}; printf " File %6d %s\n", $size, $filename if $Self->{verbose};
my $fh = IO::File->new("<$filename") or error("$! $filenme"); my $fh = IO::File->new("<$filename") or error("$! $filenme");
my @funcs; my @funcs;
while (defined (my $line = $fh->getline)) { while (defined(my $line = $fh->getline)) {
if ($line =~ /^(void|IData)\s+(.*::.*)/) { if ($line =~ /^(void|IData)\s+(.*::.*)/) {
my $func = $2; my $func = $2;
$func =~ s/\(.*$//; $func =~ s/\(.*$//;
@ -103,19 +103,19 @@ sub check_cpp {
} }
} }
if ($#funcs > 0) { if ($#funcs > 0) {
error("Split had multiple functions in $filename\n\t".join("\n\t",@funcs)); error("Split had multiple functions in $filename\n\t" . join("\n\t", @funcs));
} }
} }
sub check_gcc_flags { sub check_gcc_flags {
my $filename = shift; my $filename = shift;
my $fh = IO::File->new("<$filename") or error("$! $filenme"); my $fh = IO::File->new("<$filename") or error("$! $filenme");
while (defined (my $line = $fh->getline)) { while (defined(my $line = $fh->getline)) {
chomp $line; chomp $line;
print ":log: $line\n" if $Self->{verbose}; print ":log: $line\n" if $Self->{verbose};
if ($line =~ /$Self->{VM_PREFIX}\S*\.cpp/) { if ($line =~ /$Self->{VM_PREFIX}\S*\.cpp/) {
my $filetype = ($line =~ /Slow|Syms/) ? "slow":"fast"; my $filetype = ($line =~ /Slow|Syms/) ? "slow" : "fast";
my $opt = ($line !~ /-O2/) ? "slow":"fast"; my $opt = ($line !~ /-O2/) ? "slow" : "fast";
print "$filetype, $opt, $line\n" if $Self->{verbose}; print "$filetype, $opt, $line\n" if $Self->{verbose};
if ($filetype ne $opt) { if ($filetype ne $opt) {
error("${filetype} file compiled as if was ${opt}: $line"); error("${filetype} file compiled as if was ${opt}: $line");

1
test_regress/t/t_flag_csplit_eval.pl
View File

@ -22,7 +22,6 @@ sub check_evals {
$got >= 3 or error("Too few _eval functions found: $got"); $got >= 3 or error("Too few _eval functions found: $got");
} }
scenarios(vlt_all => 1); scenarios(vlt_all => 1);
compile( compile(

6
test_regress/t/t_flag_csplit_off.pl
View File

@ -31,13 +31,13 @@ while (1) {
run(logfile => "$Self->{obj_dir}/vlt_gcc.log", run(logfile => "$Self->{obj_dir}/vlt_gcc.log",
tee => $self->{verbose}, tee => $self->{verbose},
cmd=>[$ENV{MAKE}, cmd=>[$ENV{MAKE},
"-C ".$Self->{obj_dir}, "-C " . $Self->{obj_dir},
"-f $Self->{VM_PREFIX}.mk", "-f $Self->{VM_PREFIX}.mk",
"-j 4", "-j 4",
"VM_PREFIX=$Self->{VM_PREFIX}", "VM_PREFIX=$Self->{VM_PREFIX}",
"TEST_OBJ_DIR=$Self->{obj_dir}", "TEST_OBJ_DIR=$Self->{obj_dir}",
"CPPFLAGS_DRIVER=-D".uc($Self->{name}), "CPPFLAGS_DRIVER=-D".uc($Self->{name}),
($opt_verbose ? "CPPFLAGS_DRIVER2=-DTEST_VERBOSE=1":""), ($opt_verbose ? "CPPFLAGS_DRIVER2=-DTEST_VERBOSE=1" : ""),
"OPT_FAST=-O2", "OPT_FAST=-O2",
"OPT_SLOW=-O0", "OPT_SLOW=-O0",
($param{make_flags}||""), ($param{make_flags}||""),
@ -79,7 +79,7 @@ sub check_all_file {
sub check_gcc_flags { sub check_gcc_flags {
my $filename = shift; my $filename = shift;
my $fh = IO::File->new("<$filename") or error("$! $filenme"); my $fh = IO::File->new("<$filename") or error("$! $filenme");
while (defined (my $line = $fh->getline)) { while (defined(my $line = $fh->getline)) {
chomp $line; chomp $line;
print ":log: $line\n" if $Self->{verbose}; print ":log: $line\n" if $Self->{verbose};
if ($line =~ /\.cpp/ && $line =~ qr/-O0/) { if ($line =~ /\.cpp/ && $line =~ qr/-O0/) {

18
test_regress/t/t_flag_ldflags.pl
View File

@ -13,13 +13,13 @@ scenarios(vlt => 1);
my $m32 = $Self->cfg_with_m32 ? "-m32" : ""; my $m32 = $Self->cfg_with_m32 ? "-m32" : "";
run(cmd => ["cd $Self->{obj_dir}" run(cmd => ["cd $Self->{obj_dir}"
." && $ENV{CXX} $m32 -c ../../t/t_flag_ldflags_a.cpp" . " && $ENV{CXX} $m32 -c ../../t/t_flag_ldflags_a.cpp"
." && ar -cr t_flag_ldflags_a.a t_flag_ldflags_a.o" . " && ar -cr t_flag_ldflags_a.a t_flag_ldflags_a.o"
." && ranlib t_flag_ldflags_a.a "], . " && ranlib t_flag_ldflags_a.a "],
check_finished => 0); check_finished => 0);
run(cmd => ["cd $Self->{obj_dir}" run(cmd => ["cd $Self->{obj_dir}"
." && $ENV{CXX} $m32 -fPIC -c ../../t/t_flag_ldflags_so.cpp" . " && $ENV{CXX} $m32 -fPIC -c ../../t/t_flag_ldflags_so.cpp"
." && $ENV{CXX} $m32 -shared -o t_flag_ldflags_so.so -lc t_flag_ldflags_so.o"], . " && $ENV{CXX} $m32 -shared -o t_flag_ldflags_so.so -lc t_flag_ldflags_so.o"],
check_finished => 0); check_finished => 0);
compile( compile(
@ -34,12 +34,12 @@ compile(
# On OS X, LD_LIBRARY_PATH is ignored, so set rpath of the exe to find the .so # On OS X, LD_LIBRARY_PATH is ignored, so set rpath of the exe to find the .so
if ($^O eq "darwin") { if ($^O eq "darwin") {
run(cmd => ["cd $Self->{obj_dir}" run(cmd => ["cd $Self->{obj_dir}"
." && install_name_tool -add_rpath \@executable_path/." . " && install_name_tool -add_rpath \@executable_path/."
." $Self->{VM_PREFIX}"], . " $Self->{VM_PREFIX}"],
check_finished => 0); check_finished => 0);
run(cmd => ["cd $Self->{obj_dir}" run(cmd => ["cd $Self->{obj_dir}"
." && install_name_tool -change t_flag_ldflags_so.so" . " && install_name_tool -change t_flag_ldflags_so.so"
." \@rpath/t_flag_ldflags_so.so $Self->{VM_PREFIX}"], . " \@rpath/t_flag_ldflags_so.so $Self->{VM_PREFIX}"],
check_finished => 0); check_finished => 0);
} }

3
test_regress/t/t_flag_make_cmake.pl
View File

@ -8,7 +8,6 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
# Version 2.0. # Version 2.0.
# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 # SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
scenarios(simulator => 1); scenarios(simulator => 1);
compile( compile(
@ -19,7 +18,7 @@ compile(
if (!$Self->have_cmake) { if (!$Self->have_cmake) {
skip("cmake is not installed"); skip("cmake is not installed");
} else { } else {
my $cmakecache = $Self->{obj_dir}."/CMakeCache.txt"; my $cmakecache = $Self->{obj_dir} . "/CMakeCache.txt";
if (! -e $cmakecache) { if (! -e $cmakecache) {
error("$cmakecache does not exist.") error("$cmakecache does not exist.")
} }

1
test_regress/t/t_flag_make_gmake.pl
View File

@ -8,7 +8,6 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
# Version 2.0. # Version 2.0.
# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 # SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
scenarios(simulator => 1); scenarios(simulator => 1);
top_filename("t/t_flag_make_cmake.v"); top_filename("t/t_flag_make_cmake.v");

6
test_regress/t/t_flag_skipidentical.pl
View File

@ -15,9 +15,9 @@ scenarios(vlt => 1);
print "NOTE: use --debugi, as --debug in driver turns off skip-identical\n"; print "NOTE: use --debugi, as --debug in driver turns off skip-identical\n";
my $outfile = "$Self->{obj_dir}/V".$Self->{name}.".cpp"; my $outfile = "$Self->{obj_dir}/V" . $Self->{name} . ".cpp";
my @oldstats = stat($outfile); my @oldstats = stat($outfile);
print "Old mtime=",$oldstats[9],"\n"; print "Old mtime=", $oldstats[9], "\n";
$oldstats[9] or error("No output file found: $outfile\n"); $oldstats[9] or error("No output file found: $outfile\n");
sleep(2); # Or else it might take < 1 second to compile and see no diff. sleep(2); # Or else it might take < 1 second to compile and see no diff.
@ -26,7 +26,7 @@ scenarios(vlt => 1);
compile(); compile();
my @newstats = stat($outfile); my @newstats = stat($outfile);
print "New mtime=",$newstats[9],"\n"; print "New mtime=", $newstats[9], "\n";
($oldstats[9] == $newstats[9]) ($oldstats[9] == $newstats[9])
or error("--skip-identical was ignored -- recompiled\n"); or error("--skip-identical was ignored -- recompiled\n");

4
test_regress/t/t_flag_verilate.pl
View File

@ -8,7 +8,6 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
# Version 2.0. # Version 2.0.
# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 # SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
scenarios(simulator => 1); scenarios(simulator => 1);
top_filename("t/t_flag_make_cmake.v"); top_filename("t/t_flag_make_cmake.v");
@ -52,7 +51,7 @@ compile( # Don't call cmake nor gmake from driver.pl. Just build here
); );
# The previous run must not verilated, only build is expected. # The previous run must not verilated, only build is expected.
if ( -e $Self->{obj_dir} . '/Vt_flag_verilate_990_final.tree' ) { if (-e $Self->{obj_dir} . '/Vt_flag_verilate_990_final.tree') {
$Self->error('Unexpectedly verilated.'); $Self->error('Unexpectedly verilated.');
} }
@ -60,6 +59,5 @@ execute(
check_finished => 1, check_finished => 1,
); );
ok(1); ok(1);
1; 1;

4
test_regress/t/t_foreach.pl
View File

@ -21,14 +21,14 @@ execute(
# We expect all loops should be unrolled by verilator, # We expect all loops should be unrolled by verilator,
# none of the loop variables should exist in the output: # none of the loop variables should exist in the output:
for my $file (glob_all("$Self->{obj_dir}/$Self->{VM_PREFIX}*.cpp")) { for my $file (glob_all("$Self->{obj_dir}/$Self->{VM_PREFIX}*.cpp")) {
file_grep_not($file, qr/index_/); file_grep_not($file, qr/index_/);
} }
# Further, we expect that all logic within the loop should # Further, we expect that all logic within the loop should
# have been evaluated inside the compiler. So there should be # have been evaluated inside the compiler. So there should be
# no references to 'sum' in the .cpp. # no references to 'sum' in the .cpp.
for my $file (glob_all("$Self->{obj_dir}/$Self->{VM_PREFIX}*.cpp")) { for my $file (glob_all("$Self->{obj_dir}/$Self->{VM_PREFIX}*.cpp")) {
file_grep_not($file, qr/sum/); file_grep_not($file, qr/sum/);
} }
ok(1); ok(1);

2
test_regress/t/t_gantt_io.pl
View File

@ -11,7 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(dist => 1); scenarios(dist => 1);
run(cmd => ["cd $Self->{obj_dir} && $ENV{VERILATOR_ROOT}/bin/verilator_gantt" run(cmd => ["cd $Self->{obj_dir} && $ENV{VERILATOR_ROOT}/bin/verilator_gantt"
." $Self->{t_dir}/t_gantt_io.dat > gantt.log"], . " $Self->{t_dir}/t_gantt_io.dat > gantt.log"],
check_finished => 0); check_finished => 0);
files_identical("$Self->{obj_dir}/gantt.log", $Self->{golden_filename}); files_identical("$Self->{obj_dir}/gantt.log", $Self->{golden_filename});

36
test_regress/t/t_gate_tree.pl
View File

@ -14,7 +14,7 @@ use vars qw($Self);
scenarios(simulator => 1); scenarios(simulator => 1);
my $width = 64*($ENV{VERILATOR_TEST_WIDTH}||4); my $width = 64 * ($ENV{VERILATOR_TEST_WIDTH} || 4);
my $vars = 64; my $vars = 64;
$Self->{cycles} = ($Self->{benchmark} ? 1_000_000 : 100); $Self->{cycles} = ($Self->{benchmark} ? 1_000_000 : 100);
@ -34,15 +34,15 @@ sub gen {
my %tree; my %tree;
my $fanin = 8; my $fanin = 8;
my $stages = int(log($vars)/log($fanin)+0.99999)+1; my $stages = int(log($vars) / log($fanin) + 0.99999) + 1;
my $result = 0; my $result = 0;
for (my $n=0; $n<$vars; $n++) { for (my $n = 0; $n < $vars; $n++) {
$result += ($n||1); $result += ($n || 1);
$tree{0}{$n}{$n} = 1; $tree{0}{$n}{$n} = 1;
my $nl = $n; my $nl = $n;
for (my $stage=1; $stage<$stages; $stage++) { for (my $stage=1; $stage < $stages; $stage++) {
my $lastn = $nl; my $lastn = $nl;
$nl = int($nl/$fanin); $nl = int($nl / $fanin);
$tree{$stage}{$nl}{$lastn} = 1; $tree{$stage}{$nl}{$lastn} = 1;
} }
} }
@ -50,9 +50,9 @@ sub gen {
$fh->print("\n"); $fh->print("\n");
my $workingset = 0; my $workingset = 0;
foreach my $stage (sort {$a<=>$b} keys %tree) { foreach my $stage (sort { $a <=> $b} keys %tree) {
foreach my $n (sort {$a<=>$b} keys %{$tree{$stage}}) { foreach my $n (sort { $a <=> $b} keys %{$tree{$stage}}) {
$fh->print( " reg [".($width-1).":0] v${stage}_${n};\n"); $fh->print( " reg [" . ($width - 1) . ":0] v${stage}_${n};\n");
$workingset += int($width/8 + 7); $workingset += int($width/8 + 7);
} }
} }
@ -62,7 +62,7 @@ sub gen {
$fh->print(" cyc <= cyc + 1;\n"); $fh->print(" cyc <= cyc + 1;\n");
$fh->print("`ifdef TEST_VERBOSE\n"); $fh->print("`ifdef TEST_VERBOSE\n");
$fh->print(" \$write(\"[%0t] rst=%0x v0_0=%0x v1_0=%0x result=%0x\\n\"" $fh->print(" \$write(\"[%0t] rst=%0x v0_0=%0x v1_0=%0x result=%0x\\n\""
.", \$time, reset, v0_0, v1_0, v".($stages-1)."_0);\n"); .", \$time, reset, v0_0, v1_0, v" . ($stages - 1) . "_0);\n");
$fh->print("`endif\n"); $fh->print("`endif\n");
$fh->print(" if (cyc==0) begin\n"); $fh->print(" if (cyc==0) begin\n");
$fh->print(" reset <= 1;\n"); $fh->print(" reset <= 1;\n");
@ -74,19 +74,19 @@ sub gen {
$fh->print(" `define SIM_CYCLES 99\n"); $fh->print(" `define SIM_CYCLES 99\n");
$fh->print("`endif\n"); $fh->print("`endif\n");
$fh->print(" else if (cyc==`SIM_CYCLES) begin\n"); $fh->print(" else if (cyc==`SIM_CYCLES) begin\n");
$fh->print(" if (v".($stages-1)."_0 != ${width}'d${result}) \$stop;\n"); $fh->print(" if (v" . ($stages - 1) . "_0 != ${width}'d${result}) \$stop;\n");
$fh->print(" \$write(\"VARS=${vars} WIDTH=${width}" $fh->print(" \$write(\"VARS=${vars} WIDTH=${width}"
." WORKINGSET=".(int($workingset/1024))."KB\\n\");\n"); ." WORKINGSET=" . (int($workingset / 1024)) . "KB\\n\");\n");
$fh->print(' $write("*-* All Finished *-*\n");',"\n"); $fh->print(' $write("*-* All Finished *-*\n");', "\n");
$fh->print(' $finish;',"\n"); $fh->print(' $finish;', "\n");
$fh->print(" end\n"); $fh->print(" end\n");
$fh->print(" end\n"); $fh->print(" end\n");
$fh->print("\n"); $fh->print("\n");
for (my $n=0; $n<$vars; $n++) { for (my $n=0; $n<$vars; $n++) {
$fh->print(" always @ (posedge clk)" $fh->print(" always @ (posedge clk)"
." v0_${n} <= reset ? ${width}'d".(${n}||1)." : v0_" . " v0_${n} <= reset ? ${width}'d" . (${n} || 1) . " : v0_"
.((int($n/$fanin)*$fanin) + (($n+1) % $fanin)).";\n"); . ((int($n / $fanin) * $fanin) + (($n + 1) % $fanin)) . ";\n");
} }
foreach my $stage (sort {$a<=>$b} keys %tree) { foreach my $stage (sort {$a<=>$b} keys %tree) {
@ -94,10 +94,10 @@ sub gen {
$fh->print("\n"); $fh->print("\n");
foreach my $n (sort {$a<=>$b} keys %{$tree{$stage}}) { foreach my $n (sort {$a<=>$b} keys %{$tree{$stage}}) {
$fh->print(" always @ (posedge clk)" $fh->print(" always @ (posedge clk)"
." v${stage}_${n} <="); . " v${stage}_${n} <=");
my $op = ""; my $op = "";
foreach my $ni (sort {$a<=>$b} keys %{$tree{$stage}{$n}}) { foreach my $ni (sort {$a<=>$b} keys %{$tree{$stage}{$n}}) {
$fh->print($op." v".(${stage}-1)."_${ni}"); $fh->print($op . " v" . (${stage} - 1) . "_${ni}");
$op = " +"; $op = " +";
} }
$fh->print(";\n"); $fh->print(";\n");

2
test_regress/t/t_hier_block_cmake.pl
View File

@ -29,7 +29,7 @@ if (!$Self->have_cmake) {
run(logfile => "$Self->{obj_dir}/run.log", run(logfile => "$Self->{obj_dir}/run.log",
cmd => ['cd "' . $Self->{obj_dir} . '" && ./t_hier_block_cmake', '.'] cmd => ['cd "' . $Self->{obj_dir} . '" && ./t_hier_block_cmake', '.']
); );
my $target_dir = $Self->{obj_dir} .'/CMakeFiles/t_hier_block_cmake.dir/Vt_hier_block.dir/'; my $target_dir = $Self->{obj_dir} . '/CMakeFiles/t_hier_block_cmake.dir/Vt_hier_block.dir/';
file_grep($target_dir . 'Vsub0/sub0.sv', /^module\s+(\S+)\s+/, "sub0"); file_grep($target_dir . 'Vsub0/sub0.sv', /^module\s+(\S+)\s+/, "sub0");
file_grep($target_dir . 'Vsub1/sub1.sv', /^module\s+(\S+)\s+/, "sub1"); file_grep($target_dir . 'Vsub1/sub1.sv', /^module\s+(\S+)\s+/, "sub1");
file_grep($target_dir . 'Vsub2/sub2.sv', /^module\s+(\S+)\s+/, "sub2"); file_grep($target_dir . 'Vsub2/sub2.sv', /^module\s+(\S+)\s+/, "sub2");

1
test_regress/t/t_inst_misarray2_bad.pl
View File

@ -15,6 +15,5 @@ lint(
expect_filename => $Self->{golden_filename}, expect_filename => $Self->{golden_filename},
); );
ok(1); ok(1);
1; 1;

1
test_regress/t/t_inst_misarray_bad.pl
View File

@ -15,6 +15,5 @@ lint(
expect_filename => $Self->{golden_filename}, expect_filename => $Self->{golden_filename},
); );
ok(1); ok(1);
1; 1;

2
test_regress/t/t_inst_notunsized.pl
View File

@ -11,7 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(simulator => 1); scenarios(simulator => 1);
compile( compile(
verilator_flags2=>["-Wno-IMPLICIT"], verilator_flags2 => ["-Wno-IMPLICIT"],
); );
execute( execute(

6
test_regress/t/t_inst_tree_inl0_pub1.pl
View File

@ -31,9 +31,9 @@ sub checkRelativeRefs {
} }
if ($found_relative != $expect_relative) { if ($found_relative != $expect_relative) {
error("$file " . error("$file "
($found_relative ? "has" : "does not have") . . ($found_relative ? "has" : "does not have")
" relative variable references."); . " relative variable references.");
} }
} }
} }

2
test_regress/t/t_optm_if_array.pl
View File

@ -18,7 +18,7 @@ execute(
); );
for my $file (glob_all("$Self->{obj_dir}/$Self->{VM_PREFIX}___024root*.cpp")) { for my $file (glob_all("$Self->{obj_dir}/$Self->{VM_PREFIX}___024root*.cpp")) {
file_grep_not($file, qr/rstn_r/); file_grep_not($file, qr/rstn_r/);
} }
ok(1); ok(1);

2
test_regress/t/t_optm_redor.pl
View File

@ -18,7 +18,7 @@ execute(
); );
for my $file (glob_all("$Self->{obj_dir}/$Self->{VM_PREFIX}___024root*.cpp")) { for my $file (glob_all("$Self->{obj_dir}/$Self->{VM_PREFIX}___024root*.cpp")) {
file_grep_not($file, qr/rstn_r/); file_grep_not($file, qr/rstn_r/);
} }
ok(1); ok(1);

2
test_regress/t/t_order_dpi_export_1.pl
View File

@ -13,7 +13,7 @@ scenarios(vlt_all => 1);
compile( compile(
make_top_shell => 0, make_top_shell => 0,
make_main => 0, make_main => 0,
verilator_flags2 => ["--exe","$Self->{t_dir}/$Self->{name}.cpp"], verilator_flags2 => ["--exe", "$Self->{t_dir}/$Self->{name}.cpp"],
); );
execute( execute(

2
test_regress/t/t_order_dpi_export_2.pl
View File

@ -13,7 +13,7 @@ scenarios(vlt_all => 1);
compile( compile(
make_top_shell => 0, make_top_shell => 0,
make_main => 0, make_main => 0,
verilator_flags2 => ["--exe","$Self->{t_dir}/$Self->{name}.cpp"], verilator_flags2 => ["--exe", "$Self->{t_dir}/$Self->{name}.cpp"],
); );
execute( execute(

2
test_regress/t/t_order_dpi_export_3.pl
View File

@ -13,7 +13,7 @@ scenarios(vlt_all => 1);
compile( compile(
make_top_shell => 0, make_top_shell => 0,
make_main => 0, make_main => 0,
verilator_flags2 => ["--exe","$Self->{t_dir}/$Self->{name}.cpp"], verilator_flags2 => ["--exe", "$Self->{t_dir}/$Self->{name}.cpp"],
); );
execute( execute(

2
test_regress/t/t_order_dpi_export_4.pl
View File

@ -13,7 +13,7 @@ scenarios(vlt_all => 1);
compile( compile(
make_top_shell => 0, make_top_shell => 0,
make_main => 0, make_main => 0,
verilator_flags2 => ["--exe","$Self->{t_dir}/$Self->{name}.cpp"], verilator_flags2 => ["--exe", "$Self->{t_dir}/$Self->{name}.cpp"],
); );
execute( execute(

2
test_regress/t/t_order_dpi_export_5.pl
View File

@ -13,7 +13,7 @@ scenarios(vlt_all => 1);
compile( compile(
make_top_shell => 0, make_top_shell => 0,
make_main => 0, make_main => 0,
verilator_flags2 => ["--exe","$Self->{t_dir}/$Self->{name}.cpp"], verilator_flags2 => ["--exe", "$Self->{t_dir}/$Self->{name}.cpp"],
); );
execute( execute(

2
test_regress/t/t_order_quad.pl
View File

@ -13,7 +13,7 @@ scenarios(simulator => 1);
compile( compile(
make_top_shell => 0, make_top_shell => 0,
make_main => 0, make_main => 0,
verilator_flags2 => ["--exe","$Self->{t_dir}/$Self->{name}.cpp"], verilator_flags2 => ["--exe", "$Self->{t_dir}/$Self->{name}.cpp"],
); );
execute( execute(

2
test_regress/t/t_pipe_filter.pf
View File

@ -49,7 +49,7 @@ for cmd in sys.stdin:
pos = newpos + 1 pos = newpos + 1
# sys.stderr.write("Line count: %d\n" % lineno) # sys.stderr.write("Line count: %d\n" % lineno)
wholefile = ''.join(prefixes) + wholefile wholefile = '' . join(prefixes) + wholefile
print("Content-Length: " + str(len(wholefile)) + "\n" + wholefile) print("Content-Length: " + str(len(wholefile)) + "\n" + wholefile)
sys.stdout.flush() sys.stdout.flush()

8
test_regress/t/t_protect_ids.pl
View File

@ -14,8 +14,8 @@ scenarios(vlt_all => 1);
# This test makes randomly named .cpp/.h files, which tend to collect, so remove them first # This test makes randomly named .cpp/.h files, which tend to collect, so remove them first
foreach my $filename (glob ("$Self->{obj_dir}/*_PS*.cpp" foreach my $filename (glob ("$Self->{obj_dir}/*_PS*.cpp"
." $Self->{obj_dir}/*_PS*.h" . " $Self->{obj_dir}/*_PS*.h"
." $Self->{obj_dir}/*.d" )) { . " $Self->{obj_dir}/*.d")) {
print "rm $filename\n" if $Self->{verbose}; print "rm $filename\n" if $Self->{verbose};
unlink $filename; unlink $filename;
} }
@ -40,9 +40,9 @@ file_grep_not("$Self->{obj_dir}/$Self->{VM_PREFIX}__idmap.xml", qr/to="PS/);
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
# Check for secret in any outputs # Check for secret in any outputs
my $any; my $any;
foreach my $filename (glob $Self->{obj_dir}."/*.[ch]*") { foreach my $filename (glob $Self->{obj_dir} . "/*.[ch]*") {
if ($filename =~ /secret/i) { if ($filename =~ /secret/i) {
$Self->error("Secret found in a filename: ".$filename); $Self->error("Secret found in a filename: " . $filename);
} }
file_grep_not($filename, qr/secret/i); file_grep_not($filename, qr/secret/i);
$any = 1; $any = 1;

4
test_regress/t/t_sys_fread.pl
View File

@ -18,8 +18,8 @@ sub gen {
my $filename = shift; my $filename = shift;
my $fh = IO::File->new(">$filename"); my $fh = IO::File->new(">$filename");
for (my $copy=0; $copy<32; ++$copy) { for (my $copy = 0; $copy < 32; ++$copy) {
for (my $i=0; $i<=255; ++$i) { for (my $i = 0; $i <= 255; ++$i) {
$fh->print(chr($i)); $fh->print(chr($i));
} }
} }

2
test_regress/t/t_sys_sformat_noopt.pl
View File

@ -20,7 +20,7 @@ compile(
if ($Self->cxx_version =~ /clang/) { if ($Self->cxx_version =~ /clang/) {
skip("Known clang bug"); skip("Known clang bug");
#Here: if (VL_UNLIKELY(VL_NEQ_W(12, __Vtemp1, vlSymsp->TOP__t.__PVT__str))) #Here: if (VL_UNLIKELY(VL_NEQ_W(12, __Vtemp1, vlSymsp->TOP__t.__PVT__str)))
} else{ } else {
execute( execute(
check_finished => 1, check_finished => 1,
); );

2
test_regress/t/t_threads_crazy.pl
View File

@ -11,7 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(vltmt => 1); scenarios(vltmt => 1);
if ($Self->cfg_with_m32) { if ($Self->cfg_with_m32) {
skip("Does not work with -m32 (resource unavailable)"); skip("Does not work with -m32 (resource unavailable)");
} }
compile( compile(

2
test_regress/t/t_timing_long.pl
View File

@ -39,7 +39,7 @@ sub gen {
# mostly unpredictable # mostly unpredictable
$fh->printf(" if (cnt == %d) begin\n", $i - 1); $fh->printf(" if (cnt == %d) begin\n", $i - 1);
$fh->printf(" #1; ++cnt; `MSG((\"[%0t] cnt?=${i}\", \$time));" $fh->printf(" #1; ++cnt; `MSG((\"[%0t] cnt?=${i}\", \$time));"
." if (cnt != %d) \$stop;\n", $i); . " if (cnt != %d) \$stop;\n", $i);
$fh->printf(" end\n"); $fh->printf(" end\n");
} }

2
test_regress/t/t_trace_cat.pl
View File

@ -21,7 +21,7 @@ execute(
); );
system("cat $Self->{obj_dir}/simpart_0000.vcd " system("cat $Self->{obj_dir}/simpart_0000.vcd "
." $Self->{obj_dir}/simpart_0000_cat*.vcd > $Self->{obj_dir}/simall.vcd"); . " $Self->{obj_dir}/simpart_0000_cat*.vcd > $Self->{obj_dir}/simall.vcd");
vcd_identical("$Self->{obj_dir}/simall.vcd", vcd_identical("$Self->{obj_dir}/simall.vcd",
$Self->{golden_filename}); $Self->{golden_filename});

20
test_regress/t/t_trace_complex.pl
View File

@ -18,17 +18,17 @@ execute(
check_finished => 1, check_finished => 1,
); );
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_strp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\[/); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\[/); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\[/); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\[/);
vcd_identical ("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename}); vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
ok(1); ok(1);
1; 1;

18
test_regress/t/t_trace_complex_old_api.pl
View File

@ -23,15 +23,15 @@ execute(
check_finished => 1, check_finished => 1,
); );
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_strp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\[/); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\[/); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\[/); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\[/);
vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename}); vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});

18
test_regress/t/t_trace_complex_portable.pl
View File

@ -23,15 +23,15 @@ execute(
check_finished => 1, check_finished => 1,
); );
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_strp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\[/); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\[/); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\[/); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\[/);
vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename}); vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});

20
test_regress/t/t_trace_complex_structs.pl
View File

@ -20,17 +20,17 @@ execute(
check_finished => 1, check_finished => 1,
); );
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_strp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /);
file_grep_not ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /); file_grep_not("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /);
file_grep_not ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /); file_grep_not("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\[/); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\[/); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\[/); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\[/);
vcd_identical ("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename}); vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
ok(1); ok(1);
1; 1;

20
test_regress/t/t_trace_complex_threads_1.pl
View File

@ -21,17 +21,17 @@ execute(
check_finished => 1, check_finished => 1,
); );
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_strp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\[/); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\[/); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\[/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\[/); file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\[/);
vcd_identical ("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename}); vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
ok(1); ok(1);
1; 1;

8
test_regress/t/t_trace_ena_cc.pl
View File

@ -21,10 +21,10 @@ execute(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep ("$Self->{obj_dir}/V$Self->{name}__Trace__0__Slow.cpp", qr/c_trace_on\"/x); file_grep("$Self->{obj_dir}/V$Self->{name}__Trace__0__Slow.cpp", qr/c_trace_on\"/x);
file_grep_not ("$Self->{obj_dir}/V$Self->{name}__Trace__0__Slow.cpp", qr/_trace_off\"/x); file_grep_not("$Self->{obj_dir}/V$Self->{name}__Trace__0__Slow.cpp", qr/_trace_off\"/x);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/x); file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/x);
file_grep_not ("$Self->{obj_dir}/simx.vcd", qr/inside_sub/x); file_grep_not("$Self->{obj_dir}/simx.vcd", qr/inside_sub/x);
vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename}); vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
} }

2
test_regress/t/t_trace_ena_sc.pl
View File

@ -26,7 +26,7 @@ else {
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
# Note more checks in _cc.pl # Note more checks in _cc.pl
file_grep ("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/x); file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/x);
vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename}); vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
} }

8
test_regress/t/t_unicode.pl
View File

@ -23,12 +23,12 @@ sub gen {
$fh->print("// Generated by t_unicode.pl\n"); $fh->print("// Generated by t_unicode.pl\n");
$fh->print("module t;\n"); $fh->print("module t;\n");
$fh->print(" // Chinese " $fh->print(" // Chinese "
.chr(0xe8).chr(0xaf).chr(0x84).chr(0xe8).chr(0xae).chr(0xba) # Comment . chr(0xe8) . chr(0xaf) . chr(0x84) . chr(0xe8) . chr(0xae) . chr(0xba) # Comment
."\n"); . "\n");
$fh->print(" initial begin\n"); $fh->print(" initial begin\n");
$fh->print(" \$write(\"Hello " $fh->print(" \$write(\"Hello "
.chr(0xe4).chr(0xb8).chr(0x96).chr(0xe7).chr(0x95).chr(0x8c) # World . chr(0xe4) . chr(0xb8) . chr(0x96) . chr(0xe7) . chr(0x95) . chr(0x8c) # World
."\\n\");\n"); . "\\n\");\n");
$fh->print(" \$write(\"*-* All Finished *-*\\n\");\n"); $fh->print(" \$write(\"*-* All Finished *-*\\n\");\n");
$fh->print(" \$finish;\n"); $fh->print(" \$finish;\n");
$fh->print(" end\n"); $fh->print(" end\n");

11
test_regress/t/t_var_escape.pl
View File

@ -20,13 +20,12 @@ execute(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep ("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/x); file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/x);
my $sig = quotemeta("bra[ket]slash/dash-colon:9"); my $sig = quotemeta("bra[ket]slash/dash-colon:9");
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ $sig/); file_grep("$Self->{obj_dir}/simx.vcd", qr/ $sig/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ other\.cyc /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ other\.cyc /);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ module mod\.with_dot /); file_grep("$Self->{obj_dir}/simx.vcd", qr/ module mod\.with_dot /);
vcd_identical ("$Self->{obj_dir}/simx.vcd", vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
$Self->{golden_filename});
} }
ok(1); ok(1);

2
test_regress/t/t_verilated_all.pl
View File

@ -55,7 +55,7 @@ foreach my $file (sort keys %hit) {
&& $file !~ /_fst/ && $file !~ /_fst/
&& $file !~ /_heavy/ && $file !~ /_heavy/
&& ($file !~ /_thread/ || $Self->cfg_with_threaded)) { && ($file !~ /_thread/ || $Self->cfg_with_threaded)) {
error("Include file not covered by t_verilated_all test: ",$file); error("Include file not covered by t_verilated_all test: ", $file);
} }
} }

4
test_regress/t/t_vpi_get_public_rw_switch.pl
View File

@ -21,8 +21,8 @@ compile(
make_top_shell => 0, make_top_shell => 0,
make_main => 0, make_main => 0,
verilator_flags2 => ["--exe --vpi" verilator_flags2 => ["--exe --vpi"
." --public-flat-rw --prefix Vt_vpi_get --no-l2name" . " --public-flat-rw --prefix Vt_vpi_get --no-l2name"
." $Self->{t_dir}/t_vpi_get.cpp"], . " $Self->{t_dir}/t_vpi_get.cpp"],
make_pli => 1, make_pli => 1,
iv_flags2 => ["-g2005-sv -D USE_VPI_NOT_DPI"], iv_flags2 => ["-g2005-sv -D USE_VPI_NOT_DPI"],
v_flags2 => ["+define+USE_VPI_NOT_DPI"], v_flags2 => ["+define+USE_VPI_NOT_DPI"],

2
test_regress/t/t_wire_beh1364_bad.pl
View File

@ -19,7 +19,7 @@ lint(
); );
if (-e $waiver_filename) { if (-e $waiver_filename) {
error("Waiver file generated, not expected.."); error("Waiver file generated, not expected");
} }
ok(1); ok(1);

4
test_regress/t/t_x_assign_0.pl
View File

@ -13,8 +13,8 @@ scenarios(vlt_all => 1);
top_filename("t/t_x_assign.v"); top_filename("t/t_x_assign.v");
compile( compile(
make_top_shell => 0, make_top_shell => 0,
make_main => 0, make_main => 0,
verilator_flags2 => ["--x-assign 0 --exe $Self->{t_dir}/t_x_assign.cpp"], verilator_flags2 => ["--x-assign 0 --exe $Self->{t_dir}/t_x_assign.cpp"],
); );

4
test_regress/t/t_x_assign_1.pl
View File

@ -13,8 +13,8 @@ scenarios(vlt_all => 1);
top_filename("t/t_x_assign.v"); top_filename("t/t_x_assign.v");
compile( compile(
make_top_shell => 0, make_top_shell => 0,
make_main => 0, make_main => 0,
verilator_flags2 => ["--x-assign 1 --exe $Self->{t_dir}/t_x_assign.cpp"], verilator_flags2 => ["--x-assign 1 --exe $Self->{t_dir}/t_x_assign.cpp"],
); );

4
test_regress/t/t_x_assign_unique_0.pl
View File

@ -13,8 +13,8 @@ scenarios(vlt_all => 1);
top_filename("t/t_x_assign.v"); top_filename("t/t_x_assign.v");
compile( compile(
make_top_shell => 0, make_top_shell => 0,
make_main => 0, make_main => 0,
verilator_flags2 => ["--x-assign unique --exe $Self->{t_dir}/t_x_assign.cpp"], verilator_flags2 => ["--x-assign unique --exe $Self->{t_dir}/t_x_assign.cpp"],
); );

4
test_regress/t/t_x_assign_unique_1.pl
View File

@ -13,8 +13,8 @@ scenarios(vlt_all => 1);
top_filename("t/t_x_assign.v"); top_filename("t/t_x_assign.v");
compile( compile(
make_top_shell => 0, make_top_shell => 0,
make_main => 0, make_main => 0,
verilator_flags2 => ["--x-assign unique --exe $Self->{t_dir}/t_x_assign.cpp"], verilator_flags2 => ["--x-assign unique --exe $Self->{t_dir}/t_x_assign.cpp"],
); );

6
test_regress/t/t_xml_debugcheck.pl
View File

@ -29,9 +29,9 @@ file_grep("$out_filename", qr/<constpool /x);
file_grep("$out_filename", qr/<inititem /x); file_grep("$out_filename", qr/<inititem /x);
file_grep("$out_filename", qr/<if /x); file_grep("$out_filename", qr/<if /x);
file_grep("$out_filename", qr/<while /x); file_grep("$out_filename", qr/<while /x);
file_grep("$out_filename", qr/<begin>/x); # for <if> and <while> file_grep("$out_filename", qr/<begin>/x); # for <if> and <while>
file_grep("$out_filename", qr/ signed=/x); # for <basicdtype> file_grep("$out_filename", qr/ signed=/x); # for <basicdtype>
file_grep("$out_filename", qr/ func=/x); # for <ccall> file_grep("$out_filename", qr/ func=/x); # for <ccall>
ok(1); ok(1);
1; 1;