diff options
| author | Clifford Wolf <clifford@clifford.at> | 2014-09-19 14:05:41 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2014-09-19 14:05:41 +0200 |
| commit | 5827826098fd827c7ac964ed45e99f92d63d9267 (patch) | |
| tree | c2582e9b5916468ce77b0cdd4a4ead6d096bc28b | |
| parent | 3aa003c8e9c207758797e533cb85514cdb0db2c6 (diff) | |
| download | yosys-5827826098fd827c7ac964ed45e99f92d63d9267.tar.gz yosys-5827826098fd827c7ac964ed45e99f92d63d9267.tar.bz2 yosys-5827826098fd827c7ac964ed45e99f92d63d9267.zip | |
Small improvements in "abc" command handle_loops() function
| -rw-r--r-- | passes/abc/abc.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/passes/abc/abc.cc b/passes/abc/abc.cc index 75368e3ce..f1d56b23a 100644 --- a/passes/abc/abc.cc +++ b/passes/abc/abc.cc @@ -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); - fprintf(f, "digraph slide%d {\n", nr); - fprintf(f, " rankdir=\"LR\";\n"); + fprintf(f, "digraph \"slide%d\" {\n", nr); + fprintf(f, " label=\"slide%d\";\n", nr); + fprintf(f, " rankdir=\"TD\";\n"); std::set<int> nodes; for (auto &e : edges) { @@ -375,10 +376,10 @@ static void handle_loops() int id2 = edge_it.first; RTLIL::Wire *w1 = signal_list[id1].bit.wire; RTLIL::Wire *w2 = signal_list[id2].bit.wire; - if (w1 != NULL) - continue; - else if (w2 == NULL) + if (w1 == NULL) id1 = id2; + else if (w2 == NULL) + continue; else if (w1->name[0] == '$' && w2->name[0] == '\\') id1 = id2; else if (w1->name[0] == '\\' && w2->name[0] == '$') @@ -387,7 +388,7 @@ static void handle_loops() id1 = id2; else if (edges[id1].size() > edges[id2].size()) continue; - else if (w2->name < w1->name) + else if (w2->name.str() < w1->name.str()) id1 = id2; } @@ -396,6 +397,8 @@ static void handle_loops() continue; } + log_assert(signal_list[id1].bit.wire != NULL); + std::stringstream sstr; sstr << "$abcloop$" << (autoidx++); RTLIL::Wire *wire = module->addWire(sstr.str()); |