diff options
| author | Eddie Hung <e.hung@imperial.ac.uk> | 2018-07-24 22:20:10 -0700 |
|---|---|---|
| committer | Eddie Hung <e.hung@imperial.ac.uk> | 2018-07-24 22:20:10 -0700 |
| commit | 9382938661613b84e3ad3155e414aaae2fa87da2 (patch) | |
| tree | 107c14811cf2e91c82ee4f9ea983260ee7acea8c /ecp5/arch_place.cc | |
| parent | 4920cf18fa1128758dac2ffd12bf88d194863f17 (diff) | |
| parent | 32c7247785f48b2307e559a0af50d9387bda8b49 (diff) | |
| download | nextpnr-9382938661613b84e3ad3155e414aaae2fa87da2.tar.gz nextpnr-9382938661613b84e3ad3155e414aaae2fa87da2.tar.bz2 nextpnr-9382938661613b84e3ad3155e414aaae2fa87da2.zip | |
Merge branch 'master' into redist_slack
Diffstat (limited to 'ecp5/arch_place.cc')
| -rw-r--r-- | ecp5/arch_place.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ecp5/arch_place.cc b/ecp5/arch_place.cc index 22ebab67..84432043 100644 --- a/ecp5/arch_place.cc +++ b/ecp5/arch_place.cc @@ -66,7 +66,8 @@ bool Arch::isBelLocationValid(BelId bel) const { if (getBelType(bel) == TYPE_TRELLIS_SLICE) { 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(); @@ -89,8 +90,8 @@ bool Arch::isValidBelForCell(CellInfo *cell, BelId bel) const NPNR_ASSERT(getBelType(bel) == TYPE_TRELLIS_SLICE); 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(); |