luke/verilator
1
0
Fork 0
mirror of https://github.com/verilator/verilator.git synced 2026-09-03 16:28:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support class handle covergroup arguments (#8071)

Browse Source
This commit is contained in:
Marco Bartoli
2026-08-13 20:41:39 -04:00
committed by GitHub
parent c8853d1507
commit 7da43d8302
8 changed files with 241 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/V3Covergroup.cpp
+22 -8
View File
@@ -1959,6 +1959,7 @@ class FunctionalCoverageVisitor final : public VNVisitor {
class FormalRefVisitor final : public VNVisitor {
const std::set<const AstVar*>& m_constructorArgs;
const std::map<const AstVar*, AstVar*>& m_replacements;
AstMemberSel* m_memberSelp = nullptr;
AstNode* m_offenderp = nullptr;
@@ -1969,7 +1970,11 @@ class FunctionalCoverageVisitor final : public VNVisitor {
iterateChildren(nodep);
}
void visit(AstVarRef* nodep) override {
if (m_memberSelp && m_constructorArgs.count(nodep->varp())) {
if (!m_memberSelp) return;
const auto it = m_replacements.find(nodep->varp());
if (it != m_replacements.end()) {
nodep->varp(it->second);
} else if (m_constructorArgs.count(nodep->varp())) {
m_offenderp = m_memberSelp;
}
}
@@ -1978,8 +1983,10 @@ class FunctionalCoverageVisitor final : public VNVisitor {
}
public:
explicit FormalRefVisitor(const std::set<const AstVar*>& constructorArgs)
: m_constructorArgs{constructorArgs} {}
FormalRefVisitor(const std::set<const AstVar*>& constructorArgs,
const std::map<const AstVar*, AstVar*>& replacements)
: m_constructorArgs{constructorArgs}
, m_replacements{replacements} {}
void scan(AstNode* nodep) {
if (nodep && !m_offenderp) iterate(nodep);
}
@@ -1988,12 +1995,19 @@ class FunctionalCoverageVisitor final : public VNVisitor {
AstNode* findUnsupportedFormalRef() {
std::set<const AstVar*> constructorArgs;
std::map<const AstVar*, AstVar*> replacements;
for (AstNode* stmtp = m_constructorp->stmtsp(); stmtp; stmtp = stmtp->nextp()) {
if (const AstVar* const varp = VN_CAST(stmtp, Var)) {
if (varp->isIO()) constructorArgs.insert(varp);
}
AstVar* const varp = VN_CAST(stmtp, Var);
if (!varp || !varp->isIO()) continue;
constructorArgs.insert(varp);
if (!VN_IS(varp->dtypep()->skipRefp(), ClassRefDType)) continue;
AstVar* const memberp
= VN_CAST(m_memberMap.findMember(m_covergroupp, varp->name()), Var);
UASSERT_OBJ(memberp && memberp->isClassMember(), varp,
"Covergroup constructor argument missing persistent member");
replacements.emplace(varp, memberp);
}
FormalRefVisitor visitor{constructorArgs};
FormalRefVisitor visitor{constructorArgs, replacements};
for (AstCoverpoint* const cpp : m_coverpoints) {
visitor.scan(cpp->exprp());
visitor.scan(cpp->iffp());
@@ -2167,7 +2181,7 @@ class FunctionalCoverageVisitor final : public VNVisitor {
if (AstNode* const offenderp = findUnsupportedFormalRef()) {
offenderp->v3warn(COVERIGN, "Unsupported: 'covergroup' coverpoint dereferencing a "
"class handle member; ignoring covergroup "
"non-class constructor argument; ignoring covergroup "
<< nodep->prettyNameQ());
deleteCoverageItems();
if (embeddedEventForkp) {