synth_ice40: switch -relut to be always on.

diff --git a/techlibs/ice40/synth_ice40.cc b/techlibs/ice40/synth_ice40.cc
index 78c62213e7f4c1fd9e9ab5ef07dd8c2060929d73..0474e76e9273128c895157a686bcc1916df5d990 100644 (file)
--- a/techlibs/ice40/synth_ice40.cc
+++ b/techlibs/ice40/synth_ice40.cc
@@ -67,9 +67,6 @@ struct SynthIce40Pass : public ScriptPass
                log("    -retime\n");
                log("        run 'abc' with -dff option\n");
                log("\n");
-               log("    -relut\n");
-               log("        combine LUTs after synthesis\n");
-               log("\n");
                log("    -nocarry\n");
                log("        do not use SB_CARRY cells in output netlist\n");
                log("\n");
@@ -106,7 +103,7 @@ struct SynthIce40Pass : public ScriptPass
        }
 
        string top_opt, blif_file, edif_file, json_file, abc, device_opt;
-       bool nocarry, nodffe, nobram, dsp, flatten, retime, relut, noabc, abc2, vpr;
+       bool nocarry, nodffe, nobram, dsp, flatten, retime, noabc, abc2, vpr;
        int min_ce_use;
 
        void clear_flags() YS_OVERRIDE
@@ -122,7 +119,6 @@ struct SynthIce40Pass : public ScriptPass
                dsp = false;
                flatten = true;
                retime = false;
-               relut = false;
                noabc = false;
                abc2 = false;
                vpr = false;
@@ -175,7 +171,7 @@ struct SynthIce40Pass : public ScriptPass
                                continue;
                        }
                        if (args[argidx] == "-relut") {
-                               relut = true;
+                               // removed, opt_lut is always run
                                continue;
                        }
                        if (args[argidx] == "-nocarry") {
@@ -347,10 +343,8 @@ struct SynthIce40Pass : public ScriptPass
                                        run(abc + " -dress -lut 4", "(skip if -noabc)");
                        }
                        run("clean");
-                       if (relut || help_mode) {
-                               run("ice40_unlut", "                            (only if -relut)");
-                               run("opt_lut -dlogic SB_CARRY:I0=1:I1=2:CI=3", "(only if -relut)");
-                       }
+                       run("ice40_unlut");
+                       run("opt_lut -dlogic SB_CARRY:I0=1:I1=2:CI=3");
                }
 
                if (check_label("map_cells"))