aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEddie Hung <eddie@fpgeh.com>2019-09-20 09:02:29 -0700
committerEddie Hung <eddie@fpgeh.com>2019-09-20 09:02:29 -0700
commit289cf688b76328d62c7416d1327d2d6777b0ffd9 (patch)
treebf4bf4a5fca4242ab9d61cb0dfb054bf8f067333
parent829e4f5d2c8a521b5e4f80e85b9d58191d64f0d5 (diff)
downloadyosys-289cf688b76328d62c7416d1327d2d6777b0ffd9.tar.gz
yosys-289cf688b76328d62c7416d1327d2d6777b0ffd9.tar.bz2
yosys-289cf688b76328d62c7416d1327d2d6777b0ffd9.zip
Re-add DSP_A_MINWIDTH, remove unnec. opt_expr -fine from synth_ice40
-rw-r--r--techlibs/ice40/synth_ice40.cc3
-rw-r--r--techlibs/xilinx/synth_xilinx.cc2
2 files changed, 2 insertions, 3 deletions
diff --git a/techlibs/ice40/synth_ice40.cc b/techlibs/ice40/synth_ice40.cc
index 284bc90d0..7a8f3d70c 100644
--- a/techlibs/ice40/synth_ice40.cc
+++ b/techlibs/ice40/synth_ice40.cc
@@ -274,9 +274,8 @@ struct SynthIce40Pass : public ScriptPass
run("opt_clean");
if (help_mode || dsp) {
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_Y_MINWIDTH=11 "
+ "-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", " (if -dsp)");
run("wreduce", " (if -dsp)");
run("ice40_dsp", " (if -dsp)");
run("chtype -set $mul t:$__soft_mul","(if -dsp)");
diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc
index 6687a0786..022b0d108 100644
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@ -343,7 +343,7 @@ struct SynthXilinxPass : public ScriptPass
if (!nodsp || help_mode) {
// NB: Xilinx multipliers are signed only
run("techmap -map +/mul2dsp.v -map +/xilinx/dsp_map.v -D DSP_A_MAXWIDTH=25 -D DSP_A_MAXWIDTH_PARTIAL=18 -D DSP_B_MAXWIDTH=18 "
- "-D DSP_B_MINWIDTH=2 " // Blocks Nx1 multipliers
+ "-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("xilinx_dsp");