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

Tests: Use only case-sensitve non-extended regexps

This commit is contained in:
Wilson Snyder 2024-08-26 08:14:39 -04:00
parent d3e07b6ad9
commit 4e86e60491
119 changed files with 368 additions and 368 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test_regress/t/t_alw_noreorder.pl
View File

@ -15,13 +15,13 @@ compile(
verilator_flags2 => ["--stats -fno-reorder"], verilator_flags2 => ["--stats -fno-reorder"],
); );
file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 0); file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/, 0);
# Here we should see some dly vars since reorder is disabled. # Here we should see some dly vars since reorder is disabled.
# (Whereas our twin test, t_alw_reorder, should see no dly vars # (Whereas our twin test, t_alw_reorder, should see no dly vars
# since it enables the reorder step.) # since it enables the reorder step.)
my @files = glob_all("$Self->{obj_dir}/$Self->{vm_prefix}___024root*.cpp"); my @files = glob_all("$Self->{obj_dir}/$Self->{vm_prefix}___024root*.cpp");
file_grep_any(\@files, qr/dly__t__DOT__v1/i); file_grep_any(\@files, qr/dly__t__DOT__v1/);
file_grep_any(\@files, qr/dly__t__DOT__v2/i); file_grep_any(\@files, qr/dly__t__DOT__v2/);
execute( execute(
); );

2
test_regress/t/t_alw_nosplit.pl
View File

@ -15,7 +15,7 @@ compile(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 0); file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/, 0);
} }
execute( execute(

8
test_regress/t/t_alw_reorder.pl
View File

@ -14,7 +14,7 @@ compile(
verilator_flags2 => ["--stats"], verilator_flags2 => ["--stats"],
); );
file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 0); file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/, 0);
# Important: if reorder succeeded, we should see no dly vars. # Important: if reorder succeeded, we should see no dly vars.
# Equally important: twin test t_alw_noreorder should see dly vars, # Equally important: twin test t_alw_noreorder should see dly vars,
# is identical to this test except for disabling the reorder step. # is identical to this test except for disabling the reorder step.
@ -22,9 +22,9 @@ foreach my $file (
glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.h"), glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.h"),
glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.cpp") glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.cpp")
) { ) {
file_grep_not($file, qr/dly__t__DOT__v1/i); file_grep_not($file, qr/dly__t__DOT__v1/);
file_grep_not($file, qr/dly__t__DOT__v2/i); file_grep_not($file, qr/dly__t__DOT__v2/);
file_grep_not($file, qr/dly__t__DOT__v3/i); file_grep_not($file, qr/dly__t__DOT__v3/);
} }
execute( execute(

2
test_regress/t/t_alw_split.pl
View File

@ -15,7 +15,7 @@ compile(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 4); file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/, 4);
} }
execute( execute(

2
test_regress/t/t_alw_split_rst.pl
View File

@ -16,7 +16,7 @@ compile(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 12); file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/, 12);
} }
execute( execute(

2
test_regress/t/t_alw_splitord.pl
View File

@ -15,7 +15,7 @@ compile(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 5); file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/, 5);
} }
execute( execute(

2
test_regress/t/t_assigndly_dynamic_nofork.pl
View File

@ -20,7 +20,7 @@ foreach my $file (
glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.h"), glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.h"),
glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.cpp") glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.cpp")
) { ) {
file_grep_not($file, qr/__Vfork_/i); file_grep_not($file, qr/__Vfork_/);
} }
ok(1); ok(1);

8
test_regress/t/t_case_huge.pl
View File

@ -15,11 +15,11 @@ compile(
); );
if ($Self->{vlt}) { if ($Self->{vlt}) {
file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 10); file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 10);
file_grep($Self->{stats}, qr/Optimizations, Combined CFuncs\s+(\d+)/i, 8); file_grep($Self->{stats}, qr/Optimizations, Combined CFuncs\s+(\d+)/, 8);
} elsif ($Self->{vltmt}) { } elsif ($Self->{vltmt}) {
file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 10); file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 10);
file_grep($Self->{stats}, qr/Optimizations, Combined CFuncs\s+(\d+)/i, 9); file_grep($Self->{stats}, qr/Optimizations, Combined CFuncs\s+(\d+)/, 9);
} }
execute( execute(

2
test_regress/t/t_cellarray.pl
View File

@ -18,7 +18,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+)/, 28);
} }
ok(1); ok(1);

2
test_regress/t/t_clk_gater.pl
View File

@ -20,7 +20,7 @@ execute(
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
#Optimization is disabled #Optimization is disabled
#file_grep ($Self->{stats}, qr/Optimizations, Gaters inserted\s+(\d+)/i, 3); #file_grep ($Self->{stats}, qr/Optimizations, Gaters inserted\s+(\d+)/, 3);
} }
ok(1); ok(1);

2
test_regress/t/t_const_opt.pl
View File

@ -19,7 +19,7 @@ execute(
); );
if ($Self->{vlt}) { if ($Self->{vlt}) {
file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/i, 45); file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/, 45);
} }
ok(1); ok(1);
1; 1;

2
test_regress/t/t_const_opt_cov.pl
View File

@ -18,7 +18,7 @@ execute(
); );
if ($Self->{vlt}) { if ($Self->{vlt}) {
file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/i, 144); file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/, 144);
} }
ok(1); ok(1);

2
test_regress/t/t_const_opt_dfg.pl
View File

@ -20,7 +20,7 @@ execute(
); );
if ($Self->{vlt}) { if ($Self->{vlt}) {
file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/i, 40); file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/, 40);
} }
ok(1); ok(1);
1; 1;

2
test_regress/t/t_const_opt_no_expand.pl
View File

@ -20,7 +20,7 @@ execute(
); );
if ($Self->{vlt}) { if ($Self->{vlt}) {
file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/i, 1); file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/, 1);
} }
ok(1); ok(1);
1; 1;

2
test_regress/t/t_const_opt_red.pl
View File

@ -18,7 +18,7 @@ execute(
); );
if ($Self->{vlt}) { if ($Self->{vlt}) {
file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/i, 158); file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/, 158);
} }
ok(1); ok(1);

2
test_regress/t/t_cover_toggle.pl
View File

