From: Eddie Hung <eddieh@ece.ubc.ca>
Date: Tue, 9 Jul 2019 17:14:23 +0000 (-0700)
Subject: Revert "Add "synth -keepdc" option"
X-Git-Tag: working-ls180~1213^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=713337255e6ab57b0679d64539d5c87d036c067f;p=yosys.git

Revert "Add "synth -keepdc" option"
---

diff --git a/CHANGELOG b/CHANGELOG
index 646d63a63..ae7d28236 100644
--- 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 f749c8249..1fbc41082 100644
--- 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 af70cc498..555de9fba 100644
--- 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)