Skip to content

Commit a9472ca

Browse files
Fix t_rr_graph_storage::sort_edges warning
1 parent afe997a commit a9472ca

File tree

2 files changed

+7
-19
lines changed

2 files changed

+7
-19
lines changed

libs/librrgraph/src/base/rr_graph_storage.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,6 @@ size_t t_rr_graph_storage::count_rr_switches(const std::vector<t_arch_switch_inf
168168
// Sort by destination node to collect per node/per switch fan in values
169169
// This sort is safe to do because partition_edges() has not been invoked yet.
170170
sort_edges(edge_compare_dest_node(*this));
171-
// std::stable_sort(
172-
// edge_sort_iterator(this, 0),
173-
// edge_sort_iterator(this, edge_dest_node_.size()),
174-
// edge_compare_dest_node());
175171

176172
// Collect the fan-in per switch type for each node in the graph
177173
// Record the unique switch type/fanin combinations

libs/librrgraph/src/base/rr_graph_storage.h

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -828,31 +828,25 @@ class t_rr_graph_storage {
828828
// That would make the sorting in-place and much more efficient.
829829

830830
size_t num_edges = edge_src_node_.size();
831-
std::vector<size_t> edge_indices;
832-
edge_indices.resize(num_edges);
831+
std::vector<size_t> edge_indices(num_edges, 0);
833832

834833
std::iota(edge_indices.begin(), edge_indices.end(), 0);
835834

836835
std::ranges::stable_sort(edge_indices, comparison_function);
837836

838837

839838

840-
vtr::vector<RREdgeId, RRNodeId> new_edge_src_node_;
841-
vtr::vector<RREdgeId, RRNodeId> new_edge_dest_node_;
842-
vtr::vector<RREdgeId, short> new_edge_switch_;
843-
vtr::vector<RREdgeId, bool> new_edge_remapped_;
844-
845-
new_edge_src_node_.resize(num_edges);
846-
new_edge_dest_node_.resize(num_edges);
847-
new_edge_switch_.resize(num_edges);
848-
new_edge_remapped_.resize(num_edges);
839+
vtr::vector<RREdgeId, RRNodeId> new_edge_src_node_(num_edges, RRNodeId::INVALID());
840+
vtr::vector<RREdgeId, RRNodeId> new_edge_dest_node_(num_edges, RRNodeId::INVALID());
841+
vtr::vector<RREdgeId, short> new_edge_switch_(num_edges, LIBRRGRAPH_UNDEFINED_VAL);
842+
vtr::vector<RREdgeId, bool> new_edge_remapped_(num_edges, false);
849843

850844
size_t new_index = 0;
851845
for (size_t edge_index : edge_indices) {
852846
new_edge_src_node_[RREdgeId(new_index)] = edge_src_node_[RREdgeId(edge_index)];
853847
new_edge_dest_node_[RREdgeId(new_index)] = edge_dest_node_[RREdgeId(edge_index)];
854-
new_edge_switch_[RREdgeId(new_index)] = new_edge_switch_[RREdgeId(edge_index)];
855-
new_edge_remapped_[RREdgeId(new_index)] = new_edge_remapped_[RREdgeId(edge_index)];
848+
new_edge_switch_[RREdgeId(new_index)] = edge_switch_[RREdgeId(edge_index)];
849+
new_edge_remapped_[RREdgeId(new_index)] = edge_remapped_[RREdgeId(edge_index)];
856850
new_index++;
857851
}
858852

@@ -907,8 +901,6 @@ class t_rr_graph_storage {
907901
}
908902

909903
private:
910-
friend struct edge_swapper;
911-
friend class edge_sort_iterator;
912904
friend class edge_compare_dest_node;
913905
friend class edge_compare_src_node_and_configurable_first;
914906

0 commit comments

Comments
 (0)