@ -22,7 +22,7 @@ inline_checks();
file_grep_not("$Self->{obj_dir}/coverage.dat", "largeish"); file_grep_not("$Self->{obj_dir}/coverage.dat", "largeish");
file_grep($Self->{stats}, qr/Coverage, Toggle points joined\s+(\d+)/i, 23) file_grep($Self->{stats}, qr/Coverage, Toggle points joined\s+(\d+)/, 23)
if $Self->{vlt_all}; if $Self->{vlt_all};
run(cmd => ["$ENV{VERILATOR_ROOT}/bin/verilator_coverage", run(cmd => ["$ENV{VERILATOR_ROOT}/bin/verilator_coverage",

2
test_regress/t/t_dedupe_clk_gate.pl
View File

@ -18,7 +18,7 @@ compile(
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep("$out_filename", qr/{"type":"VAR","name":"t.f0.clock_gate.clken_latched","addr":"[^"]*","loc":"\w,44:[^"]*","dtypep":"\(\w+\)",.*"origName":"clken_latched",.*"isLatched":true,.*"dtypeName":"logic"/); file_grep("$out_filename", qr/{"type":"VAR","name":"t.f0.clock_gate.clken_latched","addr":"[^"]*","loc":"\w,44:[^"]*","dtypep":"\(\w+\)",.*"origName":"clken_latched",.*"isLatched":true,.*"dtypeName":"logic"/);
file_grep($Self->{stats}, qr/Optimizations, Gate sigs deduped\s+(\d+)/i, 4); file_grep($Self->{stats}, qr/Optimizations, Gate sigs deduped\s+(\d+)/, 4);
} }
ok(1); ok(1);

2
test_regress/t/t_dedupe_seq_logic.pl
View File

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

2
test_regress/t/t_dfg_peephole.pl
View File

@ -86,7 +86,7 @@ if (!-r "$root/.git") {
my $name = shift; my $name = shift;
$name = lc $name; $name = lc $name;
$name =~ s/_/ /g; $name =~ s/_/ /g;
file_grep("$Self->{obj_dir}/obj_opt/Vopt__stats.txt", qr/DFG\s+(pre|post) inline Peephole, ${name}\s+([1-9]\d*)/i); file_grep("$Self->{obj_dir}/obj_opt/Vopt__stats.txt", qr/DFG\s+(pre|post) inline Peephole, ${name}\s+([1-9]\d*)/);
} }
# Check all optimizations defined in # Check all optimizations defined in

2
test_regress/t/t_dfg_unhandled.pl
View File

@ -14,7 +14,7 @@ compile(
verilator_flags2 => ["--stats"], verilator_flags2 => ["--stats"],
); );
file_grep($Self->{stats}, qr/Optimizations, DFG pre inline Ast2Dfg, non-representable \(impure\)\s+(\d+)/i, 1); file_grep($Self->{stats}, qr/Optimizations, DFG pre inline Ast2Dfg, non-representable \(impure\)\s+(\d+)/, 1);
ok(1); ok(1);
1; 1;

2
test_regress/t/t_do_not_convert_to_comb.pl
View File

@ -15,7 +15,7 @@ compile(
); );
# We must not convert these blocks into combinational blocks # We must not convert these blocks into combinational blocks
file_grep($Self->{stats}, qr/Scheduling, size of class: combinational\s+(\d+)/i, 0); file_grep($Self->{stats}, qr/Scheduling, size of class: combinational\s+(\d+)/, 0);
ok(1); ok(1);
1; 1;

4
test_regress/t/t_extract_static_const.pl
View File

@ -19,9 +19,9 @@ execute(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/Optimizations, Prelim extracted value to ConstPool\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, Prelim extracted value to ConstPool\s+(\d+)/,
8); 8);
file_grep($Self->{stats}, qr/ConstPool, Constants emitted\s+(\d+)/i, file_grep($Self->{stats}, qr/ConstPool, Constants emitted\s+(\d+)/,
1); 1);
} }

4
test_regress/t/t_extract_static_const_multimodule.pl
View File

@ -19,9 +19,9 @@ execute(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/Optimizations, Prelim extracted value to ConstPool\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, Prelim extracted value to ConstPool\s+(\d+)/,
8); 8);
file_grep($Self->{stats}, qr/ConstPool, Constants emitted\s+(\d+)/i, file_grep($Self->{stats}, qr/ConstPool, Constants emitted\s+(\d+)/,
1); 1);
} }

4
test_regress/t/t_extract_static_const_no_merge.pl
View File

@ -22,9 +22,9 @@ execute(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/Optimizations, Prelim extracted value to ConstPool\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, Prelim extracted value to ConstPool\s+(\d+)/,
8); 8);
file_grep($Self->{stats}, qr/ConstPool, Constants emitted\s+(\d+)/i, file_grep($Self->{stats}, qr/ConstPool, Constants emitted\s+(\d+)/,
2); 2);
} }

2
test_regress/t/t_flag_comp_limit_parens.pl
View File

@ -18,7 +18,7 @@ execute(
); );
my @files = glob_all("$Self->{obj_dir}/$Self->{vm_prefix}___024root__DepSet*__Slow.cpp"); my @files = glob_all("$Self->{obj_dir}/$Self->{vm_prefix}___024root__DepSet*__Slow.cpp");
file_grep_any(\@files, qr/Vdeeptemp/i); file_grep_any(\@files, qr/Vdeeptemp/);
ok(1); ok(1);
1; 1;

2
test_regress/t/t_flag_expand_limit.pl
View File

@ -14,7 +14,7 @@ compile(
verilator_flags2 => ['--expand-limit 1 --stats -fno-dfg'], verilator_flags2 => ['--expand-limit 1 --stats -fno-dfg'],
); );
file_grep($Self->{stats}, qr/Optimizations, expand limited\s+(\d+)/i, 3); file_grep($Self->{stats}, qr/Optimizations, expand limited\s+(\d+)/, 3);
ok(1); ok(1);
1; 1;

2
test_regress/t/t_flag_help.pl
View File

@ -27,7 +27,7 @@ sub check {
verilator_run => 1, verilator_run => 1,
); );
file_grep($logfile, qr/(DISTRIBUTION|usage:)/i); file_grep($logfile, qr/(DISTRIBUTION|usage:)/);
} }
check("perl", "$ENV{VERILATOR_ROOT}/bin/verilator"); check("perl", "$ENV{VERILATOR_ROOT}/bin/verilator");

2
test_regress/t/t_flag_mmd.pl
View File

@ -14,7 +14,7 @@ compile(
verilator_flags2 => ["-MMD -MP"], verilator_flags2 => ["-MMD -MP"],
); );
file_grep("$Self->{obj_dir}/Vt_flag_mmd__ver.d", qr!t/t_flag_mmd.v!x); file_grep("$Self->{obj_dir}/Vt_flag_mmd__ver.d", qr!t/t_flag_mmd.v!);
ok(1); ok(1);
1; 1;

