riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Small improvements in "abc" command handle_loops() function

This commit is contained in:
Clifford Wolf 2014-09-19 14:05:41 +02:00
parent 3aa003c8e9
commit 5827826098
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
passes/abc/abc.cc
View File

@ -287,8 +287,9 @@ static void dump_loop_graph(FILE *f, int &nr, std::map<int, std::set<int>> &edge
log("Dumping loop state graph to slide %d.\n", ++nr); log("Dumping loop state graph to slide %d.\n", ++nr);
fprintf(f, "digraph slide%d {\n", nr); fprintf(f, "digraph \"slide%d\" {\n", nr);
fprintf(f, " rankdir=\"LR\";\n"); fprintf(f, " label=\"slide%d\";\n", nr);
fprintf(f, " rankdir=\"TD\";\n");
std::set<int> nodes; std::set<int> nodes;
for (auto &e : edges) { for (auto &e : edges) {
@ -375,10 +376,10 @@ static void handle_loops()
int id2 = edge_it.first; int id2 = edge_it.first;
RTLIL::Wire *w1 = signal_list[id1].bit.wire; RTLIL::Wire *w1 = signal_list[id1].bit.wire;
RTLIL::Wire *w2 = signal_list[id2].bit.wire; RTLIL::Wire *w2 = signal_list[id2].bit.wire;
if (w1 != NULL) if (w1 == NULL)
continue;
else if (w2 == NULL)
id1 = id2; id1 = id2;
else if (w2 == NULL)
continue;
else if (w1->name[0] == '$' && w2->name[0] == '\\') else if (w1->name[0] == '$' && w2->name[0] == '\\')
id1 = id2; id1 = id2;
else if (w1->name[0] == '\\' && w2->name[0] == '$') else if (w1->name[0] == '\\' && w2->name[0] == '$')
@ -387,7 +388,7 @@ static void handle_loops()
id1 = id2; id1 = id2;
else if (edges[id1].size() > edges[id2].size()) else if (edges[id1].size() > edges[id2].size())
continue; continue;
else if (w2->name < w1->name) else if (w2->name.str() < w1->name.str())
id1 = id2; id1 = id2;
} }
@ -396,6 +397,8 @@ static void handle_loops()
continue; continue;
} }
log_assert(signal_list[id1].bit.wire != NULL);
std::stringstream sstr; std::stringstream sstr;
sstr << "$abcloop$" << (autoidx++); sstr << "$abcloop$" << (autoidx++);
RTLIL::Wire *wire = module->addWire(sstr.str()); RTLIL::Wire *wire = module->addWire(sstr.str());