luke/verilator
1
0
Fork 0
mirror of https://github.com/verilator/verilator.git synced 2026-10-06 18:13:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken support of unassigned virtual interfaces (#6253) (#6338)

Browse Source 
* Fix broken support of unassigned virtual interfaces

Unassigned virtual interface support added by #6245 is broken - PR marks
dead module as alive - we can't do that as once a module is dead it
needs to remain dead because earlier steps (e.g. port resolution) have
already been skipped.

This commit handles unassigned virtual interfaces at the beginning of
first pass of LinkDot (so it is never marked as dead, and no linking
steps are getting skipped).

Fixes #6253.

* Apply suggestions from code review

Co-authored-by: Wilson Snyder <[email protected]>

* Apply 'make format'

* Revert add of redundant iterateChildren() call

* Add original test case

---------

Co-authored-by: Wilson Snyder <[email protected]>
Co-authored-by: github action <[email protected]>
This commit is contained in:
Szymon Gizler
2025-08-28 09:03:46 -04:00
committed by GitHub
co-authored by Wilson Snyder github action
parent 1043a6c6be
commit 8868d459a2
9 changed files with 164 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/V3LinkDot.cpp
+46 -17
View File
@@ -533,22 +533,9 @@ public:
continue;
} else if (ifacerefp->ifaceViaCellp()->dead()
|| !existsNodeSym(ifacerefp->ifaceViaCellp())) {
// virtual interface never assigned any actual interface
ifacerefp->ifacep()->dead(false);
varp->dtypep(ifacerefp->dtypep());
// Create dummy cell to keep the virtual interface alive
// (later stages assume that non-dead interface has associated cell)
AstCell* const ifacecellp
= new AstCell{ifacerefp->ifacep()->fileline(),
ifacerefp->ifacep()->fileline(),
ifacerefp->ifacep()->name() + "__02E" + varp->name(),
ifacerefp->ifaceName(),
nullptr,
nullptr,
nullptr};
ifacecellp->modp(ifacerefp->ifacep());
VSymEnt* const symp = new VSymEnt{&m_syms, ifacecellp};
ifacerefp->ifacep()->user1p(symp);
UASSERT_OBJ(false, ifacerefp->ifaceViaCellp(),
"Interface referenced by virtual iface is dead. "
"Dead interfaces have required linking steps skipped");
}
VSymEnt* const ifaceSymp = getNodeSym(ifacerefp->ifaceViaCellp());
VSymEnt* ifOrPortSymp = ifaceSymp;
@@ -874,6 +861,14 @@ LinkDotState* LinkDotState::s_errorThisp = nullptr;
//======================================================================
class LinkDotFindVisitor final : public VNVisitor {
// NODE STATE
// Cleared on global
// *::user1p() -> See LinkDotState
// *::user2p() -> See LinkDotState
// *::user3() // bool. Node stored in m_virtualIfaces
// *::user4() -> See LinkDotState
const VNUser3InUse m_inuser3;
// STATE
LinkDotState* const m_statep; // State to pass between visitors, including symbol table
AstNodeModule* m_classOrPackagep = nullptr; // Current package
@@ -891,6 +886,8 @@ class LinkDotFindVisitor final : public VNVisitor {
int m_modBlockNum = 0; // Begin block number in module, 0=none seen
int m_modWithNum = 0; // With block number, 0=none seen
int m_modArgNum = 0; // Arg block number for randomize(), 0=none seen
std::vector<AstIface*> m_virtIfaces; // interfaces used as virtual,
// needed for handleUnvisitedVirtIfaces()
// METHODS
void makeImplicitNew(AstClass* nodep) {
@@ -986,6 +983,14 @@ class LinkDotFindVisitor final : public VNVisitor {
}
void visit(AstTypeTable*) override {} // FindVisitor::
void visit(AstConstPool*) override {} // FindVisitor::
void visit(AstIfaceRefDType* nodep) override {
if (m_statep->forPrimary() && nodep->isVirtual() && nodep->ifacep()
&& !nodep->ifacep()->user3()) {
m_virtIfaces.push_back(nodep->ifacep());
nodep->ifacep()->user3(true);
}
iterateChildren(nodep);
}
void visit(AstNodeModule* nodep) override { // FindVisitor::
// Called on top module from Netlist, other modules from the cell creating them,
// and packages
@@ -1821,12 +1826,36 @@ class LinkDotFindVisitor final : public VNVisitor {
void visit(AstNode* nodep) override { iterateChildren(nodep); } // FindVisitor::
void handleUnvisitedVirtIfaces() {
AstNodeModule* const top = v3Global.rootp()->modulesp();
m_curSymp = m_statep->getNodeSym(top);
for (AstIface* ifacep : m_virtIfaces) {
if (!ifacep->user4()) { // virtual interface never assigned any actual interface
// Create dummy cell to keep the virtual interface alive
// (later stages assume that non-dead interface has associated cell)
AstCell* const ifacecellp = new AstCell{ifacep->fileline(),
ifacep->fileline(),
"__VdummyInstOf" + ifacep->name(),
ifacep->name(),
nullptr,
nullptr,
nullptr};
ifacecellp->modp(ifacep);
top->addStmtsp(ifacecellp);
iterate(ifacecellp);
}
}
}
public:
// CONSTRUCTORS
LinkDotFindVisitor(AstNetlist* rootp, LinkDotState* statep)
: m_statep{statep} {
UINFO(4, __FUNCTION__ << ": ");
iterate(rootp);
if (!m_virtIfaces.empty()) handleUnvisitedVirtIfaces();
}
~LinkDotFindVisitor() override = default;
};
@@ -2877,7 +2906,7 @@ class LinkDotResolveVisitor final : public VNVisitor {
void visit(AstTypeTable*) override {}
void visit(AstConstPool*) override {}
void visit(AstNodeModule* nodep) override {
if (nodep->dead() || !m_statep->existsNodeSym(nodep)) return;
if (nodep->dead()) return;
LINKDOT_VISIT_START();
UINFO(8, indent() << "visit " << nodep);
VL_RESTORER(m_genericIfaceModule);