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

Merge pull request #606 from pepijndevos/gowin_fixes

Browse Source 
Gowin DFF fixes
This commit is contained in:
gatecat 2021-02-28 18:20:11 +00:00 committed by GitHub
commit 6ff02248a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gowin/arch.cc
View File

@ -1129,6 +1129,7 @@ void Arch::assignArchInfo()
if (ci->type == id("SLICE")) { if (ci->type == id("SLICE")) {
ci->is_slice = true; ci->is_slice = true;
ci->ff_used = ci->params.at(id_FF_USED).as_bool(); ci->ff_used = ci->params.at(id_FF_USED).as_bool();
ci->ff_type = id(ci->params.at(id_FF_TYPE).as_string());
ci->slice_clk = get_net_or_empty(ci, id("CLK")); ci->slice_clk = get_net_or_empty(ci, id("CLK"));
ci->slice_ce = get_net_or_empty(ci, id("CE")); ci->slice_ce = get_net_or_empty(ci, id("CE"));
ci->slice_lsr = get_net_or_empty(ci, id("LSR")); ci->slice_lsr = get_net_or_empty(ci, id("LSR"));
@ -1162,9 +1163,10 @@ bool Arch::cellsCompatible(const CellInfo **cells, int count) const
const NetInfo *clk[4] = {nullptr, nullptr, nullptr, nullptr}; const NetInfo *clk[4] = {nullptr, nullptr, nullptr, nullptr};
const NetInfo *ce[4] = {nullptr, nullptr, nullptr, nullptr}; const NetInfo *ce[4] = {nullptr, nullptr, nullptr, nullptr};
const NetInfo *lsr[4] = {nullptr, nullptr, nullptr, nullptr}; const NetInfo *lsr[4] = {nullptr, nullptr, nullptr, nullptr};
IdString mode[4] = {IdString(), IdString(), IdString(), IdString()};
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
const CellInfo *ci = cells[i]; const CellInfo *ci = cells[i];
if (ci->is_slice && ci->slice_clk != nullptr) { if (ci->is_slice) {
Loc loc = getBelLocation(ci->bel); Loc loc = getBelLocation(ci->bel);
int cls = loc.z / 2; int cls = loc.z / 2;
if (loc.z >= 6 && ci->ff_used) // top slice have no ff if (loc.z >= 6 && ci->ff_used) // top slice have no ff
@ -1181,6 +1183,10 @@ bool Arch::cellsCompatible(const CellInfo **cells, int count) const
lsr[cls] = ci->slice_lsr; lsr[cls] = ci->slice_lsr;
else if (lsr[cls] != ci->slice_lsr) else if (lsr[cls] != ci->slice_lsr)
return false; return false;
if (mode[cls] == IdString())
mode[cls] = ci->ff_type;
else if (mode[cls] != ci->ff_type)
return false;
} }
} }
return true; return true;

2
gowin/archdefs.h
View File

@ -57,6 +57,8 @@ struct ArchCellInfo
{ {
// Is the flip-flop of this slice used // Is the flip-flop of this slice used
bool ff_used; bool ff_used;
// The type of this flip-flop
IdString ff_type;
// Is a slice type primitive // Is a slice type primitive
bool is_slice; bool is_slice;
// Only packing rule for slice type primitives is a single clock per tile // Only packing rule for slice type primitives is a single clock per tile