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

Do not always zero out C (e.g. during cascade breaks)

This commit is contained in:
Eddie Hung 2019-09-26 13:59:05 -07:00
parent 95f0dd57df
commit 5b9deef10d
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
passes/pmgen/xilinx_dsp.cc
View File

@ -24,8 +24,6 @@
USING_YOSYS_NAMESPACE USING_YOSYS_NAMESPACE
PRIVATE_NAMESPACE_BEGIN PRIVATE_NAMESPACE_BEGIN
bool did_something;
#include "passes/pmgen/xilinx_dsp_pm.h" #include "passes/pmgen/xilinx_dsp_pm.h"
#include "passes/pmgen/xilinx_dsp_CREG_pm.h" #include "passes/pmgen/xilinx_dsp_CREG_pm.h"
#include "passes/pmgen/xilinx_dsp_cascade_pm.h" #include "passes/pmgen/xilinx_dsp_cascade_pm.h"

8
passes/pmgen/xilinx_dsp_cascade.pmg
View File

@ -40,11 +40,10 @@ finally
for (int i = 1; i < GetSize(longest_chain); i++) { for (int i = 1; i < GetSize(longest_chain); i++) {
std::tie(dsp_pcin,P,AREG,BREG) = longest_chain[i]; std::tie(dsp_pcin,P,AREG,BREG) = longest_chain[i];
dsp_pcin->setPort(ID(C), Const(0, 48));
if (i % MAX_DSP_CASCADE > 0) { if (i % MAX_DSP_CASCADE > 0) {
if (P >= 0) { if (P >= 0) {
Wire *cascade = module->addWire(NEW_ID, 48); Wire *cascade = module->addWire(NEW_ID, 48);
dsp_pcin->setPort(ID(C), Const(0, 48));
dsp_pcin->setPort(ID(PCIN), cascade); dsp_pcin->setPort(ID(PCIN), cascade);
dsp->setPort(ID(PCOUT), cascade); dsp->setPort(ID(PCOUT), cascade);
add_siguser(cascade, dsp_pcin); add_siguser(cascade, dsp_pcin);
@ -65,9 +64,9 @@ finally
} }
if (AREG >= 0) { if (AREG >= 0) {
Wire *cascade = module->addWire(NEW_ID, 30); Wire *cascade = module->addWire(NEW_ID, 30);
dsp_pcin->setPort(ID(A), Const(0, 30));
dsp_pcin->setPort(ID(ACIN), cascade); dsp_pcin->setPort(ID(ACIN), cascade);
dsp->setPort(ID(ACOUT), cascade); dsp->setPort(ID(ACOUT), cascade);
dsp_pcin->setPort(ID(A), Const(0, 30));
add_siguser(cascade, dsp_pcin); add_siguser(cascade, dsp_pcin);
add_siguser(cascade, dsp); add_siguser(cascade, dsp);
@ -78,9 +77,9 @@ finally
} }
if (BREG >= 0) { if (BREG >= 0) {
Wire *cascade = module->addWire(NEW_ID, 18); Wire *cascade = module->addWire(NEW_ID, 18);
dsp_pcin->setPort(ID(B), Const(0, 18));
dsp_pcin->setPort(ID(BCIN), cascade); dsp_pcin->setPort(ID(BCIN), cascade);
dsp->setPort(ID(BCOUT), cascade); dsp->setPort(ID(BCOUT), cascade);
dsp_pcin->setPort(ID(B), Const(0, 18));
add_siguser(cascade, dsp_pcin); add_siguser(cascade, dsp_pcin);
add_siguser(cascade, dsp); add_siguser(cascade, dsp);
@ -97,7 +96,6 @@ finally
dsp = dsp_pcin; dsp = dsp_pcin;
} }
did_something = true;
accept; accept;
} }
endcode endcode