mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-11-04 05:19:11 +00:00
Code Activity

Sensitive to CEB CEM CEP polarity

Browse source
This commit is contained in:
Eddie Hung 2019-09-05 21:38:35 -07:00
parent 53ca536d67
commit 174edbcb96
2 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

13
passes/pmgen/xilinx_dsp.cc
View file

@ -84,8 +84,8 @@ void pack_xilinx_dsp(dict<SigBit, Cell*> &bit_to_driver, xilinx_dsp_pm &pm)
if (st.ffAmux) { if (st.ffAmux) {
SigSpec Y = st.ffAmux->getPort("\\Y"); SigSpec Y = st.ffAmux->getPort("\\Y");
SigSpec AB = st.ffAmux->getPort(st.ffAenpol ? "\\A" : "\\B"); SigSpec AB = st.ffAmux->getPort(st.ffAenpol ? "\\A" : "\\B");
A.replace(Y, AB);
SigSpec S = st.ffAmux->getPort("\\S"); SigSpec S = st.ffAmux->getPort("\\S");
A.replace(Y, AB);
cell->setPort("\\CEA2", st.ffAenpol ? S : pm.module->Not(NEW_ID, S)); cell->setPort("\\CEA2", st.ffAenpol ? S : pm.module->Not(NEW_ID, S));
} }
else else
@ -101,9 +101,10 @@ void pack_xilinx_dsp(dict<SigBit, Cell*> &bit_to_driver, xilinx_dsp_pm &pm)
B.replace(Q, D); B.replace(Q, D);
if (st.ffBmux) { if (st.ffBmux) {
SigSpec Y = st.ffBmux->getPort("\\Y"); SigSpec Y = st.ffBmux->getPort("\\Y");
SigSpec AB = st.ffBmux->getPort(st.ffBmuxAB == "\\A" ? "\\B" : "\\A"); SigSpec AB = st.ffBmux->getPort(st.ffBenpol ? "\\A" : "\\B");
SigSpec S = st.ffBmux->getPort("\\S");
B.replace(Y, AB); B.replace(Y, AB);
cell->setPort("\\CEB2", st.ffBmux->getPort("\\S")); cell->setPort("\\CEB2", st.ffBenpol ? S : pm.module->Not(NEW_ID, S));
} }
else else
cell->setPort("\\CEB2", State::S1); cell->setPort("\\CEB2", State::S1);
@ -113,7 +114,8 @@ void pack_xilinx_dsp(dict<SigBit, Cell*> &bit_to_driver, xilinx_dsp_pm &pm)
} }
if (st.ffM) { if (st.ffM) {
if (st.ffMmux) { if (st.ffMmux) {
cell->setPort("\\CEM", st.ffMmux->getPort("\\S")); SigSpec S = st.ffMmux->getPort("\\S");
cell->setPort("\\CEM", st.ffMenpol ? S : pm.module->Not(NEW_ID, S));
pm.autoremove(st.ffMmux); pm.autoremove(st.ffMmux);
} }
else else
@ -127,7 +129,8 @@ void pack_xilinx_dsp(dict<SigBit, Cell*> &bit_to_driver, xilinx_dsp_pm &pm)
} }
if (st.ffP) { if (st.ffP) {
if (st.ffPmux) { if (st.ffPmux) {
cell->setPort("\\CEP", st.ffPmux->getPort("\\S")); SigSpec S = st.ffPmux->getPort("\\S");
cell->setPort("\\CEP", st.ffPenpol ? S : pm.module->Not(NEW_ID, S));
st.ffPmux->connections_.at("\\Y").replace(P, pm.module->addWire(NEW_ID, GetSize(P))); st.ffPmux->connections_.at("\\Y").replace(P, pm.module->addWire(NEW_ID, GetSize(P)));
} }
else else

35
passes/pmgen/xilinx_dsp.pmg
View file

@ -2,8 +2,8 @@ pattern xilinx_dsp
state <SigBit> clock state <SigBit> clock
state <SigSpec> sigA sigffAmux sigB sigffBmux sigC sigM sigP state <SigSpec> sigA sigffAmux sigB sigffBmux sigC sigM sigP
state <IdString> ffBmuxAB ffMmuxAB ffPmuxAB postAddAB postAddMuxAB state <IdString> postAddAB postAddMuxAB
state <bool> ffAenpol state <bool> ffAenpol ffBenpol ffMenpol ffPenpol
match dsp match dsp
select dsp->type.in(\DSP48E1) select dsp->type.in(\DSP48E1)
@ -112,9 +112,10 @@ match ffBmux
filter GetSize(port(ffBmux, \Y)) >= GetSize(sigB) filter GetSize(port(ffBmux, \Y)) >= GetSize(sigB)
slice offset GetSize(port(ffBmux, \Y)) slice offset GetSize(port(ffBmux, \Y))
filter offset+GetSize(sigB) <= GetSize(port(ffBmux, \Y)) && port(ffBmux, \Y).extract(offset, GetSize(sigB)) == sigB filter offset+GetSize(sigB) <= GetSize(port(ffBmux, \Y)) && port(ffBmux, \Y).extract(offset, GetSize(sigB)) == sigB
choice <IdString> AB {\A, \B} choice <IdString> BA {\B, \A}
filter offset+GetSize(sigffBmux) <= GetSize(port(ffBmux, \Y)) && port(ffBmux, AB).extract(offset, GetSize(sigffBmux)) == sigffBmux filter offset+GetSize(sigffBmux) <= GetSize(port(ffBmux, \Y)) && port(ffBmux, BA).extract(offset, GetSize(sigffBmux)) == sigffBmux
set ffBmuxAB AB define <bool> pol (BA == \B)
set ffBenpol pol
semioptional semioptional
endmatch endmatch
@ -122,10 +123,11 @@ match ffMmux
select ffMmux->type.in($mux) select ffMmux->type.in($mux)
select nusers(port(ffMmux, \Y)) == 2 select nusers(port(ffMmux, \Y)) == 2
filter GetSize(port(ffMmux, \Y)) <= GetSize(sigM) filter GetSize(port(ffMmux, \Y)) <= GetSize(sigM)
choice <IdString> AB {\A, \B} choice <IdString> BA {\B, \A}
filter port(ffMmux, AB) == sigM.extract(0, GetSize(port(ffMmux, \Y))) filter port(ffMmux, BA) == sigM.extract(0, GetSize(port(ffMmux, \Y)))
filter nusers(sigM.extract_end(GetSize(port(ffMmux, AB)))) <= 1 filter nusers(sigM.extract_end(GetSize(port(ffMmux, BA)))) <= 1
set ffMmuxAB AB define <bool> pol (BA == \B)
set ffMenpol pol
optional optional
endmatch endmatch
@ -144,7 +146,7 @@ match ffM
filter port(ffM, \D) == sigM.extract(0, GetSize(port(ffM, \D))) filter port(ffM, \D) == sigM.extract(0, GetSize(port(ffM, \D)))
filter nusers(sigM.extract_end(GetSize(port(ffM, \D)))) <= 1 filter nusers(sigM.extract_end(GetSize(port(ffM, \D)))) <= 1
// Check ffMmux (when present) is a $dff enable mux // Check ffMmux (when present) is a $dff enable mux
filter !ffMmux || port(ffM, \Q) == port(ffMmux, ffMmuxAB == \A ? \B : \A) filter !ffMmux || port(ffM, \Q) == port(ffMmux, ffMenpol ? \A : \B)
optional optional
endmatch endmatch
@ -208,16 +210,17 @@ match ffPmux
select ffPmux->type.in($mux) select ffPmux->type.in($mux)
select nusers(port(ffPmux, \Y)) == 2 select nusers(port(ffPmux, \Y)) == 2
filter GetSize(port(ffPmux, \Y)) <= GetSize(sigP) filter GetSize(port(ffPmux, \Y)) <= GetSize(sigP)
choice <IdString> AB {\A, \B} choice <IdString> BA {\B, \A}
filter port(ffPmux, AB) == sigP.extract(0, GetSize(port(ffPmux, \Y))) filter port(ffPmux, BA) == sigP.extract(0, GetSize(port(ffPmux, \Y)))
filter nusers(sigP.extract_end(GetSize(port(ffPmux, AB)))) <= 1 filter nusers(sigP.extract_end(GetSize(port(ffPmux, BA)))) <= 1
set ffPmuxAB AB define <bool> pol (BA == \B)
set ffPenpol pol
optional optional
endmatch endmatch
code sigP code sigP
if (ffPmux) if (ffPmux)
sigP.replace(port(ffPmux, ffPmuxAB), port(ffPmux, \Y)); sigP.replace(port(ffPmux, ffPenpol ? \A : \B), port(ffPmux, \Y));
endcode endcode
match ffP match ffP
@ -229,7 +232,7 @@ match ffP
slice offset GetSize(port(ffP, \D)) slice offset GetSize(port(ffP, \D))
filter offset+GetSize(sigP) <= GetSize(port(ffP, \D)) && port(ffP, \D).extract(offset, GetSize(sigP)) == sigP filter offset+GetSize(sigP) <= GetSize(port(ffP, \D)) && port(ffP, \D).extract(offset, GetSize(sigP)) == sigP
// Check ffPmux (when present) is a $dff enable mux // Check ffPmux (when present) is a $dff enable mux
filter !ffPmux || port(ffP, \Q) == port(ffPmux, ffPmuxAB == \A ? \B : \A) filter !ffPmux || port(ffP, \Q) == port(ffPmux, ffPenpol ? \A : \B)
optional optional
endmatch endmatch