summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2015-01-22 13:40:26 +0100
committerClifford Wolf <clifford@clifford.at>2015-01-22 13:42:04 +0100
commita6aa32e762d29f050d0b6d49e288514964a5aac5 (patch)
tree57a49aeb765b1d9ec1b34d78b77d43a22645e5fd
parent0a225f8b273bfd036efa89f660114d4ab9cb190f (diff)
Various equiv_simple improvements
-rw-r--r--kernel/satgen.h19
-rw-r--r--passes/equiv/equiv_simple.cc75
2 files changed, 69 insertions, 25 deletions
diff --git a/kernel/satgen.h b/kernel/satgen.h
index 2c69663c..c874099b 100644
--- a/kernel/satgen.h
+++ b/kernel/satgen.h
@@ -1163,6 +1163,25 @@ struct SatGen
return true;
}
+ if (cell->type == "$_BUF_" || cell->type == "$equiv")
+ {
+ std::vector<int> a = importDefSigSpec(cell->getPort("\\A"), timestep);
+ std::vector<int> y = importDefSigSpec(cell->getPort("\\Y"), timestep);
+ extendSignalWidthUnary(a, y, cell);
+
+ std::vector<int> yy = model_undef ? ez->vec_var(y.size()) : y;
+ ez->assume(ez->vec_eq(a, yy));
+
+ if (model_undef) {
+ std::vector<int> undef_a = importUndefSigSpec(cell->getPort("\\A"), timestep);
+ std::vector<int> undef_y = importUndefSigSpec(cell->getPort("\\Y"), timestep);
+ extendSignalWidthUnary(undef_a, undef_y, cell, false);
+ ez->assume(ez->vec_eq(undef_a, undef_y));
+ undefGating(y, yy, undef_y);
+ }
+ return true;
+ }
+
if (cell->type == "$assert")
{
std::string pf = prefix + (timestep == -1 ? "" : stringf("@%d:", timestep));
diff --git a/passes/equiv/equiv_simple.cc b/passes/equiv/equiv_simple.cc
index b87f4ed7..f0ab6da6 100644
--- a/passes/equiv/equiv_simple.cc
+++ b/passes/equiv/equiv_simple.cc
@@ -34,10 +34,11 @@ struct EquivSimpleWorker
ezDefaultSAT ez;
SatGen satgen;
int max_seq;
+ bool verbose;
- EquivSimpleWorker(Cell *equiv_cell, SigMap &sigmap, dict<SigBit, Cell*> &bit2driver, int max_seq) :
+ EquivSimpleWorker(Cell *equiv_cell, SigMap &sigmap, dict<SigBit, Cell*> &bit2driver, int max_seq, bool verbose) :
module(equiv_cell->module), equiv_cell(equiv_cell), sigmap(sigmap),
- bit2driver(bit2driver), satgen(&ez, &sigmap), max_seq(max_seq)
+ bit2driver(bit2driver), satgen(&ez, &sigmap), max_seq(max_seq), verbose(verbose)
{
}
@@ -90,8 +91,12 @@ struct EquivSimpleWorker
pool<SigBit> seed_a = { bit_a };
pool<SigBit> seed_b = { bit_b };
- log(" Trying to prove $equiv cell %s:\n", log_id(equiv_cell));
- log(" A = %s, B = %s, Y = %s\n", log_signal(bit_a), log_signal(bit_b), log_signal(equiv_cell->getPort("\\Y")));
+ if (verbose) {
+ log(" Trying to prove $equiv cell %s:\n", log_id(equiv_cell));
+ log(" A = %s, B = %s, Y = %s\n", log_signal(bit_a), log_signal(bit_b), log_signal(equiv_cell->getPort("\\Y")));
+ } else {
+ log(" Trying to prove $equiv for %s:", log_signal(equiv_cell->getPort("\\Y")));
+ }
int step = max_seq;
while (1)
@@ -127,54 +132,66 @@ struct EquivSimpleWorker
problem_cells.insert(short_cells_cone_a.begin(), short_cells_cone_a.end());
problem_cells.insert(short_cells_cone_b.begin(), short_cells_cone_b.end());
- log(" Adding %d new cells to the problem (%d A, %d B, %d shared).\n",
- GetSize(problem_cells), GetSize(short_cells_cone_a), GetSize(short_cells_cone_b),
- (GetSize(short_cells_cone_a) + GetSize(short_cells_cone_b)) - GetSize(problem_cells));
+ if (verbose)
+ log(" Adding %d new cells to the problem (%d A, %d B, %d shared).\n",
+ GetSize(problem_cells), GetSize(short_cells_cone_a), GetSize(short_cells_cone_b),
+ (GetSize(short_cells_cone_a) + GetSize(short_cells_cone_b)) - GetSize(problem_cells));
for (auto cell : problem_cells)
- satgen.importCell(cell, step+1);
+ if (!satgen.importCell(cell, step+1))
+ log_cmd_error("No SAT model available for cell %s (%s).\n", log_id(cell), log_id(cell->type));
- log(" Problem size at t=%d: %d literals, %d clauses\n", step, ez.numCnfVariables(), ez.numCnfClauses());
+ if (verbose)
+ log(" Problem size at t=%d: %d literals, %d clauses\n", step, ez.numCnfVariables(), ez.numCnfClauses());
if (!ez.solve()) {
- log(" Proved equivalence! Marking $equiv cell as proven.\n");
+ log(verbose ? " Proved equivalence! Marking $equiv cell as proven.\n" : " success!\n");
equiv_cell->setPort("\\B", equiv_cell->getPort("\\A"));
return true;
}
- log(" Failed to prove equivalence with sequence length %d.\n", max_seq - step);
+ if (verbose)
+ log(" Failed to prove equivalence with sequence length %d.\n", max_seq - step);
if (--step < 0) {
- log(" Reached sequence limit.\n");
+ if (verbose)
+ log(" Reached sequence limit.\n");
break;
}
if (seed_a.empty() && seed_b.empty()) {
- log(" No nets to continue in previous time step.\n");
+ if (verbose)
+ log(" No nets to continue in previous time step.\n");
break;
}
if (seed_a.empty()) {
- log(" No nets on A-side to continue in previous time step.\n");
+ if (verbose)
+ log(" No nets on A-side to continue in previous time step.\n");
break;
}
if (seed_b.empty()) {
- log(" No nets on B-side to continue in previous time step.\n");
+ if (verbose)
+ log(" No nets on B-side to continue in previous time step.\n");
break;
}
- #if 0
- log(" Continuing analysis in previous time step with the following nets:\n");
- for (auto bit : seed_a)
- log(" A: %s\n", log_signal(bit));
- for (auto bit : seed_b)
- log(" B: %s\n", log_signal(bit));
- #else
- log(" Continuing analysis in previous time step with %d A- and %d B-nets.\n", GetSize(seed_a), GetSize(seed_b));
- #endif
+ if (verbose) {
+ #if 0
+ log(" Continuing analysis in previous time step with the following nets:\n");
+ for (auto bit : seed_a)
+ log(" A: %s\n", log_signal(bit));
+ for (auto bit : seed_b)
+ log(" B: %s\n", log_signal(bit));
+ #else
+ log(" Continuing analysis in previous time step with %d A- and %d B-nets.\n", GetSize(seed_a), GetSize(seed_b));
+ #endif
+ }
}
+ if (!verbose)
+ log(" failed.\n");
return false;
}
};
@@ -189,12 +206,16 @@ struct EquivSimplePass : public Pass {
log("\n");
log("This command tries to prove $equiv cells using a simple direct SAT approach.\n");
log("\n");
+ log(" -v\n");
+ log(" verbose output\n");
+ log("\n");
log(" -seq <N>\n");
log(" the max. number of time steps to be considered (default = 1)\n");
log("\n");
}
virtual void execute(std::vector<std::string> args, Design *design)
{
+ bool verbose = false;
int success_counter = 0;
int max_seq = 1;
@@ -202,6 +223,10 @@ struct EquivSimplePass : public Pass {
size_t argidx;
for (argidx = 1; argidx < args.size(); argidx++) {
+ if (args[argidx] == "-v") {
+ verbose = true;
+ continue;
+ }
if (args[argidx] == "-seq" && argidx+1 < args.size()) {
max_seq = atoi(args[++argidx].c_str());
continue;
@@ -240,7 +265,7 @@ struct EquivSimplePass : public Pass {
}
for (auto cell : unproven_equiv_cells) {
- EquivSimpleWorker worker(cell, sigmap, bit2driver, max_seq);
+ EquivSimpleWorker worker(cell, sigmap, bit2driver, max_seq, verbose);
if (worker.run())
success_counter++;
}