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

Internals: Cleanup some V3Simulate branches. No functional change intended.

This commit is contained in:
Wilson Snyder 2026-04-03 20:16:10 -04:00
parent ed0506ea8d
commit 00bf59ac92
1 changed files with 97 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/V3Simulate.h
View File

@ -521,7 +521,7 @@ private:
} }
} }
} }
if (!m_checkOnly && optimizable()) { // simulating if (m_checkOnly || !optimizable()) return; // Not simulating
UASSERT_OBJ(nodep->access().isReadOnly(), nodep, UASSERT_OBJ(nodep->access().isReadOnly(), nodep,
"LHS varref should be handled in AstAssign visitor."); "LHS varref should be handled in AstAssign visitor.");
{ {
@ -540,7 +540,6 @@ private:
setValue(nodep, valuep); setValue(nodep, valuep);
} }
} }
}
void visit(AstVarXRef* nodep) override { void visit(AstVarXRef* nodep) override {
if (jumpingOver()) return; if (jumpingOver()) return;
if (m_scoped) { if (m_scoped) {
@ -606,12 +605,14 @@ private:
} }
void visit(AstConst* nodep) override { void visit(AstConst* nodep) override {
checkNodeInfo(nodep); checkNodeInfo(nodep);
if (!m_checkOnly && optimizable()) newValue(nodep, nodep); if (m_checkOnly || !optimizable()) return;
newValue(nodep, nodep);
} }
void visit(AstInitArray* nodep) override { void visit(AstInitArray* nodep) override {
checkNodeInfo(nodep); checkNodeInfo(nodep);
iterateChildrenConst(nodep); iterateChildrenConst(nodep);
if (!m_checkOnly && optimizable()) newValue(nodep, nodep); if (m_checkOnly || !optimizable()) return;
newValue(nodep, nodep);
} }
void visit(AstInitItem* nodep) override { void visit(AstInitItem* nodep) override {
checkNodeInfo(nodep); checkNodeInfo(nodep);
@ -620,7 +621,7 @@ private:
void visit(AstEnumItemRef* nodep) override { void visit(AstEnumItemRef* nodep) override {
checkNodeInfo(nodep); checkNodeInfo(nodep);
UASSERT_OBJ(nodep->itemp(), nodep, "Not linked"); UASSERT_OBJ(nodep->itemp(), nodep, "Not linked");
if (!m_checkOnly && optimizable()) { if (m_checkOnly || !optimizable()) return;
AstNode* const valuep = nodep->itemp()->valuep(); AstNode* const valuep = nodep->itemp()->valuep();
if (valuep) { if (valuep) {
iterateAndNextConstNull(valuep); iterateAndNextConstNull(valuep);
@ -630,20 +631,18 @@ private:
clearOptimizable(nodep, "No value found for enum item"); // LCOV_EXCL_LINE clearOptimizable(nodep, "No value found for enum item"); // LCOV_EXCL_LINE
} }
} }
}
void visit(AstNodeUniop* nodep) override { void visit(AstNodeUniop* nodep) override {
if (!optimizable()) return; // Accelerate if (!optimizable()) return; // Accelerate
checkNodeInfo(nodep); checkNodeInfo(nodep);
iterateChildrenConst(nodep); iterateChildrenConst(nodep);
if (!m_checkOnly && optimizable()) { if (m_checkOnly || !optimizable()) return;
nodep->numberOperate(newConst(nodep)->num(), fetchConst(nodep->lhsp())->num()); nodep->numberOperate(newConst(nodep)->num(), fetchConst(nodep->lhsp())->num());
} }
}
void visit(AstNodeBiop* nodep) override { void visit(AstNodeBiop* nodep) override {
if (!optimizable()) return; // Accelerate if (!optimizable()) return; // Accelerate
checkNodeInfo(nodep); checkNodeInfo(nodep);
iterateChildrenConst(nodep); iterateChildrenConst(nodep);
if (!m_checkOnly && optimizable()) { if (m_checkOnly || !optimizable()) return;
AstConst* const valuep = newConst(nodep); AstConst* const valuep = newConst(nodep);
nodep->numberOperate(newConst(nodep)->num(), fetchConst(nodep->lhsp())->num(), nodep->numberOperate(newConst(nodep)->num(), fetchConst(nodep->lhsp())->num(),
fetchConst(nodep->rhsp())->num()); fetchConst(nodep->rhsp())->num());
@ -655,28 +654,23 @@ private:
valuep->num().opBitsOne(num); valuep->num().opBitsOne(num);
} }
} }
}
void visit(AstNodeTriop* nodep) override { void visit(AstNodeTriop* nodep) override {
if (!optimizable()) return; // Accelerate if (!optimizable()) return; // Accelerate
checkNodeInfo(nodep); checkNodeInfo(nodep);
iterateChildrenConst(nodep); iterateChildrenConst(nodep);
if (!m_checkOnly && optimizable()) { if (m_checkOnly || !optimizable()) return;
nodep->numberOperate(newConst(nodep)->num(), fetchConst(nodep->lhsp())->num(), nodep->numberOperate(newConst(nodep)->num(), fetchConst(nodep->lhsp())->num(),
fetchConst(nodep->rhsp())->num(), fetchConst(nodep->rhsp())->num(), fetchConst(nodep->thsp())->num());
fetchConst(nodep->thsp())->num());
}
} }
void visit(AstNodeQuadop* nodep) override { void visit(AstNodeQuadop* nodep) override {
if (!optimizable()) return; // Accelerate if (!optimizable()) return; // Accelerate
checkNodeInfo(nodep); checkNodeInfo(nodep);
iterateChildrenConst(nodep); iterateChildrenConst(nodep);
if (!m_checkOnly && optimizable()) { if (m_checkOnly || !optimizable()) return;
nodep->numberOperate(newConst(nodep)->num(), fetchConst(nodep->lhsp())->num(), nodep->numberOperate(newConst(nodep)->num(), fetchConst(nodep->lhsp())->num(),
fetchConst(nodep->rhsp())->num(), fetchConst(nodep->rhsp())->num(), fetchConst(nodep->thsp())->num(),
fetchConst(nodep->thsp())->num(),
fetchConst(nodep->fhsp())->num()); fetchConst(nodep->fhsp())->num());
} }
}
void visit(AstLogAnd* nodep) override { void visit(AstLogAnd* nodep) override {
// Need to short circuit // Need to short circuit
if (!optimizable()) return; // Accelerate if (!optimizable()) return; // Accelerate
@ -773,7 +767,7 @@ private:
clearOptimizable(nodep, "Array of non-basic dtype (e.g. array-of-array)"); clearOptimizable(nodep, "Array of non-basic dtype (e.g. array-of-array)");
return; return;
} }
if (!m_checkOnly && optimizable()) { if (m_checkOnly || !optimizable()) return;
AstNode* const vscp = varOrScope(varrefp); AstNode* const vscp = varOrScope(varrefp);
AstInitArray* initp = nullptr; AstInitArray* initp = nullptr;
if (AstInitArray* const vscpnump = VN_CAST(fetchOutValueNull(vscp), InitArray)) { if (AstInitArray* const vscpnump = VN_CAST(fetchOutValueNull(vscp), InitArray)) {
@ -782,8 +776,8 @@ private:
initp = vscpnump; initp = vscpnump;
} else { // Assignment to unassigned variable, all bits are X } else { // Assignment to unassigned variable, all bits are X
// TODO generic initialization which builds X/arrays by recursion // TODO generic initialization which builds X/arrays by recursion
AstConst* const outconstp = new AstConst{ AstConst* const outconstp
nodep->fileline(), AstConst::WidthedValue{}, basicp->widthMin(), 0}; = new AstConst{nodep->fileline(), AstConst::WidthedValue{}, basicp->widthMin(), 0};
if (basicp->isZeroInit()) { if (basicp->isZeroInit()) {
outconstp->num().setAllBits0(); outconstp->num().setAllBits0();
} else { } else {
@ -802,12 +796,11 @@ private:
UINFOTREE(9, initp, "", "array"); UINFOTREE(9, initp, "", "array");
assignOutValue(nodep, vscp, initp); assignOutValue(nodep, vscp, initp);
} }
}
void handleAssignSel(AstNodeAssign* nodep, AstSel* selp, AstNodeExpr* valueFromp) { void handleAssignSel(AstNodeAssign* nodep, AstSel* selp, AstNodeExpr* valueFromp) {
AstVarRef* varrefp = nullptr; AstVarRef* varrefp = nullptr;
V3Number lsb{nodep}; V3Number lsb{nodep};
handleAssignSelRecurse(nodep, selp, varrefp /*ref*/, lsb /*ref*/, 0); handleAssignSelRecurse(nodep, selp, varrefp /*ref*/, lsb /*ref*/, 0);
if (!m_checkOnly && optimizable()) { if (m_checkOnly || !optimizable()) return;
UASSERT_OBJ(varrefp, nodep, UASSERT_OBJ(varrefp, nodep,
"Indicated optimizable, but no variable found on RHS of select"); "Indicated optimizable, but no variable found on RHS of select");
AstNode* const vscp = varOrScope(varrefp); AstNode* const vscp = varOrScope(varrefp);
@ -829,7 +822,6 @@ private:
outconstp->num().opSelInto(fetchConst(valueFromp)->num(), lsb, selp->widthConst()); outconstp->num().opSelInto(fetchConst(valueFromp)->num(), lsb, selp->widthConst());
assignOutValue(nodep, vscp, outconstp); assignOutValue(nodep, vscp, outconstp);
} }
}
void handleAssignSelRecurse(AstNodeAssign* nodep, AstSel* selp, AstVarRef*& outVarrefpRef, void handleAssignSelRecurse(AstNodeAssign* nodep, AstSel* selp, AstVarRef*& outVarrefpRef,
V3Number& lsbRef, int depth) { V3Number& lsbRef, int depth) {
// Recurse down to find final variable being set (outVarrefp), with // Recurse down to find final variable being set (outVarrefp), with
@ -1059,8 +1051,8 @@ private:
iterateAndNextConstNull(nodep->stmtsp()); iterateAndNextConstNull(nodep->stmtsp());
if (!optimizable()) return; if (!optimizable()) return;
iterateAndNextConstNull(nodep->resultp()); iterateAndNextConstNull(nodep->resultp());
if (!optimizable()) return; if (m_checkOnly || !optimizable()) return;
if (!m_checkOnly) newValue(nodep, fetchValue(nodep->resultp())); newValue(nodep, fetchValue(nodep->resultp()));
} }
void visit(AstJumpBlock* nodep) override { void visit(AstJumpBlock* nodep) override {
@ -1121,7 +1113,8 @@ private:
if (jumpingOver()) return; if (jumpingOver()) return;
checkNodeInfo(nodep); checkNodeInfo(nodep);
iterateConst(nodep->condp()); iterateConst(nodep->condp());
if (!m_checkOnly && optimizable() && fetchConst(nodep->condp())->num().isEqZero()) { if (m_checkOnly || !optimizable()) return;
if (fetchConst(nodep->condp())->num().isEqZero()) {
UINFO(5, " LOOP TEST GO " << nodep); UINFO(5, " LOOP TEST GO " << nodep);
UASSERT_OBJ(!m_jumptargetp, nodep, "Jump inside jump"); UASSERT_OBJ(!m_jumptargetp, nodep, "Jump inside jump");
m_jumptargetp = nodep->loopp(); m_jumptargetp = nodep->loopp();
@ -1274,8 +1267,7 @@ private:
if (!optimizable()) return; // Accelerate if (!optimizable()) return; // Accelerate
checkNodeInfo(nodep); checkNodeInfo(nodep);
iterateChildrenConst(nodep); iterateChildrenConst(nodep);
if (m_checkOnly) return; if (m_checkOnly || !optimizable()) return;
if (!optimizable()) return; // Accelerate
AstNode* nextArgp = nodep->exprsp(); AstNode* nextArgp = nodep->exprsp();
string result; string result;
@ -1357,8 +1349,7 @@ private:
if (!optimizable()) return; // Accelerate if (!optimizable()) return; // Accelerate
checkNodeInfo(nodep); checkNodeInfo(nodep);
iterateChildrenConst(nodep); iterateChildrenConst(nodep);
if (!optimizable()) return; if (m_checkOnly || !optimizable()) return;
if (m_checkOnly) return;
const std::string result = toStringRecurse(nodep->lhsp()); const std::string result = toStringRecurse(nodep->lhsp());
if (!optimizable()) return; if (!optimizable()) return;
AstConst* const resultConstp = new AstConst{nodep->fileline(), AstConst::String{}, result}; AstConst* const resultConstp = new AstConst{nodep->fileline(), AstConst::String{}, result};