New changes has been made in rr_graph_uxsdcxx_serializer.h

Author: Umar Iqbal

vpr/src/device/rr_graph_view.h

@@ -263,7 +263,7 @@ class RRGraphView {
       *  @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 {
+    inline const  t_segment_inf& rr_segments(RRSegmentId seg_id) const {
         return rr_segments_[seg_id];
     }
 

vpr/src/route/rr_graph.cpp

@@ -449,8 +449,8 @@ 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]);
+    for (long unsigned int iseg = 0; iseg <num_segments; ++iseg) {
+    device_ctx.rr_segments.push_back(segment_inf[(iseg)]);
     }
 
     int num_seg_details = 0;

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 vtr::vector<RRSegmentId, t_segment_inf>& segment_inf,
+void  alloc_and_load_rr_indexed_data(const std::vector<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 vtr::vector<RRSegmentId, t_segment_inf>& segment_inf,
+void alloc_and_load_rr_indexed_data(const std::vector<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

@@ -47,12 +47,13 @@ void load_rr_file(const t_graph_type graph_type,
 
     auto& device_ctx = g_vpr_ctx.mutable_device();
 
-    //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) {
+    for (long unsigned int iseg = 0; iseg < num_segments; ++iseg) {
     device_ctx.rr_segments.push_back(segment_inf[iseg]);
     }
+    //device_ctx.rr_segments = segment_inf;
     RrGraphSerializer reader(
         graph_type,
         base_cost_type,

vpr/src/route/rr_graph_uxsdcxx_serializer.h

@@ -16,7 +16,7 @@
 #include "check_rr_graph.h"
 #include "rr_graph2.h"
 #include "rr_graph_indexed_data.h"
-
+#include "globals.h"
 class MetadataBind {
   public:
     MetadataBind(vtr::string_internment* strings, vtr::interned_string empty)
@@ -1308,6 +1308,7 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
         return std::make_pair(tile, &tile->class_inf[n]);
     }
 
+
     /** Generated for complex type "block_type":
      * <xs:complexType name="block_type">
      *   <xs:sequence>
@@ -1543,14 +1544,21 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
     inline void* get_rr_graph_rr_nodes(void*& /*ctx*/) final {
         return nullptr;
     }
-
     void finish_load() final {
+        auto& device_ctx = g_vpr_ctx.mutable_device();
         process_rr_node_indices();
 
-        rr_nodes_->init_fan_in();
+		rr_nodes_->init_fan_in();
+
+		auto& segment_inf = segment_inf_;
+        size_t num_segments = segment_inf_.size();
+        device_ctx.rr_segments.reserve(num_segments);
+        for (long unsigned int iseg = 0; iseg <num_segments; ++iseg) {
+        device_ctx.rr_segments.push_back(segment_inf_[RRSegmentId(iseg)]);
+        }
 
-        alloc_and_load_rr_indexed_data(
-            segment_inf_,
+       alloc_and_load_rr_indexed_data(
+    		segment_inf,
             *wire_to_rr_ipin_switch_,
             base_cost_type_);
 
@@ -1846,6 +1854,7 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
 
     // Temporary storage
     vtr::vector<RRIndexedDataId, short> seg_index_;
+    vtr::vector<RRSegmentId, short> seg_id_;
     std::string temp_string_;
 
     // Constant mapping which is frequently used
@@ -1871,7 +1880,7 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
 
     const size_t num_arch_switches_;
     const t_arch_switch_inf* arch_switch_inf_;
-    const vtr::vector<RRSegmentId,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_;