2
test_regress/t/t_flag_quiet_stats.pl
View File

@ -16,7 +16,7 @@ compile(
logfile => $Self->{run_log_filename}, logfile => $Self->{run_log_filename},
); );
file_grep_not($Self->{obj_dir}.'/vlt_compile.log', qr/V e r i l a t/i,); file_grep_not($Self->{obj_dir}.'/vlt_compile.log', qr/V e r i l a t/);
ok(1); ok(1);
1; 1;

2
test_regress/t/t_flag_quiet_stats2.pl
View File

@ -18,7 +18,7 @@ compile(
logfile => $Self->{run_log_filename}, logfile => $Self->{run_log_filename},
); );
file_grep_not($Self->{obj_dir}.'/vlt_compile.log', qr/V e r i l a t/i,); file_grep_not($Self->{obj_dir}.'/vlt_compile.log', qr/V e r i l a t/);
ok(1); ok(1);
1; 1;

2
test_regress/t/t_flag_quiet_stats3.pl
View File

@ -18,7 +18,7 @@ compile(
logfile => $Self->{run_log_filename}, logfile => $Self->{run_log_filename},
); );
file_grep($Self->{obj_dir}.'/vlt_compile.log', qr/V e r i l a t/i,); file_grep($Self->{obj_dir}.'/vlt_compile.log', qr/V e r i l a t/);
ok(1); ok(1);
1; 1;

2
test_regress/t/t_func_crc.pl
View File

@ -18,7 +18,7 @@ execute(
); );
if ($Self->{vlt}) { if ($Self->{vlt}) {
file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/i, 3888); file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/, 3888);
} }
ok(1); ok(1);

6
test_regress/t/t_func_dotted_inl1.pl
View File

@ -18,9 +18,9 @@ compile(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep_not("$out_filename", qr/"ma0"/i); file_grep_not("$out_filename", qr/"ma0"/);
file_grep_not("$out_filename", qr/"mb0"/i); file_grep_not("$out_filename", qr/"mb0"/);
file_grep_not("$out_filename", qr/"mc0"/i); file_grep_not("$out_filename", qr/"mc0"/);
} }
execute( execute(

6
test_regress/t/t_func_dotted_inl1_vlt.pl
View File

@ -18,9 +18,9 @@ compile(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep_not("$out_filename", qr/"ma0"/i); file_grep_not("$out_filename", qr/"ma0"/);
file_grep_not("$out_filename", qr/"mb0"/i); file_grep_not("$out_filename", qr/"mb0"/);
file_grep_not("$out_filename", qr/"mc0"/i); file_grep_not("$out_filename", qr/"mc0"/);
} }
execute( execute(

2
test_regress/t/t_func_real_exprstmt.pl
View File

@ -16,7 +16,7 @@ compile(
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
# Check no EXPRSTMTs in final output - should get optimized away # Check no EXPRSTMTs in final output - should get optimized away
file_grep_not($Self->{stats}, qr/Node count, EXPRSTMT/i); file_grep_not($Self->{stats}, qr/Node count, EXPRSTMT/);
} }
execute( execute(

12
test_regress/t/t_gantt.pl
View File

@ -42,15 +42,15 @@ run(cmd => ["$ENV{VERILATOR_ROOT}/bin/verilator_gantt",
); );
if ($Self->{vltmt}) { if ($Self->{vltmt}) {
file_grep("$Self->{obj_dir}/gantt.log", qr/Total threads += 2/i); file_grep("$Self->{obj_dir}/gantt.log", qr/Total threads += 2/);
file_grep("$Self->{obj_dir}/gantt.log", qr/Total mtasks += 7/i); file_grep("$Self->{obj_dir}/gantt.log", qr/Total mtasks += 7/);
# Predicted thread utilization should be less than 100% # Predicted thread utilization should be less than 100%
file_grep_not("$Self->{obj_dir}/gantt.log", qr/Thread utilization =\s*\d\d\d+\.\d+%/i); file_grep_not("$Self->{obj_dir}/gantt.log", qr/Thread utilization =\s*\d\d\d+\.\d+%/);
} else { } else {
file_grep("$Self->{obj_dir}/gantt.log", qr/Total threads += 1/i); file_grep("$Self->{obj_dir}/gantt.log", qr/Total threads += 1/);
file_grep("$Self->{obj_dir}/gantt.log", qr/Total mtasks += 0/i); file_grep("$Self->{obj_dir}/gantt.log", qr/Total mtasks += 0/);
} }
file_grep("$Self->{obj_dir}/gantt.log", qr/\|\s+2\s+\|\s+2\.0+\s+\|\s+eval/i); file_grep("$Self->{obj_dir}/gantt.log", qr/\|\s+2\s+\|\s+2\.0+\s+\|\s+eval/);
# Diff to itself, just to check parsing # Diff to itself, just to check parsing
vcd_identical("$Self->{obj_dir}/profile_exec.vcd", "$Self->{obj_dir}/profile_exec.vcd"); vcd_identical("$Self->{obj_dir}/profile_exec.vcd", "$Self->{obj_dir}/profile_exec.vcd");

10
test_regress/t/t_gantt_two.pl
View File

@ -47,13 +47,13 @@ run(cmd => ["$ENV{VERILATOR_ROOT}/bin/verilator_gantt",
); );
if ($Self->{vltmt}) { if ($Self->{vltmt}) {
file_grep("$Self->{obj_dir}/gantt.log", qr/Total threads += 2/i); file_grep("$Self->{obj_dir}/gantt.log", qr/Total threads += 2/);
file_grep("$Self->{obj_dir}/gantt.log", qr/Total mtasks += 7/i); file_grep("$Self->{obj_dir}/gantt.log", qr/Total mtasks += 7/);
} else { } else {
file_grep("$Self->{obj_dir}/gantt.log", qr/Total threads += 1/i); file_grep("$Self->{obj_dir}/gantt.log", qr/Total threads += 1/);
file_grep("$Self->{obj_dir}/gantt.log", qr/Total mtasks += 0/i); file_grep("$Self->{obj_dir}/gantt.log", qr/Total mtasks += 0/);
} }
file_grep("$Self->{obj_dir}/gantt.log", qr/\|\s+4\s+\|\s+4\.0+\s+\|\s+eval/i); file_grep("$Self->{obj_dir}/gantt.log", qr/\|\s+4\s+\|\s+4\.0+\s+\|\s+eval/);
# Diff to itself, just to check parsing # Diff to itself, just to check parsing
vcd_identical("$Self->{obj_dir}/profile_exec.vcd", "$Self->{obj_dir}/profile_exec.vcd"); vcd_identical("$Self->{obj_dir}/profile_exec.vcd", "$Self->{obj_dir}/profile_exec.vcd");

2
test_regress/t/t_gate_chained.pl
View File

@ -53,7 +53,7 @@ execute(
); );
# Must be <<9000 above to prove this worked # Must be <<9000 above to prove this worked
file_grep($Self->{stats}, qr/Optimizations, Gate sigs deleted\s+(\d+)/i, 8575); file_grep($Self->{stats}, qr/Optimizations, Gate sigs deleted\s+(\d+)/, 8575);
ok(1); ok(1);
1; 1;

2
test_regress/t/t_gate_ormux.pl
View File

@ -19,7 +19,7 @@ compile(
); );
if ($Self->{vlt}) { if ($Self->{vlt}) {
file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/i, 1058); file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/, 1058);
} }
execute( execute(

6
test_regress/t/t_hier_block.pl
View File

@ -30,12 +30,12 @@ compile(
execute( execute(
); );
file_grep($Self->{obj_dir} . "/Vsub0/sub0.sv", qr/^\s+\/\/\s+timeprecision\s+(\d+)ps;/mi, 1); file_grep($Self->{obj_dir} . "/Vsub0/sub0.sv", qr/^\s+\/\/\s+timeprecision\s+(\d+)ps;/m, 1);
file_grep($Self->{obj_dir} . "/Vsub0/sub0.sv", /^module\s+(\S+)\s+/, "sub0"); file_grep($Self->{obj_dir} . "/Vsub0/sub0.sv", /^module\s+(\S+)\s+/, "sub0");
file_grep($Self->{obj_dir} . "/Vsub1/sub1.sv", /^module\s+(\S+)\s+/, "sub1"); file_grep($Self->{obj_dir} . "/Vsub1/sub1.sv", /^module\s+(\S+)\s+/, "sub1");
file_grep($Self->{obj_dir} . "/Vsub2/sub2.sv", /^module\s+(\S+)\s+/, "sub2"); file_grep($Self->{obj_dir} . "/Vsub2/sub2.sv", /^module\s+(\S+)\s+/, "sub2");
file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/i, 14); file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/, 14);
file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/i, "cplusplus"); file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/, "cplusplus");
ok(1); ok(1);
1; 1;

