From 4beb0d50c6750f624125f6bc68cfc20054bbdb7e Mon Sep 17 00:00:00 2001 From: Muhammad Haris Zafar Date: Wed, 27 Oct 2021 11:32:50 +0500 Subject: [PATCH 1/2] Adding api make_edges_as_rr_switch_ids to rr_graph_builder.h --- vpr/src/device/rr_graph_builder.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vpr/src/device/rr_graph_builder.h b/vpr/src/device/rr_graph_builder.h index c8baa9619c4..cae0e59bd75 100644 --- a/vpr/src/device/rr_graph_builder.h +++ b/vpr/src/device/rr_graph_builder.h @@ -117,6 +117,11 @@ class RRGraphBuilder { return node_storage_.count_rr_switches(num_arch_switches, arch_switch_inf, arch_switch_fanins); } + /** @brief Marks that edge switch values are rr switch indicies*/ + inline void mark_edges_as_rr_switch_ids() { + node_storage_.mark_edges_as_rr_switch_ids(); + } + /* -- Internal data storage -- */ private: /* TODO: When the refactoring effort finishes, From 44ac5d88b5044670c092aa26fd3c2cc996ba822d Mon Sep 17 00:00:00 2001 From: Muhammad Haris Zafar Date: Wed, 27 Oct 2021 11:43:22 +0500 Subject: [PATCH 2/2] replacing mark_edges_as_rr_switch_ids from respective .cpp/.h files --- vpr/src/route/rr_graph_uxsdcxx_serializer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vpr/src/route/rr_graph_uxsdcxx_serializer.h b/vpr/src/route/rr_graph_uxsdcxx_serializer.h index 23f2e22abe5..fb19a6518ba 100644 --- a/vpr/src/route/rr_graph_uxsdcxx_serializer.h +++ b/vpr/src/route/rr_graph_uxsdcxx_serializer.h @@ -955,7 +955,7 @@ class RrGraphSerializer final : public uxsd::RrGraphBase { // Partition the rr graph edges for efficient access to // configurable/non-configurable edge subsets. Must be done after RR // switches have been allocated. - rr_nodes_->mark_edges_as_rr_switch_ids(); + rr_graph_builder_->mark_edges_as_rr_switch_ids(); rr_nodes_->partition_edges(); for (int source_node = 0; source_node < (ssize_t)rr_nodes_->size(); ++source_node) {