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

Fixes for reverting SigSpec helper functions

This commit is contained in:
Eddie Hung 2019-08-14 10:22:33 -07:00
parent 2f04beeeb5
commit aad97168b0
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
passes/pmgen/ice40_dsp.cc
View File

@ -155,9 +155,9 @@ void create_ice40_dsp(ice40_dsp_pm &pm)
// If we have a signed multiply-add, then perform sign extension // If we have a signed multiply-add, then perform sign extension
// TODO: Need to check CD[31:16] is sign extension of CD[15:0]? // TODO: Need to check CD[31:16] is sign extension of CD[15:0]?
if (st.addAB->getParam("\\A_SIGNED").as_bool() && st.addAB->getParam("\\B_SIGNED").as_bool()) if (st.addAB->getParam("\\A_SIGNED").as_bool() && st.addAB->getParam("\\B_SIGNED").as_bool())
pm.module->connect(O[-1], O[-2]); pm.module->connect(O[32], O[31]);
else else
cell->setPort("\\CO", O[-1]); cell->setPort("\\CO", O[32]);
O.remove(O_width-1); O.remove(O_width-1);
} }
else else

4
passes/pmgen/ice40_dsp.pmg
View File

@ -206,10 +206,12 @@ match ffO_lo
endmatch endmatch
code code
if (ffO_lo) {
SigSpec O = sigOused.extract(0,std::min(16,param(ffO_lo, \WIDTH).as_int())); SigSpec O = sigOused.extract(0,std::min(16,param(ffO_lo, \WIDTH).as_int()));
O.remove_const(); O.remove_const();
if (!includes(port(ffO_lo, \D).to_sigbit_set(), O.to_sigbit_set())) if (!includes(port(ffO_lo, \D).to_sigbit_set(), O.to_sigbit_set()))
reject; reject;
}
endcode endcode
match ffO_hi match ffO_hi
@ -220,10 +222,12 @@ match ffO_hi
endmatch endmatch
code code
if (ffO_hi) {
SigSpec O = sigOused.extract_end(16); SigSpec O = sigOused.extract_end(16);
O.remove_const(); O.remove_const();
if (!includes(port(ffO_hi, \D).to_sigbit_set(), O.to_sigbit_set())) if (!includes(port(ffO_hi, \D).to_sigbit_set(), O.to_sigbit_set()))
reject; reject;
}
endcode endcode
code clock clock_pol sigO sigCD code clock clock_pol sigO sigCD