From: Clifford Wolf <clifford@clifford.at>
Date: Sun, 14 Jun 2015 13:47:11 +0000 (+0200)
Subject: Added "memory -nordff"
X-Git-Tag: yosys-0.6~257
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f6eca509bbf69d6b98f12c65bbb9c842026d9df7;p=yosys.git

Added "memory -nordff"
---

diff --git a/passes/memory/memory.cc b/passes/memory/memory.cc
index 866efae77..7b2b89b2b 100644
--- a/passes/memory/memory.cc
+++ b/passes/memory/memory.cc
@@ -31,7 +31,7 @@ struct MemoryPass : public Pass {
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 		log("\n");
-		log("    memory [-nomap] [-bram <bram_rules>] [selection]\n");
+		log("    memory [-nomap] [-nordff] [-bram <bram_rules>] [selection]\n");
 		log("\n");
 		log("This pass calls all the other memory_* passes in a useful order:\n");
 		log("\n");
@@ -43,6 +43,8 @@ struct MemoryPass : public Pass {
 		log("    memory_bram -rules <bram_rules>     (when called with -bram)\n");
 		log("    memory_map                          (skipped if called with -nomap)\n");
 		log("\n");
+		log("when called with -nordff, memory_dff will be called with -wr_only.\n");
+		log("\n");
 		log("This converts memories to word-wide DFFs and address decoders\n");
 		log("or multiport memory blocks if called with the -nomap option.\n");
 		log("\n");
@@ -50,6 +52,7 @@ struct MemoryPass : public Pass {
 	virtual void execute(std::vector<std::string> args, RTLIL::Design *design)
 	{
 		bool flag_nomap = false;
+		bool flag_nordff = false;
 		string memory_bram_opts;
 
 		log_header("Executing MEMORY pass.\n");
@@ -61,6 +64,10 @@ struct MemoryPass : public Pass {
 				flag_nomap = true;
 				continue;
 			}
+			if (args[argidx] == "-nordff") {
+				flag_nordff = true;
+				continue;
+			}
 			if (argidx+1 < args.size() && args[argidx] == "-bram") {
 				memory_bram_opts += " -rules " + args[++argidx];
 				continue;
@@ -69,7 +76,7 @@ struct MemoryPass : public Pass {
 		}
 		extra_args(args, argidx, design);
 
-		Pass::call(design, "memory_dff");
+		Pass::call(design, flag_nordff ? "memory_dff -wr_only" : "memory_dff");
 		Pass::call(design, "opt_clean");
 		Pass::call(design, "memory_share");
 		Pass::call(design, "opt_clean");