synth_*: no need to explicitly read +/abc9_model.v
authorEddie Hung <eddie@fpgeh.com>
Thu, 16 Apr 2020 17:25:41 +0000 (10:25 -0700)
committerEddie Hung <eddie@fpgeh.com>
Thu, 14 May 2020 17:33:56 +0000 (10:33 -0700)
techlibs/ecp5/synth_ecp5.cc
techlibs/ice40/synth_ice40.cc
techlibs/intel_alm/synth_intel_alm.cc
techlibs/xilinx/synth_xilinx.cc

index 8039531ae4561fc2dd8f74585a831f03a86657ab..c1545cbb54ebd463a01769c4b5bffdda812d224e 100644 (file)
@@ -338,7 +338,7 @@ struct SynthEcp5Pass : public ScriptPass
                                run("techmap " + techmap_args);
 
                        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;
                                if (nowidelut)
                                        abc9_opts += " -maxlut 4";
index 376cb7dbd955f6ab6def0114ba0501c27f5efde3..f780832e68eca42f9d1cba8199935bf3eac0a89f 100644 (file)
@@ -387,7 +387,7 @@ struct SynthIce40Pass : public ScriptPass
                        }
                        if (!noabc) {
                                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 k = "synth_ice40.abc9.W";
                                        if (active_design && active_design->scratchpad.count(k))
index bf9e746b878becc63a3be801e901fad6af5c3582..0f844961eafd61446f883c74e91c3efacf97d454 100644 (file)
@@ -209,7 +209,6 @@ struct SynthIntelALMPass : public ScriptPass {
                }
 
                if (check_label("map_luts")) {
-                       run("read_verilog -icells -specify -lib +/abc9_model.v");
                        run("abc9 -maxlut 6 -W 200");
                        run("techmap -map +/intel_alm/common/alm_map.v");
                        run("opt -fast");
index c45d389efca152b4b4c7f5f9e9277afe98639a3e..d6ca9e57ee78f0bcb531b379d70f8b9b513902aa 100644 (file)
@@ -616,7 +616,7 @@ struct SynthXilinxPass : public ScriptPass
                                        log_warning("'synth_xilinx -abc9' not currently supported for the '%s' family, "
                                                        "will use timing for 'xc7' instead.\n", family.c_str());
                                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 k = "synth_xilinx.abc9.W";
                                if (active_design && active_design->scratchpad.count(k))