luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix stream concatenation in init array patterns (#7890 repair) (#7928)

This commit is contained in:
Jeffrey Song 2026-07-13 17:29:19 -07:00 committed by GitHub
parent 4262aea87c
commit e24efae5a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/V3Width.cpp
View File

@ -3453,7 +3453,8 @@ class WidthVisitor final : public VNVisitor {
} }
const AstNodeDType* const arrayp = nodep->dtypep()->skipRefp(); const AstNodeDType* const arrayp = nodep->dtypep()->skipRefp();
if (VN_IS(arrayp, NodeArrayDType) || VN_IS(arrayp, AssocArrayDType)) { if (VN_IS(arrayp, NodeArrayDType) || VN_IS(arrayp, AssocArrayDType)) {
userIterateChildren(nodep, WidthVP{arrayp->subDTypep(), BOTH}.p()); userIterateChildren(nodep,
WidthVP{arrayp->subDTypep(), BOTH, STREAM_USE_ASSIGN}.p());
} else { } else {
UINFO(1, "on " << nodep); UINFO(1, "on " << nodep);
UINFO(1, "dtype object " << arrayp); UINFO(1, "dtype object " << arrayp);

11
test_regress/t/t_array_pattern_concat.v
View File

@ -14,6 +14,12 @@ endpackage
module t ( /*AUTOARG*/); module t ( /*AUTOARG*/);
typedef logic [31:0] word_t;
typedef word_t word_pair_t[2];
word_t stream_src = 32'h1234_5678;
word_pair_t stream_words;
// Test: array concatenation in pattern initialization // Test: array concatenation in pattern initialization
// An array localparam used as a value in another array's pattern // An array localparam used as a value in another array's pattern
// should have its elements "flattened" into the target array. // should have its elements "flattened" into the target array.
@ -78,6 +84,11 @@ module t ( /*AUTOARG*/);
localparam logic [31:0] PKG_SLICE[4] = '{arr_pkg::PKG_ADDRS[0:1], 32'hAA, 32'hBB}; localparam logic [31:0] PKG_SLICE[4] = '{arr_pkg::PKG_ADDRS[0:1], 32'hAA, 32'hBB};
initial begin initial begin
// Streaming concatenation as a positional assignment-pattern member
stream_words = '{{<<8{stream_src}}, 32'h0};
`checkh(stream_words[0], 32'h7856_3412);
`checkh(stream_words[1], 32'h0000_0000);
`checkh(ALL_ADDRS[0], 32'h80001000); `checkh(ALL_ADDRS[0], 32'h80001000);
`checkh(ALL_ADDRS[1], 32'h80002000); `checkh(ALL_ADDRS[1], 32'h80002000);
`checkh(ALL_ADDRS[2], 32'h80003000); `checkh(ALL_ADDRS[2], 32'h80003000);