Merge branch 'xc7dsp' of github.com:YosysHQ/yosys into xc7dsp

diff --cc techlibs/xilinx/synth_xilinx.cc
index 477b2f6f75ef93172e614295dffdc8f4c9111b1a,546d673377a76ddeed7c0db0fb0656c48ae498f0..102c896aabc0fa875047e9fb16e331f3d76b9dab
--- 1/techlibs/xilinx/synth_xilinx.cc
--- 2/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@@ -283,10 -283,12 +283,12 @@@ struct SynthXilinxPass : public ScriptP
                        }
  
                        run("techmap -map +/cmp2lut.v -D LUT_WIDTH=6");
+               }
  
+               if (check_label("dsp")) {
                        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_B_MAXWIDTH=18 -D DSP_SIGNEDONLY=1 -D DSP_NAME=$__MUL25X18", "(skip if '-nodsp')");
 +                              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_SIGNEDONLY=1 -D DSP_NAME=$__MUL25X18", "(skip if '-nodsp')");
                                run("opt_expr -fine", "                 (skip if '-nodsp')");
                                run("wreduce", "                        (skip if '-nodsp')");
                                run("xilinx_dsp", "                     (skip if '-nodsp')");