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

Internals: Additional debug dumps.

This commit is contained in:
Wilson Snyder 2019-12-07 16:41:34 -05:00
parent 10a6b566ef
commit f330f16bf6
1 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/V3Gate.cpp
View File

@ -61,9 +61,13 @@ class GateLogicVertex;
class GateVarVertex; class GateVarVertex;
class GateGraphBaseVisitor { class GateGraphBaseVisitor {
public: public:
virtual VNUser visit(GateLogicVertex* vertexp, VNUser vu=VNUser(0)) = 0; V3Graph* m_graphp; // Graph this class is visiting
virtual VNUser visit(GateVarVertex* vertexp, VNUser vu=VNUser(0)) = 0; GateGraphBaseVisitor(V3Graph* graphp)
: m_graphp(graphp) {}
virtual ~GateGraphBaseVisitor() {} virtual ~GateGraphBaseVisitor() {}
virtual VNUser visit(GateLogicVertex* vertexp, VNUser vu = VNUser(0)) = 0;
virtual VNUser visit(GateVarVertex* vertexp, VNUser vu = VNUser(0)) = 0;
VL_DEBUG_FUNC; // Declare debug()
}; };
//###################################################################### //######################################################################
@ -400,8 +404,14 @@ private:
// Then propagate more complicated equations // Then propagate more complicated equations
optimizeSignals(true); optimizeSignals(true);
// Remove redundant logic // Remove redundant logic
if (v3Global.opt.oDedupe()) dedupe(); if (v3Global.opt.oDedupe()) {
if (v3Global.opt.oAssemble()) mergeAssigns(); dedupe();
if (debug() >= 6) m_graph.dumpDotFilePrefixed("gate_dedup");
}
if (v3Global.opt.oAssemble()) {
mergeAssigns();
if (debug() >= 6) m_graph.dumpDotFilePrefixed("gate_assm");
}
// Consumption warnings // Consumption warnings
consumedMark(); consumedMark();
m_graph.dumpDotFilePrefixed("gate_opt"); m_graph.dumpDotFilePrefixed("gate_opt");
@ -870,7 +880,7 @@ private:
// However a VARREF should point to the original as it's otherwise confusing // However a VARREF should point to the original as it's otherwise confusing
// to throw warnings that point to a PIN rather than where the pin us used. // to throw warnings that point to a PIN rather than where the pin us used.
if (VN_IS(substp, VarRef)) substp->fileline(nodep->fileline()); if (VN_IS(substp, VarRef)) substp->fileline(nodep->fileline());
// Make the substp an rvalue like nodep. This facilitate the hashing in dedupe. // Make the substp an rvalue like nodep. This facilitates the hashing in dedupe.
if (AstNodeVarRef* varrefp = VN_CAST(substp, NodeVarRef)) varrefp->lvalue(false); if (AstNodeVarRef* varrefp = VN_CAST(substp, NodeVarRef)) varrefp->lvalue(false);
hashReplace(nodep, substp); hashReplace(nodep, substp);
nodep->replaceWith(substp); nodep->replaceWith(substp);
@ -885,6 +895,9 @@ public:
virtual ~GateElimVisitor() {} virtual ~GateElimVisitor() {}
GateElimVisitor(AstNode* nodep, AstVarScope* varscp, AstNode* replaceTreep, GateElimVisitor(AstNode* nodep, AstVarScope* varscp, AstNode* replaceTreep,
GateDedupeVarVisitor* varVisp) { GateDedupeVarVisitor* varVisp) {
UINFO(9, " elimvisitor " << nodep << endl);
UINFO(9, " elim varscp " << varscp << endl);
UINFO(9, " elim repce " << replaceTreep << endl);
m_didReplace = false; m_didReplace = false;
m_elimVarScp = varscp; m_elimVarScp = varscp;
m_replaceTreep = replaceTreep; m_replaceTreep = replaceTreep;
@ -1222,12 +1235,10 @@ private:
} }
public: public:
GateDedupeGraphVisitor() { explicit GateDedupeGraphVisitor(V3Graph* graphp)
m_depth = 0; : GateGraphBaseVisitor(graphp)
} , m_depth(0) {}
void dedupeTree(GateVarVertex* vvertexp) { void dedupeTree(GateVarVertex* vvertexp) { vvertexp->accept(*this); }
vvertexp->accept(*this);
}
VDouble0 numDeduped() { return m_numDeduped; } VDouble0 numDeduped() { return m_numDeduped; }
}; };
@ -1235,7 +1246,7 @@ public:
void GateVisitor::dedupe() { void GateVisitor::dedupe() {
AstNode::user2ClearTree(); AstNode::user2ClearTree();
GateDedupeGraphVisitor deduper; GateDedupeGraphVisitor deduper(&m_graph);
// Traverse starting from each of the clocks // Traverse starting from each of the clocks
UINFO(9,"Gate dedupe() clocks:\n"); UINFO(9,"Gate dedupe() clocks:\n");
for (V3GraphVertex* itp = m_graph.verticesBeginp(); itp; itp=itp->verticesNextp()) { for (V3GraphVertex* itp = m_graph.verticesBeginp(); itp; itp=itp->verticesNextp()) {
@ -1267,7 +1278,6 @@ private:
AstNodeAssign* m_assignp; AstNodeAssign* m_assignp;
AstActive* m_activep; AstActive* m_activep;
GateLogicVertex* m_logicvp; GateLogicVertex* m_logicvp;
V3Graph* m_graphp;
VDouble0 m_numMergedAssigns; // Statistic tracking VDouble0 m_numMergedAssigns; // Statistic tracking
@ -1367,7 +1377,8 @@ private:
} }
public: public:
explicit GateMergeAssignsGraphVisitor(V3Graph* graphp) { explicit GateMergeAssignsGraphVisitor(V3Graph* graphp)
: GateGraphBaseVisitor(graphp) {
m_assignp = NULL; m_assignp = NULL;
m_activep = NULL; m_activep = NULL;
m_logicvp = NULL; m_logicvp = NULL;
@ -1469,7 +1480,6 @@ class GateClkDecompGraphVisitor : public GateGraphBaseVisitor {
private: private:
// NODE STATE // NODE STATE
// AstVarScope::user2p -> bool: already visited // AstVarScope::user2p -> bool: already visited
V3Graph* m_graphp;
int m_seen_clk_vectors; int m_seen_clk_vectors;
AstVarScope* m_clk_vsp; AstVarScope* m_clk_vsp;
GateVarVertex* m_clk_vvertexp; GateVarVertex* m_clk_vvertexp;
@ -1551,8 +1561,8 @@ private:
} }
public: public:
explicit GateClkDecompGraphVisitor(V3Graph* graphp) { explicit GateClkDecompGraphVisitor(V3Graph* graphp)
m_graphp = graphp; : GateGraphBaseVisitor(graphp) {
m_seen_clk_vectors = 0; m_seen_clk_vectors = 0;
m_clk_vsp = NULL; m_clk_vsp = NULL;
m_clk_vvertexp = NULL; m_clk_vvertexp = NULL;