it compiles ^^

This commit is contained in:
em2machine 2025-12-21 18:22:42 +01:00
parent 471171701f
commit c801718ba1
3 changed files with 82 additions and 7 deletions

View File

@ -29,6 +29,9 @@
#include "V3Stats.h" #include "V3Stats.h"
// EOM
#include "V3UndrivenCapture.h"
#include <vector> #include <vector>
VL_DEFINE_DEBUG_FUNCTIONS; VL_DEFINE_DEBUG_FUNCTIONS;
@ -51,6 +54,10 @@ class UndrivenVarEntry final {
const FileLine* m_nodeFileLinep = nullptr; // File line of varref if driven, else nullptr const FileLine* m_nodeFileLinep = nullptr; // File line of varref if driven, else nullptr
bool m_underGen = false; // Under a generate bool m_underGen = false; // Under a generate
// EOM
const AstNode* m_callNodep = nullptr; // call node if driven via writeSummary, else nullptr
const FileLine* m_callFileLinep = nullptr; // file line of call node if driven via summary
enum : uint8_t { FLAG_USED = 0, FLAG_DRIVEN = 1, FLAG_DRIVEN_ALWCOMB = 2, FLAGS_PER_BIT = 3 }; enum : uint8_t { FLAG_USED = 0, FLAG_DRIVEN = 1, FLAG_DRIVEN_ALWCOMB = 2, FLAGS_PER_BIT = 3 };
public: public:
@ -278,6 +285,17 @@ public:
} }
} }
} }
// EOM
void drivenViaCall(const AstNode* nodep, const FileLine* fileLinep) {
drivenWhole();
if (!m_callNodep) {
m_callNodep = nodep;
m_callFileLinep = fileLinep;
}
}
const AstNode* getCallNodep() const { return m_callNodep; }
const FileLine* getCallFileLinep() const { return m_callFileLinep; }
}; };
//###################################################################### //######################################################################
@ -304,6 +322,10 @@ class UndrivenVisitor final : public VNVisitorConst {
const AstAlways* m_alwaysp = nullptr; // Current always of either type const AstAlways* m_alwaysp = nullptr; // Current always of either type
const AstAlways* m_alwaysCombp = nullptr; // Current always if combo, otherwise nullptr const AstAlways* m_alwaysCombp = nullptr; // Current always if combo, otherwise nullptr
// EOM
V3UndrivenCapture* const m_capturep = nullptr;
const bool m_enableWriteSummary = false;
// METHODS // METHODS
UndrivenVarEntry* getEntryp(AstVar* nodep, int which_user) { UndrivenVarEntry* getEntryp(AstVar* nodep, int which_user) {
@ -432,7 +454,14 @@ class UndrivenVisitor final : public VNVisitorConst {
if (entryp->isDrivenWhole() && !m_inBBox && !VN_IS(nodep, VarXRef) if (entryp->isDrivenWhole() && !m_inBBox && !VN_IS(nodep, VarXRef)
&& !VN_IS(nodep->dtypep()->skipRefp(), UnpackArrayDType) && !VN_IS(nodep->dtypep()->skipRefp(), UnpackArrayDType)
&& nodep->fileline() != entryp->getNodeFileLinep() && !entryp->isUnderGen() && nodep->fileline() != entryp->getNodeFileLinep() && !entryp->isUnderGen()
&& entryp->getNodep()) { // EOM
//&& entryp->getNodep()) {
&& (entryp->getNodep() || (V3UndrivenCapture::enableWriteSummary && entryp->getCallNodep()))) {
// EOM
const AstNode* const otherWritep = entryp->getNodep() ? static_cast<const AstNode*>(entryp->getNodep())
: (V3UndrivenCapture::enableWriteSummary ? entryp->getCallNodep() : nullptr);
if (m_alwaysCombp if (m_alwaysCombp
&& (!entryp->isDrivenAlwaysCombWhole() && (!entryp->isDrivenAlwaysCombWhole()
|| (m_alwaysCombp != entryp->getAlwCombp() || (m_alwaysCombp != entryp->getAlwCombp()
@ -443,9 +472,12 @@ class UndrivenVisitor final : public VNVisitorConst {
<< " (IEEE 1800-2023 9.2.2.2): " << nodep->prettyNameQ() << '\n' << " (IEEE 1800-2023 9.2.2.2): " << nodep->prettyNameQ() << '\n'
<< nodep->warnOther() << '\n' << nodep->warnOther() << '\n'
<< nodep->warnContextPrimary() << '\n' << nodep->warnContextPrimary() << '\n'
<< entryp->getNodep()->warnOther() // EOM
//<< entryp->getNodep()->warnOther()
<< otherWritep->warnOther()
<< "... Location of other write\n" << "... Location of other write\n"
<< entryp->getNodep()->warnContextSecondary()); //<< entryp->getNodep()->warnContextSecondary());
<< otherWritep->warnContextSecondary());
} }
if (!m_alwaysCombp && entryp->isDrivenAlwaysCombWhole()) { if (!m_alwaysCombp && entryp->isDrivenAlwaysCombWhole()) {
nodep->v3warn(MULTIDRIVEN, nodep->v3warn(MULTIDRIVEN,
@ -454,9 +486,12 @@ class UndrivenVisitor final : public VNVisitorConst {
<< '\n' << '\n'
<< nodep->warnOther() << '\n' << nodep->warnOther() << '\n'
<< nodep->warnContextPrimary() << '\n' << nodep->warnContextPrimary() << '\n'
<< entryp->getNodep()->warnOther() //EOM
//<< entryp->getNodep()->warnOther()
<< otherWritep->warnOther()
<< "... Location of always_comb write\n" << "... Location of always_comb write\n"
<< entryp->getNodep()->warnContextSecondary()); //<< entryp->getNodep()->warnContextSecondary());
<< otherWritep->warnContextSecondary());
} }
} }
entryp->drivenWhole(nodep, nodep->fileline()); entryp->drivenWhole(nodep, nodep->fileline());
@ -523,11 +558,34 @@ class UndrivenVisitor final : public VNVisitorConst {
iterateChildrenConst(nodep); iterateChildrenConst(nodep);
if (nodep->keyword() == VAlwaysKwd::ALWAYS_COMB) UINFO(9, " Done " << nodep); if (nodep->keyword() == VAlwaysKwd::ALWAYS_COMB) UINFO(9, " Done " << nodep);
} }
// EOM
/*
void visit(AstNodeFTaskRef* nodep) override { void visit(AstNodeFTaskRef* nodep) override {
VL_RESTORER(m_inFTaskRef); VL_RESTORER(m_inFTaskRef);
m_inFTaskRef = true; m_inFTaskRef = true;
iterateChildrenConst(nodep); iterateChildrenConst(nodep);
} }
*/
void visit(AstNodeFTaskRef* nodep) override {
VL_RESTORER(m_inFTaskRef);
m_inFTaskRef = true;
iterateChildrenConst(nodep);
if (!m_enableWriteSummary || !m_capturep) return;
AstNodeFTask* const calleep = nodep->taskp();
if (!calleep) return;
const auto& vars = m_capturep->writeSummary(calleep);
for (AstVar* const varp : vars) {
for (int usr = 1; usr < (m_alwaysCombp ? 3 : 2); ++usr) {
UndrivenVarEntry* const entryp = getEntryp(varp, usr);
entryp->drivenViaCall(nodep, nodep->fileline());
if (m_alwaysCombp)
entryp->drivenAlwaysCombWhole(m_alwaysCombp, m_alwaysCombp->fileline());
}
}
}
void visit(AstNodeFTask* nodep) override { void visit(AstNodeFTask* nodep) override {
VL_RESTORER(m_taskp); VL_RESTORER(m_taskp);
@ -556,7 +614,13 @@ class UndrivenVisitor final : public VNVisitorConst {
public: public:
// CONSTRUCTORS // CONSTRUCTORS
explicit UndrivenVisitor(AstNetlist* nodep) { iterateConst(nodep); } // EOM
// explicit UndrivenVisitor(AstNetlist* nodep) { iterateConst(nodep); }
explicit UndrivenVisitor(AstNetlist* nodep, V3UndrivenCapture* capturep, bool enableWriteSummary) :
m_capturep{capturep},
m_enableWriteSummary{enableWriteSummary}
{ iterateConst(nodep); }
~UndrivenVisitor() override { ~UndrivenVisitor() override {
for (UndrivenVarEntry* ip : m_entryps[1]) ip->reportViolations(); for (UndrivenVarEntry* ip : m_entryps[1]) ip->reportViolations();
for (int usr = 1; usr < 3; ++usr) { for (int usr = 1; usr < 3; ++usr) {
@ -570,6 +634,13 @@ public:
void V3Undriven::undrivenAll(AstNetlist* nodep) { void V3Undriven::undrivenAll(AstNetlist* nodep) {
UINFO(2, __FUNCTION__ << ":"); UINFO(2, __FUNCTION__ << ":");
{ UndrivenVisitor{nodep}; } // EOM
//{ UndrivenVisitor{nodep}; }
if (V3UndrivenCapture::enableWriteSummary) {
V3UndrivenCapture capture{nodep};
{ UndrivenVisitor{nodep, &capture, V3UndrivenCapture::enableWriteSummary}; }
} else {
{ UndrivenVisitor{nodep, nullptr, V3UndrivenCapture::enableWriteSummary}; }
}
if (v3Global.opt.stats()) V3Stats::statsStage("undriven"); if (v3Global.opt.stats()) V3Stats::statsStage("undriven");
} }

View File

@ -105,6 +105,8 @@ private:
} // namespace } // namespace
bool V3UndrivenCapture::enableWriteSummary = false;
// static // static
void V3UndrivenCapture::sortUniqueVars(std::vector<Var>& vec) { void V3UndrivenCapture::sortUniqueVars(std::vector<Var>& vec) {
std::sort(vec.begin(), vec.end()); std::sort(vec.begin(), vec.end());

View File

@ -45,6 +45,8 @@ public:
State state = State::UNVISITED; State state = State::UNVISITED;
}; };
static bool enableWriteSummary;
private: private:
// Per-task/function capture info keyed by resolved AstNodeFTask* identity. // Per-task/function capture info keyed by resolved AstNodeFTask* identity.
std::unordered_map<FTask, FTaskInfo> m_info; std::unordered_map<FTask, FTaskInfo> m_info;