mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-13 04:28:18 +00:00
Code Activity

Merge branch 'master' of github.com:cliffordwolf/yosys

Browse source
This commit is contained in:
Clifford Wolf 2014-02-18 20:05:53 +01:00
parent 3d9da919d8 a78bba1f5c
commit 23a3b488a0
2 changed files with 99 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libs/ezsat/ezsat.cc
View file

@ -1131,10 +1131,15 @@ void ezSAT::printDIMACS(FILE *f, bool verbose) const
int maxClauseLen = 0; int maxClauseLen = 0;
for (auto &clause : cnfClauses) for (auto &clause : cnfClauses)
maxClauseLen = std::max(int(clause.size()), maxClauseLen); maxClauseLen = std::max(int(clause.size()), maxClauseLen);
if (!verbose)
maxClauseLen = std::min(maxClauseLen, 3);
for (auto &clause : cnfClauses) { for (auto &clause : cnfClauses) {
for (auto idx : clause) for (auto idx : clause)
fprintf(f, " %*d", digits, idx); fprintf(f, " %*d", digits, idx);
fprintf(f, " %*d\n", (digits + 1)*int(maxClauseLen - clause.size()) + digits, 0); if (maxClauseLen >= int(clause.size()))
fprintf(f, " %*d\n", (digits + 1)*int(maxClauseLen - clause.size()) + digits, 0);
else
fprintf(f, " %*d\n", digits, 0);
} }
} }

142
passes/sat/sat.cc
View file