4
test_regress/t/t_hier_block_cmake.pl
View File

@ -36,8 +36,8 @@ if (!$Self->have_cmake) {
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");
file_grep($target_dir . 'Vt_hier_block__stats.txt', qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/i, 14); file_grep($target_dir . 'Vt_hier_block__stats.txt', qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/, 14);
file_grep($Self->{obj_dir} . '/run.log', qr/MACRO:(\S+) is defined/i, "cplusplus"); file_grep($Self->{obj_dir} . '/run.log', qr/MACRO:(\S+) is defined/, "cplusplus");
} }
ok(1); ok(1);

4
test_regress/t/t_hier_block_nohier.pl
View File

@ -31,8 +31,8 @@ compile(
execute( execute(
); );
file_grep_not($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/i); file_grep_not($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/);
file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/i, "cplusplus"); file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/, "cplusplus");
ok(1); ok(1);
1; 1;

2
test_regress/t/t_hier_block_prot_lib.pl
View File

@ -59,7 +59,7 @@ while (1) {
file_grep($secret_dir . "/Vsub0/sub0.sv", /^module\s+(\S+)\s+/, "sub0"); file_grep($secret_dir . "/Vsub0/sub0.sv", /^module\s+(\S+)\s+/, "sub0");
file_grep($secret_dir . "/Vsub1/sub1.sv", /^module\s+(\S+)\s+/, "sub1"); file_grep($secret_dir . "/Vsub1/sub1.sv", /^module\s+(\S+)\s+/, "sub1");
file_grep($secret_dir . "/Vsub2/sub2.sv", /^module\s+(\S+)\s+/, "sub2"); file_grep($secret_dir . "/Vsub2/sub2.sv", /^module\s+(\S+)\s+/, "sub2");
file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/i, "cplusplus"); file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/, "cplusplus");
ok(1); ok(1);
1; 1;

2
test_regress/t/t_hier_block_prot_lib_shared.pl
View File

@ -61,7 +61,7 @@ while (1) {
file_grep($secret_dir . "/Vsub0/sub0.sv", /^module\s+(\S+)\s+/, "sub0"); file_grep($secret_dir . "/Vsub0/sub0.sv", /^module\s+(\S+)\s+/, "sub0");
file_grep($secret_dir . "/Vsub1/sub1.sv", /^module\s+(\S+)\s+/, "sub1"); file_grep($secret_dir . "/Vsub1/sub1.sv", /^module\s+(\S+)\s+/, "sub1");
file_grep($secret_dir . "/Vsub2/sub2.sv", /^module\s+(\S+)\s+/, "sub2"); file_grep($secret_dir . "/Vsub2/sub2.sv", /^module\s+(\S+)\s+/, "sub2");
file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/i, "cplusplus"); file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/, "cplusplus");
ok(1); ok(1);
1; 1;

4
test_regress/t/t_hier_block_sc.pl
View File

@ -34,8 +34,8 @@ execute(
file_grep($Self->{obj_dir} . "/Vsub0/sub0.sv", /^module\s+(\S+)\s+/, "sub0"); file_grep($Self->{obj_dir} . "/Vsub0/sub0.sv", /^module\s+(\S+)\s+/, "sub0");
file_grep($Self->{obj_dir} . "/Vsub1/sub1.sv", /^module\s+(\S+)\s+/, "sub1"); file_grep($Self->{obj_dir} . "/Vsub1/sub1.sv", /^module\s+(\S+)\s+/, "sub1");
file_grep($Self->{obj_dir} . "/Vsub2/sub2.sv", /^module\s+(\S+)\s+/, "sub2"); file_grep($Self->{obj_dir} . "/Vsub2/sub2.sv", /^module\s+(\S+)\s+/, "sub2");
file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/i, 14); file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/, 14);
file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/i, "cplusplus"); file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/, "cplusplus");
ok(1); ok(1);
1; 1;

4
test_regress/t/t_hier_block_sc_trace_fst.pl
View File

