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

Fix missing temporary for DfgSplicePacked (#7361)

This commit is contained in:
Geza Lore 2026-04-01 22:44:58 +01:00 committed by GitHub
parent 2e151c3b74
commit d7c484ae85
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/V3DfgPeephole.cpp
View File

@ -166,6 +166,7 @@ class V3DfgPeephole final : public DfgVisitor {
DfgVertex* m_vtxp = nullptr; // Currently considered vertex DfgVertex* m_vtxp = nullptr; // Currently considered vertex
size_t m_currentGeneration = 0; // Current generation number size_t m_currentGeneration = 0; // Current generation number
size_t m_lastId = 0; // Last unique vertex ID assigned size_t m_lastId = 0; // Last unique vertex ID assigned
size_t m_nTemps = 0; // Number of temporary variables created
// STATIC STATE // STATIC STATE
static V3DebugBisect s_debugBisect; // Debug aid static V3DebugBisect s_debugBisect; // Debug aid
@ -1248,14 +1249,11 @@ class V3DfgPeephole final : public DfgVisitor {
} }
} }
// Sel from a partial variable or narrowed vertex // Sel from a partial temporary (including narrowed vertex)
{ if (DfgVarPacked* const varp = fromp->cast<DfgVarPacked>()) {
DfgSplicePacked* splicep = fromp->cast<DfgSplicePacked>(); if (varp->tmpForp() && varp->srcp()) {
if (DfgVarPacked* const varp = fromp->cast<DfgVarPacked>()) {
// Must be a splice, otherwise it would have been inlined // Must be a splice, otherwise it would have been inlined
if (varp->tmpForp() && varp->srcp()) splicep = varp->srcp()->as<DfgSplicePacked>(); DfgSplicePacked* splicep = varp->srcp()->as<DfgSplicePacked>();
}
if (splicep) {
DfgVertex* driverp = nullptr; DfgVertex* driverp = nullptr;
uint32_t driverLsb = 0; uint32_t driverLsb = 0;
splicep->foreachDriver([&](DfgVertex& src, const uint32_t dLsb) { splicep->foreachDriver([&](DfgVertex& src, const uint32_t dLsb) {
@ -1861,11 +1859,21 @@ class V3DfgPeephole final : public DfgVisitor {
// Need to insert via a partial splice to avoid infinite matching, // Need to insert via a partial splice to avoid infinite matching,
// this splice will be eliminated on later visits to its sinks. // this splice will be eliminated on later visits to its sinks.
const DfgVertex::ScopeCache scopeCache;
DfgSplicePacked* const sp = new DfgSplicePacked{m_dfg, flp, vtxp->dtype()}; DfgSplicePacked* const sp = new DfgSplicePacked{m_dfg, flp, vtxp->dtype()};
sp->addDriver(catp, lsb, flp);
m_vInfo[sp].m_id = ++m_lastId; m_vInfo[sp].m_id = ++m_lastId;
replace(sp); sp->addDriver(catp, lsb, flp);
AstScope* const scopep = [&]() -> AstScope* {
if (m_dfg.modulep()) return nullptr;
DfgVertex::ScopeCache scopeCache;
return vtxp->scopep(scopeCache, true);
}();
const std::string name = m_dfg.makeUniqueName("PeepholeNarrow", m_nTemps++);
DfgVertexVar* const varp = m_dfg.makeNewVar(flp, name, vtxp->dtype(), scopep);
varp->tmpForp(varp->nodep());
m_vInfo[varp].m_id = ++m_lastId;
varp->varp()->isInternal(true);
varp->srcp(sp);
replace(varp);
return; return;
} }
} }