Data type conversion from std to vtr has been done in alloc_and_load_rr_indexed_data() and RRSegmentId has been added in API's where needed

Author: Umar Iqbal

vpr/src/device/rr_graph_view.h

@@ -259,6 +259,10 @@ class RRGraphView {
         return node_lookup_;
     }
 
+    /** @brief Return detailed routing segment information with a given id
+      *  @note The routing segments here may not be exactly same as those defined in architecture file. They have been adapted to fit the context of routing resource graphs.
+      */
+
     inline const t_segment_inf& rr_segments(RRSegmentId seg_id) const {
         return rr_segments_[seg_id];
     }

vpr/src/route/rr_graph.cpp

@@ -449,6 +449,10 @@ static void build_rr_graph(const t_graph_type graph_type,
     //device_ctx.rr_segments = segment_inf;
     size_t num_segments = segment_inf.size();
     device_ctx.rr_segments.reserve(num_segments);
+    for (int iseg = 0; iseg <num_segments; ++iseg) {
+    device_ctx.rr_segments.push_back(segment_inf[iseg]);
+    }
+
     int num_seg_details = 0;
     t_seg_details* seg_details = nullptr;
 

vpr/src/route/rr_graph_indexed_data.cpp

@@ -53,7 +53,7 @@ static void print_rr_index_info(const char* fname, const std::vector<t_segment_i
  * etc. more expensive than others.  I give each segment type in an          *
  * x-channel its own cost_index, and each segment type in a y-channel its    *
  * own cost_index.                                                           */
-void alloc_and_load_rr_indexed_data(const std::vector<t_segment_inf>& segment_inf,
+void alloc_and_load_rr_indexed_data(const vtr::vector<RRSegmentId, t_segment_inf>& segment_inf,
                                     int wire_to_ipin_switch,
                                     enum e_base_cost_type base_cost_type) {
     int iseg, length, i, index;

vpr/src/route/rr_graph_indexed_data.h

@@ -2,7 +2,7 @@
 #define RR_GRAPH_INDEXED_DATA_H
 #include "physical_types.h"
 
-void alloc_and_load_rr_indexed_data(const std::vector<t_segment_inf>& segment_inf,
+void alloc_and_load_rr_indexed_data(const vtr::vector<RRSegmentId, t_segment_inf>& segment_inf,
                                     int wire_to_ipin_switch,
                                     enum e_base_cost_type base_cost_type);
 

vpr/src/route/rr_graph_reader.cpp

@@ -50,6 +50,9 @@ void load_rr_file(const t_graph_type graph_type,
     //device_ctx.rr_segments = segment_inf;
     size_t num_segments = segment_inf.size();
     device_ctx.rr_segments.reserve(num_segments);
+    for (int iseg = 0; iseg < num_segments; ++iseg) {
+    device_ctx.rr_segments.push_back(segment_inf[iseg]);
+    }
     RrGraphSerializer reader(
         graph_type,
         base_cost_type,

vpr/src/route/rr_graph_uxsdcxx_serializer.h

@@ -1150,7 +1150,7 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
      * </xs:complexType>
      */
     inline int get_segment_id(const t_segment_inf*& segment) final {
-        return segment - &segment_inf_.at(0);
+        return segment - &segment_inf_.at(RRSegmentId(0));
     }
     inline const char* get_segment_name(const t_segment_inf*& segment) final {
         return segment->name.c_str();
@@ -1178,14 +1178,14 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
         }
     }
     inline const t_segment_inf* add_segments_segment(void*& /*ctx*/, int id) final {
-        return &segment_inf_.at(id);
+        return &segment_inf_.at(RRSegmentId(id));
     }
     inline void finish_segments_segment(const t_segment_inf*& /*iter*/) final {}
     inline size_t num_segments_segment(void*& /*iter*/) final {
         return segment_inf_.size();
     }
     inline const t_segment_inf* get_segments_segment(int n, void*& /*ctx*/) final {
-        return &segment_inf_.at(n);
+        return &segment_inf_.at(RRSegmentId(n));
     }
 
     inline void* init_rr_graph_segments(void*& /*ctx*/) final {
@@ -1871,7 +1871,7 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
 
     const size_t num_arch_switches_;
     const t_arch_switch_inf* arch_switch_inf_;
-    const std::vector<t_segment_inf>& segment_inf_;
+    const vtr::vector<RRSegmentId,t_segment_inf>& segment_inf_;
     const std::vector<t_physical_tile_type>& physical_tile_types_;
     const DeviceGrid& grid_;
     MetadataStorage<int>* rr_node_metadata_;