mirror of
https://github.com/verilator/verilator.git
synced 2026-09-07 10:01:11 +02:00
Fix UNUSED / UNDRIVEN for unused functions (#6967)
This commit is contained in:
+40
-20
@@ -51,6 +51,7 @@ class UndrivenVarEntry final {
|
||||
const AstNode* m_procWritep = nullptr; // varref if written in process
|
||||
const FileLine* m_nodeFileLinep = nullptr; // File line of varref if driven, else nullptr
|
||||
bool m_underGen = false; // Under a generate
|
||||
bool m_ftaskDriven = false; // Last driven by function or task
|
||||
|
||||
const AstNodeFTaskRef* m_callNodep = nullptr; // Call node if driven via writeSummary
|
||||
|
||||
@@ -124,7 +125,8 @@ public:
|
||||
UINFO(9, "set d[*] " << m_varp->name());
|
||||
m_wholeFlags[FLAG_DRIVEN] = true;
|
||||
}
|
||||
void drivenWhole(const AstNodeVarRef* nodep, const FileLine* fileLinep) {
|
||||
void drivenWhole(const AstNodeVarRef* nodep, const FileLine* fileLinep, bool ftaskDef) {
|
||||
m_ftaskDriven = ftaskDef && !isDrivenWhole();
|
||||
drivenWhole();
|
||||
m_nodep = nodep;
|
||||
m_nodeFileLinep = fileLinep;
|
||||
@@ -143,6 +145,7 @@ public:
|
||||
bool isUnderGen() const { return m_underGen; }
|
||||
bool isDrivenWhole() const { return m_wholeFlags[FLAG_DRIVEN]; }
|
||||
bool isDrivenAlwaysCombWhole() const { return m_wholeFlags[FLAG_DRIVEN_ALWCOMB]; }
|
||||
bool isFtaskDriven() const { return m_ftaskDriven; }
|
||||
const AstNodeVarRef* getNodep() const { return m_nodep; }
|
||||
const FileLine* getNodeFileLinep() const { return m_nodeFileLinep; }
|
||||
const AstAlways* getAlwCombp() const { return m_alwCombp; }
|
||||
@@ -207,6 +210,8 @@ public:
|
||||
true); // Warn only once
|
||||
}
|
||||
} else { // Signal
|
||||
const string varType{nodep->isFuncLocal() ? "Function variable" : "Signal"};
|
||||
bool funcInout = nodep->isFuncLocal() && nodep->isInout();
|
||||
bool allU = true;
|
||||
bool allD = true;
|
||||
bool anyU = m_wholeFlags[FLAG_USED];
|
||||
@@ -225,6 +230,10 @@ public:
|
||||
anyDnotU |= !used && driv;
|
||||
anynotDU |= !used && !driv;
|
||||
}
|
||||
if (funcInout) {
|
||||
if (anyD) allU = true;
|
||||
allD = true;
|
||||
}
|
||||
if (allU) m_wholeFlags[FLAG_USED] = true;
|
||||
if (allD) m_wholeFlags[FLAG_DRIVEN] = true;
|
||||
// Test results
|
||||
@@ -239,37 +248,45 @@ public:
|
||||
// thus undriven+unused bits get UNUSED warnings, as they're not as buggy.
|
||||
if (!unusedMatch(nodep)) {
|
||||
nodep->v3warn(UNUSEDSIGNAL,
|
||||
"Signal is not driven, nor used: " << nodep->prettyNameQ());
|
||||
varType << " is not driven, nor used: " << nodep->prettyNameQ());
|
||||
nodep->fileline()->modifyWarnOff(V3ErrorCode::UNUSEDSIGNAL,
|
||||
true); // Warn only once
|
||||
}
|
||||
} else if (allD && !anyU) {
|
||||
if (!unusedMatch(nodep)) {
|
||||
nodep->v3warn(UNUSEDSIGNAL, "Signal is not used: " << nodep->prettyNameQ());
|
||||
nodep->v3warn(UNUSEDSIGNAL,
|
||||
varType << " is not used: " << nodep->prettyNameQ());
|
||||
nodep->fileline()->modifyWarnOff(V3ErrorCode::UNUSEDSIGNAL,
|
||||
true); // Warn only once
|
||||
}
|
||||
} else if (!anyD && allU) {
|
||||
nodep->v3warn(UNDRIVEN, "Signal is not driven: " << nodep->prettyNameQ());
|
||||
nodep->v3warn(UNDRIVEN, varType << " is not driven: " << nodep->prettyNameQ());
|
||||
nodep->fileline()->modifyWarnOff(V3ErrorCode::UNDRIVEN, true); // Warn only once
|
||||
} else {
|
||||
} else if (!funcInout) {
|
||||
// Bits have different dispositions
|
||||
const std::string varTypeLower = [&varType]() {
|
||||
std::string str = varType;
|
||||
str[0] = std::tolower(static_cast<unsigned char>(str[0]));
|
||||
return str;
|
||||
}();
|
||||
bool setU = false;
|
||||
bool setD = false;
|
||||
if (anynotDU && !unusedMatch(nodep)) {
|
||||
nodep->v3warn(UNUSEDSIGNAL, "Bits of signal are not driven, nor used: "
|
||||
<< nodep->prettyNameQ() << bitNames(BN_BOTH));
|
||||
nodep->v3warn(UNUSEDSIGNAL,
|
||||
"Bits of " << varTypeLower << " are not driven, nor used: "
|
||||
<< nodep->prettyNameQ() << bitNames(BN_BOTH));
|
||||
setU = true;
|
||||
}
|
||||
if (anyDnotU && !unusedMatch(nodep)) {
|
||||
nodep->v3warn(UNUSEDSIGNAL,
|
||||
"Bits of signal are not used: " << nodep->prettyNameQ()
|
||||
<< bitNames(BN_UNUSED));
|
||||
nodep->v3warn(UNUSEDSIGNAL, "Bits of " << varTypeLower << " are not used: "
|
||||
<< nodep->prettyNameQ()
|
||||
<< bitNames(BN_UNUSED));
|
||||
setU = true;
|
||||
}
|
||||
if (anyUnotD) {
|
||||
nodep->v3warn(UNDRIVEN, "Bits of signal are not driven: "
|
||||
<< nodep->prettyNameQ() << bitNames(BN_UNDRIVEN));
|
||||
nodep->v3warn(UNDRIVEN, "Bits of " << varTypeLower << " are not driven: "
|
||||
<< nodep->prettyNameQ()
|
||||
<< bitNames(BN_UNDRIVEN));
|
||||
setD = true;
|
||||
}
|
||||
if (setU) { // Warn only once
|
||||
@@ -354,18 +371,20 @@ class UndrivenVisitor final : public VNVisitorConst {
|
||||
|
||||
// VISITORS
|
||||
void visit(AstVar* nodep) override {
|
||||
const bool funcInout = nodep->isFuncLocal() && nodep->isInout();
|
||||
for (int usr = 1; usr < (m_alwaysCombp ? 3 : 2); ++usr) {
|
||||
// For assigns and non-combo always, do just usr==1, to look
|
||||
// for module-wide undriven etc.
|
||||
// For combo always, run both usr==1 for above, and also
|
||||
// usr==2 for always-only checks.
|
||||
UndrivenVarEntry* const entryp = getEntryp(nodep, usr);
|
||||
if (nodep->isNonOutput() || nodep->isSigPublic() || nodep->isSigUserRWPublic()
|
||||
if ((nodep->isNonOutput() && !funcInout) || nodep->isSigPublic()
|
||||
|| nodep->isSigUserRWPublic()
|
||||
|| (m_taskp && (m_taskp->dpiImport() || m_taskp->dpiExport()))) {
|
||||
entryp->drivenWhole();
|
||||
}
|
||||
if (nodep->isWritable() || nodep->isSigPublic() || nodep->isSigUserRWPublic()
|
||||
|| nodep->isSigUserRdPublic()
|
||||
if ((nodep->isWritable() && !funcInout) || nodep->isSigPublic()
|
||||
|| nodep->isSigUserRWPublic() || nodep->isSigUserRdPublic()
|
||||
|| (m_taskp && (m_taskp->dpiImport() || m_taskp->dpiExport()))) {
|
||||
entryp->usedWhole();
|
||||
}
|
||||
@@ -433,12 +452,12 @@ class UndrivenVisitor final : public VNVisitorConst {
|
||||
}
|
||||
|
||||
// If writeSummary is enabled, task/function definitions are treated as non-executed.
|
||||
// Their effects are applied at call sites via writeSummary(), so don't let definition
|
||||
// traversal create phantom "other writes" for MULTIDRIVEN.
|
||||
// Remember that anything driven here doesn't count toward MULTIDRIVEN.
|
||||
bool ftaskDef = false;
|
||||
if (m_taskp && !m_alwaysp && !m_inContAssign && !m_inInitialStatic && !m_inBBox
|
||||
&& !m_taskp->dpiExport()) {
|
||||
AstVar* const retVarp = VN_CAST(m_taskp->fvarp(), Var);
|
||||
if (!retVarp || nodep->varp() != retVarp) return;
|
||||
if (!retVarp || nodep->varp() != retVarp) ftaskDef = true;
|
||||
}
|
||||
|
||||
for (int usr = 1; usr < (m_alwaysCombp ? 3 : 2); ++usr) {
|
||||
@@ -453,7 +472,8 @@ class UndrivenVisitor final : public VNVisitorConst {
|
||||
if (entryp->isDrivenWhole() && !m_inBBox && !VN_IS(nodep, VarXRef)
|
||||
&& !VN_IS(nodep->dtypep()->skipRefp(), UnpackArrayDType)
|
||||
&& nodep->fileline() != entryp->getNodeFileLinep() && !entryp->isUnderGen()
|
||||
&& (entryp->getNodep() || entryp->callNodep())) {
|
||||
&& (entryp->getNodep() || entryp->callNodep()) && !entryp->isFtaskDriven()
|
||||
&& !ftaskDef) {
|
||||
|
||||
const AstNode* const otherWritep
|
||||
= entryp->getNodep() ? static_cast<const AstNode*>(entryp->getNodep())
|
||||
@@ -483,7 +503,7 @@ class UndrivenVisitor final : public VNVisitorConst {
|
||||
<< otherWritep->warnContextSecondary());
|
||||
}
|
||||
}
|
||||
entryp->drivenWhole(nodep, nodep->fileline());
|
||||
entryp->drivenWhole(nodep, nodep->fileline(), ftaskDef);
|
||||
if (m_alwaysCombp && entryp->isDrivenAlwaysCombWhole()
|
||||
&& m_alwaysCombp != entryp->getAlwCombp()
|
||||
&& m_alwaysCombp->fileline() == entryp->getAlwCombFileLinep())
|
||||
|
||||
Reference in New Issue
Block a user