From 5f807a7a5b3f4c1eae7b75ad93d90f3d202e2b6c Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddie@fpgeh.com>
Date: Wed, 26 Jun 2019 16:25:48 -0700
Subject: [PATCH] Return to upstream synth_xilinx with opt -full and wreduce

---
 techlibs/xilinx/synth_xilinx.cc | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc
index 278098a58..c139fb3c4 100644
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@ -241,26 +241,10 @@ struct SynthXilinxPass : public ScriptPass
 		}
 
 		if (check_label("coarse")) {
-			run("proc");
-			if (flatten || help_mode)
-				run("flatten", "(with -flatten only)");
-			run("opt_expr");
-			run("opt_clean");
-			run("check");
-			run("opt");
 			if (help_mode)
-				run("wreduce [-keepdc]", "('-widemux' only)");
+				run("synth -run coarse [-flatten]", "(with '-flatten')");
 			else
-				run("wreduce" + std::string(widemux > 0 ? " -keepdc" : ""));
-			run("peepopt");
-			run("opt_clean");
-			run("alumacc");
-			run("share");
-			run("opt");
-			run("fsm");
-			run("opt -fast");
-			run("memory -nomap");
-			run("opt_clean");
+				run("synth -run coarse" + std::string(flatten ? "" : " -flatten"), "(with '-flatten')");
 
 			if (widemux > 0 || help_mode)
 				run("muxpack", "    ('-widemux' only)");
@@ -288,7 +272,7 @@ struct SynthXilinxPass : public ScriptPass
 		}
 
 		if (check_label("fine")) {
-			run("opt -fast");
+			run("opt -fast -full");
 			run("memory_map");
 			run("dffsr2dff");
 			run("dff2dffe");