diff --git a/test_regress/t/t_array_packed_sysfunct.v b/test_regress/t/t_array_packed_sysfunct.v index 4a8ce3f9a..b6f8877f6 100644 --- a/test_regress/t/t_array_packed_sysfunct.v +++ b/test_regress/t/t_array_packed_sysfunct.v @@ -4,6 +4,9 @@ // without warranty, 2009 by Iztok Jeras. // SPDX-License-Identifier: CC0-1.0 +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); + module t (/*AUTOARG*/ // Inputs clk @@ -11,8 +14,6 @@ module t (/*AUTOARG*/ input clk; -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); - // parameters for array sizes localparam WA = 4; localparam WB = 6; diff --git a/test_regress/t/t_array_type_methods.v b/test_regress/t/t_array_type_methods.v index ca6d5e204..80875aaf0 100644 --- a/test_regress/t/t_array_type_methods.v +++ b/test_regress/t/t_array_type_methods.v @@ -4,8 +4,9 @@ // any use, without warranty, 2014 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); -`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); +`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t (/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_assert_sampled.v b/test_regress/t/t_assert_sampled.v index 27b2e9b70..3803e3634 100644 --- a/test_regress/t/t_assert_sampled.v +++ b/test_regress/t/t_assert_sampled.v @@ -4,7 +4,8 @@ // any use, without warranty, 2022 by Antmicro Ltd. // SPDX-License-Identifier: CC0-1.0 -`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t (/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_assign_expr.v b/test_regress/t/t_assign_expr.v index b54320153..c9789b38f 100644 --- a/test_regress/t/t_assign_expr.v +++ b/test_regress/t/t_assign_expr.v @@ -4,7 +4,8 @@ // any use, without warranty, 2022 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t(/*AUTOARG*/); diff --git a/test_regress/t/t_assoc.v b/test_regress/t/t_assoc.v index 4f8049dcd..a3a658ab7 100644 --- a/test_regress/t/t_assoc.v +++ b/test_regress/t/t_assoc.v @@ -4,9 +4,10 @@ // any use, without warranty, 2019 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); -`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); -`define checkg(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%g' exp='%g'\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); +`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); +`define checkg(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%g' exp='%g'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t (/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_assoc2.v b/test_regress/t/t_assoc2.v index 7ceff9c25..07a6dc6db 100644 --- a/test_regress/t/t_assoc2.v +++ b/test_regress/t/t_assoc2.v @@ -4,9 +4,10 @@ // any use, without warranty, 2019 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); -`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); -`define checkg(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%g' exp='%g'\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); +`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); +`define checkg(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%g' exp='%g'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t (/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_assoc_wildcard.v b/test_regress/t/t_assoc_wildcard.v index 28fa62037..8e67d841f 100644 --- a/test_regress/t/t_assoc_wildcard.v +++ b/test_regress/t/t_assoc_wildcard.v @@ -4,9 +4,10 @@ // any use, without warranty, 2019 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); -`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); -`define checkg(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%g' exp='%g'\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); +`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); +`define checkg(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%g' exp='%g'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t (/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_bind2.v b/test_regress/t/t_bind2.v index 67f8e04f5..273e21b31 100644 --- a/test_regress/t/t_bind2.v +++ b/test_regress/t/t_bind2.v @@ -6,7 +6,8 @@ // verilator lint_off WIDTH -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t (/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_bitsel_struct2.v b/test_regress/t/t_bitsel_struct2.v index e53d8c6bf..9aa41623a 100644 --- a/test_regress/t/t_bitsel_struct2.v +++ b/test_regress/t/t_bitsel_struct2.v @@ -4,6 +4,10 @@ // any use, without warranty, 2013 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 +`define stop $stop +`define checkb(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='b%x exp='b%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); + module t (/*AUTOARG*/); typedef struct packed { @@ -15,9 +19,6 @@ module t (/*AUTOARG*/); c_t [17:16] d; } e_t; -`define checkb(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='b%x exp='b%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); - initial begin e_t e; `checkh($bits(ab_t),6); diff --git a/test_regress/t/t_bitsel_struct3.v b/test_regress/t/t_bitsel_struct3.v index 0b7d276da..ee92dfd0f 100644 --- a/test_regress/t/t_bitsel_struct3.v +++ b/test_regress/t/t_bitsel_struct3.v @@ -9,7 +9,8 @@ // warranty, 2013 by Jie Xu. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t(/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_class_copy2.v b/test_regress/t/t_class_copy2.v index 9fb72e670..a923e18c1 100644 --- a/test_regress/t/t_class_copy2.v +++ b/test_regress/t/t_class_copy2.v @@ -5,7 +5,7 @@ // SPDX-License-Identifier: CC0-1.0 `define stop $stop -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); class Cls; bit x = 1; diff --git a/test_regress/t/t_class_dict.v b/test_regress/t/t_class_dict.v index 5002474c8..40da3f81a 100644 --- a/test_regress/t/t_class_dict.v +++ b/test_regress/t/t_class_dict.v @@ -5,7 +5,7 @@ // SPDX-License-Identifier: CC0-1.0 `define stop $stop -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); class Cls; int x; diff --git a/test_regress/t/t_class_param.v b/test_regress/t/t_class_param.v index ae0a4386a..d96efa44e 100644 --- a/test_regress/t/t_class_param.v +++ b/test_regress/t/t_class_param.v @@ -4,7 +4,8 @@ // any use, without warranty, 2020 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); // See also t_class_param_mod.v diff --git a/test_regress/t/t_class_param_mod.v b/test_regress/t/t_class_param_mod.v index 93ebe28e6..63656a1ba 100644 --- a/test_regress/t/t_class_param_mod.v +++ b/test_regress/t/t_class_param_mod.v @@ -4,7 +4,8 @@ // any use, without warranty, 2020 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); // See also t_class_param.v diff --git a/test_regress/t/t_class_param_pkg.v b/test_regress/t/t_class_param_pkg.v index e311756c2..1b5a365ca 100644 --- a/test_regress/t/t_class_param_pkg.v +++ b/test_regress/t/t_class_param_pkg.v @@ -4,7 +4,8 @@ // any use, without warranty, 2020 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); // See also t_class_param_mod.v diff --git a/test_regress/t/t_class_static.v b/test_regress/t/t_class_static.v index ffb92c2d5..f1df96ea5 100644 --- a/test_regress/t/t_class_static.v +++ b/test_regress/t/t_class_static.v @@ -4,7 +4,8 @@ // any use, without warranty, 2014 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); class Cls; int c_no = 2; diff --git a/test_regress/t/t_class_static_member.v b/test_regress/t/t_class_static_member.v index bc772f2e6..fa4b417ad 100644 --- a/test_regress/t/t_class_static_member.v +++ b/test_regress/t/t_class_static_member.v @@ -4,7 +4,8 @@ // any use, without warranty, 2022 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); class Cls; int c_no = 2; diff --git a/test_regress/t/t_class_static_member_pkg.v b/test_regress/t/t_class_static_member_pkg.v index ac36ab758..02770cd79 100644 --- a/test_regress/t/t_class_static_member_pkg.v +++ b/test_regress/t/t_class_static_member_pkg.v @@ -4,7 +4,8 @@ // any use, without warranty, 2022 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); package Pkg; class Cls; diff --git a/test_regress/t/t_dpi_open.v b/test_regress/t/t_dpi_open.v index e78d01b3b..2aded7a29 100644 --- a/test_regress/t/t_dpi_open.v +++ b/test_regress/t/t_dpi_open.v @@ -6,11 +6,8 @@ // Version 2.0. // SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 -//`ifdef VERILATOR - `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0) -//`else -// `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); end while(0) -//`endif +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0) module t (/*AUTOARG*/); diff --git a/test_regress/t/t_dpi_open_elem.v b/test_regress/t/t_dpi_open_elem.v index c2b38f00a..70825de4e 100644 --- a/test_regress/t/t_dpi_open_elem.v +++ b/test_regress/t/t_dpi_open_elem.v @@ -6,7 +6,8 @@ // Version 2.0. // SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 - `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0) +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0) module t (/*AUTOARG*/); diff --git a/test_regress/t/t_dpi_open_query.v b/test_regress/t/t_dpi_open_query.v index 9da5579f2..2dcd89741 100644 --- a/test_regress/t/t_dpi_open_query.v +++ b/test_regress/t/t_dpi_open_query.v @@ -6,7 +6,8 @@ // Version 2.0. // SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 -`define check(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0) +`define stop $stop +`define check(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0) `define unless(cond,gotv,expv) do if (!(cond)) `check(gotv, expv); while(0) `ifdef VERILATOR diff --git a/test_regress/t/t_dpi_open_vecval.v b/test_regress/t/t_dpi_open_vecval.v index 8954f872a..1542e710e 100644 --- a/test_regress/t/t_dpi_open_vecval.v +++ b/test_regress/t/t_dpi_open_vecval.v @@ -6,7 +6,8 @@ // Version 2.0. // SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 - `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0) + `define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0) module t (/*AUTOARG*/); diff --git a/test_regress/t/t_dpi_openfirst.v b/test_regress/t/t_dpi_openfirst.v index a79dc4dd1..aad3d32ba 100644 --- a/test_regress/t/t_dpi_openfirst.v +++ b/test_regress/t/t_dpi_openfirst.v @@ -7,10 +7,11 @@ // SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 `ifdef VERILATOR - `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0) + `define stop $stop `else - `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); end while(0) + `define stop `endif +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0) module t (/*AUTOARG*/); diff --git a/test_regress/t/t_emit_constw.v b/test_regress/t/t_emit_constw.v index a265089db..5a22ffc91 100644 --- a/test_regress/t/t_emit_constw.v +++ b/test_regress/t/t_emit_constw.v @@ -4,7 +4,8 @@ // any use, without warranty, 2015 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkhw(gotv,w,expv) do if (gotv[(w)*32+:$bits(expv)] !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv[(w)*32+:32]), (expv)); $stop; end while(0); +`define stop $stop +`define checkhw(gotv,w,expv) do if (gotv[(w)*32+:$bits(expv)] !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv[(w)*32+:32]), (expv)); `stop; end while(0); module t (/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_enum_huge_methods.v b/test_regress/t/t_enum_huge_methods.v index 3dba73251..24bdbdba0 100644 --- a/test_regress/t/t_enum_huge_methods.v +++ b/test_regress/t/t_enum_huge_methods.v @@ -4,8 +4,9 @@ // any use, without warranty, 2014 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); -`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); +`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t (/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_enum_large_methods.v b/test_regress/t/t_enum_large_methods.v index 7e24b50a8..ff9b69763 100644 --- a/test_regress/t/t_enum_large_methods.v +++ b/test_regress/t/t_enum_large_methods.v @@ -4,8 +4,9 @@ // any use, without warranty, 2014 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); -`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); +`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t (/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_enum_type_methods.v b/test_regress/t/t_enum_type_methods.v index 8328a729b..3b1d500f0 100644 --- a/test_regress/t/t_enum_type_methods.v +++ b/test_regress/t/t_enum_type_methods.v @@ -4,8 +4,9 @@ // any use, without warranty, 2014 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); -`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); +`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t (/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_flag_parameter.v b/test_regress/t/t_flag_parameter.v index 4fe3ad8ee..f4f330d26 100644 --- a/test_regress/t/t_flag_parameter.v +++ b/test_regress/t/t_flag_parameter.v @@ -20,7 +20,8 @@ // | -gC6="32'h600D600D" | 32'h600D600D| 32'h600D600D| UNSUPPORTED | 32'h600D600D| // | -gC7='AB CD' | AB CD | UNSUPPORTED | UNSUPPORTED | UNSUPPORTED | -`define check(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: Wrong parameter value", `__FILE__,`__LINE__); $stop; end while(0); +`define stop $stop +`define check(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: Wrong parameter value", `__FILE__,`__LINE__); `stop; end while(0); module t; parameter string1 = "Original String"; diff --git a/test_regress/t/t_flag_parameter_hier.v b/test_regress/t/t_flag_parameter_hier.v index e5ee4a84a..0d611bbb1 100644 --- a/test_regress/t/t_flag_parameter_hier.v +++ b/test_regress/t/t_flag_parameter_hier.v @@ -4,7 +4,8 @@ // any use, without warranty, 2016 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define check(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: %m: Wrong parameter value\n", `__FILE__,`__LINE__); $stop; end while(0); +`define stop $stop +`define check(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: %m: Wrong parameter value\n", `__FILE__,`__LINE__); `stop; end while(0); module t (/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_for_assign.v b/test_regress/t/t_for_assign.v index 61e0d6c85..4db8e7e07 100644 --- a/test_regress/t/t_for_assign.v +++ b/test_regress/t/t_for_assign.v @@ -4,7 +4,8 @@ // any use, without warranty, 2023 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t (/*AUTOARG*/); diff --git a/test_regress/t/t_force.v b/test_regress/t/t_force.v index ec076fe3d..d6c9fce56 100644 --- a/test_regress/t/t_force.v +++ b/test_regress/t/t_force.v @@ -6,7 +6,7 @@ `define stop $stop `define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0) -`define checkr(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d: got=%f exp=%f\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define checkr(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d: got=%f exp=%f\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t(/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_foreach.v b/test_regress/t/t_foreach.v index 4cdf96180..b700d5bb6 100644 --- a/test_regress/t/t_foreach.v +++ b/test_regress/t/t_foreach.v @@ -4,7 +4,8 @@ // any use, without warranty, 2016 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t (/*AUTOARG*/); diff --git a/test_regress/t/t_foreach_class.v b/test_regress/t/t_foreach_class.v index 0f53bb3f4..cc3b767f5 100644 --- a/test_regress/t/t_foreach_class.v +++ b/test_regress/t/t_foreach_class.v @@ -4,7 +4,8 @@ // any use, without warranty, 2016 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); class Cls; int q[$]; diff --git a/test_regress/t/t_func_arg_complex.v b/test_regress/t/t_func_arg_complex.v index 728e8b426..e20095fae 100644 --- a/test_regress/t/t_func_arg_complex.v +++ b/test_regress/t/t_func_arg_complex.v @@ -4,7 +4,8 @@ // any use, without warranty, 2023 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); class Cls; enum { ONEK = 1000, TWOK = 2000 } sev_t; diff --git a/test_regress/t/t_func_call_order.v b/test_regress/t/t_func_call_order.v index 7bba5a785..2c3e6b867 100644 --- a/test_regress/t/t_func_call_order.v +++ b/test_regress/t/t_func_call_order.v @@ -4,7 +4,8 @@ // any use, without warranty, 2023 by Antmicro Ltd. // SPDX-License-Identifier: CC0-1.0 -`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t(/*AUTOARG*/); int a; diff --git a/test_regress/t/t_func_inout_bit_sel.v b/test_regress/t/t_func_inout_bit_sel.v index 3af758d75..aa1c32a87 100644 --- a/test_regress/t/t_func_inout_bit_sel.v +++ b/test_regress/t/t_func_inout_bit_sel.v @@ -5,7 +5,7 @@ // SPDX-License-Identifier: CC0-1.0 `define stop $stop -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); class Cls; function bit get_x_set_1(inout bit x); diff --git a/test_regress/t/t_func_named.v b/test_regress/t/t_func_named.v index 353232dd2..065c10f31 100644 --- a/test_regress/t/t_func_named.v +++ b/test_regress/t/t_func_named.v @@ -4,14 +4,15 @@ // any use, without warranty, 2013 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); + module t (/*AUTOARG*/); function automatic int f( int j = 1, int s = 0 ); return (j<<16) | s; endfunction -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); - initial begin `checkh( f(.j(2), .s(1)) , 32'h2_0001 ); `checkh( f(.s(1)) , 32'h1_0001 ); diff --git a/test_regress/t/t_func_ref_arg.v b/test_regress/t/t_func_ref_arg.v index b552a2b24..13f819c62 100644 --- a/test_regress/t/t_func_ref_arg.v +++ b/test_regress/t/t_func_ref_arg.v @@ -5,7 +5,7 @@ // SPDX-License-Identifier: CC0-1.0 `define stop $stop -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); class MyInt; int x; diff --git a/test_regress/t/t_func_ref_unsup.v b/test_regress/t/t_func_ref_unsup.v index 6fa1e9d87..b650ecf2b 100644 --- a/test_regress/t/t_func_ref_unsup.v +++ b/test_regress/t/t_func_ref_unsup.v @@ -5,7 +5,7 @@ // SPDX-License-Identifier: CC0-1.0 `define stop $stop -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); class MyInt; int x; diff --git a/test_regress/t/t_inside.v b/test_regress/t/t_inside.v index 36e5446f3..4b02c90f5 100644 --- a/test_regress/t/t_inside.v +++ b/test_regress/t/t_inside.v @@ -4,9 +4,10 @@ // any use, without warranty, 2013 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -module t; +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +module t; typedef enum logic [1:0] { ZERO = 2'd0, diff --git a/test_regress/t/t_math_real_random.v b/test_regress/t/t_math_real_random.v index f17e2ddaf..46d343054 100644 --- a/test_regress/t/t_math_real_random.v +++ b/test_regress/t/t_math_real_random.v @@ -4,7 +4,8 @@ // any use, without warranty, 2020 Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkr(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d: got=%f exp=%f\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkr(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d: got=%f exp=%f\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t(/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_math_real_round.v b/test_regress/t/t_math_real_round.v index 50ca98a95..7826fcf9f 100644 --- a/test_regress/t/t_math_real_round.v +++ b/test_regress/t/t_math_real_round.v @@ -7,7 +7,8 @@ // SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 `define is_near_real(a,b) (( ((a)<(b)) ? (b)-(a) : (a)-(b)) < (((a)/(b))*0.0001)) -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t (/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_math_red.v b/test_regress/t/t_math_red.v index fbd156940..c9d9d2b63 100644 --- a/test_regress/t/t_math_red.v +++ b/test_regress/t/t_math_red.v @@ -4,7 +4,8 @@ // any use, without warranty, 2004 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0) +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0) module t (/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_math_signed3.v b/test_regress/t/t_math_signed3.v index fcc602242..03b20e753 100644 --- a/test_regress/t/t_math_signed3.v +++ b/test_regress/t/t_math_signed3.v @@ -4,7 +4,8 @@ // any use, without warranty, 2014 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0) +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0) module t (/*AUTOARG*/); diff --git a/test_regress/t/t_math_signed6.v b/test_regress/t/t_math_signed6.v index 3820a8b3c..a58651950 100644 --- a/test_regress/t/t_math_signed6.v +++ b/test_regress/t/t_math_signed6.v @@ -4,7 +4,8 @@ // without warranty, 2015 by Iztok Jeras. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0) +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0) module t (/*AUTOARG*/); diff --git a/test_regress/t/t_math_signed7.v b/test_regress/t/t_math_signed7.v index 6cadf344f..ac31749a5 100644 --- a/test_regress/t/t_math_signed7.v +++ b/test_regress/t/t_math_signed7.v @@ -4,7 +4,8 @@ // without warranty, 2015 by Iztok Jeras. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0) +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0) module t (/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_merge_cond.v b/test_regress/t/t_merge_cond.v index 110ebcc43..ef1b25e3d 100644 --- a/test_regress/t/t_merge_cond.v +++ b/test_regress/t/t_merge_cond.v @@ -4,7 +4,8 @@ // any use, without warranty, 2020 by Geza Lore. // SPDX-License-Identifier: CC0-1.0 -`define check(got ,exp) do if ((got) !== (exp)) begin $write("%%Error: %s:%0d: cyc=%0d got='h%x exp='h%x\n", `__FILE__,`__LINE__, cyc, (got), (exp)); $stop; end while(0) +`define stop $stop +`define check(got ,exp) do if ((got) !== (exp)) begin $write("%%Error: %s:%0d: cyc=%0d got='h%x exp='h%x\n", `__FILE__,`__LINE__, cyc, (got), (exp)); `stop; end while(0) module t (/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_mod_interface_array3.out b/test_regress/t/t_mod_interface_array3.out index c3e75afa3..0d200dc13 100644 --- a/test_regress/t/t_mod_interface_array3.out +++ b/test_regress/t/t_mod_interface_array3.out @@ -1,8 +1,8 @@ -%Error-UNSUPPORTED: t/t_mod_interface_array3.v:25:20: Unsupported: Multidimensional instances/interfaces. - 25 | a_if iface [2:0][1:0]; +%Error-UNSUPPORTED: t/t_mod_interface_array3.v:26:20: Unsupported: Multidimensional instances/interfaces. + 26 | a_if iface [2:0][1:0]; | ^ ... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest -%Error-UNSUPPORTED: t/t_mod_interface_array3.v:27:18: Unsupported: Multidimensional instances/interfaces. - 27 | sub i_sub[2:0][1:0] (.s(str)); +%Error-UNSUPPORTED: t/t_mod_interface_array3.v:28:18: Unsupported: Multidimensional instances/interfaces. + 28 | sub i_sub[2:0][1:0] (.s(str)); | ^ %Error: Exiting due to diff --git a/test_regress/t/t_mod_interface_array3.v b/test_regress/t/t_mod_interface_array3.v index 603fb3588..354fd04a4 100644 --- a/test_regress/t/t_mod_interface_array3.v +++ b/test_regress/t/t_mod_interface_array3.v @@ -4,7 +4,8 @@ // without warranty, 2015 by Johan Bjork. // SPDX-License-Identifier: CC0-1.0 -`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); interface a_if (); string s; diff --git a/test_regress/t/t_net_delay.out b/test_regress/t/t_net_delay.out index be7a665b1..40a84f0f0 100644 --- a/test_regress/t/t_net_delay.out +++ b/test_regress/t/t_net_delay.out @@ -1,15 +1,15 @@ -%Warning-STMTDLY: t/t_net_delay.v:15:14: Ignoring delay on this statement due to --no-timing +%Warning-STMTDLY: t/t_net_delay.v:16:14: Ignoring delay on this statement due to --no-timing : ... note: In instance 't' - 15 | wire[3:0] #4 val1 = half_cyc; + 16 | wire[3:0] #4 val1 = half_cyc; | ^ ... For warning description see https://verilator.org/warn/STMTDLY?v=latest ... Use "/* verilator lint_off STMTDLY */" and lint_on around source to disable this message. -%Warning-STMTDLY: t/t_net_delay.v:16:14: Ignoring delay on this statement due to --no-timing +%Warning-STMTDLY: t/t_net_delay.v:17:14: Ignoring delay on this statement due to --no-timing : ... note: In instance 't' - 16 | wire[3:0] #4 val2; + 17 | wire[3:0] #4 val2; | ^ -%Warning-ASSIGNDLY: t/t_net_delay.v:19:11: Ignoring timing control on this assignment/primitive due to --no-timing +%Warning-ASSIGNDLY: t/t_net_delay.v:20:11: Ignoring timing control on this assignment/primitive due to --no-timing : ... note: In instance 't' - 19 | assign #4 val2 = half_cyc; + 20 | assign #4 val2 = half_cyc; | ^ %Error: Exiting due to diff --git a/test_regress/t/t_net_delay.v b/test_regress/t/t_net_delay.v index 13fece4e5..4d8190e6a 100644 --- a/test_regress/t/t_net_delay.v +++ b/test_regress/t/t_net_delay.v @@ -4,7 +4,8 @@ // any use, without warranty, 2022 by Antmicro Ltd. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0) +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0) module t (/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_param_avec.v b/test_regress/t/t_param_avec.v index 18806b3bc..d56974f9a 100644 --- a/test_regress/t/t_param_avec.v +++ b/test_regress/t/t_param_avec.v @@ -4,7 +4,8 @@ // any use, without warranty, 2016 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t (/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_param_pattern.v b/test_regress/t/t_param_pattern.v index 5f9306d64..c5af3bad9 100644 --- a/test_regress/t/t_param_pattern.v +++ b/test_regress/t/t_param_pattern.v @@ -4,7 +4,8 @@ // without warranty, 2021 by Krzysztof Bieganski. // SPDX-License-Identifier: CC0-1.0 -`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); package config_pkg; typedef struct packed { diff --git a/test_regress/t/t_param_type_cmp.pl b/test_regress/t/t_param_type_cmp.pl index b46d46042..0b0739b0a 100755 --- a/test_regress/t/t_param_type_cmp.pl +++ b/test_regress/t/t_param_type_cmp.pl @@ -11,6 +11,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di scenarios(simulator => 1); compile( + verilator_flags2 => ['--binary'], ); execute( diff --git a/test_regress/t/t_param_type_cmp.v b/test_regress/t/t_param_type_cmp.v index 9bbf2aecb..79cbc0e4a 100644 --- a/test_regress/t/t_param_type_cmp.v +++ b/test_regress/t/t_param_type_cmp.v @@ -19,6 +19,7 @@ module t (); initial b = 3'b111; initial begin + #1; if (signed_out !== 1'b0) begin $display("%%Error: bad signed comparison %b < %b: got=%d exp=%d", a, b, signed_out, 1'b0); $stop; diff --git a/test_regress/t/t_pkg_using_dollar_unit_items.v b/test_regress/t/t_pkg_using_dollar_unit_items.v index 73b000329..2ccde8879 100644 --- a/test_regress/t/t_pkg_using_dollar_unit_items.v +++ b/test_regress/t/t_pkg_using_dollar_unit_items.v @@ -4,6 +4,9 @@ // any use, without warranty, 2022 by Antmicro Ltd. // SPDX-License-Identifier: CC0-1.0 +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); + typedef int my_type; class my_class; @@ -15,9 +18,9 @@ function int get_val; endfunction package my_pkg; - int my_type_size = $bits(my_type); - int my_class_a = my_class::a; - int get_val_result = get_val(); + int my_type_size = $bits(my_type); + int my_class_a = my_class::a; + int get_val_result = get_val(); endpackage package overwriting_pkg; @@ -31,32 +34,31 @@ package overwriting_pkg; return 3; endfunction - int my_type_size = $bits(my_type); - int my_class_a = my_class::a; - int get_val_result = get_val(); + int my_type_size = $bits(my_type); + int my_class_a = my_class::a; + int get_val_result = get_val(); endpackage module t (/*AUTOARG*/ - clk + // Inputs + clk ); input clk; - always @(posedge clk) begin - bit [5:0] results = {my_pkg::my_type_size == 32, - my_pkg::my_class_a == 1, - my_pkg::get_val_result == 2, - overwriting_pkg::my_type_size == 10, - overwriting_pkg::my_class_a == 2, - overwriting_pkg::get_val_result == 3}; + int cyc; - if (results == '1) begin + always @(posedge clk) begin + cyc <= cyc + 1; + if (cyc == 2) begin + `checkh(my_pkg::my_type_size, 32); + `checkh(my_pkg::my_class_a, 1); + `checkh(my_pkg::get_val_result, 2); + `checkh(overwriting_pkg::my_type_size, 10); + `checkh(overwriting_pkg::my_class_a, 2); + `checkh(overwriting_pkg::get_val_result, 3); $write("*-* All Finished *-*\n"); $finish; end - else begin - $write("Results: %b\n", results); - $stop; - end end endmodule diff --git a/test_regress/t/t_probdist.v b/test_regress/t/t_probdist.v index af8ef0ecf..517c6f7b1 100644 --- a/test_regress/t/t_probdist.v +++ b/test_regress/t/t_probdist.v @@ -4,7 +4,8 @@ // any use, without warranty, 2022 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t(/*AUTOARG*/); diff --git a/test_regress/t/t_probdist_bad.v b/test_regress/t/t_probdist_bad.v index ee297af1e..d5f1a1752 100644 --- a/test_regress/t/t_probdist_bad.v +++ b/test_regress/t/t_probdist_bad.v @@ -4,7 +4,8 @@ // any use, without warranty, 2022 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t(/*AUTOARG*/); diff --git a/test_regress/t/t_queue_persistence.v b/test_regress/t/t_queue_persistence.v index a0ee23905..26f4dfa11 100644 --- a/test_regress/t/t_queue_persistence.v +++ b/test_regress/t/t_queue_persistence.v @@ -4,7 +4,8 @@ // any use, without warranty, 2023 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t(/*AUTOARG*/); diff --git a/test_regress/t/t_queue_persistence_inl_unsup.out b/test_regress/t/t_queue_persistence_inl_unsup.out index d9e34ab83..97622e53f 100644 --- a/test_regress/t/t_queue_persistence_inl_unsup.out +++ b/test_regress/t/t_queue_persistence_inl_unsup.out @@ -1,5 +1,5 @@ -%Error-TASKNSVAR: t/t_queue_persistence.v:30:13: Unsupported: ref argument of inlined function/task is not a simple variable - 30 | func(q[1]); +%Error-TASKNSVAR: t/t_queue_persistence.v:31:13: Unsupported: ref argument of inlined function/task is not a simple variable + 31 | func(q[1]); | ^ ... For error description see https://verilator.org/warn/TASKNSVAR?v=latest %Error: Exiting due to diff --git a/test_regress/t/t_queue_struct.v b/test_regress/t/t_queue_struct.v index e2f6b6b36..45fe432c2 100644 --- a/test_regress/t/t_queue_struct.v +++ b/test_regress/t/t_queue_struct.v @@ -4,7 +4,8 @@ // any use, without warranty, 2020 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t (/*AUTOARG*/); diff --git a/test_regress/t/t_randcase.v b/test_regress/t/t_randcase.v index cc4acb948..8d30eb0a6 100644 --- a/test_regress/t/t_randcase.v +++ b/test_regress/t/t_randcase.v @@ -4,7 +4,8 @@ // any use, without warranty, 2022 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define check_range(gotv,minv,maxv) do if ((gotv) < (minv) || (gotv) > (maxv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d-%0d\n", `__FILE__,`__LINE__, (gotv), (minv), (maxv)); $stop; end while(0); +`define stop $stop +`define check_range(gotv,minv,maxv) do if ((gotv) < (minv) || (gotv) > (maxv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d-%0d\n", `__FILE__,`__LINE__, (gotv), (minv), (maxv)); `stop; end while(0); `define check_within_30_percent(gotv,val) `check_range((gotv), (val) * 70 / 100, (val) * 130 / 100) module t (/*AUTOARG*/); diff --git a/test_regress/t/t_randsequence.out b/test_regress/t/t_randsequence.out index 55a2a3289..41d75d959 100644 --- a/test_regress/t/t_randsequence.out +++ b/test_regress/t/t_randsequence.out @@ -1,152 +1,152 @@ -%Error-UNSUPPORTED: t/t_randsequence.v:23:17: Unsupported: randsequence production id - 23 | main : one; +%Error-UNSUPPORTED: t/t_randsequence.v:24:17: Unsupported: randsequence production id + 24 | main : one; | ^~~ ... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest -%Error-UNSUPPORTED: t/t_randsequence.v:23:15: Unsupported: randsequence production - 23 | main : one; +%Error-UNSUPPORTED: t/t_randsequence.v:24:15: Unsupported: randsequence production + 24 | main : one; | ^ -%Error-UNSUPPORTED: t/t_randsequence.v:24:14: Unsupported: randsequence production - 24 | one : { o = 1; }; +%Error-UNSUPPORTED: t/t_randsequence.v:25:14: Unsupported: randsequence production + 25 | one : { o = 1; }; | ^ -%Error-UNSUPPORTED: t/t_randsequence.v:22:7: Unsupported: randsequence - 22 | randsequence(main) +%Error-UNSUPPORTED: t/t_randsequence.v:23:7: Unsupported: randsequence + 23 | randsequence(main) | ^~~~~~~~~~~~ -%Error-UNSUPPORTED: t/t_randsequence.v:40:16: Unsupported: randsequence production id - 40 | main: one two three; +%Error-UNSUPPORTED: t/t_randsequence.v:41:16: Unsupported: randsequence production id + 41 | main: one two three; | ^~~ -%Error-UNSUPPORTED: t/t_randsequence.v:40:20: Unsupported: randsequence production id - 40 | main: one two three; +%Error-UNSUPPORTED: t/t_randsequence.v:41:20: Unsupported: randsequence production id + 41 | main: one two three; | ^~~ -%Error-UNSUPPORTED: t/t_randsequence.v:40:24: Unsupported: randsequence production id - 40 | main: one two three; +%Error-UNSUPPORTED: t/t_randsequence.v:41:24: Unsupported: randsequence production id + 41 | main: one two three; | ^~~~~ -%Error-UNSUPPORTED: t/t_randsequence.v:40:14: Unsupported: randsequence production - 40 | main: one two three; +%Error-UNSUPPORTED: t/t_randsequence.v:41:14: Unsupported: randsequence production + 41 | main: one two three; | ^ -%Error-UNSUPPORTED: t/t_randsequence.v:41:13: Unsupported: randsequence production - 41 | two: { do if ((seq) !== (1)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", "t/t_randsequence.v",41, (seq), (1)); $stop; end while(0);; seq = 2; }; - | ^ %Error-UNSUPPORTED: t/t_randsequence.v:42:13: Unsupported: randsequence production - 42 | one: { do if ((seq) !== (0)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", "t/t_randsequence.v",42, (seq), (0)); $stop; end while(0);; seq = 1; }; + 42 | two: { do if ((seq) !== (1)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", "t/t_randsequence.v",42, (seq), (1)); $stop; end while(0);; seq = 2; }; | ^ -%Error-UNSUPPORTED: t/t_randsequence.v:43:15: Unsupported: randsequence production - 43 | three: { do if ((seq) !== (2)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", "t/t_randsequence.v",43, (seq), (2)); $stop; end while(0);; seq = 3; }; +%Error-UNSUPPORTED: t/t_randsequence.v:43:13: Unsupported: randsequence production + 43 | one: { do if ((seq) !== (0)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", "t/t_randsequence.v",43, (seq), (0)); $stop; end while(0);; seq = 1; }; + | ^ +%Error-UNSUPPORTED: t/t_randsequence.v:44:15: Unsupported: randsequence production + 44 | three: { do if ((seq) !== (2)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", "t/t_randsequence.v",44, (seq), (2)); $stop; end while(0);; seq = 3; }; | ^ -%Error-UNSUPPORTED: t/t_randsequence.v:39:7: Unsupported: randsequence - 39 | randsequence(main) +%Error-UNSUPPORTED: t/t_randsequence.v:40:7: Unsupported: randsequence + 40 | randsequence(main) | ^~~~~~~~~~~~ -%Error-UNSUPPORTED: t/t_randsequence.v:51:17: Unsupported: randsequence production - 51 | unnamed: { seq = 2; }; +%Error-UNSUPPORTED: t/t_randsequence.v:52:17: Unsupported: randsequence production + 52 | unnamed: { seq = 2; }; | ^ -%Error-UNSUPPORTED: t/t_randsequence.v:50:7: Unsupported: randsequence - 50 | randsequence() +%Error-UNSUPPORTED: t/t_randsequence.v:51:7: Unsupported: randsequence + 51 | randsequence() | ^~~~~~~~~~~~ -%Error-UNSUPPORTED: t/t_randsequence.v:58:17: Unsupported: randsequence production - 58 | unnamed: { }; +%Error-UNSUPPORTED: t/t_randsequence.v:59:17: Unsupported: randsequence production + 59 | unnamed: { }; | ^ -%Error-UNSUPPORTED: t/t_randsequence.v:57:7: Unsupported: randsequence - 57 | randsequence() +%Error-UNSUPPORTED: t/t_randsequence.v:58:7: Unsupported: randsequence + 58 | randsequence() | ^~~~~~~~~~~~ -%Error-UNSUPPORTED: t/t_randsequence.v:65:19: Unsupported: randsequence production id - 65 | main: one | two | three := 2; +%Error-UNSUPPORTED: t/t_randsequence.v:66:19: Unsupported: randsequence production id + 66 | main: one | two | three := 2; | ^~~ -%Error-UNSUPPORTED: t/t_randsequence.v:65:25: Unsupported: randsequence production id - 65 | main: one | two | three := 2; +%Error-UNSUPPORTED: t/t_randsequence.v:66:25: Unsupported: randsequence production id + 66 | main: one | two | three := 2; | ^~~ -%Error-UNSUPPORTED: t/t_randsequence.v:65:31: Unsupported: randsequence production id - 65 | main: one | two | three := 2; +%Error-UNSUPPORTED: t/t_randsequence.v:66:31: Unsupported: randsequence production id + 66 | main: one | two | three := 2; | ^~~~~ -%Error-UNSUPPORTED: t/t_randsequence.v:65:31: Unsupported: randsequence rule - 65 | main: one | two | three := 2; +%Error-UNSUPPORTED: t/t_randsequence.v:66:31: Unsupported: randsequence rule + 66 | main: one | two | three := 2; | ^~~~~ -%Error-UNSUPPORTED: t/t_randsequence.v:65:17: Unsupported: randsequence production - 65 | main: one | two | three := 2; +%Error-UNSUPPORTED: t/t_randsequence.v:66:17: Unsupported: randsequence production + 66 | main: one | two | three := 2; | ^ -%Error-UNSUPPORTED: t/t_randsequence.v:66:16: Unsupported: randsequence production - 66 | one: { ++counts[0]; }; - | ^ %Error-UNSUPPORTED: t/t_randsequence.v:67:16: Unsupported: randsequence production - 67 | two: { ++counts[1]; }; + 67 | one: { ++counts[0]; }; | ^ -%Error-UNSUPPORTED: t/t_randsequence.v:68:18: Unsupported: randsequence production - 68 | three: { ++counts[2]; }; +%Error-UNSUPPORTED: t/t_randsequence.v:68:16: Unsupported: randsequence production + 68 | two: { ++counts[1]; }; + | ^ +%Error-UNSUPPORTED: t/t_randsequence.v:69:18: Unsupported: randsequence production + 69 | three: { ++counts[2]; }; | ^ -%Error-UNSUPPORTED: t/t_randsequence.v:64:10: Unsupported: randsequence - 64 | randsequence(main) +%Error-UNSUPPORTED: t/t_randsequence.v:65:10: Unsupported: randsequence + 65 | randsequence(main) | ^~~~~~~~~~~~ -%Error-UNSUPPORTED: t/t_randsequence.v:79:19: Unsupported: randsequence production id - 79 | main: one_if; +%Error-UNSUPPORTED: t/t_randsequence.v:80:19: Unsupported: randsequence production id + 80 | main: one_if; | ^~~~~~ -%Error-UNSUPPORTED: t/t_randsequence.v:79:17: Unsupported: randsequence production - 79 | main: one_if; +%Error-UNSUPPORTED: t/t_randsequence.v:80:17: Unsupported: randsequence production + 80 | main: one_if; | ^ -%Error-UNSUPPORTED: t/t_randsequence.v:80:38: Unsupported: randsequence production id - 80 | one_if: if (i % 10 == 0) count_1 else most; +%Error-UNSUPPORTED: t/t_randsequence.v:81:38: Unsupported: randsequence production id + 81 | one_if: if (i % 10 == 0) count_1 else most; | ^~~~~~~ -%Error-UNSUPPORTED: t/t_randsequence.v:80:51: Unsupported: randsequence production id - 80 | one_if: if (i % 10 == 0) count_1 else most; +%Error-UNSUPPORTED: t/t_randsequence.v:81:51: Unsupported: randsequence production id + 81 | one_if: if (i % 10 == 0) count_1 else most; | ^~~~ -%Error-UNSUPPORTED: t/t_randsequence.v:80:21: Unsupported: randsequence if - 80 | one_if: if (i % 10 == 0) count_1 else most; +%Error-UNSUPPORTED: t/t_randsequence.v:81:21: Unsupported: randsequence if + 81 | one_if: if (i % 10 == 0) count_1 else most; | ^~ -%Error-UNSUPPORTED: t/t_randsequence.v:80:19: Unsupported: randsequence production - 80 | one_if: if (i % 10 == 0) count_1 else most; +%Error-UNSUPPORTED: t/t_randsequence.v:81:19: Unsupported: randsequence production + 81 | one_if: if (i % 10 == 0) count_1 else most; | ^ -%Error-UNSUPPORTED: t/t_randsequence.v:81:20: Unsupported: randsequence production - 81 | count_1: { ++counts[1]; }; - | ^ %Error-UNSUPPORTED: t/t_randsequence.v:82:20: Unsupported: randsequence production - 82 | count_2: { ++counts[2]; }; + 82 | count_1: { ++counts[1]; }; | ^ %Error-UNSUPPORTED: t/t_randsequence.v:83:20: Unsupported: randsequence production - 83 | count_3: { ++counts[3]; }; + 83 | count_2: { ++counts[2]; }; | ^ %Error-UNSUPPORTED: t/t_randsequence.v:84:20: Unsupported: randsequence production - 84 | count_4: { ++counts[4]; }; + 84 | count_3: { ++counts[3]; }; | ^ -%Error-UNSUPPORTED: t/t_randsequence.v:85:16: Unsupported: randsequence production - 85 | bad: { $stop; }; +%Error-UNSUPPORTED: t/t_randsequence.v:85:20: Unsupported: randsequence production + 85 | count_4: { ++counts[4]; }; + | ^ +%Error-UNSUPPORTED: t/t_randsequence.v:86:16: Unsupported: randsequence production + 86 | bad: { $stop; }; | ^ -%Error-UNSUPPORTED: t/t_randsequence.v:87:24: Unsupported: randsequence production id - 87 | 0: bad; +%Error-UNSUPPORTED: t/t_randsequence.v:88:24: Unsupported: randsequence production id + 88 | 0: bad; | ^~~ -%Error-UNSUPPORTED: t/t_randsequence.v:87:22: Unsupported: randsequence case item - 87 | 0: bad; +%Error-UNSUPPORTED: t/t_randsequence.v:88:22: Unsupported: randsequence case item + 88 | 0: bad; | ^ -%Error-UNSUPPORTED: t/t_randsequence.v:88:27: Unsupported: randsequence production id - 88 | 1, 2: count_2; +%Error-UNSUPPORTED: t/t_randsequence.v:89:27: Unsupported: randsequence production id + 89 | 1, 2: count_2; | ^~~~~~~ -%Error-UNSUPPORTED: t/t_randsequence.v:88:25: Unsupported: randsequence case item - 88 | 1, 2: count_2; +%Error-UNSUPPORTED: t/t_randsequence.v:89:25: Unsupported: randsequence case item + 89 | 1, 2: count_2; | ^ -%Error-UNSUPPORTED: t/t_randsequence.v:89:30: Unsupported: randsequence production id - 89 | 3, 4, 5: count_3; - | ^~~~~~~ -%Error-UNSUPPORTED: t/t_randsequence.v:89:28: Unsupported: randsequence case item - 89 | 3, 4, 5: count_3; - | ^ %Error-UNSUPPORTED: t/t_randsequence.v:90:30: Unsupported: randsequence production id - 90 | default: count_4; + 90 | 3, 4, 5: count_3; | ^~~~~~~ -%Error-UNSUPPORTED: t/t_randsequence.v:90:21: Unsupported: randsequence case item - 90 | default: count_4; +%Error-UNSUPPORTED: t/t_randsequence.v:90:28: Unsupported: randsequence case item + 90 | 3, 4, 5: count_3; + | ^ +%Error-UNSUPPORTED: t/t_randsequence.v:91:30: Unsupported: randsequence production id + 91 | default: count_4; + | ^~~~~~~ +%Error-UNSUPPORTED: t/t_randsequence.v:91:21: Unsupported: randsequence case item + 91 | default: count_4; | ^~~~~~~ -%Error-UNSUPPORTED: t/t_randsequence.v:86:19: Unsupported: randsequence case - 86 | most: case (i % 10) +%Error-UNSUPPORTED: t/t_randsequence.v:87:19: Unsupported: randsequence case + 87 | most: case (i % 10) | ^~~~ -%Error-UNSUPPORTED: t/t_randsequence.v:86:17: Unsupported: randsequence production - 86 | most: case (i % 10) +%Error-UNSUPPORTED: t/t_randsequence.v:87:17: Unsupported: randsequence production + 87 | most: case (i % 10) | ^ -%Error-UNSUPPORTED: t/t_randsequence.v:78:10: Unsupported: randsequence - 78 | randsequence(main) +%Error-UNSUPPORTED: t/t_randsequence.v:79:10: Unsupported: randsequence + 79 | randsequence(main) | ^~~~~~~~~~~~ -%Error-UNSUPPORTED: t/t_randsequence.v:103:19: Unsupported: randsequence production id - 103 | main: one_if; +%Error-UNSUPPORTED: t/t_randsequence.v:104:19: Unsupported: randsequence production id + 104 | main: one_if; | ^~~~~~ -%Error-UNSUPPORTED: t/t_randsequence.v:103:17: Unsupported: randsequence production - 103 | main: one_if; +%Error-UNSUPPORTED: t/t_randsequence.v:104:17: Unsupported: randsequence production + 104 | main: one_if; | ^ -%Error-UNSUPPORTED: t/t_randsequence.v:104:38: Unsupported: randsequence production id - 104 | one_if: if (i % 10 == 0) count_1 else most; +%Error-UNSUPPORTED: t/t_randsequence.v:105:38: Unsupported: randsequence production id + 105 | one_if: if (i % 10 == 0) count_1 else most; | ^~~~~~~ %Error: Exiting due to diff --git a/test_regress/t/t_randsequence.v b/test_regress/t/t_randsequence.v index 3bd4fbad2..3fd5a9ec8 100644 --- a/test_regress/t/t_randsequence.v +++ b/test_regress/t/t_randsequence.v @@ -6,8 +6,9 @@ // Version 2.0. // SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 -`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); -`define check_range(gotv,minv,maxv) do if ((gotv) < (minv) || (gotv) > (maxv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d-%0d\n", `__FILE__,`__LINE__, (gotv), (minv), (maxv)); $stop; end while(0); +`define stop $stop +`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); +`define check_range(gotv,minv,maxv) do if ((gotv) < (minv) || (gotv) > (maxv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d-%0d\n", `__FILE__,`__LINE__, (gotv), (minv), (maxv)); `stop; end while(0); `define check_within_30_percent(gotv,val) `check_range((gotv), (val) * 70 / 100, (val) * 130 / 100) module t(/*AUTOARG*/); diff --git a/test_regress/t/t_runflag_seed.v b/test_regress/t/t_runflag_seed.v index 74d90f219..1e1892e56 100644 --- a/test_regress/t/t_runflag_seed.v +++ b/test_regress/t/t_runflag_seed.v @@ -4,7 +4,8 @@ // any use, without warranty, 2019 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t; initial begin diff --git a/test_regress/t/t_stream3.v b/test_regress/t/t_stream3.v index 92c4c9dcf..ce0733039 100644 --- a/test_regress/t/t_stream3.v +++ b/test_regress/t/t_stream3.v @@ -4,7 +4,8 @@ // any use, without warranty, 2014 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0) +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0) module t (/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_stream_dynamic.v b/test_regress/t/t_stream_dynamic.v index f92b250ea..75bdae81b 100644 --- a/test_regress/t/t_stream_dynamic.v +++ b/test_regress/t/t_stream_dynamic.v @@ -5,7 +5,7 @@ // SPDX-License-Identifier: CC0-1.0 `define stop $stop -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); `define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); typedef enum bit [5:0] { diff --git a/test_regress/t/t_stream_dynamic_wide_unsup.v b/test_regress/t/t_stream_dynamic_wide_unsup.v index a9860f430..7059484c3 100644 --- a/test_regress/t/t_stream_dynamic_wide_unsup.v +++ b/test_regress/t/t_stream_dynamic_wide_unsup.v @@ -5,7 +5,7 @@ // SPDX-License-Identifier: CC0-1.0 `define stop $stop -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t (/*AUTOARG*/); initial begin diff --git a/test_regress/t/t_string.v b/test_regress/t/t_string.v index 34986b836..7f2799840 100644 --- a/test_regress/t/t_string.v +++ b/test_regress/t/t_string.v @@ -4,8 +4,9 @@ // any use, without warranty, 2014 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); -`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d: got=\"%s\" exp=\"%s\"\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); +`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d: got=\"%s\" exp=\"%s\"\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t (/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_string_to_bit.v b/test_regress/t/t_string_to_bit.v index b8b30be23..8d90484cb 100644 --- a/test_regress/t/t_string_to_bit.v +++ b/test_regress/t/t_string_to_bit.v @@ -4,7 +4,8 @@ // any use, without warranty, 2023 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d: got=\"%s\" exp=\"%s\"\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d: got=\"%s\" exp=\"%s\"\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t (/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_string_type_methods.v b/test_regress/t/t_string_type_methods.v index db9597dbe..7884f4a47 100644 --- a/test_regress/t/t_string_type_methods.v +++ b/test_regress/t/t_string_type_methods.v @@ -4,9 +4,10 @@ // any use, without warranty, 2014 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); -`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); -`define checkg(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%g' exp='%g'\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); +`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); +`define checkg(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%g' exp='%g'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t (/*AUTOARG*/ // Inputs diff --git a/test_regress/t/t_struct_clk.v b/test_regress/t/t_struct_clk.v index e09b4f3de..3e864f0ef 100644 --- a/test_regress/t/t_struct_clk.v +++ b/test_regress/t/t_struct_clk.v @@ -4,7 +4,8 @@ // any use, without warranty, 2023 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); typedef struct { logic clk1; diff --git a/test_regress/t/t_struct_param.v b/test_regress/t/t_struct_param.v index 8190db7b7..081a8c85f 100644 --- a/test_regress/t/t_struct_param.v +++ b/test_regress/t/t_struct_param.v @@ -4,7 +4,8 @@ // without warranty, 2017 by Matt Myers. // SPDX-License-Identifier: CC0-1.0 -`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); package config_pkg; typedef struct packed { diff --git a/test_regress/t/t_sys_file_basic.v b/test_regress/t/t_sys_file_basic.v index ac276d9a4..cb85ee822 100644 --- a/test_regress/t/t_sys_file_basic.v +++ b/test_regress/t/t_sys_file_basic.v @@ -8,9 +8,10 @@ `define STRINGIFY(x) `"x`" `define ratio_error(a,b) (((a)>(b) ? ((a)-(b)) : ((b)-(a))) /(a)) -`define checkr(gotv,expv) do if (`ratio_error((gotv),(expv))>0.0001) begin $write("%%Error: %s:%0d: got=%f exp=%f\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); -`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkr(gotv,expv) do if (`ratio_error((gotv),(expv))>0.0001) begin $write("%%Error: %s:%0d: got=%f exp=%f\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); +`define checks(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t; integer file; diff --git a/test_regress/t/t_sys_file_basic_mcd.v b/test_regress/t/t_sys_file_basic_mcd.v index e8329e20d..285c696dc 100644 --- a/test_regress/t/t_sys_file_basic_mcd.v +++ b/test_regress/t/t_sys_file_basic_mcd.v @@ -4,7 +4,8 @@ // any use, without warranty, 2020 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t; `define STR(__s) `"__s`" diff --git a/test_regress/t/t_sys_file_eof.v b/test_regress/t/t_sys_file_eof.v index 8b8069a4f..70099c9e3 100644 --- a/test_regress/t/t_sys_file_eof.v +++ b/test_regress/t/t_sys_file_eof.v @@ -6,7 +6,8 @@ `include "verilated.v" -`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t; diff --git a/test_regress/t/t_sys_file_zero.v b/test_regress/t/t_sys_file_zero.v index 252bf268b..a4197543f 100644 --- a/test_regress/t/t_sys_file_zero.v +++ b/test_regress/t/t_sys_file_zero.v @@ -4,7 +4,8 @@ // any use, without warranty, 2003 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t; int i; diff --git a/test_regress/t/t_sys_fread.v b/test_regress/t/t_sys_fread.v index 9b1818faa..eb9d2a233 100644 --- a/test_regress/t/t_sys_fread.v +++ b/test_regress/t/t_sys_fread.v @@ -5,7 +5,8 @@ // SPDX-License-Identifier: CC0-1.0 `define STRINGIFY(x) `"x`" -`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); //====================================================================== diff --git a/test_regress/t/t_time_literals.v b/test_regress/t/t_time_literals.v index c4de10979..3b102741d 100644 --- a/test_regress/t/t_time_literals.v +++ b/test_regress/t/t_time_literals.v @@ -4,7 +4,8 @@ // any use, without warranty, 2020 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); `timescale 1ns/1ps diff --git a/test_regress/t/t_time_timeunit.v b/test_regress/t/t_time_timeunit.v index e75d5ab98..4b0537fe7 100644 --- a/test_regress/t/t_time_timeunit.v +++ b/test_regress/t/t_time_timeunit.v @@ -4,7 +4,8 @@ // any use, without warranty, 2022 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t; diff --git a/test_regress/t/t_typename.v b/test_regress/t/t_typename.v index c76ee0e05..8ac5b8539 100644 --- a/test_regress/t/t_typename.v +++ b/test_regress/t/t_typename.v @@ -4,7 +4,8 @@ // any use, without warranty, 2020 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d: got='%s' exp='%s'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t(/*AUTOARG*/); diff --git a/test_regress/t/t_unpacked_slice.v b/test_regress/t/t_unpacked_slice.v index ea76566d9..caf03a40e 100644 --- a/test_regress/t/t_unpacked_slice.v +++ b/test_regress/t/t_unpacked_slice.v @@ -4,7 +4,8 @@ // without warranty, 2020 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0) +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0) module t (/*AUTOARG*/); diff --git a/test_regress/t/t_var_static.v b/test_regress/t/t_var_static.v index 47e293f61..18f56ebdf 100644 --- a/test_regress/t/t_var_static.v +++ b/test_regress/t/t_var_static.v @@ -4,7 +4,8 @@ // any use, without warranty, 2014 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); function automatic int f_au_st_global (); static int st = 0; st++; return st; diff --git a/test_regress/t/t_var_static_param.v b/test_regress/t/t_var_static_param.v index 83972619f..ba1fc3aca 100644 --- a/test_regress/t/t_var_static_param.v +++ b/test_regress/t/t_var_static_param.v @@ -4,7 +4,8 @@ // any use, without warranty, 2020 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0) +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0) module t (/*AUTOARG*/); diff --git a/test_regress/t/t_wait_order.out b/test_regress/t/t_wait_order.out index 20887769e..9f5cdd27e 100644 --- a/test_regress/t/t_wait_order.out +++ b/test_regress/t/t_wait_order.out @@ -1,17 +1,17 @@ -%Error-UNSUPPORTED: t/t_wait_order.v:16:23: Unsupported: wait_order - 16 | wait_order (a, b) wif[0] = '1; +%Error-UNSUPPORTED: t/t_wait_order.v:17:23: Unsupported: wait_order + 17 | wait_order (a, b) wif[0] = '1; | ^ ... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest -%Error-UNSUPPORTED: t/t_wait_order.v:25:23: Unsupported: wait_order - 25 | wait_order (a, b) else welse[1] = '1; +%Error-UNSUPPORTED: t/t_wait_order.v:26:23: Unsupported: wait_order + 26 | wait_order (a, b) else welse[1] = '1; | ^ -%Error-UNSUPPORTED: t/t_wait_order.v:28:23: Unsupported: wait_order - 28 | wait_order (b, a) else nelse[1] = '1; +%Error-UNSUPPORTED: t/t_wait_order.v:29:23: Unsupported: wait_order + 29 | wait_order (b, a) else nelse[1] = '1; | ^ -%Error-UNSUPPORTED: t/t_wait_order.v:32:23: Unsupported: wait_order - 32 | wait_order (a, b) wif[2] = '1; else welse[2] = '1; +%Error-UNSUPPORTED: t/t_wait_order.v:33:23: Unsupported: wait_order + 33 | wait_order (a, b) wif[2] = '1; else welse[2] = '1; | ^ -%Error-UNSUPPORTED: t/t_wait_order.v:35:23: Unsupported: wait_order - 35 | wait_order (b, a) nif[2] = '1; else nelse[2] = '1; +%Error-UNSUPPORTED: t/t_wait_order.v:36:23: Unsupported: wait_order + 36 | wait_order (b, a) nif[2] = '1; else nelse[2] = '1; | ^ %Error: Exiting due to diff --git a/test_regress/t/t_wait_order.v b/test_regress/t/t_wait_order.v index 3fa46a808..9986d87e9 100644 --- a/test_regress/t/t_wait_order.v +++ b/test_regress/t/t_wait_order.v @@ -4,7 +4,8 @@ // any use, without warranty, 2020 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 -`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); +`define stop $stop +`define checkd(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got=%0d exp=%0d\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); module t(/*AUTOARG*/); diff --git a/test_regress/t/t_wire_types.v b/test_regress/t/t_wire_types.v index 564d096e1..a1389327e 100644 --- a/test_regress/t/t_wire_types.v +++ b/test_regress/t/t_wire_types.v @@ -4,15 +4,16 @@ // any use, without warranty, 2012 by Wilson Snyder. // SPDX-License-Identifier: CC0-1.0 +`define stop $stop +`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); +`define checkr(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d: got=%f exp=%f\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); + module t (/*AUTOARG*/ // Inputs clk ); input clk; -`define checkh(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='h%x exp='h%x\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); -`define checkr(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d: got=%f exp=%f\n", `__FILE__,`__LINE__, (gotv), (expv)); $stop; end while(0); - // IEEE: integer_atom_type wire byte w_byte; wire shortint w_shortint; diff --git a/test_regress/t/t_xml_debugcheck.out b/test_regress/t/t_xml_debugcheck.out index 18f3dbde7..87529e486 100644 --- a/test_regress/t/t_xml_debugcheck.out +++ b/test_regress/t/t_xml_debugcheck.out @@ -11,7 +11,7 @@ - + @@ -19,134 +19,92 @@ - - - - - - - - - + + + + + + + + + - - + + - - + + - - - - + + + + - - + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - + + + + + + - + @@ -158,18 +116,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -177,76 +135,64 @@ - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - + + + + + + - + - + @@ -260,22 +206,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -285,22 +231,22 @@ - + - - - - - - - - - - + + + + + + + + + + - + @@ -314,22 +260,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -339,44 +285,68 @@ - + - - + + - + - - - + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - - + + - + @@ -386,73 +356,61 @@ - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + - + - - - - - - + + + + + + - + @@ -464,18 +422,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -483,300 +441,308 @@ - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - + - - - + + + - + - - - + + + - - - + + + - + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - + - - - - - - - + + + + + + + - + - - - + + + - - - - + + + + - + - - - - + + + + - - - + + + - + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - + + - - - - - - - + + + + + + + - + - - - - - - + + + + + + - + - - - - - - - + + + + + + + - + - - - - - - + + + + + + - + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - + - + - - - - + + + + - - - + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -784,29 +750,33 @@ - + - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - + + - + @@ -816,57 +786,45 @@ - - - - - - - - + + + + + + + + - + - + - + - - - - - - - - - + + + - + - + - - - - - - - - - + + + @@ -875,40 +833,52 @@ - - + + - + - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + - + - - + + - + @@ -918,57 +888,45 @@ - - - - - - - - + + + + + + + + - + - + - + - - - - - - - - - + + + - + - + - - - - - - - - - + + + @@ -976,57 +934,65 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + @@ -1034,29 +1000,33 @@ - + - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - + + - + @@ -1066,57 +1036,45 @@ - - - - - - - - + + + + + + + + - + - + - + - - - - - - - - - + + + - + - + - - - - - - - - - + + + @@ -1125,40 +1083,52 @@ - - + + - + - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + - + - - + + - + @@ -1168,57 +1138,45 @@ - - - - - - - - + + + + + + + + - + - + - + - - - - - - - - - + + + - + - + - - - - - - - - - + + + @@ -1226,57 +1184,65 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + @@ -1284,29 +1250,33 @@ - + - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - + + - + @@ -1316,57 +1286,45 @@ - - - - - - - - + + + + + + + + - + - + - + - - - - - - - - - + + + - + - + - - - - - - - - - + + + @@ -1375,40 +1333,52 @@ - - + + - + - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + - + - - + + - + @@ -1418,57 +1388,45 @@ - - - - - - - - + + + + + + + + - + - + - + - - - - - - - - - + + + - + - + - - - - - - - - - + + + @@ -1476,22 +1434,64 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - + + - + @@ -1502,34 +1502,34 @@ - - - + + + - - - + + + - - - - - - + + + + + + - - + + - - + + @@ -1565,7 +1565,7 @@ - + @@ -1590,15 +1590,15 @@ - - - - - + + + + + - - - + + + @@ -1624,26 +1624,26 @@ - - - - + + + + - + - + - - - + + + - - - + + + - - - + + + @@ -1669,25 +1669,25 @@ - - - - + + + + - + - + - - - + + + - - - + + + @@ -1696,94 +1696,94 @@ - - - + + + - - - - - + + + + + - - + + - - - + + + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + @@ -1801,53 +1801,53 @@ - - - - - - + + + + + + - - + + - - + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + +