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

Get rid of sigPused

This commit is contained in:
Eddie Hung 2019-09-04 17:06:17 -07:00
parent 93d798272d
commit 42548d9790
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
passes/pmgen/xilinx_dsp.cc
View File

@ -43,8 +43,6 @@ void pack_xilinx_dsp(dict<SigBit, Cell*> &bit_to_driver, xilinx_dsp_pm &pm)
log("postAdd: %s\n", log_id(st.postAdd, "--")); log("postAdd: %s\n", log_id(st.postAdd, "--"));
log("postAddMux: %s\n", log_id(st.postAddMux, "--")); log("postAddMux: %s\n", log_id(st.postAddMux, "--"));
log("ffP: %s\n", log_id(st.ffP, "--")); log("ffP: %s\n", log_id(st.ffP, "--"));
//log("muxP: %s\n", log_id(st.muxP, "--"));
log("sigPused: %s\n", log_signal(st.sigPused));
#endif #endif
log("Analysing %s.%s for Xilinx DSP packing.\n", log_id(pm.module), log_id(st.dsp)); log("Analysing %s.%s for Xilinx DSP packing.\n", log_id(pm.module), log_id(st.dsp));

27
passes/pmgen/xilinx_dsp.pmg
View File

@ -19,8 +19,16 @@ code sigAset sigBset
endcode endcode
code sigM code sigM
sigM = port(dsp, \P); SigSpec P = port(dsp, \P);
//if (GetSize(sigH) <= 10) // Only care about those bits that are used
int i;
for (i = 0; i < GetSize(P); i++) {
if (nusers(P[i]) <= 1)
break;
sigM.append(P[i]);
}
log_assert(nusers(P.extract_end(i)) <= 1);
//if (GetSize(sigM) <= 10)
// reject; // reject;
endcode endcode
@ -156,23 +164,14 @@ code sigC sigP
} }
endcode endcode
// Extract the bits of P that actually have a consumer
// (as opposed to being a dummy)
code sigPused
for (int i = 0; i < GetSize(sigP); i++)
if (sigP[i].wire && nusers(sigP[i]) > 1)
sigPused.append(sigP[i]);
endcode
match ffP match ffP
if param(dsp, \PREG).as_int() == 0 if param(dsp, \PREG).as_int() == 0
if !sigPused.empty()
if nusers(sigPused) == 2
select ffP->type.in($dff) select ffP->type.in($dff)
// DSP48E1 does not support clock inversion // DSP48E1 does not support clock inversion
select param(ffP, \CLK_POLARITY).as_bool() select param(ffP, \CLK_POLARITY).as_bool()
filter param(ffP, \WIDTH).as_int() >= GetSize(sigPused) filter GetSize(port(ffP, \D)) >= GetSize(sigP)
filter includes(port(ffP, \D).to_sigbit_set(), sigPused.to_sigbit_set()) slice offset GetSize(port(ffP, \D))
filter offset+GetSize(sigP) <= GetSize(port(ffP, \D)) && port(ffP, \D).extract(offset, GetSize(sigP)) == sigP
optional optional
endmatch endmatch