diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-09-06 14:57:36 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-09-06 14:57:36 -0700 |
| commit | 0d1d8b4d24d3cce071e7c7e3c6284ba2cb874bd0 (patch) | |
| tree | 2ddd1346cadc89f128b1168352bd063d3918ef62 | |
| parent | 8246062acfd3b294c59ce72a9dcc6513dc0d08bd (diff) | |
| download | yosys-0d1d8b4d24d3cce071e7c7e3c6284ba2cb874bd0.tar.gz yosys-0d1d8b4d24d3cce071e7c7e3c6284ba2cb874bd0.tar.bz2 yosys-0d1d8b4d24d3cce071e7c7e3c6284ba2cb874bd0.zip | |
Fix macc and mul tests
| -rw-r--r-- | passes/pmgen/xilinx_dsp.pmg | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/passes/pmgen/xilinx_dsp.pmg b/passes/pmgen/xilinx_dsp.pmg index f8bd26e8b..d91072868 100644 --- a/passes/pmgen/xilinx_dsp.pmg +++ b/passes/pmgen/xilinx_dsp.pmg @@ -300,6 +300,10 @@ code ffM clock sigM sigP reject; clock = c; } + // No enable mux possible without flop + else if (ffMmux) + reject; + sigP = sigM; endcode @@ -341,8 +345,11 @@ endcode match ffPmux if param(dsp, \PREG).as_int() == 0 - // new-value net must have exactly two users: dsp and ffP - if nusers(sigP) == 2 + // If ffMmux, new-value net must have exactly three users: ffMmux, ffM and ffPmux + 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) // ffPmux output must have two users: ffPmux and ffP.D select nusers(port(ffPmux, \Y)) == 2 @@ -383,7 +390,11 @@ endmatch match ffP if !ffP_enable 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) // DSP48E1 does not support clock inversion select param(ffP, \CLK_POLARITY).as_bool() @@ -413,6 +424,9 @@ code ffP sigP clock sigP.replace(port(ffP, \D), port(ffP, \Q)); } + // No enable mux possible without flop + else if (ffPmux) + reject; endcode match postAddMux |