rename t_rr_switch_offset_inf to t_rr_switch_override_inf

Author: soheilshahrouz

libs/libarchfpga/src/physical_types.h

@@ -1872,18 +1872,18 @@ struct t_rr_switch_inf {
     SwitchType type_ = SwitchType::INVALID;
 };
 
-struct t_rr_switch_offset_inf {
+struct t_rr_switch_override_inf {
 //    float R = 0.f;
 //    float Cin = 0.;
 //    float Cout = 0.;
 //    float Cinternal = 0.;
     float Tdel = 0.;
 
-    t_rr_switch_offset_inf() = default;
-    t_rr_switch_offset_inf(const t_rr_switch_inf& switch_inf)
+    t_rr_switch_override_inf() = default;
+    t_rr_switch_override_inf(const t_rr_switch_inf& switch_inf)
         : Tdel(switch_inf.Tdel) {}
 
-    auto operator<=>(const t_rr_switch_offset_inf&) const = default;
+    auto operator<=>(const t_rr_switch_override_inf&) const = default;
 };
 
 /**

libs/librrgraph/src/base/rr_graph_builder.h

@@ -104,7 +104,7 @@ class RRGraphBuilder {
         RRSwitchId switch_id = RRSwitchId(rr_switch_inf_.size());
         rr_switch_inf_.push_back(switch_info);
 
-        t_rr_switch_offset_inf switch_offset_info(switch_info);
+        t_rr_switch_override_inf switch_offset_info(switch_info);
         rr_switch_offset_inf_.push_back(switch_offset_info);
 
         VTR_ASSERT_DEBUG(rr_switch_inf_.size() == rr_switch_offset_inf_.size());
@@ -122,7 +122,7 @@ class RRGraphBuilder {
         return rr_switch_inf_;
     }
 
-    inline RRSwitchOffsetInfoId add_rr_switch_offset_info(const t_rr_switch_offset_inf& switch_offset_info) {
+    inline RRSwitchOffsetInfoId add_rr_switch_offset_info(const t_rr_switch_override_inf& switch_offset_info) {
         VTR_ASSERT_DEBUG(rr_switch_inf_.size() <= rr_switch_offset_inf_.size());
         // Allocate an ID
         RRSwitchOffsetInfoId switch_offset_info_id = RRSwitchOffsetInfoId(rr_switch_offset_inf_.size());
@@ -134,7 +134,7 @@ class RRGraphBuilder {
         node_storage_.set_edge_offset_id(edge_id, offset_id);
     }
 
-    inline vtr::vector<RRSwitchOffsetInfoId, t_rr_switch_offset_inf>& rr_switch_offset_inf() {
+    inline vtr::vector<RRSwitchOffsetInfoId, t_rr_switch_override_inf>& rr_switch_offset_inf() {
         return rr_switch_offset_inf_;
     }
 
@@ -420,7 +420,7 @@ class RRGraphBuilder {
     /* Detailed information about the switches, which are used in the RRGraph */
     vtr::vector<RRSwitchId, t_rr_switch_inf> rr_switch_inf_;
 
-    vtr::vector<RRSwitchOffsetInfoId, t_rr_switch_offset_inf> rr_switch_offset_inf_;
+    vtr::vector<RRSwitchOffsetInfoId, t_rr_switch_override_inf> rr_switch_offset_inf_;
 
     /** @warning The Metadata should stay as an independent data structure from the rest of the internal data,
      *  e.g., node_lookup! */

libs/librrgraph/src/base/rr_graph_view.cpp

@@ -10,7 +10,7 @@ RRGraphView::RRGraphView(const t_rr_graph_storage& node_storage,
                          const std::vector<t_rr_rc_data>& rr_rc_data,
                          const vtr::vector<RRSegmentId, t_segment_inf>& rr_segments,
                          const vtr::vector<RRSwitchId, t_rr_switch_inf>& rr_switch_inf,
-                         const vtr::vector<RRSwitchOffsetInfoId, t_rr_switch_offset_inf>& rr_switch_offset_inf)
+                         const vtr::vector<RRSwitchOffsetInfoId, t_rr_switch_override_inf>& rr_switch_offset_inf)
     : node_storage_(node_storage)
     , node_lookup_(node_lookup)
     , rr_node_metadata_(rr_node_metadata)

libs/librrgraph/src/base/rr_graph_view.h

