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

Support CEA

This commit is contained in:
Eddie Hung 2019-09-05 10:07:26 -07:00
parent 09c26c55bb
commit aa462da395
2 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
passes/pmgen/xilinx_dsp.cc
View File

@ -32,6 +32,7 @@ void pack_xilinx_dsp(dict<SigBit, Cell*> &bit_to_driver, xilinx_dsp_pm &pm)
#if 1 #if 1
log("\n"); log("\n");
log("ffA: %s\n", log_id(st.ffA, "--")); log("ffA: %s\n", log_id(st.ffA, "--"));
log("ffAmux: %s\n", log_id(st.ffAmux, "--"));
log("ffB: %s\n", log_id(st.ffB, "--")); log("ffB: %s\n", log_id(st.ffB, "--"));
log("dsp: %s\n", log_id(st.dsp, "--")); log("dsp: %s\n", log_id(st.dsp, "--"));
log("ffM: %s\n", log_id(st.ffM, "--")); log("ffM: %s\n", log_id(st.ffM, "--"));
@ -78,15 +79,19 @@ void pack_xilinx_dsp(dict<SigBit, Cell*> &bit_to_driver, xilinx_dsp_pm &pm)
if (st.ffA) { if (st.ffA) {
SigSpec A = cell->getPort("\\A"); SigSpec A = cell->getPort("\\A");
SigSpec D = st.ffA->getPort("\\D"); SigSpec D = st.ffA->getPort("\\D");
SigSpec Q = st.ffA->getPort("\\Q"); SigSpec Q = pm.sigmap(st.ffA->getPort("\\Q"));
A.replace(Q, D); A.replace(Q, D);
cell->setPort("\\A", A);
cell->setParam("\\AREG", 1); cell->setParam("\\AREG", 1);
if (st.ffA->type == "$dff") if (st.ffAmux) {
SigSpec Y = st.ffAmux->getPort("\\Y");
SigSpec AB = st.ffAmux->getPort(st.ffAmuxAB == "\\A" ? "\\B" : "\\A");
A.replace(Y, AB);
cell->setPort("\\CEA2", st.ffAmux->getPort("\\S"));
}
else
cell->setPort("\\CEA2", State::S1); cell->setPort("\\CEA2", State::S1);
//else if (st.ffA->type == "$dffe") cell->setPort("\\A", A);
// cell->setPort("\\CEA2", st.ffA->getPort("\\EN"));
else log_abort();
} }
if (st.ffB) { if (st.ffB) {
SigSpec B = cell->getPort("\\B"); SigSpec B = cell->getPort("\\B");

26
passes/pmgen/xilinx_dsp.pmg
View File

@ -1,8 +1,8 @@
pattern xilinx_dsp pattern xilinx_dsp
state <SigBit> clock state <SigBit> clock
state <SigSpec> sigA sigB sigC sigM sigP sigPused state <SigSpec> sigA sigffAmux sigB sigC sigM sigP sigPused
state <IdString> ffMmuxAB postAddAB postAddMuxAB state <IdString> ffAmuxAB ffMmuxAB postAddAB postAddMuxAB
match dsp match dsp
select dsp->type.in(\DSP48E1) select dsp->type.in(\DSP48E1)
@ -14,11 +14,17 @@ code sigA sigB
for (i = GetSize(sigA)-1; i > 0; i--) for (i = GetSize(sigA)-1; i > 0; i--)
if (sigA[i] != sigA[i-1]) if (sigA[i] != sigA[i-1])
break; break;
// Do not remove non-const sign bit
if (sigA[i].wire)
++i;
sigA.remove(i, GetSize(sigA)-i); sigA.remove(i, GetSize(sigA)-i);
sigB = port(dsp, \B); sigB = port(dsp, \B);
for (i = GetSize(sigB)-1; i > 0; i--) for (i = GetSize(sigB)-1; i > 0; i--)
if (sigB[i] != sigB[i-1]) if (sigB[i] != sigB[i-1])
break; break;
// Do not remove non-const sign bit
if (sigB[i].wire)
++i;
sigB.remove(i, GetSize(sigB)-i); sigB.remove(i, GetSize(sigB)-i);
endcode endcode
@ -43,20 +49,34 @@ match ffA
select param(ffA, \CLK_POLARITY).as_bool() select param(ffA, \CLK_POLARITY).as_bool()
filter GetSize(port(ffA, \Q)) >= GetSize(sigA) filter GetSize(port(ffA, \Q)) >= GetSize(sigA)
slice offset GetSize(port(ffA, \Q)) slice offset GetSize(port(ffA, \Q))
filter offset+GetSize(sigA) <= GetSize(port(ffA, \Q)) && nusers(port(ffA, \Q).extract(offset, GetSize(sigA))) <= 3
filter offset+GetSize(sigA) <= GetSize(port(ffA, \Q)) && port(ffA, \Q).extract(offset, GetSize(sigA)) == sigA filter offset+GetSize(sigA) <= GetSize(port(ffA, \Q)) && port(ffA, \Q).extract(offset, GetSize(sigA)) == sigA
optional optional
endmatch endmatch
code clock code sigA sigffAmux clock
if (ffA) { if (ffA) {
for (auto b : port(ffA, \Q)) for (auto b : port(ffA, \Q))
if (b.wire->get_bool_attribute(\keep)) if (b.wire->get_bool_attribute(\keep))
reject; reject;
clock = port(ffA, \CLK).as_bit(); clock = port(ffA, \CLK).as_bit();
if (nusers(sigA) == 3)
sigffAmux = sigA;
sigA.replace(port(ffA, \Q), port(ffA, \D));
} }
endcode endcode
match ffAmux
if sigffAmux != SigSpec()
select ffAmux->type.in($mux)
choice <IdString> AB {\A, \B}
index <SigSpec> port(ffAmux, \Y) === sigA
index <SigSpec> port(ffAmux, AB) === sigffAmux
set ffAmuxAB AB
endmatch
match ffB match ffB
if param(dsp, \BREG).as_int() == 0 if param(dsp, \BREG).as_int() == 0
select ffB->type.in($dff) select ffB->type.in($dff)