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

Fix split list ordering causing circular refs 

git-svn-id: file://localhost/svn/verilator/trunk/verilator@841 77ca24e4-aefa-0310-84f0-b9a241c72d87
This commit is contained in:
Wilson Snyder 2006-12-18 18:20:13 +00:00
parent 8848469bf9
commit cf40fd356f
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changes
View File

@ -9,6 +9,8 @@ indicates the contributor was also the author of the fix; Thanks!
**** Fix dotted references inside generated cells. [David Hewson] **** Fix dotted references inside generated cells. [David Hewson]
**** Fix missed split optimization points underneath other re-split blocks.
* Verilator 3.623 12/05/2006 * Verilator 3.623 12/05/2006
*** Add --output-split-cfuncs for accelerating GCC compile. [Eugene Weber] *** Add --output-split-cfuncs for accelerating GCC compile. [Eugene Weber]

13
src/V3Split.cpp
View File

@ -83,6 +83,8 @@ protected:
: V3GraphVertex(graphp), m_nodep(nodep) {} : V3GraphVertex(graphp), m_nodep(nodep) {}
virtual ~SplitNodeVertex() {} virtual ~SplitNodeVertex() {}
// Accessors // Accessors
// Do not make accessor for nodep(), It may change due to
// reordering a lower block, but we don't repair it
virtual string name() const { virtual string name() const {
if (m_nodep->name() == "") { if (m_nodep->name() == "") {
return cvtToStr((void*)m_nodep); return cvtToStr((void*)m_nodep);
@ -344,7 +346,8 @@ private:
// And a real ordering to get the statements into something reasonable // And a real ordering to get the statements into something reasonable
// We don't care if there's cutable violations here... // We don't care if there's cutable violations here...
//if (debug()>=9) m_graph.dumpDotFilePrefixed((string)"splitg_preo", false); // Non-cutable violations should be impossible; as those edges are program-order
if (debug()>=9) m_graph.dumpDotFilePrefixed((string)"splitg_preo", false);
m_graph.acyclic(&SplitEdge::followCyclic); m_graph.acyclic(&SplitEdge::followCyclic);
m_graph.rank(&SplitEdge::followCyclic); // Or order(), but that's more expensive m_graph.rank(&SplitEdge::followCyclic); // Or order(), but that's more expensive
if (debug()>=9) m_graph.dumpDotFilePrefixed((string)"splitg_opt", false); if (debug()>=9) m_graph.dumpDotFilePrefixed((string)"splitg_opt", false);
@ -421,8 +424,10 @@ private:
// Pass the first node in a list of block items, we'll process them // Pass the first node in a list of block items, we'll process them
// Check there's >= 2 sub statements, else nothing to analyze // Check there's >= 2 sub statements, else nothing to analyze
// Save recursion state // Save recursion state
AstNode* firstp = nodep; // We may reorder, and nodep is no longer first.
void* oldBlockUser3 = nodep->user3p(); // May be overloaded in below loop, save it void* oldBlockUser3 = nodep->user3p(); // May be overloaded in below loop, save it
nodep->user3p(NULL); nodep->user3p(NULL);
if (nodep->backp()->nextp()==nodep) nodep->v3fatalSrc("Node passed is in next list; should have processed all list at oncen");
// Process it // Process it
if (!nodep->nextp()) { if (!nodep->nextp()) {
// Just one, so can't reorder. Just look for more blocks/statements. // Just one, so can't reorder. Just look for more blocks/statements.
@ -435,12 +440,14 @@ private:
cleanupBlockGraph(nodep); cleanupBlockGraph(nodep);
reorderBlock(nodep); reorderBlock(nodep);
// Delete old vertexes and edges only applying to this block // Delete old vertexes and edges only applying to this block
for (AstNode* nextp=nodep; nextp; nextp=nextp->nextp()) { while (firstp->backp()->nextp()==firstp) firstp = firstp->backp(); // Walk back to first in list
for (AstNode* nextp=firstp; nextp; nextp=nextp->nextp()) {
SplitLogicVertex* vvertexp = (SplitLogicVertex*)nextp->user3p(); SplitLogicVertex* vvertexp = (SplitLogicVertex*)nextp->user3p();
vvertexp->unlinkDelete(&m_graph); vvertexp->unlinkDelete(&m_graph);
} }
} }
nodep->user3p(oldBlockUser3); // Again, nodep may no longer be first.
firstp->user3p(oldBlockUser3);
} }
// VISITORS // VISITORS