Added write_smt2 -wires

This commit is contained in:
Clifford Wolf 2015-10-13 17:17:12 +02:00
parent f42218682d
commit 3a22b31bda
1 changed files with 15 additions and 7 deletions

View File

@ -32,7 +32,7 @@ struct Smt2Worker
CellTypes ct; CellTypes ct;
SigMap sigmap; SigMap sigmap;
RTLIL::Module *module; RTLIL::Module *module;
bool bvmode, memmode, regsmode, verbose; bool bvmode, memmode, regsmode, wiresmode, verbose;
int idcounter; int idcounter;
std::vector<std::string> decls, trans; std::vector<std::string> decls, trans;
@ -44,8 +44,9 @@ struct Smt2Worker
std::map<Cell*, int> memarrays; std::map<Cell*, int> memarrays;
std::map<int, int> bvsizes; std::map<int, int> bvsizes;
Smt2Worker(RTLIL::Module *module, bool bvmode, bool memmode, bool regsmode, bool verbose) : Smt2Worker(RTLIL::Module *module, bool bvmode, bool memmode, bool regsmode, bool wiresmode, bool verbose) :
ct(module->design), sigmap(module), module(module), bvmode(bvmode), memmode(memmode), regsmode(regsmode), verbose(verbose), idcounter(0) ct(module->design), sigmap(module), module(module), bvmode(bvmode), memmode(memmode),
regsmode(regsmode), wiresmode(wiresmode), verbose(verbose), idcounter(0)
{ {
decls.push_back(stringf("(declare-sort |%s_s| 0)\n", log_id(module))); decls.push_back(stringf("(declare-sort |%s_s| 0)\n", log_id(module)));
@ -488,7 +489,7 @@ struct Smt2Worker
for (auto bit : SigSpec(wire)) for (auto bit : SigSpec(wire))
if (reg_bits.count(bit)) if (reg_bits.count(bit))
is_register = true; is_register = true;
if (wire->port_id || is_register || wire->get_bool_attribute("\\keep")) { if (wire->port_id || is_register || wire->get_bool_attribute("\\keep") || (wiresmode && wire->name[0] == '\\')) {
RTLIL::SigSpec sig = sigmap(wire); RTLIL::SigSpec sig = sigmap(wire);
if (wire->port_input) if (wire->port_input)
decls.push_back(stringf("; yosys-smt2-input %s %d\n", log_id(wire), wire->width)); decls.push_back(stringf("; yosys-smt2-input %s %d\n", log_id(wire), wire->width));
@ -496,7 +497,7 @@ struct Smt2Worker
decls.push_back(stringf("; yosys-smt2-output %s %d\n", log_id(wire), wire->width)); decls.push_back(stringf("; yosys-smt2-output %s %d\n", log_id(wire), wire->width));
if (is_register) if (is_register)
decls.push_back(stringf("; yosys-smt2-register %s %d\n", log_id(wire), wire->width)); decls.push_back(stringf("; yosys-smt2-register %s %d\n", log_id(wire), wire->width));
if (wire->get_bool_attribute("\\keep")) if (wire->get_bool_attribute("\\keep") || (wiresmode && wire->name[0] == '\\'))
decls.push_back(stringf("; yosys-smt2-wire %s %d\n", log_id(wire), wire->width)); decls.push_back(stringf("; yosys-smt2-wire %s %d\n", log_id(wire), wire->width));
if (bvmode && GetSize(sig) > 1) { if (bvmode && GetSize(sig) > 1) {
decls.push_back(stringf("(define-fun |%s_n %s| ((state |%s_s|)) (_ BitVec %d) %s)\n", decls.push_back(stringf("(define-fun |%s_n %s| ((state |%s_s|)) (_ BitVec %d) %s)\n",
@ -695,6 +696,9 @@ struct Smt2Backend : public Backend {
log(" -regs\n"); log(" -regs\n");
log(" also create '<mod>_n' functions for all registers.\n"); log(" also create '<mod>_n' functions for all registers.\n");
log("\n"); log("\n");
log(" -wires\n");
log(" also create '<mod>_n' functions for all public wires.\n");
log("\n");
log(" -tpl <template_file>\n"); log(" -tpl <template_file>\n");
log(" use the given template file. the line containing only the token '%%%%'\n"); log(" use the given template file. the line containing only the token '%%%%'\n");
log(" is replaced with the regular output of this command.\n"); log(" is replaced with the regular output of this command.\n");
@ -751,7 +755,7 @@ struct Smt2Backend : public Backend {
virtual void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) virtual void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design)
{ {
std::ifstream template_f; std::ifstream template_f;
bool bvmode = false, memmode = false, regsmode = false, verbose = false; bool bvmode = false, memmode = false, regsmode = false, wiresmode = false, verbose = false;
log_header("Executing SMT2 backend.\n"); log_header("Executing SMT2 backend.\n");
@ -777,6 +781,10 @@ struct Smt2Backend : public Backend {
regsmode = true; regsmode = true;
continue; continue;
} }
if (args[argidx] == "-wires") {
wiresmode = true;
continue;
}
if (args[argidx] == "-verbose") { if (args[argidx] == "-verbose") {
verbose = true; verbose = true;
continue; continue;
@ -806,7 +814,7 @@ struct Smt2Backend : public Backend {
log("Creating SMT-LIBv2 representation of module %s.\n", log_id(module)); log("Creating SMT-LIBv2 representation of module %s.\n", log_id(module));
Smt2Worker worker(module, bvmode, memmode, regsmode, verbose); Smt2Worker worker(module, bvmode, memmode, regsmode, wiresmode, verbose);
worker.run(); worker.run();
worker.write(*f); worker.write(*f);
} }