From 781dda6175c86fcb2b08d055565d3d99a687e636 Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddie@fpgeh.com>
Date: Thu, 26 Sep 2019 10:15:05 -0700
Subject: select once
---
techlibs/ice40/synth_ice40.cc | 12 +++++++-----
techlibs/xilinx/synth_xilinx.cc | 8 +++++---
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/techlibs/ice40/synth_ice40.cc b/techlibs/ice40/synth_ice40.cc
index 694782e5b..52e13bdc2 100644
--- a/techlibs/ice40/synth_ice40.cc
+++ b/techlibs/ice40/synth_ice40.cc
@@ -276,11 +276,13 @@ struct SynthIce40Pass : public ScriptPass
run("techmap -map +/mul2dsp.v -map +/ice40/dsp_map.v -D DSP_A_MAXWIDTH=16 -D DSP_B_MAXWIDTH=16 "
"-D DSP_A_MINWIDTH=2 -D DSP_B_MINWIDTH=2 -D DSP_Y_MINWIDTH=11 "
"-D DSP_NAME=$__MUL16X16", "(if -dsp)");
- run("opt_expr -fine a:mul2dsp", " (if -dsp)");
- run("wreduce a:mul2dsp", " (if -dsp)");
- run("ice40_dsp", " (if -dsp)");
- run("setattr -unset mul2dsp a:mul2dsp", "(if -dsp)");
- run("chtype -set $mul t:$__soft_mul", " (if -dsp)");
+ run("select a:mul2dsp", " (if -dsp)");
+ run("opt_expr -fine", " (if -dsp)");
+ run("wreduce", " (if -dsp)");
+ run("setattr -unset mul2dsp", " (if -dsp)");
+ run("select -clear", " (if -dsp)");
+ run("ice40_dsp", " (if -dsp)");
+ run("chtype -set $mul t:$__soft_mul", "(if -dsp)");
}
run("alumacc");
run("opt");
diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc
index b87fa9f6f..0445eb720 100644
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@ -346,9 +346,11 @@ 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("opt_expr -fine a:mul2dsp");
- run("wreduce a:mul2dsp");
- run("setattr -unset mul2dsp a:mul2dsp");
+ run("select a:mul2dsp");
+ run("opt_expr -fine"):
+ run("wreduce");
+ run("setattr -unset mul2dsp");
+ run("select -clear");
run("xilinx_dsp");
run("chtype -set $mul t:$__soft_mul");
}
--
cgit v1.2.3