diff --git a/test_regress/driver.pl b/test_regress/driver.pl index a0c616a1f..2a1685e4e 100755 --- a/test_regress/driver.pl +++ b/test_regress/driver.pl @@ -676,12 +676,12 @@ sub new { $self->{vlt_all} = $self->{vlt} || $self->{vltmt}; # Any Verilator scenario - $self->{VM_PREFIX} ||= "V" . $self->{name}; + $self->{vm_prefix} ||= "V" . $self->{name}; $self->{stats} ||= "$self->{obj_dir}/V" . $self->{name} . "__stats.txt"; $self->{status_filename} ||= "$self->{obj_dir}/V" . $self->{name} . ".status"; $self->{run_log_filename} ||= "$self->{obj_dir}/vlt_sim.log"; $self->{coverage_filename} ||= "$self->{obj_dir}/coverage.dat"; - $self->{main_filename} ||= "$self->{obj_dir}/$self->{VM_PREFIX}__main.cpp"; + $self->{main_filename} ||= "$self->{obj_dir}/$self->{vm_prefix}__main.cpp"; ($self->{top_filename} ||= $self->{pl_filename}) =~ s/\.pl$//; ($self->{golden_filename} ||= $self->{pl_filename}) =~ s/\.pl$/.out/; if (-e ($self->{top_filename} . ".vhd")) { # If VHDL file exists @@ -693,7 +693,7 @@ sub new { if (!$self->{make_top_shell}) { $self->{top_shell_filename} = $self->{top_filename}; } else { - $self->{top_shell_filename} = "$self->{obj_dir}/$self->{VM_PREFIX}__top.v"; + $self->{top_shell_filename} = "$self->{obj_dir}/$self->{vm_prefix}__top.v"; } $self->{pli_filename} ||= $self->{name} . ".cpp"; @@ -926,7 +926,7 @@ sub compile_vlt_flags { $param{make_main} && $param{verilator_make_gmake}; my @cmdargs = ( - "--prefix " . $param{VM_PREFIX}, + "--prefix " . $param{vm_prefix}, @verilator_flags, @{$param{verilator_flags2}}, @{$param{verilator_flags3}}, @@ -983,7 +983,7 @@ sub compile { = $self->{top_shell_filename} = ""; } else { $param{top_shell_filename} - = $self->{top_shell_filename} = "$self->{obj_dir}/$self->{VM_PREFIX}__top." . $self->v_suffix; + = $self->{top_shell_filename} = "$self->{obj_dir}/$self->{vm_prefix}__top." . $self->v_suffix; } if ($param{atsim}) { @@ -1174,13 +1174,13 @@ sub compile { "-C " . $self->{obj_dir}, "-f " . $FindBin::RealBin . "/Makefile_obj", ($self->{verbose} ? "" : "--no-print-directory"), - "VM_PREFIX=$self->{VM_PREFIX}", + "VM_PREFIX=$self->{vm_prefix}", "TEST_OBJ_DIR=$self->{obj_dir}", "CPPFLAGS_DRIVER=-D" . uc($self->{name}), ($self->{verbose} ? "CPPFLAGS_DRIVER2=-DTEST_VERBOSE=1" : ""), ($param{benchmark} ? "" : "OPT_FAST=-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 ($param{make_flags} || ""), ]); } @@ -1327,7 +1327,7 @@ sub execute { elsif ($param{vlt_all} #&& (!$param{needs_v4} || -r "$ENV{VERILATOR_ROOT}/src/V3Gate.cpp") ) { - $param{executable} ||= "$self->{obj_dir}/$param{VM_PREFIX}"; + $param{executable} ||= "$self->{obj_dir}/$param{vm_prefix}"; my $debugger = ""; if ($opt_gdbsim) { $debugger = ($ENV{VERILATOR_GDB} || "gdb") . " "; @@ -1549,10 +1549,10 @@ sub wno_unopthreads_for_few_cores { return ""; } -sub VM_PREFIX { +sub vm_prefix { my $self = (ref $_[0] ? shift : $Self); - $self->{VM_PREFIX} = shift if defined $_[0]; - return $self->{VM_PREFIX}; + $self->{vm_prefix} = shift if defined $_[0]; + return $self->{vm_prefix}; } #---------------------------------------------------------------------- @@ -1760,8 +1760,8 @@ sub _make_main { print $fh "#include \"verilatedos.h\"\n"; print $fh "// Generated header\n"; - my $VM_PREFIX = $self->{VM_PREFIX}; - print $fh "#include \"$VM_PREFIX.h\"\n"; + my $vm_prefix = $self->{vm_prefix}; + print $fh "#include \"${vm_prefix}.h\"\n"; print $fh "// General headers\n"; print $fh "#include \"verilated.h\"\n"; @@ -1772,7 +1772,7 @@ sub _make_main { print $fh "#include \"verilated_vcd_sc.h\"\n" if $self->{trace} && $self->{trace_format} eq 'vcd-sc'; print $fh "#include \"verilated_save.h\"\n" if $self->{savable}; - print $fh "std::unique_ptr<$VM_PREFIX> topp;\n"; + print $fh "std::unique_ptr<${vm_prefix}> topp;\n"; if ($self->{savable}) { $fh->print("\n"); @@ -1813,7 +1813,7 @@ sub _make_main { print $fh " srand48(5);\n"; # Ensure determinism print $fh " contextp->randReset(" . $self->{verilated_randReset} . ");\n" if defined $self->{verilated_randReset}; - print $fh " topp.reset(new $VM_PREFIX(\"top\"));\n"; + print $fh " topp.reset(new ${vm_prefix}(\"top\"));\n"; print $fh " contextp->internalsDump()\n;" if $self->{verilated_debug}; my $set; diff --git a/test_regress/t/t_alw_noreorder.pl b/test_regress/t/t_alw_noreorder.pl index edc2a6f7b..c30d624bd 100755 --- a/test_regress/t/t_alw_noreorder.pl +++ b/test_regress/t/t_alw_noreorder.pl @@ -19,7 +19,7 @@ file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 0); # Here we should see some dly vars since reorder is disabled. # (Whereas our twin test, t_alw_reorder, should see no dly vars # 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__v2/i); diff --git a/test_regress/t/t_alw_reorder.pl b/test_regress/t/t_alw_reorder.pl index 90a7126da..0c855076f 100755 --- a/test_regress/t/t_alw_reorder.pl +++ b/test_regress/t/t_alw_reorder.pl @@ -19,8 +19,8 @@ file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 0); # Equally important: twin test t_alw_noreorder should see dly vars, # is identical to this test except for disabling the reorder step. foreach my $file ( - 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}*.h"), + 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__v2/i); diff --git a/test_regress/t/t_c_this.pl b/test_regress/t/t_c_this.pl index 93c3b5200..7fa144221 100755 --- a/test_regress/t/t_c_this.pl +++ b/test_regress/t/t_c_this.pl @@ -19,7 +19,7 @@ if ($Self->{vlt_all}) { my $has_xthis = 0; my $has_thisx = 0; my $has_xthisx = 0; - for my $file (glob_all("$Self->{obj_dir}/$Self->{VM_PREFIX}___024root__DepSet_*__0.cpp")) { + for my $file (glob_all("$Self->{obj_dir}/$Self->{vm_prefix}___024root__DepSet_*__0.cpp")) { my $text = file_contents($file); $has_this = 1 if ($text =~ m/\bthis->clk\b/); $has_xthis = 1 if ($text =~ m/\bxthis\b/); diff --git a/test_regress/t/t_ccache_report.pl b/test_regress/t/t_ccache_report.pl index 790bbf9f0..90c5004a2 100755 --- a/test_regress/t/t_ccache_report.pl +++ b/test_regress/t/t_ccache_report.pl @@ -27,7 +27,7 @@ else { make_flags => "ccache-report" ); - my $report = "$Self->{obj_dir}/$Self->{VM_PREFIX}__ccache_report.txt"; + my $report = "$Self->{obj_dir}/$Self->{vm_prefix}__ccache_report.txt"; # We do not actually want to make this test depend on whether the file was # cached or not, so trim the report to ignore actual caching behaviour @@ -38,8 +38,8 @@ else { run( logfile => "$Self->{obj_dir}/rebuild.log", cmd => ["make", "-C", $Self->{obj_dir}, - "-f", "$Self->{VM_PREFIX}.mk", - $Self->{VM_PREFIX}, "ccache-report"] + "-f", "$Self->{vm_prefix}.mk", + $Self->{vm_prefix}, "ccache-report"] ); files_identical($report, "t/$Self->{name}__ccache_report_rebuild.out"); diff --git a/test_regress/t/t_debug_emitv.pl b/test_regress/t/t_debug_emitv.pl index 91be564c7..4af48a3e3 100755 --- a/test_regress/t/t_debug_emitv.pl +++ b/test_regress/t/t_debug_emitv.pl @@ -16,7 +16,7 @@ lint( v_flags => ["--lint-only --dumpi-tree 9 --dumpi-V3EmitV 9 --debug-emitv"], ); -files_identical(glob_one("$Self->{obj_dir}/$Self->{VM_PREFIX}_*_width.tree.v"), $Self->{golden_filename}); +files_identical(glob_one("$Self->{obj_dir}/$Self->{vm_prefix}_*_width.tree.v"), $Self->{golden_filename}); ok(1); 1; diff --git a/test_regress/t/t_display_merge.pl b/test_regress/t/t_display_merge.pl index 27cc0ef25..0de4e1ed6 100755 --- a/test_regress/t/t_display_merge.pl +++ b/test_regress/t/t_display_merge.pl @@ -19,7 +19,7 @@ execute( expect_filename => $Self->{golden_filename}, ); -file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}__stats.txt", +file_grep("$Self->{obj_dir}/$Self->{vm_prefix}__stats.txt", qr/Node count, DISPLAY \s+ 44 \s+ 27 \s+ 27 \s+ 6/); ok(1); diff --git a/test_regress/t/t_dpi_arg_inout_type.pl b/test_regress/t/t_dpi_arg_inout_type.pl index 9ca750797..3bab51d49 100755 --- a/test_regress/t/t_dpi_arg_inout_type.pl +++ b/test_regress/t/t_dpi_arg_inout_type.pl @@ -30,7 +30,7 @@ compile( ); if ($Self->{vlt_all}) { - files_identical("$Self->{obj_dir}/$Self->{VM_PREFIX}__Dpi.h", + files_identical("$Self->{obj_dir}/$Self->{vm_prefix}__Dpi.h", "t/$Self->{name}__Dpi.out"); } diff --git a/test_regress/t/t_dpi_arg_inout_unpack.pl b/test_regress/t/t_dpi_arg_inout_unpack.pl index 18dfa90cf..f58b3fb94 100755 --- a/test_regress/t/t_dpi_arg_inout_unpack.pl +++ b/test_regress/t/t_dpi_arg_inout_unpack.pl @@ -30,7 +30,7 @@ compile( ); if ($Self->{vlt_all}) { - files_identical("$Self->{obj_dir}/$Self->{VM_PREFIX}__Dpi.h", + files_identical("$Self->{obj_dir}/$Self->{vm_prefix}__Dpi.h", "t/$Self->{name}__Dpi.out"); } diff --git a/test_regress/t/t_dpi_arg_input_type.pl b/test_regress/t/t_dpi_arg_input_type.pl index 9ca750797..3bab51d49 100755 --- a/test_regress/t/t_dpi_arg_input_type.pl +++ b/test_regress/t/t_dpi_arg_input_type.pl @@ -30,7 +30,7 @@ compile( ); if ($Self->{vlt_all}) { - files_identical("$Self->{obj_dir}/$Self->{VM_PREFIX}__Dpi.h", + files_identical("$Self->{obj_dir}/$Self->{vm_prefix}__Dpi.h", "t/$Self->{name}__Dpi.out"); } diff --git a/test_regress/t/t_dpi_arg_input_unpack.pl b/test_regress/t/t_dpi_arg_input_unpack.pl index 18dfa90cf..f58b3fb94 100755 --- a/test_regress/t/t_dpi_arg_input_unpack.pl +++ b/test_regress/t/t_dpi_arg_input_unpack.pl @@ -30,7 +30,7 @@ compile( ); if ($Self->{vlt_all}) { - files_identical("$Self->{obj_dir}/$Self->{VM_PREFIX}__Dpi.h", + files_identical("$Self->{obj_dir}/$Self->{vm_prefix}__Dpi.h", "t/$Self->{name}__Dpi.out"); } diff --git a/test_regress/t/t_dpi_arg_output_type.pl b/test_regress/t/t_dpi_arg_output_type.pl index 9ca750797..3bab51d49 100755 --- a/test_regress/t/t_dpi_arg_output_type.pl +++ b/test_regress/t/t_dpi_arg_output_type.pl @@ -30,7 +30,7 @@ compile( ); if ($Self->{vlt_all}) { - files_identical("$Self->{obj_dir}/$Self->{VM_PREFIX}__Dpi.h", + files_identical("$Self->{obj_dir}/$Self->{vm_prefix}__Dpi.h", "t/$Self->{name}__Dpi.out"); } diff --git a/test_regress/t/t_dpi_arg_output_unpack.pl b/test_regress/t/t_dpi_arg_output_unpack.pl index 18dfa90cf..f58b3fb94 100755 --- a/test_regress/t/t_dpi_arg_output_unpack.pl +++ b/test_regress/t/t_dpi_arg_output_unpack.pl @@ -30,7 +30,7 @@ compile( ); if ($Self->{vlt_all}) { - files_identical("$Self->{obj_dir}/$Self->{VM_PREFIX}__Dpi.h", + files_identical("$Self->{obj_dir}/$Self->{vm_prefix}__Dpi.h", "t/$Self->{name}__Dpi.out"); } diff --git a/test_regress/t/t_dpi_result_type.pl b/test_regress/t/t_dpi_result_type.pl index 9ca750797..3bab51d49 100755 --- a/test_regress/t/t_dpi_result_type.pl +++ b/test_regress/t/t_dpi_result_type.pl @@ -30,7 +30,7 @@ compile( ); if ($Self->{vlt_all}) { - files_identical("$Self->{obj_dir}/$Self->{VM_PREFIX}__Dpi.h", + files_identical("$Self->{obj_dir}/$Self->{vm_prefix}__Dpi.h", "t/$Self->{name}__Dpi.out"); } diff --git a/test_regress/t/t_embed1.pl b/test_regress/t/t_embed1.pl index 85d36addd..5de7bb286 100755 --- a/test_regress/t/t_embed1.pl +++ b/test_regress/t/t_embed1.pl @@ -19,7 +19,7 @@ mkdir $child_dir; # Compile the child { my @cmdargs = $Self->compile_vlt_cmd - (VM_PREFIX => "$Self->{VM_PREFIX}_child", + (vm_prefix => "$Self->{vm_prefix}_child", top_filename => "$Self->{name}_child.v", verilator_flags => ["-cc", "-Mdir", "${child_dir}", "--debug-check"], # Can't use multi threading (like hier blocks), but needs to be thread safe @@ -34,7 +34,7 @@ mkdir $child_dir; $ENV{MAKE}, "-f" . getcwd() . "/Makefile_obj", "CPPFLAGS_DRIVER=-D" . uc($self->{name}), ($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 ($param{make_flags}||""), ]); diff --git a/test_regress/t/t_emit_memb_limit.pl b/test_regress/t/t_emit_memb_limit.pl index 21d001dd2..39e3eb212 100755 --- a/test_regress/t/t_emit_memb_limit.pl +++ b/test_regress/t/t_emit_memb_limit.pl @@ -55,7 +55,7 @@ execute( check_finished => 1, ); -file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}___024root.h", qr/struct \{/); +file_grep("$Self->{obj_dir}/$Self->{vm_prefix}___024root.h", qr/struct \{/); ok(1); 1; diff --git a/test_regress/t/t_event_control_expr.pl b/test_regress/t/t_event_control_expr.pl index a50ea7293..133221d43 100755 --- a/test_regress/t/t_event_control_expr.pl +++ b/test_regress/t/t_event_control_expr.pl @@ -19,7 +19,7 @@ execute( check_finished => 1, ); -for my $file (glob_all("$Self->{obj_dir}/$Self->{VM_PREFIX}*.cpp")) { +for my $file (glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.cpp")) { # Check that these simple expressions are not stored in temp variables file_grep_not($file, qr/__Vtrigcurr__expression_.* = vlSelf->clk;/); file_grep_not($file, qr/__Vtrigcurr__expression_.* = vlSelf->t__DOT__q.at\(0U\);/); diff --git a/test_regress/t/t_flag_build_dep_bin.pl b/test_regress/t/t_flag_build_dep_bin.pl index 13eaa6fe3..95eda3687 100755 --- a/test_regress/t/t_flag_build_dep_bin.pl +++ b/test_regress/t/t_flag_build_dep_bin.pl @@ -14,7 +14,7 @@ compile( v_flags2 => ['--build-dep-bin', 'path_to_exe'], ); -file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}__ver.d", qr/path_to_exe/); +file_grep("$Self->{obj_dir}/$Self->{vm_prefix}__ver.d", qr/path_to_exe/); ok(1); 1; diff --git a/test_regress/t/t_flag_comp_limit_parens.pl b/test_regress/t/t_flag_comp_limit_parens.pl index d978e33fa..444c84256 100755 --- a/test_regress/t/t_flag_comp_limit_parens.pl +++ b/test_regress/t/t_flag_comp_limit_parens.pl @@ -18,7 +18,7 @@ execute( check_finished => 1, ); -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); ok(1); diff --git a/test_regress/t/t_flag_csplit.pl b/test_regress/t/t_flag_csplit.pl index f4634a9e5..1eb2c8dd4 100755 --- a/test_regress/t/t_flag_csplit.pl +++ b/test_regress/t/t_flag_csplit.pl @@ -30,9 +30,9 @@ while (1) { tee => $self->{verbose}, cmd=>[$ENV{MAKE}, "-C " . $Self->{obj_dir}, - "-f $Self->{VM_PREFIX}.mk", + "-f $Self->{vm_prefix}.mk", "-j 4", - "VM_PREFIX=$Self->{VM_PREFIX}", + "VM_PREFIX=$Self->{vm_prefix}", "TEST_OBJ_DIR=$Self->{obj_dir}", "CPPFLAGS_DRIVER=-D".uc($Self->{name}), ($opt_verbose ? "CPPFLAGS_DRIVER2=-DTEST_VERBOSE=1" : ""), @@ -47,7 +47,7 @@ while (1) { ); # Splitting should set VM_PARALLEL_BUILDS to 1 by default - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}_classes.mk", qr/VM_PARALLEL_BUILDS\s*=\s*1/); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}_classes.mk", qr/VM_PARALLEL_BUILDS\s*=\s*1/); check_splits(); check_no_all_file(); check_gcc_flags("$Self->{obj_dir}/vlt_gcc.log"); @@ -113,7 +113,7 @@ sub check_gcc_flags { while (defined(my $line = $fh->getline)) { chomp $line; 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 $opt = ($line !~ /-O2/) ? "slow" : "fast"; print "$filetype, $opt, $line\n" if $Self->{verbose}; diff --git a/test_regress/t/t_flag_csplit_off.pl b/test_regress/t/t_flag_csplit_off.pl index ae9edfc29..64d8e466a 100755 --- a/test_regress/t/t_flag_csplit_off.pl +++ b/test_regress/t/t_flag_csplit_off.pl @@ -32,9 +32,9 @@ while (1) { tee => $self->{verbose}, cmd=>[$ENV{MAKE}, "-C " . $Self->{obj_dir}, - "-f $Self->{VM_PREFIX}.mk", + "-f $Self->{vm_prefix}.mk", "-j 4", - "VM_PREFIX=$Self->{VM_PREFIX}", + "VM_PREFIX=$Self->{vm_prefix}", "TEST_OBJ_DIR=$Self->{obj_dir}", "CPPFLAGS_DRIVER=-D".uc($Self->{name}), ($opt_verbose ? "CPPFLAGS_DRIVER2=-DTEST_VERBOSE=1" : ""), @@ -48,7 +48,7 @@ while (1) { ); # Never spliting, so should set VM_PARALLEL_BUILDS to 0 by default - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}_classes.mk", qr/VM_PARALLEL_BUILDS\s*=\s*0/); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}_classes.mk", qr/VM_PARALLEL_BUILDS\s*=\s*0/); check_no_splits(); check_all_file(); check_gcc_flags("$Self->{obj_dir}/vlt_gcc.log"); diff --git a/test_regress/t/t_flag_ldflags.pl b/test_regress/t/t_flag_ldflags.pl index d72594ba4..8f5aa8958 100755 --- a/test_regress/t/t_flag_ldflags.pl +++ b/test_regress/t/t_flag_ldflags.pl @@ -35,11 +35,11 @@ compile( if ($^O eq "darwin") { run(cmd => ["cd $Self->{obj_dir}" . " && install_name_tool -add_rpath \@executable_path/." - . " $Self->{VM_PREFIX}"], + . " $Self->{vm_prefix}"], check_finished => 0); run(cmd => ["cd $Self->{obj_dir}" . " && 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); } diff --git a/test_regress/t/t_flag_xinitial_0.pl b/test_regress/t/t_flag_xinitial_0.pl index 167593271..937f65c98 100755 --- a/test_regress/t/t_flag_xinitial_0.pl +++ b/test_regress/t/t_flag_xinitial_0.pl @@ -18,7 +18,7 @@ execute( check_finished => 1, ); -file_grep_not("$Self->{obj_dir}/$Self->{VM_PREFIX}___024root__Slow.cpp", qr/VL_RAND_RESET/); +file_grep_not("$Self->{obj_dir}/$Self->{vm_prefix}___024root__Slow.cpp", qr/VL_RAND_RESET/); ok(1); 1; diff --git a/test_regress/t/t_flag_xinitial_unique.pl b/test_regress/t/t_flag_xinitial_unique.pl index 3f6077c00..961fb9756 100755 --- a/test_regress/t/t_flag_xinitial_unique.pl +++ b/test_regress/t/t_flag_xinitial_unique.pl @@ -18,7 +18,7 @@ execute( check_finished => 1, ); -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/VL_RAND_RESET/); ok(1); diff --git a/test_regress/t/t_foreach.pl b/test_regress/t/t_foreach.pl index 3ff192bbd..6a69d589f 100755 --- a/test_regress/t/t_foreach.pl +++ b/test_regress/t/t_foreach.pl @@ -20,14 +20,14 @@ execute( # We expect all loops should be unrolled by verilator, # 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_/); } # Further, we expect that all logic within the loop should # have been evaluated inside the compiler. So there should be # 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/[^a-zA-Z]sum[^a-zA-Z]/); } diff --git a/test_regress/t/t_opt_table_sparse_output_split.pl b/test_regress/t/t_opt_table_sparse_output_split.pl index a88e82fbd..f451aeecb 100755 --- a/test_regress/t/t_opt_table_sparse_output_split.pl +++ b/test_regress/t/t_opt_table_sparse_output_split.pl @@ -23,7 +23,7 @@ if ($Self->{vlt_all}) { } # Splitting should set VM_PARALLEL_BUILDS to 1 by default -file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}_classes.mk", qr/VM_PARALLEL_BUILDS\s*=\s*1/); +file_grep("$Self->{obj_dir}/$Self->{vm_prefix}_classes.mk", qr/VM_PARALLEL_BUILDS\s*=\s*1/); check_splits(2); diff --git a/test_regress/t/t_optm_if_array.pl b/test_regress/t/t_optm_if_array.pl index caf3de14b..482484eb4 100755 --- a/test_regress/t/t_optm_if_array.pl +++ b/test_regress/t/t_optm_if_array.pl @@ -17,7 +17,7 @@ execute( check_finished => 1, ); -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/); } diff --git a/test_regress/t/t_optm_redor.pl b/test_regress/t/t_optm_redor.pl index caf3de14b..482484eb4 100755 --- a/test_regress/t/t_optm_redor.pl +++ b/test_regress/t/t_optm_redor.pl @@ -17,7 +17,7 @@ execute( check_finished => 1, ); -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/); } diff --git a/test_regress/t/t_param_in_func.pl b/test_regress/t/t_param_in_func.pl index 849ab9a69..06352942b 100755 --- a/test_regress/t/t_param_in_func.pl +++ b/test_regress/t/t_param_in_func.pl @@ -23,8 +23,8 @@ if ($Self->{vlt_all}) { # Shouldn't have any references to the parameter array foreach my $file ( - 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}*.h"), + glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.cpp") ) { file_grep_not($file, qr/digits/i); } diff --git a/test_regress/t/t_param_in_func_noinline.pl b/test_regress/t/t_param_in_func_noinline.pl index c089b8b2e..3898be53f 100755 --- a/test_regress/t/t_param_in_func_noinline.pl +++ b/test_regress/t/t_param_in_func_noinline.pl @@ -25,8 +25,8 @@ if ($Self->{vlt_all}) { # Shouldn't have any references to the parameter array foreach my $file ( - 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}*.h"), + glob_all("$Self->{obj_dir}/$Self->{vm_prefix}*.cpp") ) { file_grep_not($file, qr/digits/i); } diff --git a/test_regress/t/t_prof.pl b/test_regress/t/t_prof.pl index 8601d6715..2d276ba37 100755 --- a/test_regress/t/t_prof.pl +++ b/test_regress/t/t_prof.pl @@ -36,7 +36,7 @@ sub dotest { $gmon_path or error("Profiler did not create a gmon.out"); (my $gmon_base = $gmon_path) =~ s!.*[/\\]!!; - run(cmd => ["cd $Self->{obj_dir} && gprof $Self->{VM_PREFIX} $gmon_base > gprof.out"], + run(cmd => ["cd $Self->{obj_dir} && gprof $Self->{vm_prefix} $gmon_base > gprof.out"], check_finished => 0); run(cmd => ["cd $Self->{obj_dir} && $ENV{VERILATOR_ROOT}/bin/verilator_profcfunc gprof.out > cfuncs.out"], diff --git a/test_regress/t/t_profc.pl b/test_regress/t/t_profc.pl index ec6efa483..e972b9a9e 100755 --- a/test_regress/t/t_profc.pl +++ b/test_regress/t/t_profc.pl @@ -31,7 +31,7 @@ sub dotest { $gmon_path or error("Profiler did not create a gmon.out"); (my $gmon_base = $gmon_path) =~ s!.*[/\\]!!; - run(cmd => ["cd $Self->{obj_dir} && gprof $Self->{VM_PREFIX} $gmon_base > gprof.out"], + run(cmd => ["cd $Self->{obj_dir} && gprof $Self->{vm_prefix} $gmon_base > gprof.out"], check_finished => 0); } diff --git a/test_regress/t/t_protect_ids.pl b/test_regress/t/t_protect_ids.pl index c1b4a0455..06ec6487b 100755 --- a/test_regress/t/t_protect_ids.pl +++ b/test_regress/t/t_protect_ids.pl @@ -35,7 +35,7 @@ execute( # 'to="PS"' indicates means we probably mis-protected something already protected # Use --debug-protect to assist debugging these -file_grep_not("$Self->{obj_dir}/$Self->{VM_PREFIX}__idmap.xml", qr/to="PS/); +file_grep_not("$Self->{obj_dir}/$Self->{vm_prefix}__idmap.xml", qr/to="PS/); if ($Self->{vlt_all}) { # Check for secret in any outputs diff --git a/test_regress/t/t_protect_ids_key.pl b/test_regress/t/t_protect_ids_key.pl index e1dd48942..8c38f80c2 100755 --- a/test_regress/t/t_protect_ids_key.pl +++ b/test_regress/t/t_protect_ids_key.pl @@ -22,7 +22,7 @@ execute( ); # Since using a named key, we can check for always identical map -files_identical("$Self->{obj_dir}/$Self->{VM_PREFIX}__idmap.xml", $Self->{golden_filename}); +files_identical("$Self->{obj_dir}/$Self->{vm_prefix}__idmap.xml", $Self->{golden_filename}); ok(1); 1; diff --git a/test_regress/t/t_sys_rand_concat.pl b/test_regress/t/t_sys_rand_concat.pl index 7eb1032d5..9c5d99e16 100755 --- a/test_regress/t/t_sys_rand_concat.pl +++ b/test_regress/t/t_sys_rand_concat.pl @@ -17,7 +17,7 @@ execute( check_finished => 1, ); -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); } diff --git a/test_regress/t/t_trace_decoration.pl b/test_regress/t/t_trace_decoration.pl index fd2355ca5..e717c3d12 100755 --- a/test_regress/t/t_trace_decoration.pl +++ b/test_regress/t/t_trace_decoration.pl @@ -18,7 +18,7 @@ execute( check_finished => 1, ); -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!x); ok(1); 1; diff --git a/test_regress/t/t_trace_two_dump_cc.pl b/test_regress/t/t_trace_two_dump_cc.pl index d4643e039..b12ff1c88 100755 --- a/test_regress/t/t_trace_two_dump_cc.pl +++ b/test_regress/t/t_trace_two_dump_cc.pl @@ -17,7 +17,7 @@ compile( make_main => 0, verilator_make_gmake => 0, top_filename => 't_trace_two_b.v', - VM_PREFIX => 'Vt_trace_two_b', + vm_prefix => 'Vt_trace_two_b', verilator_flags2 => ['-trace'], ); diff --git a/test_regress/t/t_trace_two_dump_sc.pl b/test_regress/t/t_trace_two_dump_sc.pl index dd789a58b..68e985871 100755 --- a/test_regress/t/t_trace_two_dump_sc.pl +++ b/test_regress/t/t_trace_two_dump_sc.pl @@ -20,7 +20,7 @@ else { make_main => 0, verilator_make_gmake => 0, top_filename => 't_trace_two_b.v', - VM_PREFIX => 'Vt_trace_two_b', + vm_prefix => 'Vt_trace_two_b', verilator_flags2 => ['-sc -trace'], ); diff --git a/test_regress/t/t_trace_two_dumpfst_cc.pl b/test_regress/t/t_trace_two_dumpfst_cc.pl index 4c1b2c968..e672f49c0 100755 --- a/test_regress/t/t_trace_two_dumpfst_cc.pl +++ b/test_regress/t/t_trace_two_dumpfst_cc.pl @@ -17,7 +17,7 @@ compile( make_main => 0, verilator_make_gmake => 0, top_filename => 't_trace_two_b.v', - VM_PREFIX => 'Vt_trace_two_b', + vm_prefix => 'Vt_trace_two_b', verilator_flags2 => ['--trace-fst --trace-threads 1 -DTEST_FST'], ); diff --git a/test_regress/t/t_trace_two_hdr_cc.pl b/test_regress/t/t_trace_two_hdr_cc.pl index f0c386bbb..665808c3b 100755 --- a/test_regress/t/t_trace_two_hdr_cc.pl +++ b/test_regress/t/t_trace_two_hdr_cc.pl @@ -17,7 +17,7 @@ compile( make_main => 0, verilator_make_gmake => 0, top_filename => 't_trace_two_b.v', - VM_PREFIX => 'Vt_trace_two_b', + vm_prefix => 'Vt_trace_two_b', verilator_flags2 => ['-trace'], ); diff --git a/test_regress/t/t_trace_two_hdr_sc.pl b/test_regress/t/t_trace_two_hdr_sc.pl index 8374fcfee..89776af8b 100755 --- a/test_regress/t/t_trace_two_hdr_sc.pl +++ b/test_regress/t/t_trace_two_hdr_sc.pl @@ -20,7 +20,7 @@ else { make_main => 0, verilator_make_gmake => 0, top_filename => 't_trace_two_b.v', - VM_PREFIX => 'Vt_trace_two_b', + vm_prefix => 'Vt_trace_two_b', verilator_flags2 => ['-sc -trace'], ); diff --git a/test_regress/t/t_trace_two_hdrfst_cc.pl b/test_regress/t/t_trace_two_hdrfst_cc.pl index af0d8307f..e6b4a6008 100755 --- a/test_regress/t/t_trace_two_hdrfst_cc.pl +++ b/test_regress/t/t_trace_two_hdrfst_cc.pl @@ -17,7 +17,7 @@ compile( make_main => 0, verilator_make_gmake => 0, top_filename => 't_trace_two_b.v', - VM_PREFIX => 'Vt_trace_two_b', + vm_prefix => 'Vt_trace_two_b', verilator_flags2 => ['--trace-fst --trace-threads 1'], ); diff --git a/test_regress/t/t_trace_two_port_cc.pl b/test_regress/t/t_trace_two_port_cc.pl index 7e348f19b..1bc4268b2 100755 --- a/test_regress/t/t_trace_two_port_cc.pl +++ b/test_regress/t/t_trace_two_port_cc.pl @@ -17,7 +17,7 @@ compile( make_main => 0, verilator_make_gmake => 0, top_filename => 't_trace_two_b.v', - VM_PREFIX => 'Vt_trace_two_b', + vm_prefix => 'Vt_trace_two_b', verilator_flags2 => ['-trace'], ); diff --git a/test_regress/t/t_trace_two_port_sc.pl b/test_regress/t/t_trace_two_port_sc.pl index e62e64a3b..1bc1d29af 100755 --- a/test_regress/t/t_trace_two_port_sc.pl +++ b/test_regress/t/t_trace_two_port_sc.pl @@ -20,7 +20,7 @@ else { make_main => 0, verilator_make_gmake => 0, top_filename => 't_trace_two_b.v', - VM_PREFIX => 'Vt_trace_two_b', + vm_prefix => 'Vt_trace_two_b', verilator_flags2 => ['-sc -trace'], ); diff --git a/test_regress/t/t_trace_two_portfst_cc.pl b/test_regress/t/t_trace_two_portfst_cc.pl index 676bfb508..f9782d372 100755 --- a/test_regress/t/t_trace_two_portfst_cc.pl +++ b/test_regress/t/t_trace_two_portfst_cc.pl @@ -17,7 +17,7 @@ compile( make_main => 0, verilator_make_gmake => 0, top_filename => 't_trace_two_b.v', - VM_PREFIX => 'Vt_trace_two_b', + vm_prefix => 'Vt_trace_two_b', verilator_flags2 => ['--trace-fst --trace-threads 1'], ); diff --git a/test_regress/t/t_var_pins_sc1.pl b/test_regress/t/t_var_pins_sc1.pl index 6e7485b34..88e6143c4 100755 --- a/test_regress/t/t_var_pins_sc1.pl +++ b/test_regress/t/t_var_pins_sc1.pl @@ -18,27 +18,27 @@ compile( ); if ($Self->{vlt_all}) { - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i8;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i32;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i64;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i65;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv1_vlt;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv16_vlt;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i8;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i32;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i64;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i65;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv1_vlt;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv16_vlt;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o8;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o32;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o64;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o65;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv1_vlt;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv16_vlt;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o8;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o32;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o64;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o65;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv1_vlt;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv16_vlt;/x); } execute(); diff --git a/test_regress/t/t_var_pins_sc2.pl b/test_regress/t/t_var_pins_sc2.pl index 8edb72dbd..9cb732256 100755 --- a/test_regress/t/t_var_pins_sc2.pl +++ b/test_regress/t/t_var_pins_sc2.pl @@ -18,27 +18,27 @@ compile( ); { - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i8;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i32;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i64;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i65;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv1_vlt;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv16_vlt;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i8;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i32;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i64;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i65;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv1_vlt;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv16_vlt;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o8;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o32;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o64;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o65;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv1_vlt;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv16_vlt;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o8;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o32;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o64;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o65;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv1_vlt;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv16_vlt;/x); } execute(); diff --git a/test_regress/t/t_var_pins_sc32.pl b/test_regress/t/t_var_pins_sc32.pl index 6f202e8b5..f3b956e98 100755 --- a/test_regress/t/t_var_pins_sc32.pl +++ b/test_regress/t/t_var_pins_sc32.pl @@ -18,27 +18,27 @@ compile( ); { - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i8;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i32;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i64;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i65;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv1_vlt;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv16_vlt;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i8;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i32;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i64;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i65;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv1_vlt;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv16_vlt;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o8;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o32;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o64;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o65;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv1_vlt;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv16_vlt;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o8;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o32;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o64;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o65;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv1_vlt;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv16_vlt;/x); } execute(); diff --git a/test_regress/t/t_var_pins_sc64.pl b/test_regress/t/t_var_pins_sc64.pl index 9414d82d4..370dc90a3 100755 --- a/test_regress/t/t_var_pins_sc64.pl +++ b/test_regress/t/t_var_pins_sc64.pl @@ -18,27 +18,27 @@ compile( ); if ($Self->{vlt_all}) { - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i8;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i32;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i64;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i65;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv1_vlt;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv16_vlt;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i8;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i32;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i64;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i65;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv1_vlt;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv16_vlt;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o8;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o32;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o64;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o65;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv1_vlt;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv16_vlt;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o8;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o32;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o64;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o65;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv1_vlt;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv16_vlt;/x); } execute(); diff --git a/test_regress/t/t_var_pins_sc_biguint.pl b/test_regress/t/t_var_pins_sc_biguint.pl index 05ac18ba4..226882081 100755 --- a/test_regress/t/t_var_pins_sc_biguint.pl +++ b/test_regress/t/t_var_pins_sc_biguint.pl @@ -18,27 +18,27 @@ compile( ); if ($Self->{vlt_all}) { - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i8;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i32;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i64;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i65;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i128;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i513;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i8;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i32;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i64;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i65;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i128;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i513;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o8;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o32;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o64;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o65;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o128;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o513;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o8;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o32;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o64;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o65;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o128;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o513;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv16;/x); } execute(); diff --git a/test_regress/t/t_var_pins_sc_uint.pl b/test_regress/t/t_var_pins_sc_uint.pl index e7b965c3a..4a60aed89 100755 --- a/test_regress/t/t_var_pins_sc_uint.pl +++ b/test_regress/t/t_var_pins_sc_uint.pl @@ -18,27 +18,27 @@ compile( ); { - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i8;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i32;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i64;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i65;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i128;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i513;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i8;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i32;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i64;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i65;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i128;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i513;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o8;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o32;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o64;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o65;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o128;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o513;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o8;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o32;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o64;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o65;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o128;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o513;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv16;/x); } execute(); diff --git a/test_regress/t/t_var_pins_sc_uint_biguint.pl b/test_regress/t/t_var_pins_sc_uint_biguint.pl index 64b7075a7..1aae8b505 100755 --- a/test_regress/t/t_var_pins_sc_uint_biguint.pl +++ b/test_regress/t/t_var_pins_sc_uint_biguint.pl @@ -18,27 +18,27 @@ compile( ); { - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i8;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i32;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i64;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i65;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i128;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i513;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i8;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i32;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i64;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i65;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i128;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i513;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o8;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o32;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o64;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o65;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o128;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o513;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o8;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o32;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o64;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o65;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o128;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o513;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv16;/x); } execute(); diff --git a/test_regress/t/t_var_pins_scui.pl b/test_regress/t/t_var_pins_scui.pl index a0d81d189..6162561fd 100755 --- a/test_regress/t/t_var_pins_scui.pl +++ b/test_regress/t/t_var_pins_scui.pl @@ -18,23 +18,23 @@ compile( ); if ($Self->{vlt_all}) { - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i8;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i32;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in \s+ &i64;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &i65;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_in\s> \s+ &ibv16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i8;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i32;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in \s+ &i64;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &i65;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_in\s> \s+ &ibv16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o8;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o16;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o32;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out \s+ &o64;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &o65;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv1;/x); - file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.h", qr/sc_out\s> \s+ &obv16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o8;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o16;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o32;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out \s+ &o64;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &o65;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv1;/x); + file_grep("$Self->{obj_dir}/$Self->{vm_prefix}.h", qr/sc_out\s> \s+ &obv16;/x); } execute(); diff --git a/test_regress/t/t_vpi_get_public_rw_switch.pl b/test_regress/t/t_vpi_get_public_rw_switch.pl index 3a0123177..203665b14 100755 --- a/test_regress/t/t_vpi_get_public_rw_switch.pl +++ b/test_regress/t/t_vpi_get_public_rw_switch.pl @@ -13,7 +13,7 @@ scenarios(simulator => 1); skip("Known compiler limitation") if $Self->cxx_version =~ /\(GCC\) 4.4/; -VM_PREFIX("Vt_vpi_get"); +vm_prefix("Vt_vpi_get"); top_filename("t/t_vpi_get.v"); pli_filename("t_vpi_get.cpp"); diff --git a/test_regress/t/t_vpi_module_dpi.pl b/test_regress/t/t_vpi_module_dpi.pl index 25189b715..3dcaa1ef1 100755 --- a/test_regress/t/t_vpi_module_dpi.pl +++ b/test_regress/t/t_vpi_module_dpi.pl @@ -13,7 +13,7 @@ scenarios(simulator => 1); skip("Known compiler limitation") if $Self->cxx_version =~ /\(GCC\) 4.4/; -VM_PREFIX("Vt_vpi_module"); +vm_prefix("Vt_vpi_module"); top_filename("t/t_vpi_module.v"); pli_filename("t_vpi_module.cpp");