caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Ahead of LUT input swapping, assign LUT<6 from A6 downwards"

Browse Source 
This reverts commit ec96897c1d.
This commit is contained in:
Eddie Hung 2018-11-29 16:54:33 -08:00
parent c5165f7830
commit 0327fa554a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xc7/cells.cc
View File

@ -259,17 +259,17 @@ std::unique_ptr<CellInfo> create_xc7_cell(Context *ctx, IdString type, std::stri
void lut_to_lc(const Context *ctx, CellInfo *lut, CellInfo *lc, bool no_dff)
{
lc->params[ctx->id("INIT")] = lut->params[ctx->id("INIT")];
replace_port(lut, ctx->id("I0"), lc, id_I6);
replace_port(lut, ctx->id("I0"), lc, id_I1);
if (get_net_or_empty(lut, id_I1))
replace_port(lut, id_I1, lc, id_I5);
replace_port(lut, id_I1, lc, id_I2);
if (get_net_or_empty(lut, id_I2))
replace_port(lut, id_I2, lc, id_I4);
replace_port(lut, id_I2, lc, id_I3);
if (get_net_or_empty(lut, id_I3))
replace_port(lut, id_I3, lc, id_I3);
replace_port(lut, id_I3, lc, id_I4);
if (get_net_or_empty(lut, id_I4))
replace_port(lut, id_I4, lc, id_I2);
replace_port(lut, id_I4, lc, id_I5);
if (get_net_or_empty(lut, id_I5))
replace_port(lut, id_I5, lc, id_I1);
replace_port(lut, id_I5, lc, id_I6);
if (no_dff) {
replace_port(lut, id_O, lc, id_O);
lc->params[ctx->id("DFF_ENABLE")] = "0";