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

Add iteration limit to "opt_muxtree" 

Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-11-20 17:56:47 +01:00
parent 9228f015a3
commit ab97eddee9
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
passes/opt/opt_muxtree.cc
View File

@ -36,6 +36,7 @@ struct OptMuxtreeWorker
RTLIL::Module *module; RTLIL::Module *module;
SigMap assign_map; SigMap assign_map;
int removed_count; int removed_count;
int glob_abort_cnt = 100000;
struct bitinfo_t { struct bitinfo_t {
bool seen_non_mux; bool seen_non_mux;
@ -293,6 +294,9 @@ struct OptMuxtreeWorker
void eval_mux_port(knowledge_t &knowledge, int mux_idx, int port_idx, bool do_replace_known, bool do_enable_ports, int abort_count) void eval_mux_port(knowledge_t &knowledge, int mux_idx, int port_idx, bool do_replace_known, bool do_enable_ports, int abort_count)
{ {
if (glob_abort_cnt == 0)
return;
muxinfo_t &muxinfo = mux2info[mux_idx]; muxinfo_t &muxinfo = mux2info[mux_idx];
if (do_enable_ports) if (do_enable_ports)
@ -315,7 +319,7 @@ struct OptMuxtreeWorker
knowledge.visited_muxes[m] = true; knowledge.visited_muxes[m] = true;
parent_muxes.push_back(m); parent_muxes.push_back(m);
} }
for (int m : parent_muxes) for (int m : parent_muxes) {
if (root_enable_muxes.at(m)) if (root_enable_muxes.at(m))
continue; continue;
else if (root_muxes.at(m)) { else if (root_muxes.at(m)) {
@ -327,6 +331,9 @@ struct OptMuxtreeWorker
eval_mux(knowledge, m, false, do_enable_ports, abort_count - 1); eval_mux(knowledge, m, false, do_enable_ports, abort_count - 1);
} else } else
eval_mux(knowledge, m, do_replace_known, do_enable_ports, abort_count); eval_mux(knowledge, m, do_replace_known, do_enable_ports, abort_count);
if (glob_abort_cnt == 0)
return;
}
for (int m : parent_muxes) for (int m : parent_muxes)
knowledge.visited_muxes[m] = false; knowledge.visited_muxes[m] = false;
@ -390,6 +397,12 @@ struct OptMuxtreeWorker
void eval_mux(knowledge_t &knowledge, int mux_idx, bool do_replace_known, bool do_enable_ports, int abort_count) void eval_mux(knowledge_t &knowledge, int mux_idx, bool do_replace_known, bool do_enable_ports, int abort_count)
{ {
if (glob_abort_cnt == 0) {
log(" Giving up (too many iterations)\n");
return;
}
glob_abort_cnt--;
muxinfo_t &muxinfo = mux2info[mux_idx]; muxinfo_t &muxinfo = mux2info[mux_idx];
// set input ports to constants if we find known active or inactive signals // set input ports to constants if we find known active or inactive signals
@ -433,6 +446,9 @@ struct OptMuxtreeWorker
if (knowledge.known_inactive.at(portinfo.ctrl_sig)) if (knowledge.known_inactive.at(portinfo.ctrl_sig))
continue; continue;
eval_mux_port(knowledge, mux_idx, port_idx, do_replace_known, do_enable_ports, abort_count); eval_mux_port(knowledge, mux_idx, port_idx, do_replace_known, do_enable_ports, abort_count);
if (glob_abort_cnt == 0)
return;
} }
} }