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

Use feedback path for MACC

This commit is contained in:
Eddie Hung 2019-09-03 14:37:32 -07:00
parent a09e69dd56
commit 97d11708e0
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
passes/pmgen/xilinx_dsp.cc
View File

@ -51,21 +51,6 @@ void pack_xilinx_dsp(dict<SigBit, Cell*> &bit_to_driver, xilinx_dsp_pm &pm)
bit_to_driver.insert(std::make_pair(cell->getPort("\\P")[17], cell)); bit_to_driver.insert(std::make_pair(cell->getPort("\\P")[17], cell));
SigSpec P = st.sigP; SigSpec P = st.sigP;
if (st.addAB) {
log_assert(st.addAB->getParam("\\A_SIGNED").as_bool());
log_assert(st.addAB->getParam("\\B_SIGNED").as_bool());
log(" adder %s (%s)\n", log_id(st.addAB), log_id(st.addAB->type));
SigSpec C = st.sigC;
C.extend_u0(48, true);
cell->setPort("\\C", C);
SigSpec &opmode = cell->connections_.at("\\OPMODE");
opmode[6] = State::S0;
opmode[5] = State::S1;
opmode[4] = State::S1;
pm.autoremove(st.addAB);
}
if (st.clock != SigBit()) if (st.clock != SigBit())
{ {
cell->setPort("\\CLK", st.clock); cell->setPort("\\CLK", st.clock);
@ -140,6 +125,27 @@ void pack_xilinx_dsp(dict<SigBit, Cell*> &bit_to_driver, xilinx_dsp_pm &pm)
log("\n"); log("\n");
} }
if (st.addAB) {
log_assert(st.addAB->getParam("\\A_SIGNED").as_bool());
log_assert(st.addAB->getParam("\\B_SIGNED").as_bool());
log(" adder %s (%s)\n", log_id(st.addAB), log_id(st.addAB->type));
SigSpec C = st.sigC;
SigSpec &opmode = cell->connections_.at("\\OPMODE");
if (cell->getParam("\\PREG").as_bool() && C == P) {
opmode[4] = State::S0;
}
else {
C.extend_u0(48, true);
cell->setPort("\\C", C);
opmode[4] = State::S1;
}
opmode[6] = State::S0;
opmode[5] = State::S1;
pm.autoremove(st.addAB);
}
if (GetSize(P) < 48) if (GetSize(P) < 48)
P.append(pm.module->addWire(NEW_ID, 48-GetSize(P))); P.append(pm.module->addWire(NEW_ID, 48-GetSize(P)));
cell->setPort("\\P", P); cell->setPort("\\P", P);