synth_*: no need to explicitly read +/abc9_model.v

This commit is contained in:
Eddie Hung 2020-04-16 10:25:41 -07:00
parent 63246a5c0e
commit 8fbb55f4ab
4 changed files with 3 additions and 4 deletions

View File

@ -338,7 +338,7 @@ struct SynthEcp5Pass : public ScriptPass
run("techmap " + techmap_args); run("techmap " + techmap_args);
if (abc9) { if (abc9) {
run("read_verilog -icells -lib -specify +/abc9_model.v +/ecp5/abc9_model.v"); run("read_verilog -icells -lib -specify +/ecp5/abc9_model.v");
std::string abc9_opts; std::string abc9_opts;
if (nowidelut) if (nowidelut)
abc9_opts += " -maxlut 4"; abc9_opts += " -maxlut 4";

View File

@ -387,7 +387,7 @@ struct SynthIce40Pass : public ScriptPass
} }
if (!noabc) { if (!noabc) {
if (abc9) { if (abc9) {
run("read_verilog " + define + " -icells -lib -specify +/abc9_model.v +/ice40/abc9_model.v"); run("read_verilog " + define + " -icells -lib -specify +/ice40/abc9_model.v");
std::string abc9_opts; std::string abc9_opts;
std::string k = "synth_ice40.abc9.W"; std::string k = "synth_ice40.abc9.W";
if (active_design && active_design->scratchpad.count(k)) if (active_design && active_design->scratchpad.count(k))

View File

@ -209,7 +209,6 @@ struct SynthIntelALMPass : public ScriptPass {
} }
if (check_label("map_luts")) { if (check_label("map_luts")) {
run("read_verilog -icells -specify -lib +/abc9_model.v");
run("abc9 -maxlut 6 -W 200"); run("abc9 -maxlut 6 -W 200");
run("techmap -map +/intel_alm/common/alm_map.v"); run("techmap -map +/intel_alm/common/alm_map.v");
run("opt -fast"); run("opt -fast");

View File

@ -616,7 +616,7 @@ struct SynthXilinxPass : public ScriptPass
log_warning("'synth_xilinx -abc9' not currently supported for the '%s' family, " log_warning("'synth_xilinx -abc9' not currently supported for the '%s' family, "
"will use timing for 'xc7' instead.\n", family.c_str()); "will use timing for 'xc7' instead.\n", family.c_str());
run("techmap -map +/xilinx/abc9_map.v -max_iter 1"); run("techmap -map +/xilinx/abc9_map.v -max_iter 1");
run("read_verilog -icells -lib -specify +/abc9_model.v +/xilinx/abc9_model.v"); run("read_verilog -icells -lib -specify +/xilinx/abc9_model.v");
std::string abc9_opts; std::string abc9_opts;
std::string k = "synth_xilinx.abc9.W"; std::string k = "synth_xilinx.abc9.W";
if (active_design && active_design->scratchpad.count(k)) if (active_design && active_design->scratchpad.count(k))