@ -36,8 +36,8 @@ execute(
file_grep($Self->{obj_dir} . "/Vsub0/sub0.sv", /^module\s+(\S+)\s+/, "sub0"); file_grep($Self->{obj_dir} . "/Vsub0/sub0.sv", /^module\s+(\S+)\s+/, "sub0");
file_grep($Self->{obj_dir} . "/Vsub1/sub1.sv", /^module\s+(\S+)\s+/, "sub1"); file_grep($Self->{obj_dir} . "/Vsub1/sub1.sv", /^module\s+(\S+)\s+/, "sub1");
file_grep($Self->{obj_dir} . "/Vsub2/sub2.sv", /^module\s+(\S+)\s+/, "sub2"); file_grep($Self->{obj_dir} . "/Vsub2/sub2.sv", /^module\s+(\S+)\s+/, "sub2");
file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/i, 14); file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/, 14);
file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/i, "cplusplus"); file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/, "cplusplus");
fst_identical($Self->trace_filename, $Self->{golden_filename}); fst_identical($Self->trace_filename, $Self->{golden_filename});
ok(1); ok(1);

4
test_regress/t/t_hier_block_sc_trace_vcd.pl
View File

@ -36,8 +36,8 @@ execute(
file_grep($Self->{obj_dir} . "/Vsub0/sub0.sv", /^module\s+(\S+)\s+/, "sub0"); file_grep($Self->{obj_dir} . "/Vsub0/sub0.sv", /^module\s+(\S+)\s+/, "sub0");
file_grep($Self->{obj_dir} . "/Vsub1/sub1.sv", /^module\s+(\S+)\s+/, "sub1"); file_grep($Self->{obj_dir} . "/Vsub1/sub1.sv", /^module\s+(\S+)\s+/, "sub1");
file_grep($Self->{obj_dir} . "/Vsub2/sub2.sv", /^module\s+(\S+)\s+/, "sub2"); file_grep($Self->{obj_dir} . "/Vsub2/sub2.sv", /^module\s+(\S+)\s+/, "sub2");
file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/i, 14); file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/, 14);
file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/i, "cplusplus"); file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/, "cplusplus");
vcd_identical($Self->trace_filename, $Self->{golden_filename}); vcd_identical($Self->trace_filename, $Self->{golden_filename});
ok(1); ok(1);

2
test_regress/t/t_hier_block_signed_logic.pl
View File

@ -18,6 +18,6 @@ execute(
); );
file_grep($Self->{obj_dir} . "/Vsub/sub.sv", /^module\s+(\S+)\s+/, "sub"); file_grep($Self->{obj_dir} . "/Vsub/sub.sv", /^module\s+(\S+)\s+/, "sub");
file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/i, 1); file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/, 1);
ok(1); ok(1);

4
test_regress/t/t_hier_block_vlt.pl
View File

@ -34,8 +34,8 @@ file_grep($Self->{obj_dir} . "/Vsub0/sub0.sv", qr/^\s+timeprecision\s+(\d+)ps;/m
file_grep($Self->{obj_dir} . "/Vsub0/sub0.sv", /^module\s+(\S+)\s+/, "sub0"); file_grep($Self->{obj_dir} . "/Vsub0/sub0.sv", /^module\s+(\S+)\s+/, "sub0");
file_grep($Self->{obj_dir} . "/Vsub1/sub1.sv", /^module\s+(\S+)\s+/, "sub1"); file_grep($Self->{obj_dir} . "/Vsub1/sub1.sv", /^module\s+(\S+)\s+/, "sub1");
file_grep($Self->{obj_dir} . "/Vsub2/sub2.sv", /^module\s+(\S+)\s+/, "sub2"); file_grep($Self->{obj_dir} . "/Vsub2/sub2.sv", /^module\s+(\S+)\s+/, "sub2");
file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/i, 14); file_grep($Self->{stats}, qr/HierBlock,\s+Hierarchical blocks\s+(\d+)/, 14);
file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/i, "cplusplus"); file_grep($Self->{run_log_filename}, qr/MACRO:(\S+) is defined/, "cplusplus");
ok(1); ok(1);
1; 1;

2
test_regress/t/t_inst_tree_inl0_pub1.pl
View File

@ -41,7 +41,7 @@ sub checkRelativeRefs {
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
# We expect to combine sequent functions across multiple instances of # We expect to combine sequent functions across multiple instances of
# l2, l3, l4, l5. If this number drops, please confirm this has not broken. # l2, l3, l4, l5. If this number drops, please confirm this has not broken.
file_grep($Self->{stats}, qr/Optimizations, Combined CFuncs\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, Combined CFuncs\s+(\d+)/,
($Self->{vltmt} ? 85 : 67)); ($Self->{vltmt} ? 85 : 67));
# Everything should use relative references # Everything should use relative references

2
test_regress/t/t_mem_shift.pl
View File

@ -15,7 +15,7 @@ compile(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/Optimizations, Delayed shared-sets\s+(\d+)/i, 14); file_grep($Self->{stats}, qr/Optimizations, Delayed shared-sets\s+(\d+)/, 14);
} }
execute( execute(

6
test_regress/t/t_merge_cond.pl
View File

@ -19,11 +19,11 @@ execute(
if ($Self->{vlt}) { if ($Self->{vlt}) {
# Note, with vltmt this might be split differently, so only checking vlt # Note, with vltmt this might be split differently, so only checking vlt
file_grep($Self->{stats}, qr/Optimizations, MergeCond merges\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, MergeCond merges\s+(\d+)/,
9); 9);
file_grep($Self->{stats}, qr/Optimizations, MergeCond merged items\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, MergeCond merged items\s+(\d+)/,
580); 580);
file_grep($Self->{stats}, qr/Optimizations, MergeCond longest merge\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, MergeCond longest merge\s+(\d+)/,
128); 128);
} }

6
test_regress/t/t_merge_cond_blowup.pl
View File

@ -21,11 +21,11 @@ execute(
if ($Self->{vlt}) { if ($Self->{vlt}) {
# Note, with vltmt this might be split differently, so only checking vlt # Note, with vltmt this might be split differently, so only checking vlt
file_grep($Self->{stats}, qr/Optimizations, MergeCond merges\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, MergeCond merges\s+(\d+)/,
500); # V3MergeCond.cpp MAX_DISTANCE 500); # V3MergeCond.cpp MAX_DISTANCE
file_grep($Self->{stats}, qr/Optimizations, MergeCond merged items\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, MergeCond merged items\s+(\d+)/,
1000); # V3MergeCond.cpp MAX_DISTANCE *2 1000); # V3MergeCond.cpp MAX_DISTANCE *2
file_grep($Self->{stats}, qr/Optimizations, MergeCond longest merge\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, MergeCond longest merge\s+(\d+)/,
2); 2);
} }

6
test_regress/t/t_merge_cond_bug_3409.pl
View File

