diff options
| author | gatecat <gatecat@ds0.me> | 2021-07-10 23:24:38 +0100 |
|---|---|---|
| committer | gatecat <gatecat@ds0.me> | 2021-07-10 23:24:38 +0100 |
| commit | 8531658019a5d8f7834c6054e10c8438d8006505 (patch) | |
| tree | 9ed98754646aeea1c7c2cae749c7f3f20f57fc40 /fpga_interchange/arch_pack_clusters.cc | |
| parent | d290766101a62d575c3e6aacbecde46ecab349f6 (diff) | |
| parent | 478456e6e98c05ee5f810de0c0206daee25482f3 (diff) | |
| download | nextpnr-8531658019a5d8f7834c6054e10c8438d8006505.tar.gz nextpnr-8531658019a5d8f7834c6054e10c8438d8006505.tar.bz2 nextpnr-8531658019a5d8f7834c6054e10c8438d8006505.zip | |
Merge branch 'master' of github.com:YosysHQ/nextpnr
Diffstat (limited to 'fpga_interchange/arch_pack_clusters.cc')
| -rw-r--r-- | fpga_interchange/arch_pack_clusters.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fpga_interchange/arch_pack_clusters.cc b/fpga_interchange/arch_pack_clusters.cc index 18162aa4..f4e50233 100644 --- a/fpga_interchange/arch_pack_clusters.cc +++ b/fpga_interchange/arch_pack_clusters.cc @@ -193,6 +193,8 @@ bool Arch::getClusterPlacement(ClusterId cluster, BelId root_bel, const Context *ctx = getCtx(); const Cluster &packed_cluster = clusters.at(cluster); + auto &cluster_data = cluster_info(chip_info, packed_cluster.index); + CellInfo *root_cell = getClusterRootCell(cluster); if (!ctx->isValidBelForCellType(root_cell->type, root_bel)) return false; @@ -205,8 +207,6 @@ bool Arch::getClusterPlacement(ClusterId cluster, BelId root_bel, next_bel = root_bel; } else { // Find next chained cluster node - auto &cluster_data = cluster_info(chip_info, packed_cluster.index); - IdString next_bel_pin(cluster_data.chainable_ports[0].bel_source); WireId next_bel_pin_wire = ctx->getBelPinWire(next_bel, next_bel_pin); next_bel = BelId(); @@ -256,7 +256,8 @@ bool Arch::getClusterPlacement(ClusterId cluster, BelId root_bel, WireId bel_pin_wire = ctx->getBelPinWire(next_bel, bel_pin); ExpansionDirection direction = port_type == PORT_IN ? CLUSTER_UPHILL_DIR : CLUSTER_DOWNHILL_DIR; - pool<BelId> cluster_bels = find_cluster_bels(ctx, bel_pin_wire, direction); + pool<BelId> cluster_bels = + find_cluster_bels(ctx, bel_pin_wire, direction, (bool)cluster_data.out_of_site_clusters); if (cluster_bels.size() == 0) continue; |