Merge branch 'master' into api_partition_edges

Author: Muhammad Haris Zafar

vpr/src/device/rr_graph_builder.h

@@ -145,6 +145,11 @@ class RRGraphBuilder {
         node_storage_.remap_rr_node_switch_indices(switch_fanin);
     }
 
+    /** @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();
+    }
+
     /** @brief Counts the number of rr switches needed based on fan in to support mux
      * size dependent switch delays. */
     inline size_t count_rr_switches(
@@ -154,6 +159,16 @@ class RRGraphBuilder {
         return node_storage_.count_rr_switches(num_arch_switches, arch_switch_inf, arch_switch_fanins);
     }
 
+    /** @brief This function reserve storage for RR nodes. */
+    inline void reserve_nodes(size_t size) {
+        node_storage_.reserve(size);
+    }
+
+    /** @brief This function resize node storage to accomidate size RR nodes. */
+    inline void resize_nodes(size_t size) {
+        node_storage_.resize(size);
+    }
+
     /** brief Validate that edge data is partitioned correctly
      * @note This function is used to validate the correctness of the routing resource graph in terms
      * of graph attributes. Strongly recommend to call it when you finish the building a routing resource

vpr/src/route/rr_graph.cpp

@@ -576,9 +576,9 @@ static void build_rr_graph(const t_graph_type graph_type,
     size_t expected_node_count = num_rr_nodes;
     if (clock_modeling == DEDICATED_NETWORK) {
         expected_node_count += ClockRRGraphBuilder::estimate_additional_nodes(grid);
-        device_ctx.rr_nodes.reserve(expected_node_count);
+        device_ctx.rr_graph_builder.reserve_nodes(expected_node_count);
     }
-    device_ctx.rr_nodes.resize(num_rr_nodes);
+    device_ctx.rr_graph_builder.resize_nodes(num_rr_nodes);
 
     /* These are data structures used by the the unidir opin mapping. They are used
      * to spread connections evenly for each segment type among the available

vpr/src/route/rr_graph_uxsdcxx_serializer.h

@@ -755,7 +755,7 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
      * </xs:complexType>
      */
     inline void preallocate_rr_nodes_node(void*& /*ctx*/, size_t size) final {
-        rr_nodes_->reserve(size);
+        rr_graph_builder_->reserve_nodes(size);
     }
     inline int add_rr_nodes_node(void*& /*ctx*/, unsigned int capacity, unsigned int id, uxsd::enum_node_type type) final {
         // make_room_in_vector will not allocate if preallocate_rr_nodes_node
@@ -958,7 +958,7 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
         // 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_graph_builder_->partition_edges();
 
         for (int source_node = 0; source_node < (ssize_t)rr_nodes_->size(); ++source_node) {