mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-10-30 19:22:31 +00:00
Code Activity

Added "equiv_struct -maxiter <N>"

Browse source
This commit is contained in:
Clifford Wolf 2016-01-06 13:54:54 +01:00
parent 1f8c47fb47
commit c3fd03d722
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
passes/equiv/equiv_struct.cc
View file

@ -114,11 +114,11 @@ struct EquivStructWorker
module->remove(cell_b); module->remove(cell_b);
} }
EquivStructWorker(Module *module, bool mode_fwd, bool mode_icells) : EquivStructWorker(Module *module, bool mode_fwd, bool mode_icells, int iter_num) :
module(module), sigmap(module), equiv_bits(module), module(module), sigmap(module), equiv_bits(module),
mode_fwd(mode_fwd), mode_icells(mode_icells), merge_count(0) mode_fwd(mode_fwd), mode_icells(mode_icells), merge_count(0)
{ {
log(" Starting new iteration.\n"); log(" Starting iteration %d.\n", iter_num);
pool<SigBit> equiv_inputs; pool<SigBit> equiv_inputs;
pool<IdString> cells; pool<IdString> cells;
@ -296,11 +296,15 @@ struct EquivStructPass : public Pass {
log(" by default, the internal RTL and gate cell types are ignored. add\n"); log(" by default, the internal RTL and gate cell types are ignored. add\n");
log(" this option to also process those cell types with this command.\n"); log(" this option to also process those cell types with this command.\n");
log("\n"); log("\n");
log(" -maxiter <N>\n");
log(" maximum number of iterations to run before aborting\n");
log("\n");
} }
virtual void execute(std::vector<std::string> args, Design *design) virtual void execute(std::vector<std::string> args, Design *design)
{ {
bool mode_icells = false; bool mode_icells = false;
bool mode_fwd = false; bool mode_fwd = false;
int max_iter = -1;
log_header("Executing EQUIV_STRUCT pass.\n"); log_header("Executing EQUIV_STRUCT pass.\n");
@ -314,6 +318,10 @@ struct EquivStructPass : public Pass {
mode_icells = true; mode_icells = true;
continue; continue;
} }
if (args[argidx] == "-maxiter" && argidx+1 < args.size()) {
max_iter = atoi(args[++argidx].c_str());
continue;
}
break; break;
} }
extra_args(args, argidx, design); extra_args(args, argidx, design);
@ -321,8 +329,12 @@ struct EquivStructPass : public Pass {
for (auto module : design->selected_modules()) { for (auto module : design->selected_modules()) {
int module_merge_count = 0; int module_merge_count = 0;
log("Running equiv_struct on module %s:\n", log_id(module)); log("Running equiv_struct on module %s:\n", log_id(module));
while (1) { for (int iter = 0;; iter++) {
EquivStructWorker worker(module, mode_fwd, mode_icells); if (iter == max_iter) {
log(" Reached iteration limit of %d.\n", iter);
break;
}
EquivStructWorker worker(module, mode_fwd, mode_icells, iter+1);
if (worker.merge_count == 0) if (worker.merge_count == 0)
break; break;
module_merge_count += worker.merge_count; module_merge_count += worker.merge_count;