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

nexus: Fix validity checking when DSPs are used

Browse Source 
Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2020-11-16 13:22:52 +00:00
parent d8e748bc58
commit 160045a058
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nexus/arch.h
View File

@ -979,7 +979,7 @@ struct Arch : BaseCtx
cell->belStrength = strength; cell->belStrength = strength;
refreshUiBel(bel); refreshUiBel(bel);
if (tile_is(bel, LOC_LOGIC)) if (bel_tile_is(bel, LOC_LOGIC))
update_logic_bel(bel, cell); update_logic_bel(bel, cell);
} }
@ -988,7 +988,7 @@ struct Arch : BaseCtx
NPNR_ASSERT(bel != BelId()); NPNR_ASSERT(bel != BelId());
NPNR_ASSERT(tileStatus[bel.tile].boundcells[bel.index] != nullptr); NPNR_ASSERT(tileStatus[bel.tile].boundcells[bel.index] != nullptr);
if (tile_is(bel, LOC_LOGIC)) if (bel_tile_is(bel, LOC_LOGIC))
update_logic_bel(bel, nullptr); update_logic_bel(bel, nullptr);
tileStatus[bel.tile].boundcells[bel.index]->bel = BelId(); tileStatus[bel.tile].boundcells[bel.index]->bel = BelId();
@ -1492,6 +1492,13 @@ struct Arch : BaseCtx
template <typename TId> bool tile_is(TId id, LocFlags lf) const { return tile_loc_flags(id) & lf; } template <typename TId> bool tile_is(TId id, LocFlags lf) const { return tile_loc_flags(id) & lf; }
bool bel_tile_is(BelId bel, LocFlags lf) const
{
int32_t tile;
NPNR_ASSERT(rel_tile(bel.tile, bel_data(bel).rel_x, bel_data(bel).rel_y, tile));
return chip_info->grid[tile].loc_flags & lf;
}
// ------------------------------------------------- // -------------------------------------------------
enum LogicBelZ enum LogicBelZ

2
nexus/arch_place.cc
View File

@ -104,7 +104,7 @@ bool Arch::isValidBelForCell(CellInfo *cell, BelId bel) const
bool Arch::isBelLocationValid(BelId bel) const bool Arch::isBelLocationValid(BelId bel) const
{ {
if (tile_is(bel, LOC_LOGIC)) { if (bel_tile_is(bel, LOC_LOGIC)) {
LogicTileStatus *lts = tileStatus[bel.tile].lts; LogicTileStatus *lts = tileStatus[bel.tile].lts;
if (lts == nullptr) if (lts == nullptr)
return true; return true;