From: Eddie Hung <eddie@fpgeh.com>
Date: Thu, 5 Sep 2019 18:46:38 +0000 (-0700)
Subject: Do not make ff[MP]mux semioptional, use sigmap
X-Git-Tag: working-ls180~1039^2~197
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fe5a1324c953cee51774228723e73a2ecac9a45b;p=yosys.git

Do not make ff[MP]mux semioptional, use sigmap
---

diff --git a/passes/pmgen/xilinx_dsp.cc b/passes/pmgen/xilinx_dsp.cc
index a497d0a48..6e82ffac3 100644
--- a/passes/pmgen/xilinx_dsp.cc
+++ b/passes/pmgen/xilinx_dsp.cc
@@ -121,7 +121,7 @@ void pack_xilinx_dsp(dict<SigBit, Cell*> &bit_to_driver, xilinx_dsp_pm &pm)
 				cell->setPort("\\CEM", State::S1);
 			SigSpec D = st.ffM->getPort("\\D");
 			SigSpec Q = st.ffM->getPort("\\Q");
-			P.replace(/*pm.sigmap*/(D), Q);
+			P.replace(pm.sigmap(D), Q);
 
 			cell->setParam("\\MREG", State::S1);
 			pm.autoremove(st.ffM);
@@ -135,7 +135,7 @@ void pack_xilinx_dsp(dict<SigBit, Cell*> &bit_to_driver, xilinx_dsp_pm &pm)
 				cell->setPort("\\CEP", State::S1);
 			SigSpec D = st.ffP->getPort("\\D");
 			SigSpec Q = st.ffP->getPort("\\Q");
-			P.replace(/*pm.sigmap*/(D), Q);
+			P.replace(pm.sigmap(D), Q);
 			st.ffP->connections_.at("\\Q").replace(P, pm.module->addWire(NEW_ID, GetSize(P)));
 
 			cell->setParam("\\PREG", State::S1);
@@ -149,6 +149,9 @@ void pack_xilinx_dsp(dict<SigBit, Cell*> &bit_to_driver, xilinx_dsp_pm &pm)
 		if (st.ffB)
 			log(" ffB:%s", log_id(st.ffB));
 
+		if (st.ffM)
+			log(" ffM:%s", log_id(st.ffM));
+
 		if (st.ffP)
 			log(" ffP:%s", log_id(st.ffP));
 
diff --git a/passes/pmgen/xilinx_dsp.pmg b/passes/pmgen/xilinx_dsp.pmg
index a2a6f2ef0..d7632da6f 100644
--- a/passes/pmgen/xilinx_dsp.pmg
+++ b/passes/pmgen/xilinx_dsp.pmg
@@ -120,7 +120,7 @@ match ffMmux
 	filter port(ffMmux, AB) == sigM.extract(0, GetSize(port(ffMmux, \Y)))
 	filter nusers(sigM.extract_end(GetSize(port(ffMmux, AB)))) <= 1
 	set ffMmuxAB AB
-	semioptional
+	optional
 endmatch
 
 code sigM
@@ -207,12 +207,12 @@ match ffPmux
 	filter port(ffPmux, AB) == sigP.extract(0, GetSize(port(ffPmux, \Y)))
 	filter nusers(sigP.extract_end(GetSize(port(ffPmux, AB)))) <= 1
 	set ffPmuxAB AB
-	semioptional
+	optional
 endmatch
 
 code sigP
 	if (ffPmux)
-		sigP = port(ffPmux, \Y);
+		sigP.replace(port(ffPmux, ffPmuxAB), port(ffPmux, \Y));
 endcode
 
 match ffP
@@ -243,6 +243,9 @@ code ffP sigP clock
 
 		sigP.replace(port(ffP, \D), port(ffP, \Q));
 	}
+	// Cannot have ffPmux enable mux without ffP
+	else if (ffPmux)
+		reject;
 endcode
 
 match postAddMux