@ -17,11 +17,11 @@ compile(
execute(); execute();
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/Optimizations, MergeCond merges\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, MergeCond merges\s+(\d+)/,
0); 0);
file_grep($Self->{stats}, qr/Optimizations, MergeCond merged items\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, MergeCond merged items\s+(\d+)/,
0); 0);
file_grep($Self->{stats}, qr/Optimizations, MergeCond longest merge\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, MergeCond longest merge\s+(\d+)/,
0); 0);
} }

2
test_regress/t/t_merge_cond_no_extend.pl
View File

@ -14,7 +14,7 @@ compile(
verilator_flags2 => ["--stats"], verilator_flags2 => ["--stats"],
); );
file_grep($Self->{stats}, qr/Optimizations, MergeCond merges\s+(\d+)/i, 0); file_grep($Self->{stats}, qr/Optimizations, MergeCond merges\s+(\d+)/, 0);
ok(1); ok(1);
1; 1;

6
test_regress/t/t_merge_cond_no_motion.pl
View File

@ -21,11 +21,11 @@ execute(
if ($Self->{vlt}) { if ($Self->{vlt}) {
# Note, with vltmt this might be split differently, so only checking vlt # Note, with vltmt this might be split differently, so only checking vlt
file_grep($Self->{stats}, qr/Optimizations, MergeCond merges\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, MergeCond merges\s+(\d+)/,
10); 10);
file_grep($Self->{stats}, qr/Optimizations, MergeCond merged items\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, MergeCond merged items\s+(\d+)/,
580); 580);
file_grep($Self->{stats}, qr/Optimizations, MergeCond longest merge\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, MergeCond longest merge\s+(\d+)/,
64); 64);
} }

4
test_regress/t/t_nba_commit_queue.pl
View File

@ -17,9 +17,9 @@ compile(
execute( execute(
); );
file_grep($Self->{stats}, qr/Dynamic NBA, variables needing commit queue without partial updates\s+(\d+)/i, file_grep($Self->{stats}, qr/Dynamic NBA, variables needing commit queue without partial updates\s+(\d+)/,
6); 6);
file_grep($Self->{stats}, qr/Dynamic NBA, variables needing commit queue with partial updates\s+(\d+)/i, file_grep($Self->{stats}, qr/Dynamic NBA, variables needing commit queue with partial updates\s+(\d+)/,
3); 3);
ok(1); ok(1);

4
test_regress/t/t_opt_dead.pl
View File

@ -18,8 +18,8 @@ execute(
# bug2227, Verilator unsupported, class dead # bug2227, Verilator unsupported, class dead
# This is what we really want: # This is what we really want:
# file_grep_not("$Self->{obj_dir}/V$Self->{name}__Syms.h", qr/dead/ix); # file_grep_not("$Self->{obj_dir}/V$Self->{name}__Syms.h", qr/dead/);
file_grep("$Self->{obj_dir}/V$Self->{name}__Syms.h", qr/dead/ix); file_grep("$Self->{obj_dir}/V$Self->{name}__Syms.h", qr/dead/);
ok(1); ok(1);
1; 1;

2
test_regress/t/t_opt_dead_noassigns.pl
View File

@ -18,7 +18,7 @@ execute(
); );
my @files = glob_all("$Self->{obj_dir}/$Self->{vm_prefix}_*.cpp"); my @files = glob_all("$Self->{obj_dir}/$Self->{vm_prefix}_*.cpp");
file_grep_any(\@files, qr/keptdead/ix); file_grep_any(\@files, qr/keptdead/);
ok(1); ok(1);
1; 1;

2
test_regress/t/t_opt_dead_nocells.pl
View File

@ -15,7 +15,7 @@ compile(
); );
my @files = glob_all("$Self->{obj_dir}/$Self->{vm_prefix}_*.h"); my @files = glob_all("$Self->{obj_dir}/$Self->{vm_prefix}_*.h");
file_grep_any(\@files, qr/keptdead/ix); file_grep_any(\@files, qr/keptdead/);
ok(1); ok(1);
1; 1;

2
test_regress/t/t_opt_localize_max_size.pl
View File

@ -18,7 +18,7 @@ execute(
); );
# Value must differ from that in t_opt_localize_max_size.pl # Value must differ from that in t_opt_localize_max_size.pl
file_grep($Self->{stats}, qr/Optimizations, Vars localized\s+(\d+)/i, 5); file_grep($Self->{stats}, qr/Optimizations, Vars localized\s+(\d+)/, 5);
ok(1); ok(1);
1; 1;

2
test_regress/t/t_opt_localize_max_size_1.pl
View File

@ -20,7 +20,7 @@ execute(
); );
# Value must differ from that in t_opt_localize_max_size.pl # Value must differ from that in t_opt_localize_max_size.pl
file_grep($Self->{stats}, qr/Optimizations, Vars localized\s+(\d+)/i, 4); file_grep($Self->{stats}, qr/Optimizations, Vars localized\s+(\d+)/, 4);
ok(1); ok(1);
1; 1;

4
test_regress/t/t_opt_table_enum.pl
View File

@ -15,8 +15,8 @@ compile(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 1); file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 1);
file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 1); file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 1);
} }
execute( execute(

4
test_regress/t/t_opt_table_packed_array.pl
View File

@ -15,8 +15,8 @@ compile(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 1); file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 1);
file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 1); file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 1);
} }
execute( execute(

4
test_regress/t/t_opt_table_real.pl
View File

@ -15,8 +15,8 @@ compile(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 1); file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 1);
file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 1); file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 1);
} }
execute( execute(

4
test_regress/t/t_opt_table_same.pl
View File

@ -15,8 +15,8 @@ compile(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 2); file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 2);
file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 1); file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 1);
} }
execute( execute(

4
test_regress/t/t_opt_table_signed.pl
View File

@ -15,8 +15,8 @@ compile(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 1); file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 1);
file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 1); file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 1);
} }
execute( execute(

4
test_regress/t/t_opt_table_sparse.pl
View File

@ -15,8 +15,8 @@ compile(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 1); file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 1);
file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 2); file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 2);
} }
execute( execute(

4
test_regress/t/t_opt_table_sparse_output_split.pl
View File

@ -18,8 +18,8 @@ compile(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 1); file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 1);
file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 2); file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 2);
} }
# Splitting should set VM_PARALLEL_BUILDS to 1 by default # Splitting should set VM_PARALLEL_BUILDS to 1 by default

4
test_regress/t/t_opt_table_string.pl
View File

