Skip to content

Commit ad35c3e

Browse files
committed
Remove edge source accessor
Signed-off-by: Dusty DeWeese <[email protected]>
1 parent 64f07ca commit ad35c3e

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

vpr/src/route/rr_graph.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3084,12 +3084,12 @@ static void create_edge_groups(EdgeGroups* groups) {
30843084
auto& device_ctx = g_vpr_ctx.device();
30853085
auto& rr_nodes = device_ctx.rr_nodes;
30863086

3087-
for (size_t iedge = 0; iedge < rr_nodes.edges_size(); ++iedge) {
3088-
RREdgeId edge(iedge);
3089-
if (!device_ctx.rr_switch_inf[rr_nodes.edge_switch(edge)].configurable()) {
3090-
groups->add_non_config_edge(size_t(rr_nodes.edge_source_node(edge)), size_t(rr_nodes.edge_sink_node(edge)));
3091-
}
3092-
}
3087+
rr_nodes.for_each_edge(
3088+
[&](RREdgeId edge, RRNodeId src, RRNodeId sink) {
3089+
if (!device_ctx.rr_switch_inf[rr_nodes.edge_switch(edge)].configurable()) {
3090+
groups->add_non_config_edge(size_t(src), size_t(sink));
3091+
}
3092+
});
30933093

30943094
groups->create_sets();
30953095
}

vpr/src/route/rr_graph_storage.h

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,12 @@ class t_rr_graph_storage {
293293
return edge_dest_node_[edge];
294294
}
295295

296-
// Get the source node for the specified edge.
297-
RRNodeId edge_source_node(const RREdgeId& edge) const {
298-
return edge_src_node_[edge];
296+
// Call the `apply` function with the edge id, source, and sink nodes of every edge.
297+
void for_each_edge(std::function<void(RREdgeId, RRNodeId, RRNodeId)> apply) const {
298+
for (size_t i = 0; i < edge_dest_node_.size(); i++) {
299+
RREdgeId edge(i);
300+
apply(edge, edge_src_node_[edge], edge_dest_node_[edge]);
301+
}
299302
}
300303

301304
// Get the destination node for the iedge'th edge from specified RRNodeId.
@@ -390,11 +393,6 @@ class t_rr_graph_storage {
390393
return node_storage_.size();
391394
}
392395

393-
// Number of RR nodes that can be accessed.
394-
size_t edges_size() const {
395-
return edge_dest_node_.size();
396-
}
397-
398396
// Is the RR graph currently empty?
399397
bool empty() const {
400398
return node_storage_.empty();

0 commit comments

Comments
 (0)