From: Eddie Hung <eddie@fpgeh.com>
Date: Sat, 22 Jun 2019 01:12:07 +0000 (-0700)
Subject: Fix wreduce call (!!!), tweak muxcover costs
X-Git-Tag: working-ls180~1208^2~94
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=39e0e006d5a6b1ae45d95d75895284e3c48f47d7;p=yosys.git

Fix wreduce call (!!!), tweak muxcover costs
---

diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc
index 882ebe439..9724dff94 100644
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@ -229,7 +229,7 @@ struct SynthXilinxPass : public ScriptPass
 			if (help_mode)
 				run("wreduce [c:* t:$mux %d]", "(no selection if -nomux)");
 			else
-				run("wreduce" + nomux ? "" : " c:* t:$mux %d");
+				run("wreduce" + std::string(nomux ? "" : " c:* t:$mux %d"));
 			run("peepopt");
 			run("opt_clean");
 			run("alumacc");
@@ -271,10 +271,11 @@ struct SynthXilinxPass : public ScriptPass
 			run("dffsr2dff");
 			run("dff2dffe");
 			if (!nomux || help_mode) {
-				run("simplemap t:$mux", "                               (skip if -nomux)");
-				              // FIXME: Must specify mux4, even if we don't need it,
-					      //        otherwise it will use mux8 as mux4
-				run("muxcover -mux4=150 -mux8=200 -mux16=250 -dmux=0", "(skip if -nomux)");
+				run("simplemap t:$mux", "                     (skip if -nomux)");
+				// NB: Cost of mux2 is 100; mux8 should cost between 3 and 4
+				//     of those so that 4:1 muxes and below are implemented
+				//     out of mux2s
+				run("muxcover -mux8=350 -mux16=400 -dmux=0", "(skip if -nomux)");
 			}
 			run("opt -full");