diff options
| author | Sergiusz Bazanski <q3k@q3k.org> | 2018-07-24 15:54:03 +0100 |
|---|---|---|
| committer | Sergiusz Bazanski <q3k@q3k.org> | 2018-07-24 15:54:03 +0100 |
| commit | b31e95f82caf53a98827134a9f1719822d9dea52 (patch) | |
| tree | 86434ce0e46e18d1621bc43fe382c70b847b1896 /ice40/arch_place.cc | |
| parent | 90ba958abe85ced03f16888644dd026b133cab36 (diff) | |
| parent | c57463e87b4976f63f04eff133c554af7e8d59d3 (diff) | |
| download | nextpnr-b31e95f82caf53a98827134a9f1719822d9dea52.tar.gz nextpnr-b31e95f82caf53a98827134a9f1719822d9dea52.tar.bz2 nextpnr-b31e95f82caf53a98827134a9f1719822d9dea52.zip | |
Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr into q3k/pll
Diffstat (limited to 'ice40/arch_place.cc')
| -rw-r--r-- | ice40/arch_place.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ice40/arch_place.cc b/ice40/arch_place.cc index 16cc757e..59e1807d 100644 --- a/ice40/arch_place.cc +++ b/ice40/arch_place.cc @@ -72,7 +72,8 @@ bool Arch::isBelLocationValid(BelId bel) const { if (getBelType(bel) == TYPE_ICESTORM_LC) { std::vector<const CellInfo *> bel_cells; - for (auto bel_other : getBelsAtSameTile(bel)) { + Loc bel_loc = getBelLocation(bel); + for (auto bel_other : getBelsByTile(bel_loc.x, bel_loc.y)) { IdString cell_other = getBoundBelCell(bel_other); if (cell_other != IdString()) { const CellInfo *ci_other = cells.at(cell_other).get(); @@ -95,8 +96,8 @@ bool Arch::isValidBelForCell(CellInfo *cell, BelId bel) const NPNR_ASSERT(getBelType(bel) == TYPE_ICESTORM_LC); std::vector<const CellInfo *> bel_cells; - - for (auto bel_other : getBelsAtSameTile(bel)) { + Loc bel_loc = getBelLocation(bel); + for (auto bel_other : getBelsByTile(bel_loc.x, bel_loc.y)) { IdString cell_other = getBoundBelCell(bel_other); if (cell_other != IdString() && bel_other != bel) { const CellInfo *ci_other = cells.at(cell_other).get(); |