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

Fixed performance problem in opt_mux with nets driven by many conflicting drivers

This commit is contained in:
Clifford Wolf 2014-03-19 10:05:01 +01:00
parent cdf1257565
commit 9a34486bfb
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
passes/opt/opt_muxtree.cc
View File

@ -309,13 +309,17 @@ struct OptMuxtreeWorker
if (port_idx < int(muxinfo.ports.size())-1 && !muxinfo.ports[port_idx].const_activated) if (port_idx < int(muxinfo.ports.size())-1 && !muxinfo.ports[port_idx].const_activated)
knowledge.known_active.push_back(muxinfo.ports[port_idx].ctrl_sigs); knowledge.known_active.push_back(muxinfo.ports[port_idx].ctrl_sigs);
std::vector<int> parent_muxes;
for (int m : muxinfo.ports[port_idx].input_muxes) { for (int m : muxinfo.ports[port_idx].input_muxes) {
if (knowledge.visited_muxes.count(m) > 0) if (knowledge.visited_muxes.count(m) > 0)
continue; continue;
knowledge.visited_muxes.insert(m); knowledge.visited_muxes.insert(m);
eval_mux(knowledge, m); parent_muxes.push_back(m);
knowledge.visited_muxes.erase(m);
} }
for (int m : parent_muxes)
eval_mux(knowledge, m);
for (int m : parent_muxes)
knowledge.visited_muxes.erase(m);
if (port_idx < int(muxinfo.ports.size())-1 && !muxinfo.ports[port_idx].const_activated) if (port_idx < int(muxinfo.ports.size())-1 && !muxinfo.ports[port_idx].const_activated)
knowledge.known_active.pop_back(); knowledge.known_active.pop_back();
@ -393,6 +397,7 @@ struct OptMuxtreeWorker
void eval_root_mux(int mux_idx) void eval_root_mux(int mux_idx)
{ {
knowledge_t knowledge; knowledge_t knowledge;
knowledge.visited_muxes.insert(mux_idx);
eval_mux(knowledge, mux_idx); eval_mux(knowledge, mux_idx);
} }
}; };