intel_synth: Small code cleanup to remove if ladder

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>

diff --git a/examples/intel/MAX10/run_max10 b/examples/intel/MAX10/run_max10
index 0378e4fa7fcc65d2fcad5c3706af9c399e05316b..5bf4fc14115f601b437b6dacb7842deeed8a15c4 100644 (file)
--- a/examples/intel/MAX10/run_max10
+++ b/examples/intel/MAX10/run_max10
@@ -1 +1 @@
-yosys -p "synth_intel -family max10 -top top -vqm top.vqm" top.v sevenseg.v
+../../../yosys -p "synth_intel -family max10 -top top -vqm top.vqm" top.v sevenseg.v

diff --git a/techlibs/intel/synth_intel.cc b/techlibs/intel/synth_intel.cc
index 9d5d593a4da9fc750b6a44cb96885b032ff9badc..5d6254ff62b17ef84978ff5c8729d33ab0abcbb5 100644 (file)
--- a/techlibs/intel/synth_intel.cc
+++ b/techlibs/intel/synth_intel.cc
@@ -166,20 +166,12 @@ struct SynthIntelPass : public ScriptPass {
        void script() YS_OVERRIDE
        {
                if (check_label("begin")) {
-                       if (check_label("family") && family_opt == "max10")
-                               run("read_verilog -sv -lib +/intel/max10/cells_sim.v");
-                       else if (check_label("family") && family_opt == "a10gx")
-                               run("read_verilog -sv -lib +/intel/a10gx/cells_sim.v");
-                       else if (check_label("family") && family_opt == "cyclonev")
-                               run("read_verilog -sv -lib +/intel/cyclonev/cells_sim.v");
-                       else if (check_label("family") && family_opt == "cyclone10")
-                               run("read_verilog -sv -lib +/intel/cyclone10/cells_sim.v");
-                       else if (check_label("family") && family_opt == "cycloneiv")
-                               run("read_verilog -sv -lib +/intel/cycloneiv/cells_sim.v");
-                       else if (check_label("family") && family_opt == "cycloneive")
-                               run("read_verilog -sv -lib +/intel/cycloneive/cells_sim.v");
-                       else
-                               log_cmd_error("Invalid or not family specified: '%s'\n", family_opt.c_str());
+                       string cmd = "read_verilog -sv -lib +/intel/FAMILY/cells_sim.v";
+                       cmd.replace(cmd.find("FAMILY"), 6, family_opt);
+
+                       if (check_label("family"))
+                               run(cmd);
+
                        // Misc and common cells
                        run("read_verilog -sv -lib +/intel/common/m9k_bb.v");
                        run("read_verilog -sv -lib +/intel/common/altpll_bb.v");
@@ -228,20 +220,10 @@ struct SynthIntelPass : public ScriptPass {
                if (check_label("map_cells")) {
                        if (!noiopads)
                                run("iopadmap -bits -outpad $__outpad I:O -inpad $__inpad O:I", "(unless -noiopads)");
-                       if (family_opt == "max10")
-                               run("techmap -map +/intel/max10/cells_map.v");
-                       else if (family_opt == "a10gx")
-                               run("techmap -map +/intel/a10gx/cells_map.v");
-                       else if (family_opt == "cyclonev")
-                               run("techmap -map +/intel/cyclonev/cells_map.v");
-                       else if (family_opt == "cyclone10")
-                               run("techmap -map +/intel/cyclone10/cells_map.v");
-                       else if (family_opt == "cycloneiv")
-                               run("techmap -map +/intel/cycloneiv/cells_map.v");
-                       else if (family_opt == "cycloneive")
-                               run("techmap -map +/intel/cycloneive/cells_map.v");
-                       else
-                               log_cmd_error("Invalid or not family specified: '%s'\n", family_opt.c_str());
+                       string cmd = "techmap -map +/intel/FAMILY/cells_map.v";
+                       cmd.replace(cmd.find("FAMILY"), 6, family_opt);
+                       run(cmd);
+
                        run("dffinit -highlow -ff dffeas q power_up");
                        run("clean -purge");
                }