From dc42659988c1377a485f32b13220bac69c579cf0 Mon Sep 17 00:00:00 2001
From: Zachary Snow <zach@zachjs.com>
Date: Mon, 15 Apr 2024 00:14:52 -0400
Subject: [PATCH] obey declaration order in reference output

The latest verion of iverilog enforces declaration ordering more
strictly. Update a few test cases to match. sv2v still supports
out-of-order items on a best-effort basis.
---
 test/core/multipack.v     | 14 +++++++-------
 test/core/package_order.v |  5 ++---
 test/core/reorder.v       |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/test/core/multipack.v b/test/core/multipack.v
index 538d3e9..90dc91a 100644
--- a/test/core/multipack.v
+++ b/test/core/multipack.v
@@ -1,12 +1,5 @@
 module Example;
 
-    initial
-        $monitor("%b %b %b %b %b %b %b %b %b",
-            arr1, arr2, arr3,
-            arr4, arr5, arr6,
-            arr7, arr8, arr9
-        );
-
     reg [14:0] arr1;
     reg [14:0] arr2;
     reg [14:0] arr3;
@@ -43,4 +36,11 @@ module Example;
         #1; arr9[(4-1)*3+:3] = arr9[(4-2)*3+:3];
     end
 
+    initial
+        $monitor("%b %b %b %b %b %b %b %b %b",
+            arr1, arr2, arr3,
+            arr4, arr5, arr6,
+            arr7, arr8, arr9
+        );
+
 endmodule
diff --git a/test/core/package_order.v b/test/core/package_order.v
index 0c93664..34b3ed1 100644
--- a/test/core/package_order.v
+++ b/test/core/package_order.v
@@ -1,9 +1,8 @@
-module evil_mdl (
-    output reg [evil_pkg_B-1:0] foo
-);
+module evil_mdl (foo);
     localparam evil_pkg_Z = 1;
     localparam evil_pkg_A = evil_pkg_Z;
     localparam evil_pkg_B = evil_pkg_Z;
+    output reg [evil_pkg_B-1:0] foo;
     initial foo = evil_pkg_A;
 endmodule
 
diff --git a/test/core/reorder.v b/test/core/reorder.v
index a41b315..815f781 100644
--- a/test/core/reorder.v
+++ b/test/core/reorder.v
@@ -9,8 +9,8 @@ module top;
             assign brr[0] = 1;
             initial $display("%b", brr);
             if (YES) begin : blk2
-                assign crr[0] = 1;
                 wire [19:0] crr;
+                assign crr[0] = 1;
                 initial $display("%b", crr);
             end
         end