From 61639d5387cceec6f6c50b851c4c44d6b4f93dad Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddie@fpgeh.com>
Date: Thu, 22 Aug 2019 10:51:04 -0700
Subject: [PATCH] Do not run xilinx_srl_pm in fixed loop

---
 passes/pmgen/xilinx_srl.cc | 52 ++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/passes/pmgen/xilinx_srl.cc b/passes/pmgen/xilinx_srl.cc
index 71112e3bc..36833839b 100644
--- a/passes/pmgen/xilinx_srl.cc
+++ b/passes/pmgen/xilinx_srl.cc
@@ -202,34 +202,30 @@ struct XilinxSrlPass : public Pass {
 			log_cmd_error("'-fixed' and/or '-variable' must be specified.\n");
 
 		for (auto module : design->selected_modules()) {
-			bool did_something = false;
-			if (fixed)
-				do {
-					auto pm = xilinx_srl_pm(module, module->selected_cells());
-					pm.ud_fixed.minlen = minlen;
-					// TODO: How to get these automatically?
-					pm.ud_fixed.default_params[std::make_pair(ID(FDRE),ID(INIT))] = State::S0;
-					pm.ud_fixed.default_params[std::make_pair(ID(FDRE),ID(IS_C_INVERTED))] = State::S0;
-					pm.ud_fixed.default_params[std::make_pair(ID(FDRE),ID(IS_D_INVERTED))] = State::S0;
-					pm.ud_fixed.default_params[std::make_pair(ID(FDRE),ID(IS_R_INVERTED))] = State::S0;
-					did_something = pm.run_fixed(run_fixed);
-				} while (did_something);
-			if (variable)
-				do {
-					auto pm = xilinx_srl_pm(module, module->selected_cells());
-					pm.ud_variable.minlen = minlen;
-					// Since `nusers` does not count module ports as a user,
-					//   and since `sigmap` does not always make such ports
-					//   the canonical signal.. need to maintain a pool these
-					//   ourselves
-					for (auto p : module->ports) {
-						auto w = module->wire(p);
-						if (w->port_output)
-							for (auto b : pm.sigmap(w))
-								pm.ud_variable.output_bits.insert(b);
-					}
-					did_something = pm.run_variable(run_variable);
-				} while (did_something);
+			auto pm = xilinx_srl_pm(module, module->selected_cells());
+			pm.ud_fixed.minlen = minlen;
+
+			if (fixed) {
+				// TODO: How to get these automatically?
+				pm.ud_fixed.default_params[std::make_pair(ID(FDRE),ID(INIT))] = State::S0;
+				pm.ud_fixed.default_params[std::make_pair(ID(FDRE),ID(IS_C_INVERTED))] = State::S0;
+				pm.ud_fixed.default_params[std::make_pair(ID(FDRE),ID(IS_D_INVERTED))] = State::S0;
+				pm.ud_fixed.default_params[std::make_pair(ID(FDRE),ID(IS_R_INVERTED))] = State::S0;
+				pm.run_fixed(run_fixed);
+			}
+			if (variable) {
+				// Since `nusers` does not count module ports as a user,
+				//   and since `sigmap` does not always make such ports
+				//   the canonical signal.. need to maintain a pool these
+				//   ourselves
+				for (auto p : module->ports) {
+					auto w = module->wire(p);
+					if (w->port_output)
+						for (auto b : pm.sigmap(w))
+							pm.ud_variable.output_bits.insert(b);
+				}
+				pm.run_variable(run_variable);
+			}
 		}
 	}
 } XilinxSrlPass;