From 28b6e79cf7358d220e61a5462328ca323f1d3827 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Sun, 14 Nov 2021 08:58:04 -0500 Subject: [PATCH] Tests: Rename t_lib_prot tests in prep for new options. --- test_regress/t/{t_noprot_lib.pl => t_lib_nolib.pl} | 8 ++++---- test_regress/t/{t_prot_lib.pl => t_lib_prot.pl} | 6 +++--- test_regress/t/{t_prot_lib.v => t_lib_prot.v} | 0 .../{t_prot_lib_clk_gated.pl => t_lib_prot_clk_gated.pl} | 8 ++++---- test_regress/t/{t_prot_lib_comb.pl => t_lib_prot_comb.pl} | 6 +++--- test_regress/t/{t_prot_lib_comb.v => t_lib_prot_comb.v} | 0 ...{t_prot_lib_inout_bad.out => t_lib_prot_inout_bad.out} | 2 +- .../{t_prot_lib_inout_bad.pl => t_lib_prot_inout_bad.pl} | 0 .../t/{t_prot_lib_inout_bad.v => t_lib_prot_inout_bad.v} | 0 .../t/{t_prot_lib_secret.pl => t_lib_prot_secret.pl} | 0 .../t/{t_prot_lib_secret.v => t_lib_prot_secret.v} | 0 .../t/{t_prot_lib_shared.pl => t_lib_prot_shared.pl} | 8 ++++---- 12 files changed, 19 insertions(+), 19 deletions(-) rename test_regress/t/{t_noprot_lib.pl => t_lib_nolib.pl} (84%) rename test_regress/t/{t_prot_lib.pl => t_lib_prot.pl} (94%) rename test_regress/t/{t_prot_lib.v => t_lib_prot.v} (100%) rename test_regress/t/{t_prot_lib_clk_gated.pl => t_lib_prot_clk_gated.pl} (93%) rename test_regress/t/{t_prot_lib_comb.pl => t_lib_prot_comb.pl} (94%) rename test_regress/t/{t_prot_lib_comb.v => t_lib_prot_comb.v} (100%) rename test_regress/t/{t_prot_lib_inout_bad.out => t_lib_prot_inout_bad.out} (78%) rename test_regress/t/{t_prot_lib_inout_bad.pl => t_lib_prot_inout_bad.pl} (100%) rename test_regress/t/{t_prot_lib_inout_bad.v => t_lib_prot_inout_bad.v} (100%) rename test_regress/t/{t_prot_lib_secret.pl => t_lib_prot_secret.pl} (100%) rename test_regress/t/{t_prot_lib_secret.v => t_lib_prot_secret.v} (100%) rename test_regress/t/{t_prot_lib_shared.pl => t_lib_prot_shared.pl} (94%) diff --git a/test_regress/t/t_noprot_lib.pl b/test_regress/t/t_lib_nolib.pl similarity index 84% rename from test_regress/t/t_noprot_lib.pl rename to test_regress/t/t_lib_nolib.pl index ad155e829..d4b9b47e9 100755 --- a/test_regress/t/t_noprot_lib.pl +++ b/test_regress/t/t_lib_nolib.pl @@ -17,12 +17,12 @@ scenarios( ); $Self->{sim_time} = $Self->{benchmark} * 100 if $Self->{benchmark}; -top_filename("t/t_prot_lib.v"); +top_filename("t/t_lib_prot.v"); -# Tests the same code as t_prot_lib.pl but without --protect-lib +# Tests the same code as t_lib_prot.pl but without --protect-lib compile( - verilator_flags2 => ["t/t_prot_lib_secret.v"], - xsim_flags2 => ["t/t_prot_lib_secret.v"], + verilator_flags2 => ["t/t_lib_prot_secret.v"], + xsim_flags2 => ["t/t_lib_prot_secret.v"], ); execute( diff --git a/test_regress/t/t_prot_lib.pl b/test_regress/t/t_lib_prot.pl similarity index 94% rename from test_regress/t/t_prot_lib.pl rename to test_regress/t/t_lib_prot.pl index 22fb1c6d1..2df0816e8 100755 --- a/test_regress/t/t_prot_lib.pl +++ b/test_regress/t/t_lib_prot.pl @@ -29,7 +29,7 @@ while (1) { cmd => ["perl", "$ENV{VERILATOR_ROOT}/bin/verilator", "--prefix", - "Vt_prot_lib_secret", + "Vt_lib_prot_secret", "-cc", "-Mdir", $secret_dir, @@ -37,7 +37,7 @@ while (1) { $secret_prefix, "--protect-key", "secret-key", - "t/t_prot_lib_secret.v"], + "t/t_lib_prot_secret.v"], verilator_run => 1, ); last if $Self->{errors}; @@ -47,7 +47,7 @@ while (1) { "-C", $secret_dir, "-f", - "Vt_prot_lib_secret.mk"]); + "Vt_lib_prot_secret.mk"]); last if $Self->{errors}; compile( diff --git a/test_regress/t/t_prot_lib.v b/test_regress/t/t_lib_prot.v similarity index 100% rename from test_regress/t/t_prot_lib.v rename to test_regress/t/t_lib_prot.v diff --git a/test_regress/t/t_prot_lib_clk_gated.pl b/test_regress/t/t_lib_prot_clk_gated.pl similarity index 93% rename from test_regress/t/t_prot_lib_clk_gated.pl rename to test_regress/t/t_lib_prot_clk_gated.pl index 0f7fcd125..4a290d26d 100755 --- a/test_regress/t/t_prot_lib_clk_gated.pl +++ b/test_regress/t/t_lib_prot_clk_gated.pl @@ -18,7 +18,7 @@ scenarios( $Self->{sim_time} = $Self->{benchmark} * 100 if $Self->{benchmark}; -top_filename("t/t_prot_lib.v"); +top_filename("t/t_lib_prot.v"); my $secret_prefix = "secret"; my $secret_dir = "$Self->{obj_dir}/$secret_prefix"; mkdir $secret_dir; @@ -30,7 +30,7 @@ while (1) { cmd => ["perl", "$ENV{VERILATOR_ROOT}/bin/verilator", "--prefix", - "Vt_prot_lib_secret", + "Vt_lib_prot_secret", "-cc", "-Mdir", $secret_dir, @@ -39,7 +39,7 @@ while (1) { $secret_prefix, "--protect-key", "secret-key", - "t/t_prot_lib_secret.v"], + "t/t_lib_prot_secret.v"], verilator_run => 1, ); last if $Self->{errors}; @@ -49,7 +49,7 @@ while (1) { "-C", $secret_dir, "-f", - "Vt_prot_lib_secret.mk"]); + "Vt_lib_prot_secret.mk"]); last if $Self->{errors}; compile( diff --git a/test_regress/t/t_prot_lib_comb.pl b/test_regress/t/t_lib_prot_comb.pl similarity index 94% rename from test_regress/t/t_prot_lib_comb.pl rename to test_regress/t/t_lib_prot_comb.pl index 856e3ebd0..73cfd8aef 100755 --- a/test_regress/t/t_prot_lib_comb.pl +++ b/test_regress/t/t_lib_prot_comb.pl @@ -29,7 +29,7 @@ while (1) { cmd => ["perl", "$ENV{VERILATOR_ROOT}/bin/verilator", "--prefix", - "Vt_prot_lib_secret", + "Vt_lib_prot_secret", "-cc", "-Mdir", $secret_dir, @@ -37,7 +37,7 @@ while (1) { $secret_prefix, "--protect-key", "secret-key", - "t/t_prot_lib_comb.v"], + "t/t_lib_prot_comb.v"], verilator_run => 1, ); last if $Self->{errors}; @@ -47,7 +47,7 @@ while (1) { "-C", $secret_dir, "-f", - "Vt_prot_lib_secret.mk"]); + "Vt_lib_prot_secret.mk"]); last if $Self->{errors}; compile( diff --git a/test_regress/t/t_prot_lib_comb.v b/test_regress/t/t_lib_prot_comb.v similarity index 100% rename from test_regress/t/t_prot_lib_comb.v rename to test_regress/t/t_lib_prot_comb.v diff --git a/test_regress/t/t_prot_lib_inout_bad.out b/test_regress/t/t_lib_prot_inout_bad.out similarity index 78% rename from test_regress/t/t_prot_lib_inout_bad.out rename to test_regress/t/t_lib_prot_inout_bad.out index df36c979d..1b58aebdb 100644 --- a/test_regress/t/t_prot_lib_inout_bad.out +++ b/test_regress/t/t_lib_prot_inout_bad.out @@ -1,4 +1,4 @@ -%Error-UNSUPPORTED: t/t_prot_lib_inout_bad.v:9:28: Unsupported: protect-lib port direction: INOUT +%Error-UNSUPPORTED: t/t_lib_prot_inout_bad.v:9:28: Unsupported: protect-lib port direction: INOUT 9 | inout z, | ^ ... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest diff --git a/test_regress/t/t_prot_lib_inout_bad.pl b/test_regress/t/t_lib_prot_inout_bad.pl similarity index 100% rename from test_regress/t/t_prot_lib_inout_bad.pl rename to test_regress/t/t_lib_prot_inout_bad.pl diff --git a/test_regress/t/t_prot_lib_inout_bad.v b/test_regress/t/t_lib_prot_inout_bad.v similarity index 100% rename from test_regress/t/t_prot_lib_inout_bad.v rename to test_regress/t/t_lib_prot_inout_bad.v diff --git a/test_regress/t/t_prot_lib_secret.pl b/test_regress/t/t_lib_prot_secret.pl similarity index 100% rename from test_regress/t/t_prot_lib_secret.pl rename to test_regress/t/t_lib_prot_secret.pl diff --git a/test_regress/t/t_prot_lib_secret.v b/test_regress/t/t_lib_prot_secret.v similarity index 100% rename from test_regress/t/t_prot_lib_secret.v rename to test_regress/t/t_lib_prot_secret.v diff --git a/test_regress/t/t_prot_lib_shared.pl b/test_regress/t/t_lib_prot_shared.pl similarity index 94% rename from test_regress/t/t_prot_lib_shared.pl rename to test_regress/t/t_lib_prot_shared.pl index 91e2e5cc6..a770be51b 100755 --- a/test_regress/t/t_prot_lib_shared.pl +++ b/test_regress/t/t_lib_prot_shared.pl @@ -16,7 +16,7 @@ scenarios( vltmt => 1, xsim => 1, ); -top_filename("t/t_prot_lib.v"); +top_filename("t/t_lib_prot.v"); $Self->{sim_time} = $Self->{benchmark} * 100 if $Self->{benchmark}; @@ -33,7 +33,7 @@ while (1) { "$ENV{VERILATOR_ROOT}/bin/verilator", ($Self->{vltmt} ? ' --threads 6' : ''), "--prefix", - "Vt_prot_lib_secret", + "Vt_lib_prot_secret", "-cc", "-Mdir", $secret_dir, @@ -41,7 +41,7 @@ while (1) { $secret_prefix, "--protect-key", "secret-key", - "t/t_prot_lib_secret.v"], + "t/t_lib_prot_secret.v"], verilator_run => 1, ); last if $Self->{errors}; @@ -51,7 +51,7 @@ while (1) { "-C", $secret_dir, "-f", - "Vt_prot_lib_secret.mk"]); + "Vt_lib_prot_secret.mk"]); last if $Self->{errors}; compile(