Mario1159/verilator
1
0
Fork 0
forked from github/verilator
Code Pull Requests Releases 1 Activity

Tests: Abstract out common test comparison

Browse Source
This commit is contained in:
Wilson Snyder 2021-01-12 18:09:56 -05:00
parent bcf9abf490
commit ab5d4bd51d
30 changed files with 59 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test_regress/driver.pl
View File

@ -1385,6 +1385,12 @@ sub errors {
return $self->{errors};
}
sub golden_filename {
my $self = (ref $_[0]? shift : $Self);
$self->{golden_filename} = shift if defined $_[0];
return $self->{golden_filename};
}
sub scenario_off {
my $self = (ref $_[0]? shift : $Self);
return $self->{scenario_off};

3
test_regress/t/t_cover_line_cc.pl
View File

@ -11,6 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(simulator => 1);
top_filename("t/t_cover_line.v");
golden_filename("t/t_cover_line.out");
compile(
verilator_flags2 => ['--cc --coverage-line +define+ATTRIBUTE'],
@ -29,7 +30,7 @@ run(cmd => ["../bin/verilator_coverage",
verilator_run => 1,
);
files_identical("$Self->{obj_dir}/annotated/t_cover_line.v", "t/t_cover_line.out");
files_identical("$Self->{obj_dir}/annotated/t_cover_line.v", $Self->{golden_filename});
# Also try lcov
run(cmd => ["../bin/verilator_coverage",

3
test_regress/t/t_cover_line_cc_vlt.pl
View File

@ -11,6 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(simulator => 1);
top_filename("t/t_cover_line.v");
golden_filename("t/t_cover_line.out");
compile(
verilator_flags2 => ['--cc', '--coverage-line', "t/t_cover_line.vlt"],
@ -30,7 +31,7 @@ run(cmd => ["../bin/verilator_coverage",
verilator_run => 1,
);
files_identical("$Self->{obj_dir}/annotated/t_cover_line.v", "t/t_cover_line.out");
files_identical("$Self->{obj_dir}/annotated/t_cover_line.v", $Self->{golden_filename});
ok(1);
1;

2
test_regress/t/t_display_noopt.pl
View File

@ -11,7 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(simulator => 1);
top_filename("t/t_display.v");
$Self->{golden_filename} = "t/t_display.out"; # Match unopt version
golden_filename("t/t_display.out");
compile(
verilator_flags2 => ["-O0"],

2
test_regress/t/t_display_real_noopt.pl
View File

@ -11,7 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(simulator => 1);
top_filename("t/t_display_real.v");
$Self->{golden_filename} = "t/t_display_real.out"; # Match unopt version
golden_filename("t/t_display_real.out");
compile(
verilator_flags2 => ["-O0"],

2
test_regress/t/t_display_signed_noopt.pl
View File

@ -11,7 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(simulator => 1);
top_filename("t/t_display_signed.v");
$Self->{golden_filename} = "t/t_display_signed.out"; # Match unopt version
golden_filename("t/t_display_signed.out");
compile(
verilator_flags2 => ["-O0"],

8
test_regress/t/t_dpi_arg_inout_type.pl
View File

@ -19,7 +19,7 @@ if ($Self->{nc}) {
}
compile(
v_flags2 => ["t/t_dpi_arg_inout_type.cpp"],
v_flags2 => ["t/$Self->{name}.cpp"],
# --no-decoration so .out file doesn't comment on source lines
verilator_flags2 => ["-Wall -Wno-DECLFILENAME --no-decoration"],
# NC: Gdd the obj_dir to the C include path
@ -30,10 +30,8 @@ compile(
);
if ($Self->{vlt_all}) {
files_identical(
"$Self->{obj_dir}/Vt_dpi_arg_inout_type__Dpi.h",
"t/t_dpi_arg_inout_type__Dpi.out"
);
files_identical("$Self->{obj_dir}/$Self->{VM_PREFIX}__Dpi.h",
"t/$Self->{name}__Dpi.out");
}
execute(

8
test_regress/t/t_dpi_arg_inout_unpack.pl
View File

@ -19,7 +19,7 @@ if ($Self->{nc}) {
}
compile(
v_flags2 => ["t/t_dpi_arg_inout_unpack.cpp"],
v_flags2 => ["t/$Self->{name}.cpp"],
# --no-decoration so .out file doesn't comment on source lines
verilator_flags2 => ["-Wall -Wno-DECLFILENAME --no-decoration"],
# NC: Gdd the obj_dir to the C include path
@ -30,10 +30,8 @@ compile(
);
if ($Self->{vlt_all}) {
files_identical(
"$Self->{obj_dir}/Vt_dpi_arg_inout_unpack__Dpi.h",
"t/t_dpi_arg_inout_unpack__Dpi.out"
);
files_identical("$Self->{obj_dir}/$Self->{VM_PREFIX}__Dpi.h",
"t/$Self->{name}__Dpi.out");
}
execute(

8
test_regress/t/t_dpi_arg_input_type.pl
View File

@ -19,7 +19,7 @@ if ($Self->{nc}) {
}
compile(
v_flags2 => ["t/t_dpi_arg_input_type.cpp"],
v_flags2 => ["t/$Self->{name}.cpp"],
# --no-decoration so .out file doesn't comment on source lines
verilator_flags2 => ["-Wall -Wno-DECLFILENAME --no-decoration"],
# NC: Gdd the obj_dir to the C include path
@ -30,10 +30,8 @@ compile(
);
if ($Self->{vlt_all}) {
files_identical(
"$Self->{obj_dir}/Vt_dpi_arg_input_type__Dpi.h",
"t/t_dpi_arg_input_type__Dpi.out"
);
files_identical("$Self->{obj_dir}/$Self->{VM_PREFIX}__Dpi.h",
"t/$Self->{name}__Dpi.out");
}
execute(

8
test_regress/t/t_dpi_arg_input_unpack.pl
View File

@ -19,7 +19,7 @@ if ($Self->{nc}) {
}
compile(
v_flags2 => ["t/t_dpi_arg_input_unpack.cpp"],
v_flags2 => ["t/$Self->{name}.cpp"],
# --no-decoration so .out file doesn't comment on source lines
verilator_flags2 => ["-Wall -Wno-DECLFILENAME --no-decoration"],
# NC: Gdd the obj_dir to the C include path
@ -30,10 +30,8 @@ compile(
);
if ($Self->{vlt_all}) {
files_identical(
"$Self->{obj_dir}/Vt_dpi_arg_input_unpack__Dpi.h",
"t/t_dpi_arg_input_unpack__Dpi.out"
);
files_identical("$Self->{obj_dir}/$Self->{VM_PREFIX}__Dpi.h",
"t/$Self->{name}__Dpi.out");
}
execute(

8
test_regress/t/t_dpi_arg_output_type.pl
View File

@ -19,7 +19,7 @@ if ($Self->{nc}) {
}
compile(
v_flags2 => ["t/t_dpi_arg_output_type.cpp"],
v_flags2 => ["t/$Self->{name}.cpp"],
# --no-decoration so .out file doesn't comment on source lines
verilator_flags2 => ["-Wall -Wno-DECLFILENAME --no-decoration"],
# NC: Gdd the obj_dir to the C include path
@ -30,10 +30,8 @@ compile(
);
if ($Self->{vlt_all}) {
files_identical(
"$Self->{obj_dir}/Vt_dpi_arg_output_type__Dpi.h",
"t/t_dpi_arg_output_type__Dpi.out"
);
files_identical("$Self->{obj_dir}/$Self->{VM_PREFIX}__Dpi.h",
"t/$Self->{name}__Dpi.out");
}
execute(

8
test_regress/t/t_dpi_arg_output_unpack.pl
View File

@ -19,7 +19,7 @@ if ($Self->{nc}) {
}
compile(
v_flags2 => ["t/t_dpi_arg_output_unpack.cpp"],
v_flags2 => ["t/$Self->{name}.cpp"],
# --no-decoration so .out file doesn't comment on source lines
verilator_flags2 => ["-Wall -Wno-DECLFILENAME --no-decoration"],
# NC: Gdd the obj_dir to the C include path
@ -30,10 +30,8 @@ compile(
);
if ($Self->{vlt_all}) {
files_identical(
"$Self->{obj_dir}/Vt_dpi_arg_output_unpack__Dpi.h",
"t/t_dpi_arg_output_unpack__Dpi.out"
);
files_identical("$Self->{obj_dir}/$Self->{VM_PREFIX}__Dpi.h",
"t/$Self->{name}__Dpi.out");
}
execute(

8
test_regress/t/t_dpi_result_type.pl
View File

@ -19,7 +19,7 @@ if ($Self->{nc}) {
}
compile(
v_flags2 => ["t/t_dpi_result_type.cpp"],
v_flags2 => ["t/$Self->{name}.cpp"],
# --no-decoration so .out file doesn't comment on source lines
verilator_flags2 => ["-Wall -Wno-DECLFILENAME --no-decoration"],
# NC: Gdd the obj_dir to the C include path
@ -30,10 +30,8 @@ compile(
);
if ($Self->{vlt_all}) {
files_identical(
"$Self->{obj_dir}/Vt_dpi_result_type__Dpi.h",
"t/t_dpi_result_type__Dpi.out"
);
files_identical("$Self->{obj_dir}/$Self->{VM_PREFIX}__Dpi.h",
"t/$Self->{name}__Dpi.out");
}
execute(

3
test_regress/t/t_gen_genblk_noinl.pl
View File

@ -9,6 +9,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
top_filename("t_gen_genblk.v");
golden_filename("t/t_gen_genblk.out");
scenarios(simulator => 1);
@ -19,7 +20,7 @@ compile(
);
execute(
expect_filename => "t/t_gen_genblk.out",
expect_filename => $Self->{golden_filename},
);
ok(1);

2
test_regress/t/t_interface_ref_trace_inla.pl
View File

@ -11,7 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(simulator => 1);
top_filename("t/t_interface_ref_trace.v");
$Self->{golden_filename} = "t/t_interface_ref_trace.out";
golden_filename("t/t_interface_ref_trace.out");
compile(
v_flags2 => ['+define+NO_INLINE_A'],

2
test_regress/t/t_interface_ref_trace_inlab.pl
View File

@ -11,7 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(simulator => 1);
top_filename("t/t_interface_ref_trace.v");
$Self->{golden_filename} = "t/t_interface_ref_trace.out";
golden_filename("t/t_interface_ref_trace.out");
compile(
v_flags2 => ['+define+NO_INLINE_A +define+NO_INLINE_B'],

2
test_regress/t/t_interface_ref_trace_inlb.pl
View File

@ -11,7 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(simulator => 1);
top_filename("t/t_interface_ref_trace.v");
$Self->{golden_filename} = "t/t_interface_ref_trace.out";
golden_filename("t/t_interface_ref_trace.out");
compile(
v_flags2 => ['+define+NO_INLINE_B'],

2
test_regress/t/t_preproc_dos.pl
View File

@ -11,7 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(vlt => 1);
top_filename("$Self->{obj_dir}/$Self->{name}.v");
$Self->{golden_filename} = "$Self->{obj_dir}/$Self->{name}.out";
golden_filename("$Self->{obj_dir}/$Self->{name}.out");
# Rather then having to maintain a new .v and .out, simply add returns
# to all lines of the existing t_preproc test.

2
test_regress/t/t_trace_array_fst_portable.pl
View File

@ -11,7 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(vlt => 1);
top_filename("t/t_trace_array.v");
$Self->{golden_filename} = "t/t_trace_array_fst.out";
golden_filename("t/t_trace_array_fst.out");
compile(
verilator_flags2 => ['--cc --trace-fst --trace-structs',

2
test_regress/t/t_trace_array_fst_threads_1.pl
View File

@ -11,7 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(vlt => 1);
top_filename("t/t_trace_array.v");
$Self->{golden_filename} = "t/t_trace_array_fst.out";
golden_filename("t/t_trace_array_fst.out");
compile(
verilator_flags2 => ['--cc --trace-fst --trace-threads 1 --trace-structs'],

2
test_regress/t/t_trace_array_fst_threads_2.pl
View File

@ -11,7 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(vlt => 1);
top_filename("t/t_trace_array.v");
$Self->{golden_filename} = "t/t_trace_array_fst.out";
golden_filename("t/t_trace_array_fst.out");
compile(
verilator_flags2 => ['--cc --trace-fst --trace-threads 2 --trace-structs'],

2
test_regress/t/t_trace_complex_fst_threads_1.pl
View File

@ -11,7 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(simulator => 1);
top_filename("t/t_trace_complex.v");
$Self->{golden_filename} = "t/t_trace_complex_fst.out";
golden_filename("t/t_trace_complex_fst.out");
compile(
verilator_flags2 => ['--cc --trace-fst --trace-threads 1'],

2
test_regress/t/t_trace_complex_fst_threads_2.pl
View File

@ -11,7 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(simulator => 1);
top_filename("t/t_trace_complex.v");
$Self->{golden_filename} = "t/t_trace_complex_fst.out";
golden_filename("t/t_trace_complex_fst.out");
compile(
verilator_flags2 => ['--cc --trace-fst --trace-threads 2'],

3
test_regress/t/t_trace_complex_old_api.pl
View File

@ -13,6 +13,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(vlt => 1);
top_filename("t/t_trace_complex.v");
golden_filename("t/t_trace_complex.out");
compile(
verilator_flags2 => ['--cc --trace -CFLAGS -DVL_TRACE_VCD_OLD_API'],
@ -32,7 +33,7 @@ file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\(/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\(/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\(/);
vcd_identical ("$Self->{obj_dir}/simx.vcd", "t/t_trace_complex.out");
vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
ok(1);
1;

3
test_regress/t/t_trace_complex_portable.pl
View File

@ -13,6 +13,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(vlt => 1);
top_filename("t/t_trace_complex.v");
golden_filename("t/t_trace_complex.out");
compile(
verilator_flags2 => ['--cc --trace -CFLAGS -DVL_PORTABLE_ONLY'],
@ -32,7 +33,7 @@ file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\(/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\(/);
file_grep ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\(/);
vcd_identical ("$Self->{obj_dir}/simx.vcd", "t/t_trace_complex.out");
vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
ok(1);
1;

2
test_regress/t/t_trace_complex_threads_1.pl
View File

@ -11,7 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(simulator => 1);
top_filename("t/t_trace_complex.v");
$Self->{golden_filename} = "t/t_trace_complex.out";
golden_filename("t/t_trace_complex.out");
compile(
verilator_flags2 => ['--cc --trace --trace-threads 1']

4
test_regress/t/t_trace_public_func.pl
View File

@ -11,6 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(vlt_all => 1);
top_filename("t/t_trace_public.v");
golden_filename("t/t_trace_public.out");
compile(
make_top_shell => 0,
@ -22,8 +23,7 @@ execute(
check_finished => 1,
);
vcd_identical("$Self->{obj_dir}/simx.vcd",
"t/t_trace_public.out");
vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
ok(1);
1;

4
test_regress/t/t_trace_public_func_vlt.pl
View File

@ -11,6 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(vlt_all => 1);
top_filename("t/t_trace_public.v");
golden_filename("t/t_trace_public.out");
compile(
make_top_shell => 0,
@ -22,8 +23,7 @@ execute(
check_finished => 1,
);
vcd_identical("$Self->{obj_dir}/simx.vcd",
"t/t_trace_public.out");
vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
ok(1);
1;

4
test_regress/t/t_trace_public_sig.pl
View File

@ -11,6 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(vlt_all => 1);
top_filename("t/t_trace_public.v");
golden_filename("t/t_trace_public.out");
compile(
make_top_shell => 0,
@ -22,8 +23,7 @@ execute(
check_finished => 1,
);
vcd_identical("$Self->{obj_dir}/simx.vcd",
"t/t_trace_public.out");
vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
# 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);

5
test_regress/t/t_trace_public_sig_vlt.pl
View File

@ -11,6 +11,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(vlt_all => 1);
top_filename("t/t_trace_public.v");
golden_filename("t/t_trace_public.out");
my $out_filename = "$Self->{obj_dir}/V$Self->{name}.xml";
compile(
@ -27,8 +29,7 @@ execute(
check_finished => 1,
);
vcd_identical("$Self->{obj_dir}/simx.vcd",
"t/t_trace_public.out");
vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
# 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);