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

abc9_exe: Remove `-genlib` option

This commit is contained in:
Martin Povišer 2024-10-05 18:30:22 +02:00
parent ac79a052ba
commit 3b6dcc7bd0
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
passes/techmap/abc9_exe.cc
View File

@ -166,7 +166,7 @@ struct abc9_output_filter
void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe_file, void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe_file,
vector<int> lut_costs, bool dff_mode, std::string delay_target, std::string /*lutin_shared*/, bool fast_mode, vector<int> lut_costs, bool dff_mode, std::string delay_target, std::string /*lutin_shared*/, bool fast_mode,
bool show_tempdir, std::string box_file, std::string lut_file, std::vector<std::string> genlib_files, bool show_tempdir, std::string box_file, std::string lut_file,
std::vector<std::string> liberty_files, std::string wire_delay, std::string tempdir_name, std::vector<std::string> liberty_files, std::string wire_delay, std::string tempdir_name,
std::string constr_file, std::vector<std::string> dont_use_cells) std::string constr_file, std::vector<std::string> dont_use_cells)
{ {
@ -176,7 +176,7 @@ void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe
abc9_script += stringf("read_lut %s/lutdefs.txt; ", tempdir_name.c_str()); abc9_script += stringf("read_lut %s/lutdefs.txt; ", tempdir_name.c_str());
else if (!lut_file.empty()) else if (!lut_file.empty())
abc9_script += stringf("read_lut \"%s\"; ", lut_file.c_str()); abc9_script += stringf("read_lut \"%s\"; ", lut_file.c_str());
else if (!liberty_files.empty() || !genlib_files.empty()) { else if (!liberty_files.empty()) {
std::string dont_use_args; std::string dont_use_args;
for (std::string dont_use_cell : dont_use_cells) { for (std::string dont_use_cell : dont_use_cells) {
dont_use_args += stringf("-X \"%s\" ", dont_use_cell.c_str()); dont_use_args += stringf("-X \"%s\" ", dont_use_cell.c_str());
@ -184,8 +184,6 @@ void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe
for (std::string liberty_file : liberty_files) { for (std::string liberty_file : liberty_files) {
abc9_script += stringf("read_lib %s -w \"%s\" ; ", dont_use_args.c_str(), liberty_file.c_str()); abc9_script += stringf("read_lib %s -w \"%s\" ; ", dont_use_args.c_str(), liberty_file.c_str());
} }
for (std::string liberty_file : genlib_files)
abc9_script += stringf("read_library \"%s\"; ", liberty_file.c_str());
if (!constr_file.empty()) if (!constr_file.empty())
abc9_script += stringf("read_constr -v \"%s\"; ", constr_file.c_str()); abc9_script += stringf("read_constr -v \"%s\"; ", constr_file.c_str());
} }
@ -423,7 +421,7 @@ struct Abc9ExePass : public Pass {
std::string exe_file = yosys_abc_executable; std::string exe_file = yosys_abc_executable;
std::string script_file, clk_str, box_file, lut_file, constr_file; std::string script_file, clk_str, box_file, lut_file, constr_file;
std::vector<std::string> genlib_files, liberty_files, dont_use_cells; std::vector<std::string> liberty_files, dont_use_cells;
std::string delay_target, lutin_shared = "-S 1", wire_delay; std::string delay_target, lutin_shared = "-S 1", wire_delay;
std::string tempdir_name; std::string tempdir_name;
bool fast_mode = false, dff_mode = false; bool fast_mode = false, dff_mode = false;
@ -511,10 +509,6 @@ struct Abc9ExePass : public Pass {
tempdir_name = args[++argidx]; tempdir_name = args[++argidx];
continue; continue;
} }
if (arg == "-genlib" && argidx+1 < args.size()) {
genlib_files.push_back(args[++argidx]);
continue;
}
if (arg == "-liberty" && argidx+1 < args.size()) { if (arg == "-liberty" && argidx+1 < args.size()) {
liberty_files.push_back(args[++argidx]); liberty_files.push_back(args[++argidx]);
continue; continue;
@ -590,7 +584,7 @@ struct Abc9ExePass : public Pass {
abc9_module(design, script_file, exe_file, lut_costs, dff_mode, abc9_module(design, script_file, exe_file, lut_costs, dff_mode,
delay_target, lutin_shared, fast_mode, show_tempdir, delay_target, lutin_shared, fast_mode, show_tempdir,
box_file, lut_file, genlib_files, liberty_files, wire_delay, tempdir_name, box_file, lut_file, liberty_files, wire_delay, tempdir_name,
constr_file, dont_use_cells); constr_file, dont_use_cells);
} }
} Abc9ExePass; } Abc9ExePass;