From e0950408d57b5c409136e1a12160f95c57b09ce2 Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Tue, 31 Aug 2021 12:44:36 +0200 Subject: interchange: clusters: fix other cluster allowance checks in same site Signed-off-by: Alessandro Comodi --- fpga_interchange/arch.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'fpga_interchange') diff --git a/fpga_interchange/arch.h b/fpga_interchange/arch.h index 614c6903..7873a8ec 100644 --- a/fpga_interchange/arch.h +++ b/fpga_interchange/arch.h @@ -878,16 +878,11 @@ struct Arch : ArchAPI } for (auto ci : site_status.cells_in_site) { - if (ci->cluster != ClusterId() && cell->cluster != ClusterId()) - continue; - else if (ci->cluster == cell->cluster) - continue; - - if (ci->cluster != ClusterId() && + if (ci->cluster != ClusterId() && ci->cluster != cell->cluster && cluster_info(chip_info, clusters.at(ci->cluster).index).disallow_other_cells) return false; - if (cell->cluster != ClusterId() && + if (cell->cluster != ClusterId() && ci->cluster != cell->cluster && cluster_info(chip_info, clusters.at(cell->cluster).index).disallow_other_cells) return false; } -- cgit v1.2.3