[libs][rr_graph] mode bend_start/end out of t_rr_node_data

Author: amin1377

libs/librrgraph/src/base/rr_graph_storage.cpp

@@ -779,13 +779,11 @@ void t_rr_graph_storage::set_node_coordinates(RRNodeId id, short x1, short y1, s
 }
 
 void t_rr_graph_storage::set_node_bend_start(RRNodeId id, size_t bend_start) {
-    auto& node = node_storage_[id];
-    node.node_bend_start_ = bend_start;
+    node_bend_start_[id] = bend_start;
 }
 
 void t_rr_graph_storage::set_node_bend_end(RRNodeId id, size_t bend_end) {
-    auto& node = node_storage_[id];
-    node.node_bend_end_ = bend_end;
+    node_bend_end_[id] = bend_end;
 }
 
 void t_rr_graph_storage::set_node_cost_index(RRNodeId id, RRIndexedDataId new_cost_index) {
@@ -870,7 +868,9 @@ t_rr_graph_view t_rr_graph_storage::view() const {
         vtr::make_const_array_view_id(edge_src_node_),
         vtr::make_const_array_view_id(edge_dest_node_),
         vtr::make_const_array_view_id(edge_switch_),
-        virtual_clock_network_root_idx_);
+        virtual_clock_network_root_idx_,
+        vtr::make_const_array_view_id(node_bend_start_),
+        vtr::make_const_array_view_id(node_bend_end_));
 }
 
 // Given `order`, a vector mapping each RRNodeId to a new one (old -> new),

libs/librrgraph/src/base/rr_graph_storage.h

@@ -51,7 +51,7 @@
  * side: The side of a grid location where an IPIN or OPIN is located.       *
  *       This field is valid only for IPINs and OPINs and should be ignored  *
  *       otherwise.                                                          */
-struct alignas(32) t_rr_node_data {
+struct alignas(16) t_rr_node_data {
     int16_t cost_index_ = -1;
     int16_t rc_index_ = -1;
 
@@ -60,9 +60,6 @@ struct alignas(32) t_rr_node_data {
     int16_t xhigh_ = -1;
     int16_t yhigh_ = -1;
 
-    int16_t node_bend_start_ = 0;
-    int16_t node_bend_end_ = 0;
-
     e_rr_type type_ = e_rr_type::NUM_RR_TYPES;
 
     /* The character is a hex number which is a 4-bit truth table for node sides
@@ -86,8 +83,8 @@ struct alignas(32) t_rr_node_data {
 // t_rr_node_data is a key data structure, so fail at compile time if the
 // structure gets bigger than expected (16 bytes right now). Developers
 // should only expand it after careful consideration and measurement.
-static_assert(sizeof(t_rr_node_data) == 32, "Check t_rr_node_data size");
-static_assert(alignof(t_rr_node_data) == 32, "Check t_rr_node_data size");
+static_assert(sizeof(t_rr_node_data) == 16, "Check t_rr_node_data size");
+static_assert(alignof(t_rr_node_data) == 16, "Check t_rr_node_data size");
 
 /* t_rr_node_ptc_data is cold data is therefore kept seperate from
  * t_rr_node_data.
@@ -188,10 +185,10 @@ class t_rr_graph_storage {
     }
 
     short node_bend_start(RRNodeId id) const {
-        return node_storage_[id].node_bend_start_;
+        return node_bend_start_[id];
     }
     short node_bend_end(RRNodeId id) const {
-        return node_storage_[id].node_bend_end_;
+        return node_bend_end_[id];
     }
 
     short node_capacity(RRNodeId id) const {
@@ -932,6 +929,14 @@ class t_rr_graph_storage {
     */
     vtr::vector<RREdgeId, bool> edge_remapped_;
 
+    /** @brief
+     * Bend start and end are used to store the bend information for each node.
+     * Bend start and end are only used for CHANX and CHANY nodes.
+     * Bend start and end are only used for tileable routing resource graph.
+     */
+    vtr::vector<RRNodeId, int16_t> node_bend_start_;
+    vtr::vector<RRNodeId, int16_t> node_bend_end_;
+
     /***************
      * State flags *
      ***************/
@@ -986,7 +991,9 @@ class t_rr_graph_view {
         const vtr::array_view_id<RREdgeId, const RRNodeId> edge_src_node,
         const vtr::array_view_id<RREdgeId, const RRNodeId> edge_dest_node,
         const vtr::array_view_id<RREdgeId, const short> edge_switch,
-        const std::unordered_map<std::string, RRNodeId>& virtual_clock_network_root_idx)
+        const std::unordered_map<std::string, RRNodeId>& virtual_clock_network_root_idx,
+        const vtr::array_view_id<RRNodeId, const int16_t> node_bend_start,
+        const vtr::array_view_id<RRNodeId, const int16_t> node_bend_end)
         : node_storage_(node_storage)
         , node_ptc_(node_ptc)
         , node_first_edge_(node_first_edge)
@@ -997,7 +1004,9 @@ class t_rr_graph_view {
         , edge_src_node_(edge_src_node)
         , edge_dest_node_(edge_dest_node)
         , edge_switch_(edge_switch)
-        , virtual_clock_network_root_idx_(virtual_clock_network_root_idx) {}
+        , virtual_clock_network_root_idx_(virtual_clock_network_root_idx)
+        , node_bend_start_(node_bend_start)
+        , node_bend_end_(node_bend_end) {}
 
     /****************
      * Node methods *
@@ -1218,4 +1227,7 @@ class t_rr_graph_view {
     vtr::array_view_id<RREdgeId, const short> edge_switch_;
     const std::unordered_map<std::string, RRNodeId>& virtual_clock_network_root_idx_;
 
+    vtr::array_view_id<RRNodeId, const int16_t> node_bend_start_;
+    vtr::array_view_id<RRNodeId, const int16_t> node_bend_end_;
+
 };