@@ -74,7 +74,7 @@ class RRGraphView {
                 const std::vector<t_rr_rc_data>& rr_rc_data,
                 const vtr::vector<RRSegmentId, t_segment_inf>& rr_segments,
                 const vtr::vector<RRSwitchId, t_rr_switch_inf>& rr_switch_inf,
-                const vtr::vector<RRSwitchOffsetInfoId, t_rr_switch_offset_inf>& rr_switch_offset_inf);
+                const vtr::vector<RRSwitchOffsetInfoId, t_rr_switch_override_inf>& rr_switch_offset_inf);
 
     /* Disable copy constructors and copy assignment operator
      * This is to avoid accidental copy because it could be an expensive operation considering that the 
@@ -668,7 +668,7 @@ class RRGraphView {
     /// switch info for rr edges
     const vtr::vector<RRSwitchId, t_rr_switch_inf>& rr_switch_inf_;
     /// switch offset info for edges
-    const vtr::vector<RRSwitchOffsetInfoId, t_rr_switch_offset_inf>& rr_switch_offset_inf_;
+    const vtr::vector<RRSwitchOffsetInfoId, t_rr_switch_override_inf>& rr_switch_offset_inf_;
 };
 
 #endif

libs/librrgraph/src/io/rr_graph_reader.cpp

@@ -126,7 +126,7 @@ void load_rr_edge_attribute_offset_file(RRGraphBuilder& rr_graph_builder,
         VTR_LOG_ERROR("Failed to open RR edge offset file: %s ", rr_edge_attribute_offset_filename.data());
     }
 
-    std::map<t_rr_switch_offset_inf, RRSwitchOffsetInfoId> unique_edge_offsets;
+    std::map<t_rr_switch_override_inf, RRSwitchOffsetInfoId> unique_edge_offsets;
     std::string line;
     bool first_line = true;
     while (std::getline(file, line)) {
@@ -139,7 +139,7 @@ void load_rr_edge_attribute_offset_file(RRGraphBuilder& rr_graph_builder,
 
         std::istringstream iss(line);
         int edge_id;
-        t_rr_switch_offset_inf rr_switch_detailed_inf;
+        t_rr_switch_override_inf rr_switch_detailed_inf;
 
         if (!(iss >> edge_id >> rr_switch_detailed_inf.Tdel)) {
             throw std::runtime_error("Invalid line format: " + line);

libs/librrgraph/src/io/rr_graph_uxsdcxx_serializer.h

@@ -285,7 +285,7 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
         RRGraphBuilder* rr_graph_builder,
         RRGraphView* rr_graph,
         vtr::vector<RRSwitchId, t_rr_switch_inf>* rr_switch_inf,
-        vtr::vector<RRSwitchOffsetInfoId, t_rr_switch_offset_inf>* rr_switch_offset_inf,
+        vtr::vector<RRSwitchOffsetInfoId, t_rr_switch_override_inf>* rr_switch_offset_inf,
         vtr::vector<RRIndexedDataId, t_rr_indexed_data>* rr_indexed_data,
         std::vector<t_rr_rc_data>* rr_rc_data,
         const std::vector<t_arch_switch_inf>& arch_switch_inf,
@@ -630,8 +630,8 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
         rr_switch_offset_inf_->reserve(rr_switch_inf_->size());
         std::ranges::transform(*rr_switch_inf_,
                                std::back_inserter(*rr_switch_offset_inf_),
-                               [](const t_rr_switch_inf& rr_sw) noexcept -> t_rr_switch_offset_inf  {
-                                   return t_rr_switch_offset_inf{rr_sw};
+                               [](const t_rr_switch_inf& rr_sw) noexcept -> t_rr_switch_override_inf {
+                                   return t_rr_switch_override_inf{rr_sw};
                                });
     }
 
@@ -2169,7 +2169,7 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
     RRGraphBuilder* rr_graph_builder_;
     RRGraphView* rr_graph_;
     vtr::vector<RRSwitchId, t_rr_switch_inf>* rr_switch_inf_;
-    vtr::vector<RRSwitchOffsetInfoId, t_rr_switch_offset_inf>* rr_switch_offset_inf_;
+    vtr::vector<RRSwitchOffsetInfoId, t_rr_switch_override_inf>* rr_switch_offset_inf_;
     vtr::vector<RRIndexedDataId, t_rr_indexed_data>* rr_indexed_data_;
     t_rr_node_indices* rr_node_indices_;
     std::string* read_rr_graph_filename_;

vpr/src/route/rr_graph.cpp

@@ -1865,7 +1865,7 @@ void load_rr_switch_from_arch_switch(RRGraphBuilder& rr_graph_builder,
                                      const float R_minW_pmos) {
     const t_arch_switch_inf& arch_switch = arch_sw_inf.at(arch_switch_idx);
     t_rr_switch_inf& rr_switch_to_be_updated = rr_graph_builder.rr_switch()[RRSwitchId(rr_switch_idx)];
-    t_rr_switch_offset_inf& rr_switch_offset_to_be_updated = rr_graph_builder.rr_switch_offset_inf()[RRSwitchOffsetInfoId (rr_switch_idx)];
+    t_rr_switch_override_inf& rr_switch_offset_to_be_updated = rr_graph_builder.rr_switch_offset_inf()[RRSwitchOffsetInfoId (rr_switch_idx)];
 
     /* copy over the arch switch to rr_switch_inf[rr_switch_idx], but with the changed Tdel value */
     rr_switch_to_be_updated.set_type(arch_switch.type());

vpr/src/route/rr_graph2.cpp

@@ -400,7 +400,6 @@ std::vector<t_seg_details> alloc_and_load_seg_details(int* max_chan_width,
      * (3) stagger the connection and switch boxes on different long lines,     *
      *     as they will not be staggered by different segment start points.     */
 
-    int cur_track;
     int fac;
     std::vector<t_seg_details> seg_details;
 
@@ -431,7 +430,7 @@ std::vector<t_seg_details> alloc_and_load_seg_details(int* max_chan_width,
     seg_details.resize(*max_chan_width);
 
     /* Setup the seg_details data */
-    cur_track = 0;
+    size_t cur_track = 0;
     for (size_t i = 0; i < segment_inf.size(); ++i) {
         int first_track = cur_track;