aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--passes/pmgen/xilinx_dsp.cc22
-rw-r--r--passes/pmgen/xilinx_dsp.pmg94
2 files changed, 59 insertions, 57 deletions
diff --git a/passes/pmgen/xilinx_dsp.cc b/passes/pmgen/xilinx_dsp.cc
index 3e4d596ca..a5fa67083 100644
--- a/passes/pmgen/xilinx_dsp.cc
+++ b/passes/pmgen/xilinx_dsp.cc
@@ -297,7 +297,7 @@ void pack_xilinx_dsp(dict<SigBit, Cell*> &bit_to_driver, xilinx_dsp_pm &pm)
if (st.ffAD) {
if (st.ffADmux) {
SigSpec S = st.ffADmux->getPort("\\S");
- cell->setPort("\\CEAD", st.ffADenpol ? S : pm.module->Not(NEW_ID, S));
+ cell->setPort("\\CEAD", st.ffADcepol ? S : pm.module->Not(NEW_ID, S));
}
else
cell->setPort("\\CEAD", State::S1);
@@ -346,10 +346,10 @@ void pack_xilinx_dsp(dict<SigBit, Cell*> &bit_to_driver, xilinx_dsp_pm &pm)
A.replace(Q, D);
if (st.ffAmux) {
SigSpec Y = st.ffAmux->getPort("\\Y");
- SigSpec AB = st.ffAmux->getPort(st.ffAenpol ? "\\B" : "\\A");
+ SigSpec AB = st.ffAmux->getPort(st.ffAcepol ? "\\B" : "\\A");
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.ffAcepol ? S : pm.module->Not(NEW_ID, S));
}
else
cell->setPort("\\CEA2", State::S1);
@@ -364,10 +364,10 @@ void pack_xilinx_dsp(dict<SigBit, Cell*> &bit_to_driver, xilinx_dsp_pm &pm)
B.replace(Q, D);
if (st.ffBmux) {
SigSpec Y = st.ffBmux->getPort("\\Y");
- SigSpec AB = st.ffBmux->getPort(st.ffBenpol ? "\\B" : "\\A");
+ SigSpec AB = st.ffBmux->getPort(st.ffBcepol ? "\\B" : "\\A");
SigSpec S = st.ffBmux->getPort("\\S");
B.replace(Y, AB);
- cell->setPort("\\CEB2", st.ffBenpol ? S : pm.module->Not(NEW_ID, S));
+ cell->setPort("\\CEB2", st.ffBcepol ? S : pm.module->Not(NEW_ID, S));
}
else
cell->setPort("\\CEB2", State::S1);
@@ -383,11 +383,11 @@ void pack_xilinx_dsp(dict<SigBit, Cell*> &bit_to_driver, xilinx_dsp_pm &pm)
if (st.ffCmux) {
SigSpec Y = st.ffCmux->getPort("\\Y");
- SigSpec AB = st.ffCmux->getPort(st.ffCenpol ? "\\B" : "\\A");
+ SigSpec AB = st.ffCmux->getPort(st.ffCcepol ? "\\B" : "\\A");
SigSpec S = st.ffCmux->getPort("\\S");
C.replace(Y, AB);
- cell->setPort("\\CEC", st.ffCenpol ? S : pm.module->Not(NEW_ID, S));
+ cell->setPort("\\CEC", st.ffCcepol ? S : pm.module->Not(NEW_ID, S));
}
else
cell->setPort("\\CEC", State::S1);
@@ -403,11 +403,11 @@ void pack_xilinx_dsp(dict<SigBit, Cell*> &bit_to_driver, xilinx_dsp_pm &pm)
if (st.ffDmux) {
SigSpec Y = st.ffDmux->getPort("\\Y");
- SigSpec AB = st.ffDmux->getPort(st.ffDenpol ? "\\B" : "\\A");
+ SigSpec AB = st.ffDmux->getPort(st.ffDcepol ? "\\B" : "\\A");
SigSpec S = st.ffDmux->getPort("\\S");
D_.replace(Y, AB);
- cell->setPort("\\CED", st.ffDenpol ? S : pm.module->Not(NEW_ID, S));
+ cell->setPort("\\CED", st.ffDcepol ? S : pm.module->Not(NEW_ID, S));
}
else
cell->setPort("\\CED", State::S1);
@@ -418,7 +418,7 @@ void pack_xilinx_dsp(dict<SigBit, Cell*> &bit_to_driver, xilinx_dsp_pm &pm)
if (st.ffM) {
if (st.ffMmux) {
SigSpec S = st.ffMmux->getPort("\\S");
- cell->setPort("\\CEM", st.ffMenpol ? S : pm.module->Not(NEW_ID, S));
+ cell->setPort("\\CEM", st.ffMcepol ? S : pm.module->Not(NEW_ID, S));
pm.autoremove(st.ffMmux);
}
else
@@ -433,7 +433,7 @@ void pack_xilinx_dsp(dict<SigBit, Cell*> &bit_to_driver, xilinx_dsp_pm &pm)
if (st.ffP) {
if (st.ffPmux) {
SigSpec S = st.ffPmux->getPort("\\S");
- cell->setPort("\\CEP", st.ffPenpol ? S : pm.module->Not(NEW_ID, S));
+ cell->setPort("\\CEP", st.ffPcepol ? S : pm.module->Not(NEW_ID, S));
st.ffPmux->connections_.at("\\Y").replace(P, pm.module->addWire(NEW_ID, GetSize(P)));
}
else
diff --git a/passes/pmgen/xilinx_dsp.pmg b/passes/pmgen/xilinx_dsp.pmg
index 9d6236d07..ee9ea1312 100644
--- a/passes/pmgen/xilinx_dsp.pmg
+++ b/passes/pmgen/xilinx_dsp.pmg
@@ -4,18 +4,19 @@ state <std::function<SigSpec(const SigSpec&)>> unextend
state <SigBit> clock
state <SigSpec> sigA sigffAmuxY sigB sigffBmuxY sigC sigffCmuxY sigD sigffDmuxY sigM sigP
state <IdString> postAddAB postAddMuxAB
-state <bool> ffAenpol ffADenpol ffBenpol ffCenpol ffDenpol ffMenpol ffPenpol
+state <bool> ffAcepol ffADcepol ffBcepol ffCcepol ffDcepol ffMcepol ffPcepol
state <int> ffPoffset
state <Cell*> ffAD ffADmux ffA ffAmux ffB ffBmux ffC ffCmux ffD ffDmux ffM ffMmux ffP ffPmux
// subpattern
state <SigSpec> argQ argD
-state <bool> ffenpol
+state <bool> ffcepol
+state <Cell*> ffmux
udata <SigSpec> dffD dffQ
udata <SigBit> dffclock
udata <Cell*> dff dffcemux
-udata <bool> dffenpol
+udata <bool> dffcepol
match dsp
select dsp->type.in(\DSP48E1)
@@ -53,7 +54,7 @@ code unextend sigA sigB sigC sigD sigM
sigM = P;
endcode
-code argQ ffAD ffADmux ffADenpol sigA clock
+code argQ ffAD ffADmux ffADcepol sigA clock
if (param(dsp, \ADREG).as_int() == 0) {
argQ = sigA;
subpattern(in_dffe);
@@ -62,7 +63,7 @@ code argQ ffAD ffADmux ffADenpol sigA clock
clock = dffclock;
if (dffcemux) {
ffADmux = dffcemux;
- ffADenpol = dffenpol;
+ ffADcepol = dffcepol;
}
sigA = dffD;
}
@@ -99,7 +100,7 @@ code sigA sigD
}
endcode
-code argQ ffA ffAmux ffAenpol sigA clock ffAD ffADmux ffADenpol
+code argQ ffA ffAmux ffAcepol sigA clock ffAD ffADmux ffADcepol
// Only search for ffA if there was a pre-adder
// (otherwise ffA would have been matched as ffAD)
if (preAdd) {
@@ -111,7 +112,7 @@ code argQ ffA ffAmux ffAenpol sigA clock ffAD ffADmux ffADenpol
clock = dffclock;
if (dffcemux) {
ffAmux = dffcemux;
- ffAenpol = dffenpol;
+ ffAcepol = dffcepol;
}
sigA = dffD;
}
@@ -123,11 +124,11 @@ code argQ ffA ffAmux ffAenpol sigA clock ffAD ffADmux ffADenpol
log_assert(!ffA && !ffAmux);
std::swap(ffA, ffAD);
std::swap(ffAmux, ffADmux);
- ffAenpol = ffADenpol;
+ ffAcepol = ffADcepol;
}
endcode
-code argQ ffB ffBmux ffBenpol sigB clock
+code argQ ffB ffBmux ffBcepol sigB clock
if (param(dsp, \BREG).as_int() == 0) {
argQ = sigB;
subpattern(in_dffe);
@@ -136,14 +137,14 @@ code argQ ffB ffBmux ffBenpol sigB clock
clock = dffclock;
if (dffcemux) {
ffBmux = dffcemux;
- ffBenpol = dffenpol;
+ ffBcepol = dffcepol;
}
sigB = dffD;
}
}
endcode
-code argQ ffD ffDmux ffDenpol sigD clock
+code argQ ffD ffDmux ffDcepol sigD clock
if (param(dsp, \DREG).as_int() == 0) {
argQ = sigD;
subpattern(in_dffe);
@@ -152,14 +153,14 @@ code argQ ffD ffDmux ffDenpol sigD clock
clock = dffclock;
if (dffcemux) {
ffDmux = dffcemux;
- ffDenpol = dffenpol;
+ ffDcepol = dffcepol;
}
sigD = dffD;
}
}
endcode
-code argD ffM ffMmux ffMenpol sigM sigP clock
+code argD ffM ffMmux ffMcepol sigM sigP clock
if (param(dsp, \MREG).as_int() == 0 && nusers(sigM) == 2) {
argD = sigM;
subpattern(out_dffe);
@@ -168,7 +169,7 @@ code argD ffM ffMmux ffMenpol sigM sigP clock
clock = dffclock;
if (dffcemux) {
ffMmux = dffcemux;
- ffMenpol = dffenpol;
+ ffMcepol = dffcepol;
}
sigM = dffQ;
}
@@ -212,7 +213,7 @@ code sigC sigP
}
endcode
-code argD ffP ffPmux ffPenpol sigP clock
+code argD ffP ffPmux ffPcepol sigP clock
if (param(dsp, \PREG).as_int() == 0) {
// If ffMmux and no postAdd new-value net must have exactly three users: ffMmux, ffM and ffPmux
if ((ffMmux && !postAdd && nusers(sigP) == 3) ||
@@ -225,7 +226,7 @@ code argD ffP ffPmux ffPenpol sigP clock
clock = dffclock;
if (dffcemux) {
ffPmux = dffcemux;
- ffPenpol = dffenpol;
+ ffPcepol = dffcepol;
}
sigP = dffQ;
}
@@ -250,7 +251,7 @@ code sigC
sigC = port(postAddMux, postAddMuxAB == \A ? \B : \A);
endcode
-code argQ ffC ffCmux ffCenpol sigC clock
+code argQ ffC ffCmux ffCcepol sigC clock
if (param(dsp, \CREG).as_int() == 0) {
argQ = sigC;
subpattern(in_dffe);
@@ -259,7 +260,7 @@ code argQ ffC ffCmux ffCenpol sigC clock
clock = dffclock;
if (dffcemux) {
ffCmux = dffcemux;
- ffCenpol = dffenpol;
+ ffCcepol = dffcepol;
}
sigC = dffD;
}
@@ -273,7 +274,7 @@ endcode
// #######################
subpattern in_dffe
-arg argQ clock ffenpol
+arg argQ clock ffcepol
match ff
select ff->type.in($dff)
@@ -325,15 +326,15 @@ match ffcemux
filter offset+GetSize(argQ) <= GetSize(port(ffcemux, \Y))
filter port(ffcemux, AB).extract(offset, GetSize(argQ)) == argQ
define <bool> pol (AB == \A)
- set ffenpol pol
+ set ffcepol pol
semioptional
endmatch
code
if (ffcemux) {
dffcemux = ffcemux;
- dffenpol = ffenpol;
- dffD = port(ffcemux, dffenpol ? \B : \A);
+ dffcepol = ffcepol;
+ dffD = port(ffcemux, dffcepol ? \B : \A);
}
else
dffcemux = nullptr;
@@ -342,42 +343,43 @@ endcode
// #######################
subpattern out_dffe
-arg argD clock ffenpol
-arg unextend
+arg argD clock ffcepol
+arg unextend ffmux
-match ffmux
- select ffmux->type.in($mux)
- // ffmux output must have two users: ffmux and ff.D
- select nusers(port(ffmux, \Y)) == 2
- filter GetSize(port(ffmux, \Y)) >= GetSize(argD)
+match ffcemux
+ select ffcemux->type.in($mux)
+ // ffcemux output must have two users: ffcemux and ff.D
+ select nusers(port(ffcemux, \Y)) == 2
+ filter GetSize(port(ffcemux, \Y)) >= GetSize(argD)
choice <IdString> BA {\B, \A}
- // new-value net must have exactly two users: (upstream) and ffmux
- select nusers(port(ffmux, BA)) == 2
+ // new-value net must have exactly two users: (upstream) and ffcemux
+ select nusers(port(ffcemux, BA)) == 2
- slice offset GetSize(port(ffmux, \Y))
- filter offset+GetSize(argD) <= GetSize(port(ffmux, \Y))
- filter port(ffmux, BA).extract(offset, GetSize(argD)) == argD
+ slice offset GetSize(port(ffcemux, \Y))
+ filter offset+GetSize(argD) <= GetSize(port(ffcemux, \Y))
+ filter port(ffcemux, BA).extract(offset, GetSize(argD)) == argD
define <IdString> AB (BA == \B ? \A : \B)
- // keep-last-value net must have at least three users: ffmux, ff, downstream sink(s)
- select nusers(port(ffmux, AB)) >= 3
+ // keep-last-value net must have at least three users: ffcemux, ff, downstream sink(s)
+ select nusers(port(ffcemux, AB)) >= 3
- filter GetSize(unextend(port(ffmux, BA))) <= GetSize(argD)
- filter unextend(port(ffmux, BA)) == argD.extract(0, GetSize(unextend(port(ffmux, BA))))
+ filter GetSize(unextend(port(ffcemux, BA))) <= GetSize(argD)
+ filter unextend(port(ffcemux, BA)) == argD.extract(0, GetSize(unextend(port(ffcemux, BA))))
// Remaining bits on argD must not have any other users
- filter nusers(argD.extract_end(GetSize(unextend(port(ffmux, BA))))) <= 1
+ filter nusers(argD.extract_end(GetSize(unextend(port(ffcemux, BA))))) <= 1
define <bool> pol (AB == \A)
- set ffenpol pol
+ set ffcepol pol
semioptional
endmatch
-code argD
- if (ffmux) {
- dffcemux = ffmux;
- dffenpol = ffenpol;
- argD = port(ffmux, \Y);
+code argD ffmux
+ if (ffcemux) {
+ dffcemux = ffcemux;
+ dffcepol = ffcepol;
+ argD = port(ffcemux, \Y);
+ ffmux = ffcemux;
}
else
dffcemux = nullptr;
@@ -389,7 +391,7 @@ match ff_enable
// DSP48E1 does not support clock inversion
select param(ff_enable, \CLK_POLARITY).as_bool()
index <SigSpec> port(ff_enable, \D) === argD
- index <SigSpec> port(ff_enable, \Q) === port(ffmux, ffenpol ? \A : \B)
+ index <SigSpec> port(ff_enable, \Q) === port(ffmux, ffcepol ? \A : \B)
endmatch
match ff
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-04 13:15:26 +0000