mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-06-18 20:03:39 +00:00
Code Activity

ezsat: Support for assumptions in Sat command

Browse source
This commit is contained in:
Gabriel Gouvine 2024-03-28 09:56:48 +00:00
parent d62a47b8ef
commit c807ef44dc
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libs/ezsat/ezcommand.cc
View file

@ -9,19 +9,20 @@ ezSATCommand::~ezSATCommand() {}
bool ezSATCommand::solver(const std::vector<int> &modelExpressions, std::vector<bool> &modelValues, const std::vector<int> &assumptions) bool ezSATCommand::solver(const std::vector<int> &modelExpressions, std::vector<bool> &modelValues, const std::vector<int> &assumptions)
{ {
if (!assumptions.empty()) {
Yosys::log_error("Assumptions are not supported yet by command-based Sat solver\n");
}
const std::string tempdir_name = Yosys::make_temp_dir(Yosys::get_base_tmpdir() + "/yosys-sat-XXXXXX"); const std::string tempdir_name = Yosys::make_temp_dir(Yosys::get_base_tmpdir() + "/yosys-sat-XXXXXX");
const std::string cnf_filename = Yosys::stringf("%s/problem.cnf", tempdir_name.c_str()); const std::string cnf_filename = Yosys::stringf("%s/problem.cnf", tempdir_name.c_str());
const std::string sat_command = Yosys::stringf("%s %s", command.c_str(), cnf_filename.c_str()); const std::string sat_command = Yosys::stringf("%s %s", command.c_str(), cnf_filename.c_str());
FILE *dimacs = fopen(cnf_filename.c_str(), "w"); FILE *dimacs = fopen(cnf_filename.c_str(), "w");
printDIMACS(dimacs);
fclose(dimacs);
std::vector<int> modelIdx; std::vector<int> modelIdx;
for (auto id : modelExpressions) for (auto id : modelExpressions)
modelIdx.push_back(bind(id)); modelIdx.push_back(bind(id));
std::vector<std::vector<int>> extraClauses;
for (auto id : assumptions)
extraClauses.push_back({bind(id)});
printDIMACS(dimacs, false, extraClauses);
fclose(dimacs);
bool status_sat = false; bool status_sat = false;
bool status_unsat = false; bool status_unsat = false;

6
libs/ezsat/ezsat.cc
View file

@ -1222,7 +1222,7 @@ ezSATvec ezSAT::vec(const std::vector<int> &vec)
return ezSATvec(*this, vec); return ezSATvec(*this, vec);
} }
void ezSAT::printDIMACS(FILE *f, bool verbose) const void ezSAT::printDIMACS(FILE *f, bool verbose, const std::vector<std::vector<int>> &extraClauses) const
{ {
if (cnfConsumed) { if (cnfConsumed) {
fprintf(stderr, "Usage error: printDIMACS() must not be called after cnfConsumed()!"); fprintf(stderr, "Usage error: printDIMACS() must not be called after cnfConsumed()!");
@ -1259,8 +1259,10 @@ void ezSAT::printDIMACS(FILE *f, bool verbose) const
std::vector<std::vector<int>> all_clauses; std::vector<std::vector<int>> all_clauses;
getFullCnf(all_clauses); getFullCnf(all_clauses);
assert(cnfClausesCount == int(all_clauses.size())); assert(cnfClausesCount == int(all_clauses.size()));
for (auto c : extraClauses)
all_clauses.push_back(c);
fprintf(f, "p cnf %d %d\n", cnfVariableCount, cnfClausesCount); fprintf(f, "p cnf %d %d\n", cnfVariableCount, (int) all_clauses.size());
int maxClauseLen = 0; int maxClauseLen = 0;
for (auto &clause : all_clauses) for (auto &clause : all_clauses)
maxClauseLen = std::max(int(clause.size()), maxClauseLen); maxClauseLen = std::max(int(clause.size()), maxClauseLen);

2
libs/ezsat/ezsat.h
View file

@ -295,7 +295,7 @@ public:
// printing CNF and internal state // printing CNF and internal state
void printDIMACS(FILE *f, bool verbose = false) const; void printDIMACS(FILE *f, bool verbose = false, const std::vector<std::vector<int>> &extraClauses = std::vector<std::vector<int>>()) const;
void printInternalState(FILE *f) const; void printInternalState(FILE *f) const;
// more sophisticated constraints (designed to be used directly with assume(..)) // more sophisticated constraints (designed to be used directly with assume(..))