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

Address stream concat review feedback

This commit is contained in:
JAEUK LEE 2026-07-09 13:05:50 +09:00
parent b256e640ac
commit 02726c8caa
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/V3Width.cpp
View File

@ -110,9 +110,9 @@ std::ostream& operator<<(std::ostream& str, const Determ& rhs) {
} }
enum StreamUse : uint8_t { enum StreamUse : uint8_t {
STREAM_USE_NONE, STREAM_USE_NONE, // Stream concatenation is not allowed in this context
STREAM_USE_ASSIGN, STREAM_USE_ASSIGN, // Assignment-like context permits stream concatenation
STREAM_USE_CAST, STREAM_USE_CAST, // Explicit cast context permits stream concatenation
}; };
#define v3widthWarn(lhs, rhs, msg) \ #define v3widthWarn(lhs, rhs, msg) \
@ -128,7 +128,7 @@ class WidthVP final {
// Parameters to pass down hierarchy with visit functions. // Parameters to pass down hierarchy with visit functions.
AstNodeDType* const m_dtypep; // Parent's data type to resolve to AstNodeDType* const m_dtypep; // Parent's data type to resolve to
const Stage m_stage; // If true, report errors const Stage m_stage; // If true, report errors
const StreamUse m_streamUse; // Whether current expression may be a stream concat const StreamUse m_streamUse; // Current expression may be a stream concat
public: public:
WidthVP(AstNodeDType* dtypep, Stage stage, StreamUse streamUse = STREAM_USE_NONE) WidthVP(AstNodeDType* dtypep, Stage stage, StreamUse streamUse = STREAM_USE_NONE)
@ -148,7 +148,6 @@ public:
WidthVP* p() { return this; } WidthVP* p() { return this; }
bool selfDtm() const { return m_dtypep == nullptr; } bool selfDtm() const { return m_dtypep == nullptr; }
StreamUse streamUse() const { return m_streamUse; } StreamUse streamUse() const { return m_streamUse; }
bool streamUseAllowed() const { return m_streamUse != STREAM_USE_NONE; }
AstNodeDType* dtypep() const { AstNodeDType* dtypep() const {
// Detect where overrideDType is probably the intended call // Detect where overrideDType is probably the intended call
UASSERT(m_dtypep, "Width dtype request on self-determined or preliminary VUP"); UASSERT(m_dtypep, "Width dtype request on self-determined or preliminary VUP");
@ -989,17 +988,12 @@ class WidthVisitor final : public VNVisitor {
} }
bool streamImplicitUseAllowed(const AstNodeStream* nodep) const { bool streamImplicitUseAllowed(const AstNodeStream* nodep) const {
if (m_streamConcat) return true; if (m_streamConcat) return true;
if (m_vup && m_vup->streamUseAllowed()) return true; if (m_vup && m_vup->streamUse() != STREAM_USE_NONE) return true;
const AstNode* const backp = nodep->backp(); const AstNode* const backp = nodep->backp();
if (!backp) return true; // Error elsewhere if (!backp) return true; // Error elsewhere
if (const AstNodeAssign* const assignp = VN_CAST(backp, NodeAssign)) { return VN_IS(backp, NodeAssign);
return assignp->lhsp() == nodep || assignp->rhsp() == nodep;
}
// Explicit cast nodes are legal contexts for the stream operand.
return VN_IS(backp, Cast) || VN_IS(backp, CastSize) || VN_IS(backp, CastWrap);
} }
void visit(AstNodeStream* nodep) override { void visit(AstNodeStream* nodep) override {
VL_RESTORER(m_streamConcat); VL_RESTORER(m_streamConcat);

7
test_regress/t/t_stream_queue.v
View File

@ -5,17 +5,14 @@
// SPDX-License-Identifier: CC0-1.0 // SPDX-License-Identifier: CC0-1.0
`define stop $stop `define stop $stop
`define checks(gotv,expv) do if ((gotv) != (expv)) begin $write("%%Error: %s:%0d: got='%h' exp='%h'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
`define checks_w(width,gotv,expv) do begin \ `define checks_w(width,gotv,expv) do begin \
logic [(width)-1:0] got_check; \ logic [(width)-1:0] got_check; \
logic [(width)-1:0] exp_check; \ logic [(width)-1:0] exp_check; \
got_check = (gotv); \ got_check = (gotv); \
exp_check = (expv); \ exp_check = (expv); \
if (got_check != exp_check) begin \ `checks(got_check, exp_check) \
$write("%%Error: %s:%0d: got='%h' exp='%h'\n", `__FILE__,`__LINE__, got_check, exp_check); \
`stop; \
end \
end while(0); end while(0);
`define checks(gotv,expv) `checks_w($bits(expv), gotv, expv)
module t; module t;
logic [7:0] i_char; logic [7:0] i_char;