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

This commit is contained in:
Eddie Hung 2019-08-15 12:19:47 -07:00
commit 261daffd9d
1 changed files with 5 additions and 1 deletions

View File

@ -255,7 +255,7 @@ struct SynthXilinxPass : public ScriptPass
run(stringf("hierarchy -check %s", top_opt.c_str())); run(stringf("hierarchy -check %s", top_opt.c_str()));
} }
if (check_label("coarse")) { if (check_label("prepare")) {
run("proc"); run("proc");
if (flatten || help_mode) if (flatten || help_mode)
run("flatten", "(with '-flatten')"); run("flatten", "(with '-flatten')");
@ -283,7 +283,9 @@ struct SynthXilinxPass : public ScriptPass
} }
run("techmap -map +/cmp2lut.v -D LUT_WIDTH=6"); run("techmap -map +/cmp2lut.v -D LUT_WIDTH=6");
}
if (check_label("dsp")) {
if (!nodsp || help_mode) { if (!nodsp || help_mode) {
// NB: Xilinx multipliers are signed only // 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_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')");
@ -292,7 +294,9 @@ struct SynthXilinxPass : public ScriptPass
run("xilinx_dsp", " (skip if '-nodsp')"); run("xilinx_dsp", " (skip if '-nodsp')");
run("chtype -set $mul t:$__soft_mul"," (skip if '-nodsp')"); run("chtype -set $mul t:$__soft_mul"," (skip if '-nodsp')");
} }
}
if (check_label("coarse")) {
run("alumacc"); run("alumacc");
run("share"); run("share");
run("opt"); run("opt");