create a t_rr_switch_offset_inf for each t_rr_switch_inf added to RR graph

Author: soheilshahrouz

libs/libarchfpga/src/physical_types.h

@@ -1879,6 +1879,10 @@ struct t_rr_switch_offset_inf {
 //    float Cinternal = 0.;
     float Tdel = 0.;
 
+    t_rr_switch_offset_inf() = default;
+    t_rr_switch_offset_inf(const t_rr_switch_inf& switch_inf)
+        : Tdel(switch_inf.Tdel) {}
+
     auto operator<=>(const t_rr_switch_offset_inf&) const = default;
 };
 

libs/librrgraph/src/base/rr_graph_builder.cpp

@@ -79,6 +79,7 @@ void RRGraphBuilder::clear() {
     rr_edge_metadata_.clear();
     rr_segments_.clear();
     rr_switch_inf_.clear();
+    rr_switch_offset_inf_.clear();
 }
 
 void RRGraphBuilder::reorder_nodes(e_rr_node_reorder_algorithm reorder_rr_graph_nodes_algorithm,

libs/librrgraph/src/base/rr_graph_builder.h

@@ -102,9 +102,13 @@ class RRGraphBuilder {
     inline RRSwitchId add_rr_switch(const t_rr_switch_inf& switch_info) {
         //Allocate an ID
         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);
+        rr_switch_offset_inf_.push_back(switch_offset_info);
+
+        VTR_ASSERT_DEBUG(rr_switch_inf_.size() == rr_switch_offset_inf_.size());
+
         return switch_id;
     }
     /**
@@ -119,6 +123,7 @@ class RRGraphBuilder {
     }
 
     inline RRSwitchOffsetInfoId add_rr_switch_offset_info(const t_rr_switch_offset_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());
         rr_switch_offset_inf_.push_back(switch_offset_info);

libs/librrgraph/src/base/rr_graph_storage.cpp

@@ -417,7 +417,7 @@ void t_rr_graph_storage::init_fan_in() {
     node_fan_in_.resize(node_storage_.size(), 0);
     node_fan_in_.shrink_to_fit();
     //Walk the graph and increment fanin on all downstream nodes
-    for(const auto& edge_id : edge_dest_node_.keys()) {
+    for(const RREdgeId edge_id : edge_dest_node_.keys()) {
         node_fan_in_[edge_dest_node_[edge_id]] += 1;
     }
 }
@@ -504,6 +504,7 @@ void t_rr_graph_storage::remap_rr_node_switch_indices(const t_arch_switch_fanin&
     for (size_t i = 0; i < edge_src_node_.size(); ++i) {
         RREdgeId edge(i);
         if(edge_remapped_[edge]) {
+            VTR_ASSERT(edge_switch_offset_inf_[edge].is_valid());
             continue;
         }
 
@@ -521,6 +522,7 @@ void t_rr_graph_storage::remap_rr_node_switch_indices(const t_arch_switch_fanin&
         int rr_switch_index = itr->second;
 
         edge_switch_[edge] = rr_switch_index;
+        edge_switch_offset_inf_[edge] = (RRSwitchOffsetInfoId)rr_switch_index;
         edge_remapped_[edge] = true;
     }
     remapped_edges_ = true;
@@ -558,7 +560,7 @@ void t_rr_graph_storage::partition_edges(const vtr::vector<RRSwitchId, t_rr_swit
 void t_rr_graph_storage::set_edge_offset_id(RREdgeId edge_id, RRSwitchOffsetInfoId offset_id) {
     VTR_ASSERT_DEBUG(partitioned_);
     VTR_ASSERT_DEBUG(remapped_edges_);
-    VTR_ASSERT_DEBUG(edge_switch_offset_inf_[edge_id] == RRSwitchOffsetInfoId::INVALID());
+    VTR_ASSERT_DEBUG(edge_switch_offset_inf_[edge_id].is_valid());
 
     edge_switch_offset_inf_[edge_id] = offset_id;
 }

libs/librrgraph/src/base/rr_graph_view.h

@@ -422,7 +422,7 @@ class RRGraphView {
     inline float edge_delay(RRNodeId id, t_edge_size iedge) const {
         RREdgeId edge_id = node_storage_.edge_id(id, iedge);
         RRSwitchOffsetInfoId switch_offset_inf_id = node_storage_.edge_switch_offset_inf(edge_id);
-        return rr_switch_offset_inf_[switch_offset_inf_id].Tdel;;
+        return rr_switch_offset_inf_[switch_offset_inf_id].Tdel;
     }
 
     /** @brief Return the source node for the specified edge. 

libs/librrgraph/src/io/rr_graph_reader.cpp

@@ -158,8 +158,9 @@ void load_rr_edge_attribute_offset_file(RRGraphBuilder& rr_graph_builder,
 
         RRSwitchOffsetInfoId rr_switch_offset_id;
         if (it == unique_edge_offsets.end()) {
-            // if the detailed info is seen for the first time, add it to RR graph
+            // if the detailed info is seen for the first time, add it to RR graph and record it in `unique_edge_offsets`
             rr_switch_offset_id = rr_graph_builder.add_rr_switch_offset_info(rr_switch_detailed_inf);
+            unique_edge_offsets.insert({rr_switch_detailed_inf, rr_switch_offset_id});
         } else {
             // the detailed info has already been added to the RR graph
             rr_switch_offset_id = it->second;