mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-13 04:28:18 +00:00
Code Activity

Fix enable polarity

Browse source
This commit is contained in:
Eddie Hung 2019-09-06 14:36:10 -07:00
parent 2c32056990
commit 8246062acf
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
passes/pmgen/xilinx_dsp.cc
View file

@ -112,7 +112,7 @@ void pack_xilinx_dsp(dict<SigBit, Cell*> &bit_to_driver, xilinx_dsp_pm &pm)
A.replace(Q, D); A.replace(Q, D);
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 ? "\\B" : "\\A");
SigSpec S = st.ffAmux->getPort("\\S"); SigSpec S = st.ffAmux->getPort("\\S");
A.replace(Y, AB); 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));
@ -130,7 +130,7 @@ 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.ffBenpol ? "\\A" : "\\B"); SigSpec AB = st.ffBmux->getPort(st.ffBenpol ? "\\B" : "\\A");
SigSpec S = st.ffBmux->getPort("\\S"); SigSpec S = st.ffBmux->getPort("\\S");
B.replace(Y, AB); B.replace(Y, AB);
cell->setPort("\\CEB2", st.ffBenpol ? S : pm.module->Not(NEW_ID, S)); cell->setPort("\\CEB2", st.ffBenpol ? S : pm.module->Not(NEW_ID, S));

24
passes/pmgen/xilinx_dsp.pmg
View file

@ -85,10 +85,10 @@ match ffADmux
slice offset GetSize(port(ffADmux, \Y)) slice offset GetSize(port(ffADmux, \Y))
filter offset+GetSize(sigA) <= GetSize(port(ffADmux, \Y)) filter offset+GetSize(sigA) <= GetSize(port(ffADmux, \Y))
filter port(ffADmux, \Y).extract(offset, GetSize(sigA)) == sigA filter port(ffADmux, \Y).extract(offset, GetSize(sigA)) == sigA
choice <IdString> BA {\B, \A} choice <IdString> AB {\A, \B}
filter offset+GetSize(sigffAmuxY) <= GetSize(port(ffADmux, \Y)) filter offset+GetSize(sigffAmuxY) <= GetSize(port(ffADmux, \Y))
filter port(ffADmux, BA).extract(offset, GetSize(sigffAmuxY)) == sigffAmuxY filter port(ffADmux, AB).extract(offset, GetSize(sigffAmuxY)) == sigffAmuxY
define <bool> pol (BA == \B) define <bool> pol (AB == \A)
set ffADenpol pol set ffADenpol pol
optional optional
endmatch endmatch
@ -166,10 +166,10 @@ match ffAmux
slice offset GetSize(port(ffAmux, \Y)) slice offset GetSize(port(ffAmux, \Y))
filter offset+GetSize(sigA) <= GetSize(port(ffAmux, \Y)) filter offset+GetSize(sigA) <= GetSize(port(ffAmux, \Y))
filter port(ffAmux, \Y).extract(offset, GetSize(sigA)) == sigA filter port(ffAmux, \Y).extract(offset, GetSize(sigA)) == sigA
choice <IdString> BA {\B, \A} choice <IdString> AB {\A, \B}
filter offset+GetSize(sigffAmuxY) <= GetSize(port(ffAmux, \Y)) filter offset+GetSize(sigffAmuxY) <= GetSize(port(ffAmux, \Y))
filter port(ffAmux, BA).extract(offset, GetSize(sigffAmuxY)) == sigffAmuxY filter port(ffAmux, AB).extract(offset, GetSize(sigffAmuxY)) == sigffAmuxY
define <bool> pol (BA == \B) define <bool> pol (AB == \A)
set ffAenpol pol set ffAenpol pol
optional optional
endmatch endmatch
@ -228,10 +228,10 @@ match ffBmux
slice offset GetSize(port(ffBmux, \Y)) slice offset GetSize(port(ffBmux, \Y))
filter offset+GetSize(sigB) <= GetSize(port(ffBmux, \Y)) filter offset+GetSize(sigB) <= GetSize(port(ffBmux, \Y))
filter port(ffBmux, \Y).extract(offset, GetSize(sigB)) == sigB filter port(ffBmux, \Y).extract(offset, GetSize(sigB)) == sigB
choice <IdString> BA {\B, \A} choice <IdString> AB {\A, \B}
filter offset+GetSize(sigffBmuxY) <= GetSize(port(ffBmux, \Y)) filter offset+GetSize(sigffBmuxY) <= GetSize(port(ffBmux, \Y))
filter port(ffBmux, BA).extract(offset, GetSize(sigffBmuxY)) == sigffBmuxY filter port(ffBmux, AB).extract(offset, GetSize(sigffBmuxY)) == sigffBmuxY
define <bool> pol (BA == \B) define <bool> pol (AB == \A)
set ffBenpol pol set ffBenpol pol
optional optional
endmatch endmatch
@ -252,7 +252,7 @@ match ffMmux
filter port(ffMmux, BA) == sigM.extract(0, GetSize(port(ffMmux, \Y))) filter port(ffMmux, BA) == sigM.extract(0, GetSize(port(ffMmux, \Y)))
// Remaining bits on sigM must not have any other users // Remaining bits on sigM must not have any other users
filter nusers(sigM.extract_end(GetSize(port(ffMmux, BA)))) <= 1 filter nusers(sigM.extract_end(GetSize(port(ffMmux, BA)))) <= 1
define <bool> pol (BA == \B) define <bool> pol (AB == \A)
set ffMenpol pol set ffMenpol pol
optional optional
endmatch endmatch
@ -348,15 +348,15 @@ match ffPmux
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> BA {\B, \A}
slice offset GetSize(port(ffPmux, \Y)) slice offset GetSize(port(ffPmux, \Y))
filter offset+GetSize(sigP) <= GetSize(port(ffPmux, \Y)) filter offset+GetSize(sigP) <= GetSize(port(ffPmux, \Y))
choice <IdString> BA {\B, \A}
filter port(ffPmux, BA).extract(offset, GetSize(sigP)) == sigP filter port(ffPmux, BA).extract(offset, GetSize(sigP)) == sigP
define <IdString> AB (BA == \B ? \A : \B) define <IdString> AB (BA == \B ? \A : \B)
// keep-last-value net must have at least three users: ffPmux, ffP, downstream sink(s) // keep-last-value net must have at least three users: ffPmux, ffP, downstream sink(s)
filter nusers(port(ffPmux, AB)) >= 3 filter nusers(port(ffPmux, AB)) >= 3
define <bool> pol (BA == \B) define <bool> pol (AB == \A)
set ffPenpol pol set ffPenpol pol
set ffPoffset offset set ffPoffset offset
optional optional