riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve "verific -all" handling

This commit is contained in:
Clifford Wolf 2017-07-25 13:33:25 +02:00
parent 41be530c4e
commit c97c92e4ec
1 changed files with 43 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
frontends/verific/verific.cc
View File

@ -1077,7 +1077,7 @@ struct VerificPass : public Pass {
log("Load the specified VHDL files into Verific.\n"); log("Load the specified VHDL files into Verific.\n");
log("\n"); log("\n");
log("\n"); log("\n");
log(" verific -import [options] {-all | <top-module>..}\n"); log(" verific -import [options] <top-module>..\n");
log("\n"); log("\n");
log("Elaborate the design for the specified top modules, import to Yosys and\n"); log("Elaborate the design for the specified top modules, import to Yosys and\n");
log("reset the internal state of Verific. A gate-level netlist is created\n"); log("reset the internal state of Verific. A gate-level netlist is created\n");
@ -1085,6 +1085,10 @@ struct VerificPass : public Pass {
log("\n"); log("\n");
log("Import options:\n"); log("Import options:\n");
log("\n"); log("\n");
log(" -all\n");
log(" Elaborate all modules, not just the hierarchy below the given top\n");
log(" modules. With this option the list of modules to import is optional.\n");
log("\n");
log(" -gates\n"); log(" -gates\n");
log(" Create a gate-level netlist.\n"); log(" Create a gate-level netlist.\n");
log("\n"); log("\n");
@ -1242,38 +1246,53 @@ struct VerificPass : public Pass {
if (mode_all) if (mode_all)
{ {
if (argidx != GetSize(args)) log("Running veri_file::ElaborateAll().\n");
log_cmd_error("Got -all and an explicit list of top modules.\n"); if (!veri_file::ElaborateAll())
log_cmd_error("Elaboration of Verilog modules failed.\n");
MapIter m1, m2, m3; log("Running vhdl_file::ElaborateAll().\n");
VeriModule *mod; if (!vhdl_file::ElaborateAll())
FOREACH_VERILOG_MODULE(m1, mod) log_cmd_error("Elaboration of VHDL modules failed.\n");
args.push_back(mod->Name());
VhdlLibrary *lib; std::set<string> modnames;
VhdlPrimaryUnit *primunit; for (; argidx < GetSize(args); argidx++)
FOREACH_VHDL_LIBRARY(m1, lib) modnames.insert(args[argidx]);
FOREACH_VHDL_PRIMARY_UNIT(lib, m2, primunit) {
if (primunit->IsPackageDecl()) Library *lib = Netlist::PresentDesign()->Owner()->Owner();
MapIter iter;
char *iter_name;
Verific::Cell *iter_cell;
FOREACH_MAP_ITEM(lib->GetCells(), iter, &iter_name, &iter_cell)
{
if (*iter_name == '$' || (!modnames.empty() && !modnames.count(iter_name)))
continue; continue;
args.push_back(primunit->Name());
nl_todo.insert(iter_cell->GetFirstNetlist());
modnames.erase(iter_name);
} }
for (auto name : modnames)
log_cmd_error("Module not found: %s\n", name.c_str());
} }
else else
{
if (argidx == GetSize(args)) if (argidx == GetSize(args))
log_cmd_error("No top module specified.\n"); log_cmd_error("No top module specified.\n");
for (; argidx < GetSize(args); argidx++) { for (; argidx < GetSize(args); argidx++) {
if (veri_file::GetModule(args[argidx].c_str())) { if (veri_file::GetModule(args[argidx].c_str())) {
log("Running veri_file::Elaborate(\"%s\").\n", args[argidx].c_str()); log("Running veri_file::Elaborate(\"%s\").\n", args[argidx].c_str());
if (!veri_file::Elaborate(args[argidx].c_str())) if (!veri_file::Elaborate(args[argidx].c_str()))
log_cmd_error("Elaboration of top module `%s' failed.\n", args[argidx].c_str()); log_cmd_error("Elaboration of top module `%s' failed.\n", args[argidx].c_str());
nl_todo.insert(Netlist::PresentDesign()); nl_todo.insert(Netlist::PresentDesign());
} else { } else {
log("Running vhdl_file::Elaborate(\"%s\").\n", args[argidx].c_str()); log("Running vhdl_file::Elaborate(\"%s\").\n", args[argidx].c_str());
if (!vhdl_file::Elaborate(args[argidx].c_str())) if (!vhdl_file::Elaborate(args[argidx].c_str()))
log_cmd_error("Elaboration of top module `%s' failed.\n", args[argidx].c_str()); log_cmd_error("Elaboration of top module `%s' failed.\n", args[argidx].c_str());
nl_todo.insert(Netlist::PresentDesign()); nl_todo.insert(Netlist::PresentDesign());
}
} }
} }