diff --git a/passes/equiv/equiv_induct.cc b/passes/equiv/equiv_induct.cc index 8d882ae83..b39d7a785 100644 --- a/passes/equiv/equiv_induct.cc +++ b/passes/equiv/equiv_induct.cc @@ -37,14 +37,15 @@ struct EquivInductWorker int max_seq; int success_counter; + bool set_assumes; dict ez_step_is_consistent; pool cell_warn_cache; SigPool undriven_signals; - EquivInductWorker(Module *module, const pool &unproven_equiv_cells, bool model_undef, int max_seq) : module(module), sigmap(module), + EquivInductWorker(Module *module, const pool &unproven_equiv_cells, bool model_undef, int max_seq, bool set_assumes) : module(module), sigmap(module), cells(module->selected_cells()), workset(unproven_equiv_cells), - satgen(ez.get(), &sigmap), max_seq(max_seq), success_counter(0) + satgen(ez.get(), &sigmap), max_seq(max_seq), success_counter(0), set_assumes(set_assumes) { satgen.model_undef = model_undef; } @@ -77,6 +78,14 @@ struct EquivInductWorker } } + if (set_assumes) { + RTLIL::SigSpec assumes_a, assumes_en; + satgen.getAssumes(assumes_a, assumes_en, step); + for (int i = 0; i < GetSize(assumes_a); i++) + log("Import constraint from assume cell: %s when %s.\n", log_signal(assumes_a[i]), log_signal(assumes_en[i])); + ez->assume(satgen.importAssumes(step)); + } + if (satgen.model_undef) { for (auto bit : undriven_signals.export_all()) ez->assume(ez->NOT(satgen.importUndefSigBit(bit, step))); @@ -184,6 +193,9 @@ struct EquivInductPass : public Pass { log(" -seq \n"); log(" the max. number of time steps to be considered (default = 4)\n"); log("\n"); + log(" -set-assumes\n"); + log(" set all assumptions provided via $assume cells\n"); + log("\n"); log("This command is very effective in proving complex sequential circuits, when\n"); log("the internal state of the circuit quickly propagates to $equiv cells.\n"); log("\n"); @@ -200,7 +212,7 @@ struct EquivInductPass : public Pass { void execute(std::vector args, Design *design) override { int success_counter = 0; - bool model_undef = false; + bool model_undef = false, set_assumes = false; int max_seq = 4; log_header(design, "Executing EQUIV_INDUCT pass.\n"); @@ -215,6 +227,10 @@ struct EquivInductPass : public Pass { max_seq = atoi(args[++argidx].c_str()); continue; } + if (args[argidx] == "-set-assumes") { + set_assumes = true; + continue; + } break; } extra_args(args, argidx, design); @@ -222,6 +238,7 @@ struct EquivInductPass : public Pass { for (auto module : design->selected_modules()) { pool unproven_equiv_cells; + vector assume_cells; for (auto cell : module->selected_cells()) if (cell->type == ID($equiv)) { @@ -234,7 +251,7 @@ struct EquivInductPass : public Pass { continue; } - EquivInductWorker worker(module, unproven_equiv_cells, model_undef, max_seq); + EquivInductWorker worker(module, unproven_equiv_cells, model_undef, max_seq, set_assumes); worker.run(); success_counter += worker.success_counter; }