From 8ac3b1509956d2d23a3a981407568f345f4d8d9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Chmiel?= Date: Mon, 3 Mar 2025 14:12:00 +0100 Subject: [PATCH] Simplify tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bartłomiej Chmiel --- test_regress/t/t_force_chained.out | 7 +++--- test_regress/t/t_force_chained.v | 25 ++++++++++++--------- test_regress/t/t_force_func.out | 5 +++-- test_regress/t/t_force_func.v | 20 ++++++++--------- test_regress/t/t_force_initial.out | 3 +-- test_regress/t/t_force_initial.v | 21 ++++++++--------- test_regress/t/t_force_rhs_ref.v | 17 ++++++++------ test_regress/t/t_force_rhs_ref_multiple.out | 11 ++++----- test_regress/t/t_force_rhs_ref_multiple.v | 4 ---- 9 files changed, 57 insertions(+), 56 deletions(-) diff --git a/test_regress/t/t_force_chained.out b/test_regress/t/t_force_chained.out index 93b75fa764..ddfa525883 100644 --- a/test_regress/t/t_force_chained.out +++ b/test_regress/t/t_force_chained.out @@ -1,3 +1,4 @@ -%Error: t/t_force_chained.v:30: got='h0 exp='h00000001 -%Error: t/t_force_chained.v:37: got='h0 exp='h00000002 -%Error: t/t_force_chained.v:43: got='h0 exp='h00000003 +%Error: t/t_force_chained.v:27: got='h0 exp='h00000001 +%Error: t/t_force_chained.v:33: got='h0 exp='h00000002 +%Error: t/t_force_chained.v:40: got='h0 exp='h00000003 +%Error: t/t_force_chained.v:46: got='h0 exp='h00000003 diff --git a/test_regress/t/t_force_chained.v b/test_regress/t/t_force_chained.v index aae1b00bb5..9374daf1a3 100644 --- a/test_regress/t/t_force_chained.v +++ b/test_regress/t/t_force_chained.v @@ -19,24 +19,27 @@ module t; `checkh(b, 0); `checkh(c, 0); - #1 a = 1; + a = 1; + #1; `checkh(a, 1); - `checkh(b, 0); - `checkh(c, 0); - - #1 a = 2; - `checkh(a, 2); `checkh(b, 1); + // TODO implement inter-dependency resolution between force statements `checkh(c, 1); - #1 a = 3; - c = 3; - `checkh(a, 3); + a = 2; + #1; + `checkh(a, 2); `checkh(b, 2); - // TODO implement inter-dependency resolution between force statements `checkh(c, 2); - #1 release b; + a = 3; + c = 3; + #1; + `checkh(a, 3); + `checkh(b, 3); + `checkh(c, 3); + + release b; release c; `checkh(a, 3); `checkh(b, 1); diff --git a/test_regress/t/t_force_func.out b/test_regress/t/t_force_func.out index 1d18834470..7ecdbb3c08 100644 --- a/test_regress/t/t_force_func.out +++ b/test_regress/t/t_force_func.out @@ -1,3 +1,4 @@ -%Error: t/t_force_func.v:32: got='h0 exp='h00000001 -%Error: t/t_force_func.v:36: got='h0 exp='h00000002 +%Error: t/t_force_func.v:26: got='h0 exp='h00000001 +%Error: t/t_force_func.v:34: got='h0 exp='h00000002 +%Error: t/t_force_func.v:39: got='h0 exp='h00000003 %Error: t/t_force_func.v:43: got='h0 exp='h00000003 diff --git a/test_regress/t/t_force_func.v b/test_regress/t/t_force_func.v index dc4c480301..91b0194218 100644 --- a/test_regress/t/t_force_func.v +++ b/test_regress/t/t_force_func.v @@ -20,26 +20,26 @@ module t; `checkh(a, 0); `checkh(b, 0); - #1 a = 1; + a = 1; + #1; `checkh(a, 1); - `checkh(b, 0); + `checkh(b, 1); - #1 a = 2; + a = 2; + #1; `checkh(a, 2); // TODO // IEEE 1800-2023 10.6 // Assignment shall be reevaluated while the assign or force is in effect. - `checkh(b, 1); + `checkh(b, 2); - #1 a = 3; + a = 3; + #1; `checkh(a, 3); - `checkh(b, 2); + `checkh(b, 3); - #1 release b; + release b; `checkh(a, 3); - // IEEE 1800-2023 10.6.2 - // Not driven variable maintains its value after release. - // Value is maintained until a next assignment. `checkh(b, 3); b = 2; diff --git a/test_regress/t/t_force_initial.out b/test_regress/t/t_force_initial.out index 1be80a523e..a4c65cd9c0 100644 --- a/test_regress/t/t_force_initial.out +++ b/test_regress/t/t_force_initial.out @@ -1,3 +1,2 @@ -%Error: t/t_force_initial.v:23: got='h2 exp='h00000000 +%Error: t/t_force_initial.v:21: got='h2 exp='h00000000 %Error: t/t_force_initial.v:27: got='h2 exp='h00000001 -%Error: t/t_force_initial.v:35: got='h2 exp='h00000003 diff --git a/test_regress/t/t_force_initial.v b/test_regress/t/t_force_initial.v index 6536e0aa17..c5bf27c11f 100644 --- a/test_regress/t/t_force_initial.v +++ b/test_regress/t/t_force_initial.v @@ -17,22 +17,23 @@ module t; end initial begin - #1 a = 1; - `checkh(a, 1); - // TODO trigger forced variable update from different initial block. + #1; `checkh(b, 0); - #1 a = 2; - `checkh(a, 2); + a = 1; + #1; + `checkh(a, 1); + // TODO trigger forced variable update from different initial block. `checkh(b, 1); - #1 a = 3; - `checkh(a, 3); + a = 2; + #1; + `checkh(a, 2); `checkh(b, 2); - #1 release b; - `checkh(a, 3); - `checkh(b, 3); + release b; + `checkh(a, 2); + `checkh(b, 2); b = 0; #1; diff --git a/test_regress/t/t_force_rhs_ref.v b/test_regress/t/t_force_rhs_ref.v index 099fed6626..a6515bec19 100644 --- a/test_regress/t/t_force_rhs_ref.v +++ b/test_regress/t/t_force_rhs_ref.v @@ -17,19 +17,22 @@ module t; `checkh(a, 0); `checkh(b, 0); - #1 a = 1; + a = 1; + #1; `checkh(a, 1); - `checkh(b, 0); + `checkh(b, 1); - #1 a = 2; + a = 2; + #1; `checkh(a, 2); - `checkh(b, 1); + `checkh(b, 2); - #1 a = 3; + a = 3; + #1; `checkh(a, 3); - `checkh(b, 2); + `checkh(b, 3); - #1 release b; + release b; `checkh(a, 3); `checkh(b, 1); diff --git a/test_regress/t/t_force_rhs_ref_multiple.out b/test_regress/t/t_force_rhs_ref_multiple.out index 7c10c59f67..b6245d9405 100644 --- a/test_regress/t/t_force_rhs_ref_multiple.out +++ b/test_regress/t/t_force_rhs_ref_multiple.out @@ -1,8 +1,5 @@ -%Error: t/t_force_rhs_ref_multiple.v:24: got='h0a exp='h00000009 -%Error: t/t_force_rhs_ref_multiple.v:27: got='h0a exp='h00000009 -%Error: t/t_force_rhs_ref_multiple.v:29: got='h0a exp='h00000007 -%Error: t/t_force_rhs_ref_multiple.v:32: got='h0a exp='h00000007 -%Error: t/t_force_rhs_ref_multiple.v:34: got='h0a exp='h00000004 -%Error: t/t_force_rhs_ref_multiple.v:37: got='h0a exp='h00000004 +%Error: t/t_force_rhs_ref_multiple.v:23: got='h0a exp='h00000009 +%Error: t/t_force_rhs_ref_multiple.v:27: got='h0a exp='h00000007 +%Error: t/t_force_rhs_ref_multiple.v:31: got='h0a exp='h00000004 +%Error: t/t_force_rhs_ref_multiple.v:35: got='h0a exp='h00000000 %Error: t/t_force_rhs_ref_multiple.v:39: got='h0a exp='h00000000 -%Error: t/t_force_rhs_ref_multiple.v:43: got='h0a exp='h00000000 diff --git a/test_regress/t/t_force_rhs_ref_multiple.v b/test_regress/t/t_force_rhs_ref_multiple.v index fae2961fec..ce44a36c84 100644 --- a/test_regress/t/t_force_rhs_ref_multiple.v +++ b/test_regress/t/t_force_rhs_ref_multiple.v @@ -18,23 +18,19 @@ module t; `checkh(e, 10); #1; a = 0; - `checkh(e, 10); #1; // TODO support multiple VarRefs on RHS `checkh(e, 9); b = 0; - `checkh(e, 9); #1; `checkh(e, 7); c = 0; - `checkh(e, 7); #1; `checkh(e, 4); d = 0; - `checkh(e, 4); #1; `checkh(e, 0);