diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-09-20 08:56:16 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-09-20 08:56:16 -0700 |
| commit | 829e4f5d2c8a521b5e4f80e85b9d58191d64f0d5 (patch) | |
| tree | 995ffa6042bf65196e2a6d905814a6fa2b2a548b /techlibs/ice40 | |
| parent | e4f4f6a9d5cf8bb23870fc483f16f66c80ceebab (diff) | |
| download | yosys-829e4f5d2c8a521b5e4f80e85b9d58191d64f0d5.tar.gz yosys-829e4f5d2c8a521b5e4f80e85b9d58191d64f0d5.tar.bz2 yosys-829e4f5d2c8a521b5e4f80e85b9d58191d64f0d5.zip | |
Revert "Move mul2dsp before wreduce"
This reverts commit e4f4f6a9d5cf8bb23870fc483f16f66c80ceebab.
Diffstat (limited to 'techlibs/ice40')
| -rw-r--r-- | techlibs/ice40/synth_ice40.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/techlibs/ice40/synth_ice40.cc b/techlibs/ice40/synth_ice40.cc index 225603475..284bc90d0 100644 --- a/techlibs/ice40/synth_ice40.cc +++ b/techlibs/ice40/synth_ice40.cc @@ -265,10 +265,6 @@ struct SynthIce40Pass : public ScriptPass run("opt_clean"); run("check"); run("opt"); - 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_NAME=$__MUL16X16", "(if -dsp)"); run("wreduce"); run("peepopt"); run("opt_clean"); @@ -277,6 +273,11 @@ struct SynthIce40Pass : public ScriptPass run("opt_expr"); 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_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)"); } |