add edge attribute methods

Author: soheilshahrouz

libs/libarchfpga/src/physical_types.h

@@ -1873,15 +1873,19 @@ struct t_rr_switch_inf {
 };
 
 struct t_rr_switch_override_inf {
-//    float R = 0.f;
-//    float Cin = 0.;
-//    float Cout = 0.;
-//    float Cinternal = 0.;
+    float R = 0.f;
+    float Cin = 0.;
+    float Cout = 0.;
+    float Cinternal = 0.;
     float Tdel = 0.;
 
     t_rr_switch_override_inf() = default;
     t_rr_switch_override_inf(const t_rr_switch_inf& switch_inf)
-        : Tdel(switch_inf.Tdel) {}
+        : R(switch_inf.R)
+        , Cin(switch_inf.Cin)
+        , Cout(switch_inf.Cout)
+        , Cinternal(switch_inf.Cinternal)
+        , Tdel(switch_inf.Tdel) {}
 
     auto operator<=>(const t_rr_switch_override_inf&) const = default;
 };

libs/librrgraph/src/base/rr_graph_builder.cpp

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

libs/librrgraph/src/base/rr_graph_builder.h

@@ -104,10 +104,10 @@ class RRGraphBuilder {
         RRSwitchId switch_id = RRSwitchId(rr_switch_inf_.size());
         rr_switch_inf_.push_back(switch_info);
 
-        t_rr_switch_override_inf switch_offset_info(switch_info);
-        rr_switch_offset_inf_.push_back(switch_offset_info);
+        t_rr_switch_override_inf switch_override_info(switch_info);
+        rr_switch_override_inf_.push_back(switch_override_info);
 
-        VTR_ASSERT_DEBUG(rr_switch_inf_.size() == rr_switch_offset_inf_.size());
+        VTR_ASSERT_DEBUG(rr_switch_inf_.size() == rr_switch_override_inf_.size());
 
         return switch_id;
     }
@@ -122,11 +122,11 @@ class RRGraphBuilder {
         return rr_switch_inf_;
     }
 
-    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());
+    inline RRSwitchOffsetInfoId add_rr_switch_override_info(const t_rr_switch_override_inf& switch_override_info) {
+        VTR_ASSERT_DEBUG(rr_switch_inf_.size() <= rr_switch_override_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);
+        RRSwitchOffsetInfoId switch_offset_info_id = RRSwitchOffsetInfoId(rr_switch_override_inf_.size());
+        rr_switch_override_inf_.push_back(switch_override_info);
         return switch_offset_info_id;
     }
 
@@ -135,7 +135,7 @@ class RRGraphBuilder {
     }
 
     inline vtr::vector<RRSwitchOffsetInfoId, t_rr_switch_override_inf>& rr_switch_offset_inf() {
-        return rr_switch_offset_inf_;
+        return rr_switch_override_inf_;
     }
 
     /** @brief Set the type of a node with a given valid id */
@@ -336,7 +336,7 @@ class RRGraphBuilder {
         this->rr_switch_inf_.reserve(num_switches);
     }
     inline void reserve_switch_offse_info(size_t num_offsets) {
-        this->rr_switch_offset_inf_.reserve(num_offsets);
+        this->rr_switch_override_inf_.reserve(num_offsets);
     }
     /** @brief This function resize node storage to accomidate size RR nodes. */
     inline void resize_nodes(size_t size) {
@@ -351,7 +351,7 @@ class RRGraphBuilder {
     /** @brief This function resize rr_switch to accomidate size RR Switch. */
     inline void resize_switches(size_t size) {
         rr_switch_inf_.resize(size);
-        rr_switch_offset_inf_.resize(size);
+        rr_switch_override_inf_.resize(size);
     }
 
     /** @brief Validate that edge data is partitioned correctly
@@ -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_override_inf> rr_switch_offset_inf_;
+    vtr::vector<RRSwitchOffsetInfoId, t_rr_switch_override_inf> rr_switch_override_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.h

@@ -424,15 +424,55 @@ class RRGraphView {
     }
 
     inline float edge_delay(RREdgeId edge_id) const {
-        RRSwitchOffsetInfoId switch_offset_inf_id = node_storage_.edge_switch_offset_inf(edge_id);
-        return rr_switch_offset_inf_[switch_offset_inf_id].Tdel;
+        RRSwitchOffsetInfoId switch_override_inf_id = node_storage_.edge_switch_offset_inf(edge_id);
+        return rr_switch_offset_inf_[switch_override_inf_id].Tdel;
     }
 
     inline float edge_delay(RRNodeId id, t_edge_size iedge) const {
         RREdgeId edge_id = node_storage_.edge_id(id, iedge);
         return edge_delay(edge_id);
     }
 
+    inline float edge_R(RREdgeId edge_id) const {
+        RRSwitchOffsetInfoId switch_override_inf_id = node_storage_.edge_switch_offset_inf(edge_id);
+        return rr_switch_offset_inf_[switch_override_inf_id].R;
+    }
+
+    inline float edge_R(RRNodeId id, t_edge_size iedge) const {
+        RREdgeId edge_id = node_storage_.edge_id(id, iedge);
+        return edge_R(edge_id);
+    }
+
+    inline float edge_Cin(RREdgeId edge_id) const {
+        RRSwitchOffsetInfoId switch_override_inf_id = node_storage_.edge_switch_offset_inf(edge_id);
+        return rr_switch_offset_inf_[switch_override_inf_id].Cin;
+    }
+
+    inline float edge_Cin(RRNodeId id, t_edge_size iedge) const {
+        RREdgeId edge_id = node_storage_.edge_id(id, iedge);
+        return edge_Cin(edge_id);
+    }
+
+    inline float edge_Cout(RREdgeId edge_id) const {
+        RRSwitchOffsetInfoId switch_override_inf_id = node_storage_.edge_switch_offset_inf(edge_id);
+        return rr_switch_offset_inf_[switch_override_inf_id].Cout;
+    }
+
+    inline float edge_Cout(RRNodeId id, t_edge_size iedge) const {
+        RREdgeId edge_id = node_storage_.edge_id(id, iedge);
+        return edge_Cout(edge_id);
+    }
+
+    inline float edge_Cint(RREdgeId edge_id) const {
+        RRSwitchOffsetInfoId switch_override_inf_id = node_storage_.edge_switch_offset_inf(edge_id);
+        return rr_switch_offset_inf_[switch_override_inf_id].Cinternal;
+    }
+
+    inline float edge_Cint(RRNodeId id, t_edge_size iedge) const {
+        RREdgeId edge_id = node_storage_.edge_id(id, iedge);
+        return edge_Cint(edge_id);
+    }
+
     /** @brief Return the source node for the specified edge. 
     */
     inline RRNodeId edge_src_node(const RREdgeId edge_id) const {

libs/librrgraph/src/io/rr_graph_reader.cpp

@@ -160,7 +160,7 @@ 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 and record it in `unique_edge_offsets`
-            rr_switch_offset_id = rr_graph_builder.add_rr_switch_offset_info(rr_switch_detailed_inf);
+            rr_switch_offset_id = rr_graph_builder.add_rr_switch_override_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