fix partial packing of multidimensional unpacked arrays

src/Convert/UnpackedArray.hs

@@ -60,9 +60,9 @@ rewriteDeclM (decl @ (Variable d t x a e)) = do
     case usedAsPacked of
         Just depth -> do
             let (tf, rs) = typeRanges t
-            let (shifted, rest) = splitAt (length a - depth) a
+            let (unpacked, packed) = splitAt depth a
-            let t' = tf $ shifted ++ rs
+            let t' = tf $ packed ++ rs
-            return $ Variable d t' x rest e
+            return $ Variable d t' x unpacked e
         Nothing -> return decl
 rewriteDeclM decl @ Net{} = traverseNetAsVarM rewriteDeclM decl
 rewriteDeclM other = return other

test/core/unpacked_array_depth.sv

@@ -1,18 +1,22 @@
 module example(
-    input wire [7:0] inp,
+    input wire inp [7:0],
-    output wire [7:0] out
+    output wire out [7:0]
 );
-    assign out = ~inp;
+    for (genvar i = 0; i < 8; ++i)
+        assign out[i] = ~inp[i];
 endmodule
 
 module top;
-    reg arr1 [7:0][1:0];
+    reg arr1 [1:0][7:0];
-    reg arr2 [7:0][1:0][1:0];
+    reg arr2 [1:0][1:0][7:0];
-    wire [7:0] out1, out2;
+    wire out1 [7:0];
+    wire out2 [7:0];
     example e1(arr1[0], out1);
     example e2(arr2[0][0], out2);
     initial begin
-        #1 arr1[0] = 8'hAD;
+        for (integer i = 0; i < 8; ++i) begin
-        #1 arr2[0][0] = 8'h42;
+            #1 arr1[0][i] = (8'hAD >> i) & 1'b1;
+            #1 arr2[0][0][i] = (8'h42 >> i) & 1'b1;
+        end
     end
 endmodule

test/core/unpacked_array_depth.v

@@ -11,8 +11,11 @@ module top;
     wire [7:0] out1, out2;
     example e1(arr1[0], out1);
     example e2(arr2[0][0], out2);
-    initial begin
+    initial begin : blk
-        #1 arr1[0] = 8'hAD;
+        integer i;
-        #1 arr2[0][0] = 8'h42;
+        for (i = 0; i < 8; i = i + 1) begin
+            #1 arr1[0][i] = (8'hAD >> i) & 1'b1;
+            #1 arr2[0][0][i] = (8'h42 >> i) & 1'b1;
+        end
     end
 endmodule