riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix macc and mul tests

This commit is contained in:
Eddie Hung 2019-09-06 14:57:36 -07:00
parent 8246062acf
commit 0d1d8b4d24
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
passes/pmgen/xilinx_dsp.pmg
View File

@ -300,6 +300,10 @@ code ffM clock sigM sigP
reject; reject;
clock = c; clock = c;
} }
// No enable mux possible without flop
else if (ffMmux)
reject;
sigP = sigM; sigP = sigM;
endcode endcode
@ -341,8 +345,11 @@ endcode
match ffPmux match ffPmux
if param(dsp, \PREG).as_int() == 0 if param(dsp, \PREG).as_int() == 0
// new-value net must have exactly two users: dsp and ffP // If ffMmux, new-value net must have exactly three users: ffMmux, ffM and ffPmux
if nusers(sigP) == 2 if !ffMmux || nusers(sigP) == 3
// Otherwise new-value net must have exactly two users: dsp and ffPmux
if ffMmux || nusers(sigP) == 2
select ffPmux->type.in($mux) select ffPmux->type.in($mux)
// ffPmux output must have two users: ffPmux and ffP.D // ffPmux output must have two users: ffPmux and ffP.D
select nusers(port(ffPmux, \Y)) == 2 select nusers(port(ffPmux, \Y)) == 2
@ -383,7 +390,11 @@ endmatch
match ffP match ffP
if !ffP_enable if !ffP_enable
if param(dsp, \PREG).as_int() == 0 if param(dsp, \PREG).as_int() == 0
if nusers(sigP) == 2 // If ffMmux, input net must have exactly three users: ffMmux, ffM and ffP
if !ffMmux || nusers(sigP) == 3
// Otherwise input net must have exactly two users: dsp and ffP
if ffMmux || nusers(sigP) == 2
select ffP->type.in($dff) select ffP->type.in($dff)
// DSP48E1 does not support clock inversion // DSP48E1 does not support clock inversion
select param(ffP, \CLK_POLARITY).as_bool() select param(ffP, \CLK_POLARITY).as_bool()
@ -413,6 +424,9 @@ code ffP sigP clock
sigP.replace(port(ffP, \D), port(ffP, \Q)); sigP.replace(port(ffP, \D), port(ffP, \Q));
} }
// No enable mux possible without flop
else if (ffPmux)
reject;
endcode endcode
match postAddMux match postAddMux