diff options
| author | Alessandro Comodi <acomodi@antmicro.com> | 2021-08-31 12:44:36 +0200 |
|---|---|---|
| committer | Alessandro Comodi <acomodi@antmicro.com> | 2021-08-31 12:44:36 +0200 |
| commit | e0950408d57b5c409136e1a12160f95c57b09ce2 (patch) | |
| tree | 8e56bb14536091f3859953465588fac973d7509a /fpga_interchange | |
| parent | 2df931f7dbe0a59fe849c2d76c18ae60a411e328 (diff) | |
| download | nextpnr-e0950408d57b5c409136e1a12160f95c57b09ce2.tar.gz nextpnr-e0950408d57b5c409136e1a12160f95c57b09ce2.tar.bz2 nextpnr-e0950408d57b5c409136e1a12160f95c57b09ce2.zip | |
interchange: clusters: fix other cluster allowance checks in same site
Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>
Diffstat (limited to 'fpga_interchange')
| -rw-r--r-- | fpga_interchange/arch.h | 9 |
1 files changed, 2 insertions, 7 deletions
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<ArchRanges> } 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; } |