[lib][rr_graph] pass vector of ptc nums to set_node_ptc_nums and add parse_ptc_numbers to rr graph util

Author: amin1377

libs/librrgraph/src/base/rr_graph_builder.cpp

@@ -225,8 +225,8 @@ std::vector<RREdgeId> RRGraphBuilder::node_in_edges(RRNodeId node) const {
     return node_in_edges_[node];
 }
 
-void RRGraphBuilder::set_node_ptc_nums(RRNodeId node, const std::string& ptc_str) {
-    node_storage_.set_node_ptc_nums(node, ptc_str);
+void RRGraphBuilder::set_node_ptc_nums(RRNodeId node, const std::vector<int>& ptc_numbers) {
+    node_storage_.set_node_ptc_nums(node, ptc_numbers);
 }
 
 std::string RRGraphBuilder::node_ptc_nums_to_string(RRNodeId node) const {
@@ -266,8 +266,12 @@ void RRGraphBuilder::add_track_node_to_lookup(RRNodeId node) {
             // Find the track ids using the x/y offset  
             if (e_rr_type::CHANX == node_type || e_rr_type::CHANY == node_type) {
                 const std::vector<short>& track_nums = node_storage_.node_tilable_track_nums(node);
-                ptc = (node_type == e_rr_type::CHANX) ? track_nums[x - node_storage_.node_xlow(node)] : 
-                      track_nums[y - node_storage_.node_ylow(node)];
+                if (node_type == e_rr_type::CHANX) {
+                    ptc = track_nums[x - node_storage_.node_xlow(node)];
+                } else {
+                    VTR_ASSERT_DEBUG(node_type == e_rr_type::CHANY);
+                    ptc = track_nums[y - node_storage_.node_ylow(node)];
+                }
                 node_lookup_.add_node(node, node_storage_.node_layer_low(node), x, y, node_type, ptc);
             }
         }

libs/librrgraph/src/base/rr_graph_builder.h

@@ -276,8 +276,8 @@ class RRGraphBuilder {
         node_storage_.set_node_mux_num(id, new_mux_num);
     }
 
-    /** @brief Add a list of ptc number in string (split by comma) to a given node. This function is used by rr graph reader only. */
-    void set_node_ptc_nums(RRNodeId node, const std::string& ptc_str);
+    /** @brief Add a list of ptc numbers to a given node. This function is used by rr graph reader only. */
+    void set_node_ptc_nums(RRNodeId node, const std::vector<int>& ptc_numbers);
 
     /** @brief With a given node, output ptc numbers into a string (use comma as delima). This function is used by rr graph writer only. */
     std::string node_ptc_nums_to_string(RRNodeId node) const;

libs/librrgraph/src/base/rr_graph_storage.cpp

@@ -629,16 +629,15 @@ void t_rr_graph_storage::set_node_direction(RRNodeId id, Direction new_direction
     node_storage_[id].dir_side_.direction = new_direction;
 }
 
-void t_rr_graph_storage::set_node_ptc_nums(RRNodeId node, const std::string& ptc_str) {
+void t_rr_graph_storage::set_node_ptc_nums(RRNodeId node, const std::vector<int>& ptc_numbers) {
     VTR_ASSERT(size_t(node) < node_storage_.size());
-    std::vector<std::string> ptc_tokens = vtr::StringToken(ptc_str).split(",");
-    VTR_ASSERT(ptc_tokens.size() >= 1);
-    set_node_ptc_num(node, std::stoi(ptc_tokens[0]));
-    if (ptc_tokens.size() > 1) {
+    VTR_ASSERT(ptc_numbers.size() >= 1);
+    set_node_ptc_num(node, ptc_numbers[0]);
+    if (ptc_numbers.size() > 1) {
         VTR_ASSERT(size_t(node) < node_tilable_track_nums_.size());
-        node_tilable_track_nums_[node].resize(ptc_tokens.size());
-        for (size_t iptc = 0; iptc < ptc_tokens.size(); iptc++) {
-            node_tilable_track_nums_[node][iptc] = std::stoi(ptc_tokens[iptc]);
+        node_tilable_track_nums_[node].resize(ptc_numbers.size());
+        for (size_t iptc = 0; iptc < ptc_numbers.size(); iptc++) {
+            node_tilable_track_nums_[node][iptc] = ptc_numbers[iptc];
         }
     }
 }

libs/librrgraph/src/base/rr_graph_storage.h

@@ -708,11 +708,9 @@ class t_rr_graph_storage {
     /**
      * @brief Set the ptc numbers for a node.
      * @param node The node id
-     * @param ptc_str The ptc numbers string. Note that if tileable RR Graph is used,
-     * multiple ptc numbers can be assigned to node of the type of CHANX or CHANY. If that's the case,
-     * the ptc numbers are separated by commas.
+     * @param ptc_numbers The ptc numbers vector to be set for the node.
      */
-    void set_node_ptc_nums(RRNodeId node, const std::string& ptc_str);
+    void set_node_ptc_nums(RRNodeId node, const std::vector<int>& ptc_numbers);
 
     /**
      * @brief Add a track number to a node.

libs/librrgraph/src/base/rr_graph_utils.cpp

@@ -390,4 +390,13 @@ bool chan_same_type_are_adjacent(const RRGraphView& rr_graph, RRNodeId node1, RR
     }
 
     return false; // unreachable
-}
+}
+
+std::vector<int> parse_ptc_numbers(const std::string& ptc_str) {
+    std::vector<int> ptc_numbers;
+    std::vector<std::string> ptc_tokens = vtr::StringToken(ptc_str).split(",");
+    for (const std::string& ptc_token : ptc_tokens) {
+        ptc_numbers.push_back(std::stoi(ptc_token));
+    }
+    return ptc_numbers;
+}

libs/librrgraph/src/base/rr_graph_utils.h

@@ -125,3 +125,10 @@ bool chanxy_chanz_adjacent(const RRGraphView& rr_graph, RRNodeId node1, RRNodeId
 
 bool chan_same_type_are_adjacent(const RRGraphView& rr_graph, RRNodeId node1, RRNodeId node2);
 
+/**
+ * @brief Parse the ptc numbers string into a vector of integers.
+ * @param ptc_str The ptc numbers string in the format of "ptc1,ptc2,ptc3,...ptcn".
+ * @return A vector of integers representing the ptc numbers.
+ */
+std::vector<int> parse_ptc_numbers(const std::string& ptc_str);
+

libs/librrgraph/src/io/rr_graph_uxsdcxx_serializer.h

@@ -713,7 +713,8 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
     inline void set_node_loc_ptc(const char* ptc, int& inode) final {
         t_rr_node node = (*rr_nodes_)[inode];
         RRNodeId node_id = node.id();
-        return rr_graph_builder_->set_node_ptc_nums(node_id, std::string(ptc));
+        std::vector<int> ptc_numbers = parse_ptc_numbers(ptc);
+        return rr_graph_builder_->set_node_ptc_nums(node_id, ptc_numbers);
     }
 
     inline const char* get_node_loc_ptc(const t_rr_node& node) final {