From 78052f87bde82555c460954c9e708ea2a7d91d2d Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Mon, 3 Jan 2022 12:02:53 -0500 Subject: [PATCH] Tests: Update recursive function tests --- test_regress/t/t_func_bad2.out | 6 ----- test_regress/t/t_func_bad2.v | 18 ------------- test_regress/t/t_func_bad3.out | 5 ---- test_regress/t/t_func_recurse.out | 5 ++++ .../t/{t_func_bad3.pl => t_func_recurse.pl} | 4 +++ test_regress/t/t_func_recurse.v | 22 +++++++++++++++ test_regress/t/t_func_recurse2.out | 6 +++++ .../t/{t_func_bad2.pl => t_func_recurse2.pl} | 4 +++ test_regress/t/t_func_recurse2.v | 27 +++++++++++++++++++ test_regress/t/t_func_recurse_param.out | 5 ++++ test_regress/t/t_func_recurse_param.pl | 23 ++++++++++++++++ test_regress/t/t_func_recurse_param.v | 25 +++++++++++++++++ test_regress/t/t_func_recurse_param_bad.out | 5 ++++ test_regress/t/t_func_recurse_param_bad.pl | 19 +++++++++++++ ...func_bad3.v => t_func_recurse_param_bad.v} | 14 +++++++--- test_regress/t/t_math_precedence.pl | 2 -- 16 files changed, 156 insertions(+), 34 deletions(-) delete mode 100644 test_regress/t/t_func_bad2.out delete mode 100644 test_regress/t/t_func_bad2.v delete mode 100644 test_regress/t/t_func_bad3.out create mode 100644 test_regress/t/t_func_recurse.out rename test_regress/t/{t_func_bad3.pl => t_func_recurse.pl} (90%) create mode 100644 test_regress/t/t_func_recurse.v create mode 100644 test_regress/t/t_func_recurse2.out rename test_regress/t/{t_func_bad2.pl => t_func_recurse2.pl} (90%) create mode 100644 test_regress/t/t_func_recurse2.v create mode 100644 test_regress/t/t_func_recurse_param.out create mode 100755 test_regress/t/t_func_recurse_param.pl create mode 100644 test_regress/t/t_func_recurse_param.v create mode 100644 test_regress/t/t_func_recurse_param_bad.out create mode 100755 test_regress/t/t_func_recurse_param_bad.pl rename test_regress/t/{t_func_bad3.v => t_func_recurse_param_bad.v} (50%) diff --git a/test_regress/t/t_func_bad2.out b/test_regress/t/t_func_bad2.out deleted file mode 100644 index ee66206cb..000000000 --- a/test_regress/t/t_func_bad2.out +++ /dev/null @@ -1,6 +0,0 @@ -%Error-UNSUPPORTED: t/t_func_bad2.v:8:13: Unsupported: Recursive function or task call - : ... In instance t - 8 | function recurse; - | ^~~~~~~ - ... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest -%Error: Exiting due to diff --git a/test_regress/t/t_func_bad2.v b/test_regress/t/t_func_bad2.v deleted file mode 100644 index 19ead4dd4..000000000 --- a/test_regress/t/t_func_bad2.v +++ /dev/null @@ -1,18 +0,0 @@ -// DESCRIPTION: Verilator: Verilog Test module -// -// This file ONLY is placed under the Creative Commons Public Domain, for -// any use, without warranty, 2003 by Wilson Snyder. -// SPDX-License-Identifier: CC0-1.0 - -module t; - function recurse; - input i; - recurse = recurse2(i); - endfunction - - function recurse2; - input i; - recurse2 = recurse(i); - endfunction - -endmodule diff --git a/test_regress/t/t_func_bad3.out b/test_regress/t/t_func_bad3.out deleted file mode 100644 index 628c1a173..000000000 --- a/test_regress/t/t_func_bad3.out +++ /dev/null @@ -1,5 +0,0 @@ -%Error-UNSUPPORTED: t/t_func_bad3.v:12:27: Unsupported: Recursive function call 'recurse_self' - 12 | else recurse_self = recurse_self(i - 1) + 1; - | ^~~~~~~~~~~~ - ... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest -%Error: Exiting due to diff --git a/test_regress/t/t_func_recurse.out b/test_regress/t/t_func_recurse.out new file mode 100644 index 000000000..6d1b05195 --- /dev/null +++ b/test_regress/t/t_func_recurse.out @@ -0,0 +1,5 @@ +%Error-UNSUPPORTED: t/t_func_recurse.v:12:31: Unsupported: Recursive function call 'recurse_self' + 12 | else recurse_self = i + recurse_self(i - 1) * 2; + | ^~~~~~~~~~~~ + ... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest +%Error: Exiting due to diff --git a/test_regress/t/t_func_bad3.pl b/test_regress/t/t_func_recurse.pl similarity index 90% rename from test_regress/t/t_func_bad3.pl rename to test_regress/t/t_func_recurse.pl index 877e6133a..be66c40e6 100755 --- a/test_regress/t/t_func_bad3.pl +++ b/test_regress/t/t_func_recurse.pl @@ -15,5 +15,9 @@ compile( expect_filename => $Self->{golden_filename}, ); +execute( + check_finished => 1, + ) if !$Self->{vlt_all}; + ok(1); 1; diff --git a/test_regress/t/t_func_recurse.v b/test_regress/t/t_func_recurse.v new file mode 100644 index 000000000..2b03f09e4 --- /dev/null +++ b/test_regress/t/t_func_recurse.v @@ -0,0 +1,22 @@ +// DESCRIPTION: Verilator: Verilog Test module +// +// This file ONLY is placed under the Creative Commons Public Domain, for +// any use, without warranty, 2003 by Wilson Snyder. +// SPDX-License-Identifier: CC0-1.0 + +module t; + + function automatic int recurse_self; + input int i; + if (i == 0) recurse_self = 0; + else recurse_self = i + recurse_self(i - 1) * 2; + endfunction + + initial begin + if (recurse_self(0) != 0) $stop; + if (recurse_self(3) != (3 + 2*(2 + 2*(1)))) $stop; + $write("*-* All Finished *-*\n"); + $finish; + end + +endmodule diff --git a/test_regress/t/t_func_recurse2.out b/test_regress/t/t_func_recurse2.out new file mode 100644 index 000000000..476d8791a --- /dev/null +++ b/test_regress/t/t_func_recurse2.out @@ -0,0 +1,6 @@ +%Error-UNSUPPORTED: t/t_func_recurse2.v:9:27: Unsupported: Recursive function or task call + : ... In instance t + 9 | function automatic int recurse_1; + | ^~~~~~~~~ + ... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest +%Error: Exiting due to diff --git a/test_regress/t/t_func_bad2.pl b/test_regress/t/t_func_recurse2.pl similarity index 90% rename from test_regress/t/t_func_bad2.pl rename to test_regress/t/t_func_recurse2.pl index 877e6133a..be66c40e6 100755 --- a/test_regress/t/t_func_bad2.pl +++ b/test_regress/t/t_func_recurse2.pl @@ -15,5 +15,9 @@ compile( expect_filename => $Self->{golden_filename}, ); +execute( + check_finished => 1, + ) if !$Self->{vlt_all}; + ok(1); 1; diff --git a/test_regress/t/t_func_recurse2.v b/test_regress/t/t_func_recurse2.v new file mode 100644 index 000000000..6ef719186 --- /dev/null +++ b/test_regress/t/t_func_recurse2.v @@ -0,0 +1,27 @@ +// DESCRIPTION: Verilator: Verilog Test module +// +// This file ONLY is placed under the Creative Commons Public Domain, for +// any use, without warranty, 2003 by Wilson Snyder. +// SPDX-License-Identifier: CC0-1.0 + +module t; + + function automatic int recurse_1; + input int i; + if (i == 0) recurse_1 = 0; + else recurse_1 = i + recurse_2(i); + endfunction + + function automatic int recurse_2; + input int i; + return recurse_1(i - 1) * 2; + endfunction + + initial begin + if (recurse_1(0) != 0) $stop; + if (recurse_1(3) != (3 + 2*(2 + 2*(1)))) $stop; + $write("*-* All Finished *-*\n"); + $finish; + end + +endmodule diff --git a/test_regress/t/t_func_recurse_param.out b/test_regress/t/t_func_recurse_param.out new file mode 100644 index 000000000..f43ed155d --- /dev/null +++ b/test_regress/t/t_func_recurse_param.out @@ -0,0 +1,5 @@ +%Error-UNSUPPORTED: t/t_func_recurse_param.v:12:31: Unsupported: Recursive function call 'recurse_self' + 12 | else recurse_self = i + recurse_self(i - 1) * 2; + | ^~~~~~~~~~~~ + ... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest +%Error: Exiting due to diff --git a/test_regress/t/t_func_recurse_param.pl b/test_regress/t/t_func_recurse_param.pl new file mode 100755 index 000000000..be66c40e6 --- /dev/null +++ b/test_regress/t/t_func_recurse_param.pl @@ -0,0 +1,23 @@ +#!/usr/bin/env perl +if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); die; } +# DESCRIPTION: Verilator: Verilog Test driver/expect definition +# +# Copyright 2003 by Wilson Snyder. This program is free software; you +# can redistribute it and/or modify it under the terms of either the GNU +# Lesser General Public License Version 3 or the Perl Artistic License +# Version 2.0. +# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 + +scenarios(simulator => 1); + +compile( + fails => $Self->{vlt_all}, + expect_filename => $Self->{golden_filename}, + ); + +execute( + check_finished => 1, + ) if !$Self->{vlt_all}; + +ok(1); +1; diff --git a/test_regress/t/t_func_recurse_param.v b/test_regress/t/t_func_recurse_param.v new file mode 100644 index 000000000..0082b0f20 --- /dev/null +++ b/test_regress/t/t_func_recurse_param.v @@ -0,0 +1,25 @@ +// DESCRIPTION: Verilator: Verilog Test module +// +// This file ONLY is placed under the Creative Commons Public Domain, for +// any use, without warranty, 2003 by Wilson Snyder. +// SPDX-License-Identifier: CC0-1.0 + +module t; + + function automatic int recurse_self; + input int i; + if (i == 0) recurse_self = 0; + else recurse_self = i + recurse_self(i - 1) * 2; + endfunction + + localparam int ZERO = recurse_self(0); + localparam int ELEVEN = recurse_self(3); + + initial begin + if (ZERO != 0) $stop; + if (ELEVEN != 11) $stop; + $write("*-* All Finished *-*\n"); + $finish; + end + +endmodule diff --git a/test_regress/t/t_func_recurse_param_bad.out b/test_regress/t/t_func_recurse_param_bad.out new file mode 100644 index 000000000..44cf3059a --- /dev/null +++ b/test_regress/t/t_func_recurse_param_bad.out @@ -0,0 +1,5 @@ +%Error-UNSUPPORTED: t/t_func_recurse_param_bad.v:12:31: Unsupported: Recursive function call 'recurse_self' + 12 | else recurse_self = i + recurse_self(i - 1) * 2; + | ^~~~~~~~~~~~ + ... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest +%Error: Exiting due to diff --git a/test_regress/t/t_func_recurse_param_bad.pl b/test_regress/t/t_func_recurse_param_bad.pl new file mode 100755 index 000000000..a5846c699 --- /dev/null +++ b/test_regress/t/t_func_recurse_param_bad.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl +if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); die; } +# DESCRIPTION: Verilator: Verilog Test driver/expect definition +# +# Copyright 2003 by Wilson Snyder. This program is free software; you +# can redistribute it and/or modify it under the terms of either the GNU +# Lesser General Public License Version 3 or the Perl Artistic License +# Version 2.0. +# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 + +scenarios(vlt => 1); + +lint( + fails => 1, + expect_filename => $Self->{golden_filename}, + ); + +ok(1); +1; diff --git a/test_regress/t/t_func_bad3.v b/test_regress/t/t_func_recurse_param_bad.v similarity index 50% rename from test_regress/t/t_func_bad3.v rename to test_regress/t/t_func_recurse_param_bad.v index 9b8d672f0..eb7ff29b2 100644 --- a/test_regress/t/t_func_bad3.v +++ b/test_regress/t/t_func_recurse_param_bad.v @@ -6,10 +6,18 @@ module t; - function recurse_self; - input i; + function automatic int recurse_self; + input int i; if (i == 0) recurse_self = 0; - else recurse_self = recurse_self(i - 1) + 1; + else recurse_self = i + recurse_self(i - 1) * 2; endfunction + localparam int HUGE = recurse_self(10000); // too much recursion + + initial begin + $display(HUGE); + $write("*-* All Finished *-*\n"); + $finish; + end + endmodule diff --git a/test_regress/t/t_math_precedence.pl b/test_regress/t/t_math_precedence.pl index 7cb68e14d..b46d46042 100755 --- a/test_regress/t/t_math_precedence.pl +++ b/test_regress/t/t_math_precedence.pl @@ -10,8 +10,6 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(simulator => 1); -#!$Self->{vcs} or unsupported("VCS does ** wrong, fixed in 2014"); - compile( );