diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-08-08 10:45:56 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-08-08 10:45:56 -0700 |
| commit | 716024387468285f0d5ee2719b86fe6ddbfff93e (patch) | |
| tree | 1c1def4ae799bea6a4d9f2150f34140fd8ed12fd /techlibs/xilinx/synth_xilinx.cc | |
| parent | 911129e3ef9196a2f775d97746d704ed761da40d (diff) | |
| download | yosys-716024387468285f0d5ee2719b86fe6ddbfff93e.tar.gz yosys-716024387468285f0d5ee2719b86fe6ddbfff93e.tar.bz2 yosys-716024387468285f0d5ee2719b86fe6ddbfff93e.zip | |
Move xilinx_dsp to before alumacc
Diffstat (limited to 'techlibs/xilinx/synth_xilinx.cc')
| -rw-r--r-- | techlibs/xilinx/synth_xilinx.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc index a787c7c4c..49beaa565 100644 --- a/techlibs/xilinx/synth_xilinx.cc +++ b/techlibs/xilinx/synth_xilinx.cc @@ -286,7 +286,10 @@ struct SynthXilinxPass : public ScriptPass if (!nodsp || help_mode) { // NB: Xilinx multipliers are signed only - run("techmap -map +/mul2dsp.v -D DSP_A_MAXWIDTH=25 -D DSP_B_MAXWIDTH=18 -D DSP_SIGNEDONLY=1 -D DSP_NAME=$__MUL25X18"); + run("techmap -map +/mul2dsp.v -D DSP_A_MAXWIDTH=25 -D DSP_B_MAXWIDTH=18 -D DSP_SIGNEDONLY=1 -D DSP_NAME=$__MUL25X18", "(skip if '-nodsp')"); + run("techmap -map +/xilinx/dsp_map.v", "(skip if '-nodsp')"); // TODO: fold into xilinx_dsp + run("xilinx_dsp", " (skip if '-nodsp')"); + run("chtype -set $mul t:$__soft_mul"," (skip if '-nodsp')"); } run("alumacc"); @@ -331,11 +334,6 @@ struct SynthXilinxPass : public ScriptPass run("memory_map"); run("dffsr2dff"); run("dff2dffe"); - if (help_mode || !nodsp) { - run("techmap -map +/xilinx/dsp_map.v", "(skip if '-nodsp')"); - run("xilinx_dsp", " (skip if '-nodsp')"); - run("chtype -set $mul t:$__soft_mul"," (skip if '-nodsp')"); - } if (help_mode) { run("simplemap t:$mux", " ('-widemux' only)"); run("muxcover <internal options>, ('-widemux' only)"); |