From: Eddie Hung <eddie@fpgeh.com>
Date: Mon, 10 Jun 2019 21:34:43 +0000 (-0700)
Subject: Revert "Rename shregmap -tech xilinx -> xilinx_dynamic"
X-Git-Tag: working-ls180~1208^2~170
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a1d4ae78a0ee474af6782bc5e12d8bd1fc790f04;p=yosys.git

Revert "Rename shregmap -tech xilinx -> xilinx_dynamic"

This reverts commit 94a5f4e60985fc1e3fea75eec85638fa29874bea.
---

diff --git a/passes/techmap/shregmap.cc b/passes/techmap/shregmap.cc
index 60b04be6f..21dfe9619 100644
--- a/passes/techmap/shregmap.cc
+++ b/passes/techmap/shregmap.cc
@@ -93,12 +93,12 @@ struct ShregmapTechGreenpak4 : ShregmapTech
 	}
 };
 
-struct ShregmapTechXilinx7Dynamic : ShregmapTech
+struct ShregmapTechXilinx7 : ShregmapTech
 {
 	dict<SigBit, std::tuple<Cell*,int,int>> sigbit_to_shiftx_offset;
 	const ShregmapOptions &opts;
 
-	ShregmapTechXilinx7Dynamic(const ShregmapOptions &opts) : opts(opts) {}
+	ShregmapTechXilinx7(const ShregmapOptions &opts) : opts(opts) {}
 
 	virtual void init(const Module* module, const SigMap &sigmap) override
 	{
@@ -663,11 +663,11 @@ struct ShregmapPass : public Pass {
 					opts.zinit = true;
 					opts.tech = new ShregmapTechGreenpak4;
 				}
-				else if (tech == "xilinx_dynamic") {
+				else if (tech == "xilinx") {
 					opts.init = true;
 					opts.params = true;
 					enpol = "any_or_none";
-					opts.tech = new ShregmapTechXilinx7Dynamic(opts);
+					opts.tech = new ShregmapTechXilinx7(opts);
 				} else {
 					argidx--;
 					break;
diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc
index ffdb22960..689a40135 100644
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@ -266,8 +266,8 @@ struct SynthXilinxPass : public ScriptPass
 				// shregmap operates on bit-level flops, not word-level,
 				//   so break those down here
 				run("simplemap t:$dff t:$dffe", "(skip if '-nosrl')");
-				// shregmap to infer variable length shift regs
-				run("shregmap -tech xilinx_dynamic -minlen 3", "(skip if '-nosrl')");
+				// shregmap with '-tech xilinx' infers variable length shift regs
+				run("shregmap -tech xilinx -minlen 3", "(skip if '-nosrl')");
 			}
 
 			std::string techmap_files = " -map +/techmap.v";