@ -15,8 +15,8 @@ compile(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 1); file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 1);
file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 1); file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 1);
} }
execute( execute(

4
test_regress/t/t_opt_table_struct.pl
View File

@ -15,8 +15,8 @@ compile(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 1); file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/, 1);
file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 1); file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 1);
} }
execute( execute(

4
test_regress/t/t_param_in_func.pl
View File

@ -18,7 +18,7 @@ execute();
# The parameter array should have been put in the constant pool # The parameter array should have been put in the constant pool
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 3); file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 3);
} }
# Shouldn't have any references to the parameter array # Shouldn't have any references to the parameter array
@ -26,7 +26,7 @@ foreach my $file (
glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.h"), glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.h"),
glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.cpp") glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.cpp")
) { ) {
file_grep_not($file, qr/digits/i); file_grep_not($file, qr/digits/);
} }
ok(1); ok(1);

4
test_regress/t/t_param_in_func_noinline.pl
View File

@ -20,7 +20,7 @@ execute();
# The parameter array should have been put in the constant pool # The parameter array should have been put in the constant pool
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/i, 3); file_grep($Self->{stats}, qr/ConstPool, Tables emitted\s+(\d+)/, 3);
} }
# Shouldn't have any references to the parameter array # Shouldn't have any references to the parameter array
@ -28,7 +28,7 @@ foreach my $file (
glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.h"), glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.h"),
glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.cpp") glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.cpp")
) { ) {
file_grep_not($file, qr/digits/i); file_grep_not($file, qr/digits/);
} }
ok(1); ok(1);

2
test_regress/t/t_pgo_threads.pl
View File

@ -25,7 +25,7 @@ execute(
], ],
); );
file_grep("$Self->{obj_dir}/profile.vlt", qr/profile_data/i); file_grep("$Self->{obj_dir}/profile.vlt", qr/profile_data/);
compile( compile(
# Intentionally no --prof-pgo here to make sure profile data can be read in # Intentionally no --prof-pgo here to make sure profile data can be read in

2
test_regress/t/t_protect_ids.pl
View File

@ -43,7 +43,7 @@ if ($Self->{vlt_all}) {
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/);
$any = 1; $any = 1;
} }
$any or $Self->error("No outputs found"); $any or $Self->error("No outputs found");

4
test_regress/t/t_reloop_cam.pl
View File

@ -21,9 +21,9 @@ execute(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep($Self->{stats}, qr/Optimizations, Reloop iterations\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, Reloop iterations\s+(\d+)/,
768); 768);
file_grep($Self->{stats}, qr/Optimizations, Reloops\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, Reloops\s+(\d+)/,
3); 3);
} }

4
test_regress/t/t_reloop_offset.pl
View File

@ -22,9 +22,9 @@ execute(
if ($Self->{vlt}) { if ($Self->{vlt}) {
# Note, with vltmt this might be split differently, so only checking vlt # Note, with vltmt this might be split differently, so only checking vlt
file_grep($Self->{stats}, qr/Optimizations, Reloop iterations\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, Reloop iterations\s+(\d+)/,
125); 125);
file_grep($Self->{stats}, qr/Optimizations, Reloops\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, Reloops\s+(\d+)/,
2); 2);
} }

4
test_regress/t/t_reloop_offset_lim_63.pl
View File

@ -26,9 +26,9 @@ execute(
if ($Self->{vlt}) { if ($Self->{vlt}) {
# Note, with vltmt this might be split differently, so only checking vlt # Note, with vltmt this might be split differently, so only checking vlt
file_grep($Self->{stats}, qr/Optimizations, Reloop iterations\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, Reloop iterations\s+(\d+)/,
63); 63);
file_grep($Self->{stats}, qr/Optimizations, Reloops\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, Reloops\s+(\d+)/,
1); 1);
} }

4
test_regress/t/t_runflag_quiet.pl
View File

@ -19,7 +19,7 @@ execute(
logfile => "$Self->{obj_dir}/sim__quiet.log", logfile => "$Self->{obj_dir}/sim__quiet.log",
); );
file_grep_not("$Self->{obj_dir}/sim__quiet.log", qr/S i m u l a t/i,); file_grep_not("$Self->{obj_dir}/sim__quiet.log", qr/S i m u l a t/);
#--- #---
@ -28,7 +28,7 @@ execute(
logfile => "$Self->{obj_dir}/sim__noquiet.log", logfile => "$Self->{obj_dir}/sim__noquiet.log",
); );
file_grep("$Self->{obj_dir}/sim__noquiet.log", qr/S i m u l a t/i,); file_grep("$Self->{obj_dir}/sim__noquiet.log", qr/S i m u l a t/);
ok(1); ok(1);

4
test_regress/t/t_split_var_0.pl
View File

@ -21,7 +21,7 @@ compile(
execute( execute(
); );
file_grep($Self->{stats}, qr/SplitVar,\s+Split packed variables\s+(\d+)/i, 13); file_grep($Self->{stats}, qr/SplitVar,\s+Split packed variables\s+(\d+)/, 13);
file_grep($Self->{stats}, qr/SplitVar,\s+Split unpacked arrays\s+(\d+)/i, 27); file_grep($Self->{stats}, qr/SplitVar,\s+Split unpacked arrays\s+(\d+)/, 27);
ok(1); ok(1);
1; 1;

4
test_regress/t/t_split_var_2_trace.pl
View File

@ -23,8 +23,8 @@ execute(
); );
vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename}); vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
file_grep($Self->{stats}, qr/SplitVar,\s+Split packed variables\s+(\d+)/i, 12); file_grep($Self->{stats}, qr/SplitVar,\s+Split packed variables\s+(\d+)/, 12);
file_grep($Self->{stats}, qr/SplitVar,\s+Split unpacked arrays\s+(\d+)/i, 27); file_grep($Self->{stats}, qr/SplitVar,\s+Split unpacked arrays\s+(\d+)/, 27);
ok(1); ok(1);
1; 1;

4
test_regress/t/t_split_var_3_wreal.pl
View File

