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

Improve memory usage for SenTrees in V3OrderProcessDomains (#6112)

This commit is contained in:
Geza Lore 2025-06-23 19:22:10 +01:00 committed by GitHub
parent c0b505849c
commit d35e4a2b60
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/V3OrderProcessDomains.cpp
View File

@ -64,13 +64,28 @@ class V3OrderProcessDomains final {
: ""); : "");
} }
// Make a domain that merges the two domains // Make a domain that merges the two domains, but don't yet simplify or add to global list
AstSenTree* combineDomains(AstSenTree* ap, AstSenTree* bp) { AstSenTree* combineDomains(AstSenTree* ap, AstSenTree* bp) {
if (ap == bp) return ap; if (ap == bp) return ap;
if (ap == m_deleteDomainp) return bp; if (ap == m_deleteDomainp) return bp;
UASSERT_OBJ(bp != m_deleteDomainp, bp, "'bp' Should not be delete domain"); UASSERT_OBJ(bp != m_deleteDomainp, bp, "'bp' Should not be delete domain");
AstSenTree* const senTreep = ap->cloneTree(false); // If either tree has a backp, it is an existing tree, otherwise it is an intermediae
// created in this function.
// Clone existing 'ap' tree, or reuse intermediate
AstSenTree* const senTreep = ap->backp() ? ap->cloneTree(false) : ap;
// Clone or move items from 'bp'
if (bp->backp()) {
senTreep->addSensesp(bp->sensesp()->cloneTree(true)); senTreep->addSensesp(bp->sensesp()->cloneTree(true));
} else {
senTreep->addSensesp(bp->sensesp()->unlinkFrBackWithNext());
VL_DO_DANGLING(bp->deleteTree(), bp);
}
return senTreep;
}
AstSenTree* simplifyDomain(AstSenTree* senTreep) {
// If it has a back pointer, then it is already one of the existing global trees
if (senTreep->backp()) return senTreep;
V3Const::constifyExpensiveEdit(senTreep); // Remove duplicates V3Const::constifyExpensiveEdit(senTreep); // Remove duplicates
senTreep->multi(true); // Comment that it was made from 2 domains senTreep->multi(true); // Comment that it was made from 2 domains
AstSenTree* const resultp = m_finder.getSenTree(senTreep); AstSenTree* const resultp = m_finder.getSenTree(senTreep);
@ -99,7 +114,10 @@ class V3OrderProcessDomains final {
// For logic, start with the explicit hybrid sensitivities // For logic, start with the explicit hybrid sensitivities
OrderLogicVertex* const lvtxp = vtxp->cast<OrderLogicVertex>(); OrderLogicVertex* const lvtxp = vtxp->cast<OrderLogicVertex>();
if (lvtxp) domainp = lvtxp->hybridp(); if (lvtxp) domainp = lvtxp->hybridp();
if (domainp) UINFO(6, " hybr d=" << debugDomain(domainp) << " " << vtxp); if (domainp) {
UINFO(6, " hybr d=" << debugDomain(domainp) << " " << vtxp);
UASSERT(domainp->backp(), "Hybrid senTree should have backp");
}
// For each incoming edge, examine the source vertex // For each incoming edge, examine the source vertex
for (V3GraphEdge& edge : vtxp->inEdges()) { for (V3GraphEdge& edge : vtxp->inEdges()) {
@ -114,6 +132,8 @@ class V3OrderProcessDomains final {
UINFO(6, " from d=" << debugDomain(fromDomainp) << " " << fromVtxp); UINFO(6, " from d=" << debugDomain(fromDomainp) << " " << fromVtxp);
UASSERT(fromDomainp == m_deleteDomainp || !fromDomainp->hasCombo(), UASSERT(fromDomainp == m_deleteDomainp || !fromDomainp->hasCombo(),
"There should be no need for combinational domains"); "There should be no need for combinational domains");
UASSERT(fromDomainp == m_deleteDomainp || fromDomainp->backp(),
"Driver SenTree should have backp");
// Add in any external domains of variables // Add in any external domains of variables
if (OrderVarVertex* const varVtxp = fromVtxp->cast<OrderVarVertex>()) { if (OrderVarVertex* const varVtxp = fromVtxp->cast<OrderVarVertex>()) {
@ -125,6 +145,8 @@ class V3OrderProcessDomains final {
<< " because of " << vscp); << " because of " << vscp);
UASSERT_OBJ(!externalDomainp->hasCombo(), vscp, UASSERT_OBJ(!externalDomainp->hasCombo(), vscp,
"There should be no need for combinational domains"); "There should be no need for combinational domains");
UASSERT_OBJ(externalDomainp->backp(), vscp,
"External SenTree should have backp()");
fromDomainp = combineDomains(fromDomainp, externalDomainp); fromDomainp = combineDomains(fromDomainp, externalDomainp);
} }
} }
@ -145,6 +167,9 @@ class V3OrderProcessDomains final {
if (!domainp) { if (!domainp) {
domainp = m_deleteDomainp; domainp = m_deleteDomainp;
if (lvtxp) m_logicpsToDelete.push_back(lvtxp); if (lvtxp) m_logicpsToDelete.push_back(lvtxp);
} else {
// Simplify and create canonical global SenTree
domainp = simplifyDomain(domainp);
} }
// Set the domain of the vertex // Set the domain of the vertex