@ -632,27 +632,27 @@ struct SatHelper
if (last_timestep == -2) if (last_timestep == -2)
log(" no model variables selected for display.\n"); log(" no model variables selected for display.\n");
} }
void dump_model_to_vcd(std::string vcd_file_name) void dump_model_to_vcd(std::string vcd_file_name)
{ {
FILE* f = fopen(vcd_file_name.c_str(), "w"); FILE *f = fopen(vcd_file_name.c_str(), "w");
if(!f) if (!f)
log_cmd_error("Can't open output file `%s' for writing: %s\n", vcd_file_name.c_str(), strerror(errno)); log_cmd_error("Can't open output file `%s' for writing: %s\n", vcd_file_name.c_str(), strerror(errno));
log("Dumping SAT model to VCD file %s\n", vcd_file_name.c_str()); log("Dumping SAT model to VCD file %s\n", vcd_file_name.c_str());
time_t timestamp; time_t timestamp;
struct tm* now; struct tm* now;
char stime[128] = {0}; char stime[128] = {};
time(&timestamp); time(&timestamp);
now = localtime(&timestamp); now = localtime(&timestamp);
strftime(stime, sizeof(stime), "%c", now); strftime(stime, sizeof(stime), "%c", now);
std::string module_fname = "unknown"; std::string module_fname = "unknown";
auto apos = module->attributes.find("\\src"); auto apos = module->attributes.find("\\src");
if(apos != module->attributes.end()) if(apos != module->attributes.end())
module_fname = module->attributes["\\src"].decode_string(); module_fname = module->attributes["\\src"].decode_string();
fprintf(f, "$date\n"); fprintf(f, "$date\n");
fprintf(f, " %s\n", stime); fprintf(f, " %s\n", stime);
fprintf(f, "$end\n"); fprintf(f, "$end\n");
@ -663,21 +663,22 @@ struct SatHelper
fprintf(f, " Generated from SAT problem in module %s (declared at %s)\n", fprintf(f, " Generated from SAT problem in module %s (declared at %s)\n",
module->name.c_str(), module_fname.c_str()); module->name.c_str(), module_fname.c_str());
fprintf(f, "$end\n"); fprintf(f, "$end\n");
//VCD has some limits on internal (non-display) identifier names, so make legal ones // VCD has some limits on internal (non-display) identifier names, so make legal ones
std::map<std::string, std::string> vcdnames; std::map<std::string, std::string> vcdnames;
fprintf(f, "$timescale 1ns\n"); //arbitrary time scale since actual clock period is unknown/unimportant fprintf(f, "$timescale 1ns\n"); // arbitrary time scale since actual clock period is unknown/unimportant
fprintf(f, "$scope module %s $end\n", module->name.c_str()); fprintf(f, "$scope module %s $end\n", module->name.c_str());
for (auto &info : modelInfo) { for (auto &info : modelInfo)
if(vcdnames.find(info.description) != vcdnames.end()) {
if (vcdnames.find(info.description) != vcdnames.end())
continue; continue;
char namebuf[16]; char namebuf[16];
snprintf(namebuf, sizeof(namebuf), "v%d", static_cast<int>(vcdnames.size())); snprintf(namebuf, sizeof(namebuf), "v%d", static_cast<int>(vcdnames.size()));
vcdnames[info.description] = namebuf; vcdnames[info.description] = namebuf;
//Even display identifiers can't use some special characters // Even display identifiers can't use some special characters
std::string legal_desc = info.description.c_str(); std::string legal_desc = info.description.c_str();
for (auto &c : legal_desc) { for (auto &c : legal_desc) {
if(c == '$') if(c == '$')
@ -685,21 +686,21 @@ struct SatHelper
if(c == ':') if(c == ':')
c = '_'; c = '_';
} }
fprintf(f, "$var wire %d %s %s $end\n", info.width, namebuf, legal_desc.c_str()); fprintf(f, "$var wire %d %s %s $end\n", info.width, namebuf, legal_desc.c_str());
//Need to look at first *two* cycles! // Need to look at first *two* cycles!
//We need to put a name on all variables but those without an initialization clause // We need to put a name on all variables but those without an initialization clause
//have no value at timestep 0 // have no value at timestep 0
if(info.timestep > 1) if(info.timestep > 1)
break; break;
} }
fprintf(f, "$upscope $end\n"); fprintf(f, "$upscope $end\n");
fprintf(f, "$enddefinitions $end\n"); fprintf(f, "$enddefinitions $end\n");
fprintf(f, "$dumpvars\n"); fprintf(f, "$dumpvars\n");
static const char bitvals[] = "01xzxx"; static const char bitvals[] = "01xzxx";
int last_timestep = -2; int last_timestep = -2;
for (auto &info : modelInfo) for (auto &info : modelInfo)
{ {
@ -710,19 +711,18 @@ struct SatHelper
if (enable_undef && modelValues.at(modelExpressions.size()/2 + info.offset + i)) if (enable_undef && modelValues.at(modelExpressions.size()/2 + info.offset + i))
value.bits.back() = RTLIL::State::Sx; value.bits.back() = RTLIL::State::Sx;
} }
if (info.timestep != last_timestep) { if (info.timestep != last_timestep) {
if(last_timestep == 0) if(last_timestep == 0)
fprintf(f, "$end\n"); fprintf(f, "$end\n");
else else
fprintf(f, "#%d\n", info.timestep); fprintf(f, "#%d\n", info.timestep);
last_timestep = info.timestep; last_timestep = info.timestep;
} }
if(info.width == 1) if(info.width == 1) {
fprintf(f, "%c%s\n", bitvals[value.bits[0]], vcdnames[info.description].c_str()); fprintf(f, "%c%s\n", bitvals[value.bits[0]], vcdnames[info.description].c_str());
else { } else {
fprintf(f, "b"); fprintf(f, "b");
for(int k=info.width-1; k >= 0; k --) //need to flip bit ordering for VCD for(int k=info.width-1; k >= 0; k --) //need to flip bit ordering for VCD
fprintf(f, "%c", bitvals[value.bits[k]]); fprintf(f, "%c", bitvals[value.bits[k]]);
@ -732,7 +732,7 @@ struct SatHelper
if (last_timestep == -2) if (last_timestep == -2)
log(" no model variables selected for display.\n"); log(" no model variables selected for display.\n");
fclose(f); fclose(f);
} }
@ -878,6 +878,10 @@ struct SatPass : public Pass {
log(" -dump_vcd <vcd-file-name>\n"); log(" -dump_vcd <vcd-file-name>\n");
log(" dump SAT model (counter example in proof) to VCD file\n"); log(" dump SAT model (counter example in proof) to VCD file\n");
log("\n"); log("\n");
log(" -dump_cnf <cnf-file-name>\n");
log(" dump CNF of SAT problem (in DIMACS format). in temporal induction\n");
log(" proofs this is the CNF of the first induction step.\n");
log("\n");
log("The following additional options can be used to set up a proof. If also -seq\n"); log("The following additional options can be used to set up a proof. If also -seq\n");
log("is passed, a temporal induction proof is performed.\n"); log("is passed, a temporal induction proof is performed.\n");
log("\n"); log("\n");
@ -903,6 +907,9 @@ struct SatPass : public Pass {
log(" -maxsteps <N>\n"); log(" -maxsteps <N>\n");
log(" Set a maximum length for the induction.\n"); log(" Set a maximum length for the induction.\n");
log("\n"); log("\n");
log(" -initsteps <N>\n");
log(" Set initial length for the induction.\n");
log("\n");
log(" -timeout <N>\n"); log(" -timeout <N>\n");
log(" Maximum number of seconds a single SAT instance may take.\n"); log(" Maximum number of seconds a single SAT instance may take.\n");
log("\n"); log("\n");
@ -925,12 +932,12 @@ struct SatPass : public Pass {
std::map<int, std::vector<std::pair<std::string, std::string>>> sets_at; std::map<int, std::vector<std::pair<std::string, std::string>>> sets_at;
std::map<int, std::vector<std::string>> unsets_at, sets_def_at, sets_any_undef_at, sets_all_undef_at; std::map<int, std::vector<std::string>> unsets_at, sets_def_at, sets_any_undef_at, sets_all_undef_at;
std::vector<std::string> shows, sets_def, sets_any_undef, sets_all_undef; std::vector<std::string> shows, sets_def, sets_any_undef, sets_all_undef;
int loopcount = 0, seq_len = 0, maxsteps = 0, timeout = 0; int loopcount = 0, seq_len = 0, maxsteps = 0, initsteps = 0, timeout = 0;
bool verify = false, fail_on_timeout = false, enable_undef = false, set_def_inputs = false; bool verify = false, fail_on_timeout = false, enable_undef = false, set_def_inputs = false;
bool ignore_div_by_zero = false, set_init_undef = false, set_init_zero = false, max_undef = false; bool ignore_div_by_zero = false, set_init_undef = false, set_init_zero = false, max_undef = false;
bool tempinduct = false, prove_asserts = false, show_inputs = false, show_outputs = false; bool tempinduct = false, prove_asserts = false, show_inputs = false, show_outputs = false;
bool ignore_unknown_cells = false, falsify = false, tempinduct_def = false, set_init_def = false; bool ignore_unknown_cells = false, falsify = false, tempinduct_def = false, set_init_def = false;
std::string vcd_file_name; std::string vcd_file_name, cnf_file_name;
log_header("Executing SAT pass (solving SAT problems in the circuit).\n"); log_header("Executing SAT pass (solving SAT problems in the circuit).\n");
@ -970,6 +977,10 @@ struct SatPass : public Pass {
maxsteps = atoi(args[++argidx].c_str()); maxsteps = atoi(args[++argidx].c_str());
continue; continue;
} }
if (args[argidx] == "-initsteps" && argidx+1 < args.size()) {
initsteps = atoi(args[++argidx].c_str());
continue;
}
if (args[argidx] == "-ignore_div_by_zero") { if (args[argidx] == "-ignore_div_by_zero") {
ignore_div_by_zero = true; ignore_div_by_zero = true;
continue; continue;
@ -1108,6 +1119,10 @@ struct SatPass : public Pass {
vcd_file_name = args[++argidx]; vcd_file_name = args[++argidx];
continue; continue;
} }
if (args[argidx] == "-dump_cnf" && argidx+1 < args.size()) {
cnf_file_name = args[++argidx];
continue;
}
break; break;
} }
extra_args(args, argidx, design); extra_args(args, argidx, design);
@ -1240,21 +1255,42 @@ struct SatPass : public Pass {
if (inductlen > 1) if (inductlen > 1)
inductstep.force_unique_state(1, inductlen + 1); inductstep.force_unique_state(1, inductlen + 1);
log("\n[induction step] Solving problem with %d variables and %d clauses..\n", if (inductlen < initsteps)
inductstep.ez.numCnfVariables(), inductstep.ez.numCnfClauses()); {
log("\n[induction step] Skipping problem with %d variables and %d clauses (below initsteps).\n",
if (!inductstep.solve(inductstep.ez.NOT(property))) { inductstep.ez.numCnfVariables(), inductstep.ez.numCnfClauses());
if (inductstep.gotTimeout) inductstep.ez.assume(property);
goto timeout;
log("Induction step proven: SUCCESS!\n");
print_qed();
goto tip_success;
} }
else
{
if (!cnf_file_name.empty())
{
FILE *f = fopen(cnf_file_name.c_str(), "w");
if (!f)
log_cmd_error("Can't open output file `%s' for writing: %s\n", cnf_file_name.c_str(), strerror(errno));
log("Induction step failed. Incrementing induction length.\n"); log("Dumping CNF to file `%s'.\n", cnf_file_name.c_str());
inductstep.ez.assume(property); cnf_file_name.clear();
inductstep.print_model(); inductstep.ez.printDIMACS(f, false);
fclose(f);
}
log("\n[induction step] Solving problem with %d variables and %d clauses..\n",
inductstep.ez.numCnfVariables(), inductstep.ez.numCnfClauses());
if (!inductstep.solve(inductstep.ez.NOT(property))) {
if (inductstep.gotTimeout)
goto timeout;
log("Induction step proven: SUCCESS!\n");
print_qed();
goto tip_success;
}
log("Induction step failed. Incrementing induction length.\n");
inductstep.ez.assume(property);
inductstep.print_model();
}
} }
log("\nReached maximum number of time steps -> proof failed.\n"); log("\nReached maximum number of time steps -> proof failed.\n");
@ -1318,10 +1354,18 @@ struct SatPass : public Pass {
} }
sathelper.generate_model(); sathelper.generate_model();
#if 0 if (!cnf_file_name.empty())
// print CNF for debugging {
sathelper.ez.printDIMACS(stdout, true); FILE *f = fopen(cnf_file_name.c_str(), "w");
#endif if (!f)
log_cmd_error("Can't open output file `%s' for writing: %s\n", cnf_file_name.c_str(), strerror(errno));
log("Dumping CNF to file `%s'.\n", cnf_file_name.c_str());
cnf_file_name.clear();
sathelper.ez.printDIMACS(f, false);
fclose(f);
}
int rerun_counter = 0; int rerun_counter = 0;