diff options
| author | gatecat <gatecat@ds0.me> | 2021-09-30 11:05:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-30 11:05:32 +0100 |
| commit | 7550b60069facbca9e4292ad2753f8e317a5d681 (patch) | |
| tree | 0849903696aabb1ff58b9365b7c84be0936ff8dc /fpga_interchange/arch_pack_clusters.cc | |
| parent | bd137a8b50c220b2547030a4618aeefead2a1c38 (diff) | |
| parent | 19afb073705ce17dd70adff4215a6f6bf24d2562 (diff) | |
| download | nextpnr-7550b60069facbca9e4292ad2753f8e317a5d681.tar.gz nextpnr-7550b60069facbca9e4292ad2753f8e317a5d681.tar.bz2 nextpnr-7550b60069facbca9e4292ad2753f8e317a5d681.zip | |
Merge pull request #828 from YosysHQ/gatecat/interchange-warn-fix
interchange: Enable Werror on CI and fix some compile warnings
Diffstat (limited to 'fpga_interchange/arch_pack_clusters.cc')
| -rw-r--r-- | fpga_interchange/arch_pack_clusters.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/fpga_interchange/arch_pack_clusters.cc b/fpga_interchange/arch_pack_clusters.cc index 998c944e..acb61917 100644 --- a/fpga_interchange/arch_pack_clusters.cc +++ b/fpga_interchange/arch_pack_clusters.cc @@ -29,6 +29,7 @@ NEXTPNR_NAMESPACE_BEGIN +namespace { enum ClusterWireNodeState { IN_SINK_SITE = 0, @@ -51,6 +52,7 @@ struct ClusterWireNode int depth; bool only_down; }; +} // namespace static void handle_expansion_node(const Context *ctx, WireId prev_wire, PipId pip, ClusterWireNode curr_node, std::vector<ClusterWireNode> &nodes_to_expand, pool<BelId> &bels, @@ -678,7 +680,7 @@ void Arch::prepare_macro_cluster(const ClusterPOD *cluster, uint32_t index) for (auto &cell : macro_to_cells[ci->macro_parent]) for (auto &node : cluster->connection_graph) if (IdString(node.cell_type) == cell->type) - if (node.idx != 0 && cell->name != ci->name || node.idx == 0 && cell->name == ci->name) { + if ((node.idx != 0 && cell->name != ci->name) || (node.idx == 0 && cell->name == ci->name)) { idx_to_cells[node.idx].insert(cell); } @@ -712,7 +714,7 @@ void Arch::prepare_macro_cluster(const ClusterPOD *cluster, uint32_t index) for (const auto &cell : arc.second) possible_idx[cell].insert(arc.first); - for (const auto arc : possible_idx) { + for (const auto &arc : possible_idx) { log_info("Possible idx %s:\n", arc.first->name.c_str(ctx)); for (const auto idx : arc.second) log_info(" - %d\n", idx); @@ -743,7 +745,7 @@ void Arch::prepare_macro_cluster(const ClusterPOD *cluster, uint32_t index) for (const auto &cell : arc.second) possible_idx[cell].insert(arc.first); - for (const auto arc : possible_idx) { + for (const auto &arc : possible_idx) { log_info("Possible idx %s:\n", arc.first->name.c_str(ctx)); for (const auto idx : arc.second) log_info(" - %d\n", idx); @@ -809,7 +811,7 @@ void Arch::prepare_macro_cluster(const ClusterPOD *cluster, uint32_t index) for (const auto &cell : arc.second) possible_idx[cell].insert(arc.first); - for (const auto arc : possible_idx) { + for (const auto &arc : possible_idx) { log_info("Possible idx %s:\n", arc.first->name.c_str(ctx)); for (const auto idx : arc.second) log_info(" - %d\n", idx); @@ -831,7 +833,7 @@ void Arch::prepare_macro_cluster(const ClusterPOD *cluster, uint32_t index) for (const auto &cell : arc.second) possible_idx[cell].insert(arc.first); - for (const auto arc : possible_idx) { + for (const auto &arc : possible_idx) { log_info("Possible idx %s:\n", arc.first->name.c_str(ctx)); for (const auto idx : arc.second) log_info(" - %d\n", idx); |