Revert "Add "synth -keepdc" option"

diff --git a/CHANGELOG b/CHANGELOG
index 646d63a63828b4fa103b1eaf014b70e5ee66f4b3..ae7d28236e2c554cf47e7bc975febbb9d884f596 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,7 +12,6 @@ Yosys 0.9 .. Yosys 0.9-dev
     - Added "synth_xilinx -abc9" (experimental)
     - Added "synth_ice40 -abc9" (experimental)
     - Added "synth -abc9" (experimental)
-    - Added "synth -keepdc"
     - Added "script -scriptwire
 
 

diff --git a/passes/opt/wreduce.cc b/passes/opt/wreduce.cc
index f749c824941b9ac20e47a15eb8f94c857a91b594..1fbc4108264618c0f5aa288e1cec6ee970afbad8 100644 (file)
--- a/passes/opt/wreduce.cc
+++ b/passes/opt/wreduce.cc
@@ -497,7 +497,7 @@ struct WreducePass : public Pass {
                log("        flows that use the 'memory_memx' pass.\n");
                log("\n");
                log("    -keepdc\n");
-               log("        Do not optimize explicit don't-care values on $mux cells.\n");
+               log("        Do not optimize explicit don't-care values.\n");
                log("\n");
        }
        void execute(std::vector<std::string> args, Design *design) YS_OVERRIDE

diff --git a/techlibs/common/synth.cc b/techlibs/common/synth.cc
index af70cc4983e0d4d1a132385c918304e5e0185e01..555de9fba1568580f6536fefc5c41eba5dcc25c4 100644 (file)
--- a/techlibs/common/synth.cc
+++ b/techlibs/common/synth.cc
@@ -78,9 +78,6 @@ struct SynthPass : public ScriptPass
                log("    -abc9\n");
                log("        use new ABC9 flow (EXPERIMENTAL)\n");
                log("\n");
-               log("    -keepdc\n");
-               log("        do not optimize explicit don't-care values on $mux cells.\n");
-               log("\n");
                log("\n");
                log("The following commands are executed by this synthesis command:\n");
                help_script();
@@ -88,7 +85,7 @@ struct SynthPass : public ScriptPass
        }
 
        string top_module, fsm_opts, memory_opts, abc;
-       bool autotop, flatten, noalumacc, nofsm, noabc, noshare, keepdc;
+       bool autotop, flatten, noalumacc, nofsm, noabc, noshare;
        int lut;
 
        void clear_flags() YS_OVERRIDE
@@ -105,7 +102,6 @@ struct SynthPass : public ScriptPass
                noabc = false;
                noshare = false;
                abc = "abc";
-               keepdc = false;
        }
 
        void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE
@@ -171,10 +167,6 @@ struct SynthPass : public ScriptPass
                                abc = "abc9";
                                continue;
                        }
-                       if (args[argidx] == "-keepdc") {
-                               keepdc = true;
-                               continue;
-                       }
                        break;
                }
                extra_args(args, argidx, design);
@@ -219,10 +211,7 @@ struct SynthPass : public ScriptPass
                        run("opt_clean");
                        run("check");
                        run("opt");
-                       if (help_mode)
-                               run("wreduce [-keepdc]");
-                       else
-                               run("wreduce" + std::string(keepdc ? " -keepdc" : ""));
+                       run("wreduce");
                        run("peepopt");
                        run("opt_clean");
                        if (help_mode)