@ -17,7 +17,7 @@ compile(
execute( execute(
); );
file_grep($Self->{stats}, qr/SplitVar,\s+Split packed variables\s+(\d+)/i, 0); file_grep($Self->{stats}, qr/SplitVar,\s+Split packed variables\s+(\d+)/, 0);
file_grep($Self->{stats}, qr/SplitVar,\s+Split unpacked arrays\s+(\d+)/i, 3); file_grep($Self->{stats}, qr/SplitVar,\s+Split unpacked arrays\s+(\d+)/, 3);
ok(1); ok(1);
1; 1;

4
test_regress/t/t_split_var_4.pl
View File

@ -17,7 +17,7 @@ compile(
execute( execute(
); );
file_grep($Self->{stats}, qr/SplitVar,\s+Split packed variables\s+(\d+)/i, 1); file_grep($Self->{stats}, qr/SplitVar,\s+Split packed variables\s+(\d+)/, 1);
file_grep($Self->{stats}, qr/SplitVar,\s+Split unpacked arrays\s+(\d+)/i, 0); file_grep($Self->{stats}, qr/SplitVar,\s+Split unpacked arrays\s+(\d+)/, 0);
ok(1); ok(1);
1; 1;

4
test_regress/t/t_split_var_5.pl
View File

@ -18,7 +18,7 @@ compile(
execute( execute(
); );
file_grep($Self->{stats}, qr/SplitVar,\s+Split packed variables\s+(\d+)/i, 0); file_grep($Self->{stats}, qr/SplitVar,\s+Split packed variables\s+(\d+)/, 0);
file_grep($Self->{stats}, qr/SplitVar,\s+Split unpacked arrays\s+(\d+)/i, 0); file_grep($Self->{stats}, qr/SplitVar,\s+Split unpacked arrays\s+(\d+)/, 0);
ok(1); ok(1);
1; 1;

2
test_regress/t/t_struct_unused.pl
View File

@ -22,7 +22,7 @@ if ($Self->{vlt_all}) {
# Check for unused structs in any outputs # Check for unused structs in any outputs
my $any; my $any;
foreach my $filename (glob $Self->{obj_dir} . "/*.[ch]*") { foreach my $filename (glob $Self->{obj_dir} . "/*.[ch]*") {
file_grep_not($filename, qr/useless/i); file_grep_not($filename, qr/useless/);
$any = 1; $any = 1;
} }
$any or $Self->error("No outputs found"); $any or $Self->error("No outputs found");

2
test_regress/t/t_sys_rand_concat.pl
View File

@ -17,7 +17,7 @@ execute(
); );
for my $file (glob_all("$Self->{obj_dir}/$Self->{vm_prefix}___024root__DepSet*__Slow.cpp")) { for my $file (glob_all("$Self->{obj_dir}/$Self->{vm_prefix}___024root__DepSet*__Slow.cpp")) {
file_grep_not($file, qr/(<<|>>)/x); file_grep_not($file, qr/(<<|>>)/);
} }
ok(1); ok(1);

2
test_regress/t/t_threads_nondeterminism.pl
View File

@ -20,7 +20,7 @@ compile(
execute( execute(
); );
file_grep("$Self->{obj_dir}/vlt_compile.log", qr/hash of shape/i); file_grep("$Self->{obj_dir}/vlt_compile.log", qr/Hash of shape/);
ok(1); ok(1);
1; 1;

4
test_regress/t/t_timing_protect.pl
View File

@ -28,8 +28,8 @@ else {
# 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]*") {
file_grep_not($filename, qr/event[123]/i); file_grep_not($filename, qr/event[123]/);
file_grep_not($filename, qr/t_timing_fork_join/i); file_grep_not($filename, qr/t_timing_fork_join/);
$any = 1; $any = 1;
} }
$any or $Self->error("No outputs found"); $any or $Self->error("No outputs found");

2
test_regress/t/t_trace_decoration.pl
View File

@ -17,7 +17,7 @@ compile(
execute( execute(
); );
file_grep_not("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr!// Body!x); file_grep_not("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr!// Body!);
ok(1); ok(1);
1; 1;

8
test_regress/t/t_trace_ena_cc.pl
View File

@ -20,10 +20,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\"/);
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\"/);
file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/x); file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/);
file_grep_not("$Self->{obj_dir}/simx.vcd", qr/inside_sub/x); file_grep_not("$Self->{obj_dir}/simx.vcd", qr/inside_sub/);
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

@ -25,7 +25,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/);
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_public_sig.pl
View File

@ -25,7 +25,7 @@ execute(
vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename}); vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
# vcd_identical doesn't detect "$var a.b;" vs "$scope module a; $var b;" # vcd_identical doesn't detect "$var a.b;" vs "$scope module a; $var b;"
file_grep("$Self->{obj_dir}/simx.vcd", qr/module glbl/i); file_grep("$Self->{obj_dir}/simx.vcd", qr/module glbl/);
ok(1); ok(1);
1; 1;

2
test_regress/t/t_trace_public_sig_vlt.pl
View File

@ -31,7 +31,7 @@ execute(
vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename}); vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
# vcd_identical doesn't detect "$var a.b;" vs "$scope module a; $var b;" # vcd_identical doesn't detect "$var a.b;" vs "$scope module a; $var b;"
file_grep("$Self->{obj_dir}/simx.vcd", qr/module glbl/i); file_grep("$Self->{obj_dir}/simx.vcd", qr/module glbl/);
ok(1); ok(1);
1; 1;

6
test_regress/t/t_trace_rollover.pl
View File

@ -27,9 +27,9 @@ system("cat $Self->{obj_dir}/simrollover_cat*.vcd "
vcd_identical("$Self->{obj_dir}/simall.vcd", vcd_identical("$Self->{obj_dir}/simall.vcd",
$Self->{golden_filename}); $Self->{golden_filename});
file_grep_not("$Self->{obj_dir}/simrollover_cat0000.vcd", qr/^#/i); file_grep_not("$Self->{obj_dir}/simrollover_cat0000.vcd", qr/^#/);
file_grep("$Self->{obj_dir}/simrollover_cat0001.vcd", qr/^#/i); file_grep("$Self->{obj_dir}/simrollover_cat0001.vcd", qr/^#/);
file_grep("$Self->{obj_dir}/simrollover_cat0002.vcd", qr/^#/i); file_grep("$Self->{obj_dir}/simrollover_cat0002.vcd", qr/^#/);
ok(1); ok(1);
1; 1;

2
test_regress/t/t_trace_two_dump_cc.pl
View File

@ -37,7 +37,7 @@ 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/);
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_two_dump_sc.pl
View File

@ -41,7 +41,7 @@ else {
); );
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/);
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_two_hdr_cc.pl
View File

@ -37,7 +37,7 @@ 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/);
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_two_hdr_sc.pl
View File

@ -41,7 +41,7 @@ else {
); );
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/);
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_two_port_cc.pl
View File

@ -37,7 +37,7 @@ 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/);
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_two_port_sc.pl
View File

@ -41,7 +41,7 @@ else {
); );
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/);
vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename}); vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
} }
} }

Some files were not shown because too many files have changed in this diff Show More