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

interchange: clusters: fix other cluster allowance checks in same site

Browse Source 
Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>
This commit is contained in:
Alessandro Comodi 2021-08-31 12:44:36 +02:00
parent 2df931f7db
commit e0950408d5
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fpga_interchange/arch.h
View File

@ -878,16 +878,11 @@ struct Arch : ArchAPI<ArchRanges>
} }
for (auto ci : site_status.cells_in_site) { for (auto ci : site_status.cells_in_site) {
if (ci->cluster != ClusterId() && cell->cluster != ClusterId()) if (ci->cluster != ClusterId() && ci->cluster != cell->cluster &&
continue;
else if (ci->cluster == cell->cluster)
continue;
if (ci->cluster != ClusterId() &&
cluster_info(chip_info, clusters.at(ci->cluster).index).disallow_other_cells) cluster_info(chip_info, clusters.at(ci->cluster).index).disallow_other_cells)
return false; 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) cluster_info(chip_info, clusters.at(cell->cluster).index).disallow_other_cells)
return false; return false;
} }