luke/verilator
1
0
Fork 0
mirror of https://github.com/verilator/verilator.git synced 2026-08-31 18:14:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop-v5

Browse Source
This commit is contained in:
Geza Lore
2022-09-22 17:33:36 +01:00
parent 4600932d8c 63c694f65f
commit ddb678cc5b
144 changed files with 681 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/V3Split.cpp
+9 -15
View File
@@ -93,6 +93,8 @@
#include <unordered_set>
#include <vector>
VL_DEFINE_DEBUG_FUNCTIONS;
//######################################################################
// Support classes
@@ -261,8 +263,6 @@ public:
// METHODS
protected:
VL_DEBUG_FUNC; // Declare debug()
void scoreboardClear() {
// VV***** We reset user1p() and user2p on each block!!!
m_inDly = false;
@@ -454,10 +454,7 @@ protected:
UINFO(5, "ReorderBlock " << nodep << endl);
m_graph.removeRedundantEdges(&V3GraphEdge::followAlwaysTrue);
if (debug() >= 9) {
m_graph.dumpDotFilePrefixed("reorderg_nodup", false);
// m_graph.dump(); cout<<endl;
}
if (dumpGraph() >= 9) m_graph.dumpDotFilePrefixed("reorderg_nodup", false);
// Mark all the logic for this step
// Vertex::m_user begin: true indicates logic for this step
@@ -514,10 +511,10 @@ protected:
// And a real ordering to get the statements into something reasonable
// We don't care if there's cutable violations here...
// Non-cutable violations should be impossible; as those edges are program-order
if (debug() >= 9) m_graph.dumpDotFilePrefixed(string("splitg_preo"), false);
if (dumpGraph() >= 9) m_graph.dumpDotFilePrefixed(string("splitg_preo"), false);
m_graph.acyclic(&SplitEdge::followCyclic);
m_graph.rank(&SplitEdge::followCyclic); // Or order(), but that's more expensive
if (debug() >= 9) m_graph.dumpDotFilePrefixed(string("splitg_opt"), false);
if (dumpGraph() >= 9) m_graph.dumpDotFilePrefixed(string("splitg_opt"), false);
}
void reorderBlock(AstNode* nodep) {
@@ -676,7 +673,6 @@ protected:
iterateChildren(nodep);
}
VL_DEBUG_FUNC; // Declare debug()
private:
VL_UNCOPYABLE(IfColorVisitor);
};
@@ -728,8 +724,6 @@ public:
}
protected:
VL_DEBUG_FUNC; // Declare debug()
AstSplitPlaceholder* makePlaceholderp() {
return new AstSplitPlaceholder(m_origAlwaysp->fileline());
}
@@ -946,14 +940,14 @@ protected:
}
}
if (debug() >= 9) m_graph.dumpDotFilePrefixed("splitg_nodup", false);
if (dumpGraph() >= 9) m_graph.dumpDotFilePrefixed("splitg_nodup", false);
// Weak coloring to determine what needs to remain grouped
// in a single always. This follows all edges excluding:
// - those we pruned above
// - PostEdges, which are done later
m_graph.weaklyConnected(&SplitEdge::followScoreboard);
if (debug() >= 9) m_graph.dumpDotFilePrefixed("splitg_colored", false);
if (dumpGraph() >= 9) m_graph.dumpDotFilePrefixed("splitg_colored", false);
}
void visit(AstAlways* nodep) override {
@@ -1007,10 +1001,10 @@ private:
void V3Split::splitReorderAll(AstNetlist* nodep) {
UINFO(2, __FUNCTION__ << ": " << endl);
{ ReorderVisitor{nodep}; } // Destruct before checking
V3Global::dumpCheckGlobalTree("reorder", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
V3Global::dumpCheckGlobalTree("reorder", 0, dumpTree() >= 3);
}
void V3Split::splitAlwaysAll(AstNetlist* nodep) {
UINFO(2, __FUNCTION__ << ": " << endl);
{ SplitVisitor{nodep}; } // Destruct before checking
V3Global::dumpCheckGlobalTree("split", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
V3Global::dumpCheckGlobalTree("split", 0, dumpTree() >= 3);
}