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

Internals: Refactor to create replaceWithKeepDType. No functional change.

This commit is contained in:
Wilson Snyder 2025-05-05 06:31:06 -04:00
parent 1e74451534
commit a3662cc3f5
6 changed files with 32 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/V3Ast.cpp
View File

@ -521,6 +521,10 @@ void AstNode::replaceWith(AstNode* newp) {
this->unlinkFrBack(&repHandle);
repHandle.relink(newp);
}
void AstNode::replaceWithKeepDType(AstNode* newp) {
newp->dtypeFrom(this);
replaceWith(newp);
}
void VNRelinker::dump(std::ostream& str) const {
str << " BK=" << reinterpret_cast<uint32_t*>(m_backp);

1
src/V3Ast.h
View File

@ -2415,6 +2415,7 @@ public:
void addNextHere(AstNode* newp); // Insert newp at this->nextp
void addHereThisAsNext(AstNode* newp); // Adds at old place of this, this becomes next
void replaceWith(AstNode* newp); // Replace current node in tree with new node
void replaceWithKeepDType(AstNode* newp); // Replace current node in tree, keep old dtype
// Unlink this from whoever points to it.
AstNode* unlinkFrBack(VNRelinker* linkerp = nullptr);
// Unlink this from whoever points to it, keep entire next list with unlinked node

63
src/V3Const.cpp
View File

@ -1096,10 +1096,9 @@ class ConstVisitor final : public VNVisitor {
new AstAnd{nodep->fileline(), maskp->cloneTree(false), condp->thenp()->unlinkFrBack()},
new AstAnd{nodep->fileline(), maskp->cloneTree(false),
condp->elsep()->unlinkFrBack()}));
newp->dtypeFrom(nodep);
newp->thenp()->dtypeFrom(nodep); // As And might have been to change widths
newp->elsep()->dtypeFrom(nodep);
nodep->replaceWith(newp);
nodep->replaceWithKeepDType(newp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
return true;
}
@ -1155,8 +1154,7 @@ class ConstVisitor final : public VNVisitor {
if (constp->num().isCaseEq(mask)) {
AstNode* const rhsp = nodep->rhsp();
rhsp->unlinkFrBack();
nodep->replaceWith(rhsp);
rhsp->dtypeFrom(nodep);
nodep->replaceWithKeepDType(rhsp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
return true;
}
@ -1354,9 +1352,8 @@ class ConstVisitor final : public VNVisitor {
if (debug() >= 9) nodep->dumpTree("- SEL(SH)-in: ");
AstSel* const newp
= new AstSel{nodep->fileline(), ap->unlinkFrBack(), newLsb, nodep->widthConst()};
newp->dtypeFrom(nodep);
nodep->replaceWithKeepDType(newp);
if (debug() >= 9) newp->dumpTree("- SEL(SH)-ou: ");
nodep->replaceWith(newp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
return true;
}
@ -1582,10 +1579,9 @@ class ConstVisitor final : public VNVisitor {
UASSERT_OBJ(!(VN_IS(oldp, Const) && !VN_AS(oldp, Const)->num().isFourState()), oldp,
"Already constant??");
AstNode* const newp = new AstConst{oldp->fileline(), num};
newp->dtypeFrom(oldp);
oldp->replaceWithKeepDType(newp);
if (debug() > 5) oldp->dumpTree("- const_old: ");
if (debug() > 5) newp->dumpTree("- _new: ");
oldp->replaceWith(newp);
VL_DO_DANGLING(pushDeletep(oldp), oldp);
}
void replaceNum(AstNode* nodep, uint32_t val) {
@ -1615,8 +1611,7 @@ class ConstVisitor final : public VNVisitor {
} else {
AstNode* const newp = new AstAnd{nodep->fileline(), new AstConst{nodep->fileline(), 0},
checkp->unlinkFrBack()};
newp->dtypeFrom(nodep);
nodep->replaceWith(newp);
nodep->replaceWithKeepDType(newp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
}
}
@ -1674,8 +1669,7 @@ class ConstVisitor final : public VNVisitor {
childp->unlinkFrBackWithNext();
// If replacing a SEL for example, the data type comes from the parent (is less wide).
// This may adversely affect the operation of the node being replaced.
childp->dtypeFrom(nodep);
nodep->replaceWith(childp);
nodep->replaceWithKeepDType(childp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
}
void replaceWChildBool(AstNode* nodep, AstNodeExpr* childp) {
@ -1872,8 +1866,7 @@ class ConstVisitor final : public VNVisitor {
= (VN_IS(nodep, ExtendS)
? static_cast<AstNodeExpr*>(new AstExtendS{nodep->fileline(), arg0p})
: static_cast<AstNodeExpr*>(new AstExtend{nodep->fileline(), arg0p}));
newp->dtypeFrom(nodep);
nodep->replaceWith(newp);
nodep->replaceWithKeepDType(newp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
}
void replacePowShift(AstNodeBiop* nodep) { // Pow or PowS
@ -1881,9 +1874,8 @@ class ConstVisitor final : public VNVisitor {
AstNodeExpr* const rhsp = nodep->rhsp()->unlinkFrBack();
AstShiftL* const newp
= new AstShiftL{nodep->fileline(), new AstConst{nodep->fileline(), 1}, rhsp};
newp->dtypeFrom(nodep);
newp->lhsp()->dtypeFrom(nodep);
nodep->replaceWith(newp);
nodep->replaceWithKeepDType(newp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
}
void replaceMulShift(AstMul* nodep) { // Mul, but not MulS as not simple shift
@ -1892,8 +1884,7 @@ class ConstVisitor final : public VNVisitor {
AstNodeExpr* const opp = nodep->rhsp()->unlinkFrBack();
AstShiftL* const newp
= new AstShiftL{nodep->fileline(), opp, new AstConst(nodep->fileline(), amount)};
newp->dtypeFrom(nodep);
nodep->replaceWith(newp);
nodep->replaceWithKeepDType(newp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
}
void replaceDivShift(AstDiv* nodep) { // Mul, but not MulS as not simple shift
@ -1902,8 +1893,7 @@ class ConstVisitor final : public VNVisitor {
AstNodeExpr* const opp = nodep->lhsp()->unlinkFrBack();
AstShiftR* const newp
= new AstShiftR{nodep->fileline(), opp, new AstConst(nodep->fileline(), amount)};
newp->dtypeFrom(nodep);
nodep->replaceWith(newp);
nodep->replaceWithKeepDType(newp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
}
void replaceModAnd(AstModDiv* nodep) { // Mod, but not ModS as not simple shift
@ -1914,8 +1904,7 @@ class ConstVisitor final : public VNVisitor {
AstNodeExpr* const opp = nodep->lhsp()->unlinkFrBack();
AstAnd* const newp
= new AstAnd{nodep->fileline(), opp, new AstConst{nodep->fileline(), mask}};
newp->dtypeFrom(nodep);
nodep->replaceWith(newp);
nodep->replaceWithKeepDType(newp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
}
void replaceShiftOp(AstNodeBiop* nodep) {
@ -1994,8 +1983,7 @@ class ConstVisitor final : public VNVisitor {
}
newp->dtypeFrom(nodep);
newp = new AstAnd{nodep->fileline(), newp, new AstConst{nodep->fileline(), mask}};
newp->dtypeFrom(nodep);
nodep->replaceWith(newp);
nodep->replaceWithKeepDType(newp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
// if (debug()) newp->dumpTree("- repShiftShift_new: ");
iterate(newp); // Further reduce, either node may have more reductions.
@ -2347,10 +2335,9 @@ class ConstVisitor final : public VNVisitor {
UASSERT_OBJ(valuep, nodep, "No value returned from simulation");
// Replace it
AstNode* const newp = valuep->cloneTree(false);
newp->dtypeFrom(nodep);
newp->fileline(nodep->fileline());
nodep->replaceWithKeepDType(newp);
UINFO(4, "Simulate->" << newp << endl);
nodep->replaceWith(newp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
}
}
@ -2448,8 +2435,7 @@ class ConstVisitor final : public VNVisitor {
if (!aRandp || !bRandp) return false;
if (!aRandp->combinable(bRandp)) return false;
UINFO(4, "Concat(Rand,Rand) => Rand: " << nodep << endl);
aRandp->dtypeFrom(nodep); // I.e. the total width
nodep->replaceWith(aRandp->unlinkFrBack());
nodep->replaceWithKeepDType(aRandp->unlinkFrBack());
VL_DO_DANGLING(pushDeletep(nodep), nodep);
return true;
}
@ -2459,8 +2445,7 @@ class ConstVisitor final : public VNVisitor {
if (!aRandp) return false;
if (aRandp->seedp()) return false;
UINFO(4, "Sel(Rand) => Rand: " << nodep << endl);
aRandp->dtypeFrom(nodep); // I.e. the total width
nodep->replaceWith(aRandp->unlinkFrBack());
nodep->replaceWithKeepDType(aRandp->unlinkFrBack());
VL_DO_DANGLING(pushDeletep(nodep), nodep);
return true;
}
@ -2540,8 +2525,7 @@ class ConstVisitor final : public VNVisitor {
new AstLogOr{nodep->fileline(),
new AstLogNot{nodep->fileline(), rhsp->cloneTreePure(false)},
lhsp->cloneTreePure(false)}};
newp->dtypeFrom(nodep);
nodep->replaceWith(newp);
nodep->replaceWithKeepDType(newp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
}
@ -2632,8 +2616,7 @@ class ConstVisitor final : public VNVisitor {
AstSel* const newp
= new AstSel{nodep->fileline(), fromp,
new AstConst{lsbp->fileline(), lsbp->toUInt() % fromp->width()}, widthp};
newp->dtypeFrom(nodep);
nodep->replaceWith(newp);
nodep->replaceWithKeepDType(newp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
return true;
}
@ -2651,8 +2634,7 @@ class ConstVisitor final : public VNVisitor {
cnt2p->unlinkFrBack();
AstReplicate* const newp
= new AstReplicate{nodep->fileline(), from2p, cnt1p->toUInt() * cnt2p->toUInt()};
newp->dtypeFrom(nodep);
nodep->replaceWith(newp);
nodep->replaceWithKeepDType(newp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
return true;
}
@ -2681,8 +2663,7 @@ class ConstVisitor final : public VNVisitor {
//
from1p->unlinkFrBack();
AstReplicate* const newp = new AstReplicate{nodep->fileline(), from1p, cnt1 + cnt2};
newp->dtypeFrom(nodep);
nodep->replaceWith(newp);
nodep->replaceWithKeepDType(newp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
return true;
}
@ -2699,8 +2680,7 @@ class ConstVisitor final : public VNVisitor {
fromp->lhsp(new AstSel{nodep->fileline(), bilhsp, lsbp->cloneTreePure(true),
widthp->cloneTreePure(true)});
fromp->rhsp(new AstSel{nodep->fileline(), birhsp, lsbp, widthp});
fromp->dtypeFrom(nodep);
nodep->replaceWith(fromp);
nodep->replaceWithKeepDType(fromp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
}
void replaceSelIntoUniop(AstSel* nodep) {
@ -2713,8 +2693,7 @@ class ConstVisitor final : public VNVisitor {
AstNodeExpr* const bilhsp = fromp->lhsp()->unlinkFrBack();
//
fromp->lhsp(new AstSel{nodep->fileline(), bilhsp, lsbp, widthp});
fromp->dtypeFrom(nodep);
nodep->replaceWith(fromp);
nodep->replaceWithKeepDType(fromp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
}

3
src/V3Premit.cpp
View File

@ -141,8 +141,7 @@ class PremitVisitor final : public VNVisitor {
newp = new AstShiftRSOvr{nodep->fileline(), nodep->lhsp()->unlinkFrBack(),
nodep->rhsp()->unlinkFrBack()};
}
newp->dtypeFrom(nodep);
nodep->replaceWith(newp);
nodep->replaceWithKeepDType(newp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
return;
}

12
src/V3Width.cpp
View File

@ -2066,8 +2066,7 @@ class WidthVisitor final : public VNVisitor {
<< nodep->warnMore()
<< "... Suggest try static cast");
}
newp->dtypeFrom(nodep);
nodep->replaceWith(newp);
nodep->replaceWithKeepDType(newp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
userIterate(newp, m_vup);
}
@ -2211,8 +2210,7 @@ class WidthVisitor final : public VNVisitor {
if (m_vup->final()) {
// CastSize not needed once sizes determined
AstNode* const underp = nodep->lhsp()->unlinkFrBack();
underp->dtypeFrom(nodep);
nodep->replaceWith(underp);
nodep->replaceWithKeepDType(underp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
}
// if (debug()) nodep->dumpTree("- CastSizeOut: ");
@ -7617,8 +7615,7 @@ class WidthVisitor final : public VNVisitor {
break;
}
UINFO(6, " ReplaceWithUOrSVersion: " << nodep << " w/ " << newp << endl);
nodep->replaceWith(newp);
newp->dtypeFrom(nodep);
nodep->replaceWithKeepDType(newp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
return newp;
}
@ -7707,8 +7704,7 @@ class WidthVisitor final : public VNVisitor {
break;
}
UINFO(6, " ReplaceWithDVersion: " << nodep << " w/ " << newp << endl);
nodep->replaceWith(newp);
newp->dtypeFrom(nodep);
nodep->replaceWithKeepDType(newp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
return newp;
}

3
src/V3WidthRemove.h
View File

@ -37,8 +37,7 @@ class WidthRemoveVisitor final : public VNVisitor {
void replaceWithSignedVersion(AstNode* nodep, AstNode* newp) {
UINFO(6, " Replace " << nodep << " w/ " << newp << endl);
nodep->replaceWith(newp);
newp->dtypeFrom(nodep);
nodep->replaceWithKeepDType(newp);
VL_DO_DANGLING(pushDeletep(nodep), nodep);
}