From: Eddie Hung <eddie@fpgeh.com>
Date: Wed, 25 Sep 2019 21:04:36 +0000 (-0700)
Subject: Call 'wreduce' after mul2dsp to avoid unextend()
X-Git-Tag: working-ls180~1039^2~27
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=53ea5daa42db335a69d3fccbf237fe5555f4bccb;p=yosys.git

Call 'wreduce' after mul2dsp to avoid unextend()
---

diff --git a/passes/pmgen/xilinx_dsp.pmg b/passes/pmgen/xilinx_dsp.pmg
index 553195649..bca44c08d 100644
--- a/passes/pmgen/xilinx_dsp.pmg
+++ b/passes/pmgen/xilinx_dsp.pmg
@@ -1,6 +1,5 @@
 pattern xilinx_dsp_pack
 
-udata <std::function<SigSpec(const SigSpec&)>> unextend
 state <SigBit> clock
 state <SigSpec> sigA sigB sigC sigD sigM sigP
 state <IdString> postAddAB postAddMuxAB
@@ -25,7 +24,7 @@ match dsp
 endmatch
 
 code sigA sigB sigC sigD sigM clock
-	unextend = [](const SigSpec &sig) {
+	auto unextend = [](const SigSpec &sig) {
 		int i;
 		for (i = GetSize(sig)-1; i > 0; i--)
 			if (sig[i] != sig[i-1])
@@ -272,9 +271,9 @@ match postAdd
 	filter !ffMcemux || nusers(port(postAdd, AB)) == 3
 
 	index <SigBit> port(postAdd, AB)[0] === sigP[0]
-	filter GetSize(unextend(port(postAdd, AB))) <= GetSize(sigP)
-	filter unextend(port(postAdd, AB)) == sigP.extract(0, GetSize(unextend(port(postAdd, AB))))
-	filter nusers(sigP.extract_end(GetSize(unextend(port(postAdd, AB))))) <= 1
+	filter GetSize(port(postAdd, AB)) <= GetSize(sigP)
+	filter port(postAdd, AB) == sigP.extract(0, GetSize(port(postAdd, AB)))
+	filter nusers(sigP.extract_end(GetSize(port(postAdd, AB)))) <= 1
 	set postAddAB AB
 	optional
 endmatch
diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc
index 022b0d108..ca108e9d6 100644
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@ -346,6 +346,7 @@ struct SynthXilinxPass : public ScriptPass
 						"-D DSP_A_MINWIDTH=2 -D DSP_B_MINWIDTH=2 " // Blocks Nx1 multipliers
 						"-D DSP_Y_MINWIDTH=9 " // UG901 suggests small multiplies are those 4x4 and smaller
 						"-D DSP_SIGNEDONLY=1 -D DSP_NAME=$__MUL25X18");
+				run("wreduce t:$add");
 				run("xilinx_dsp");
 				run("chtype -set $mul t:$__soft_mul");
 			}