[vpr] fixed a bug where rr graph I/O always require node_ptc_nums

Author: tangxifan

libs/librrgraph/src/base/rr_graph_builder.cpp

@@ -240,27 +240,39 @@ std::vector<RREdgeId> RRGraphBuilder::node_in_edges(RRNodeId node) const {
 
 void RRGraphBuilder::set_node_ptc_nums(RRNodeId node, const std::string& ptc_str) {
     VTR_ASSERT(size_t(node) < node_storage_.size());
-    VTR_ASSERT(size_t(node) < node_ptc_nums_.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]));
-    node_ptc_nums_[node].resize(ptc_tokens.size());
-    for (size_t iptc = 0; iptc < ptc_tokens.size(); iptc++) {
-      node_ptc_nums_[node].push_back(std::stoi(ptc_tokens[iptc]));
+    if (ptc_tokens.size() > 1) {
+        VTR_ASSERT(size_t(node) < node_ptc_nums_.size());
+        node_ptc_nums_[node].resize(ptc_tokens.size());
+        for (size_t iptc = 0; iptc < ptc_tokens.size(); iptc++) {
+          node_ptc_nums_[node][iptc] = std::stoi(ptc_tokens[iptc]);
+        }
     }
 }
 
 std::string RRGraphBuilder::node_ptc_nums_to_string(RRNodeId node) const {
-    VTR_ASSERT(size_t(node) < node_ptc_nums_.size());
     std::string ret;
-    for (size_t iptc = 0; iptc < node_ptc_nums_[node].size(); iptc++) {
-      ret += std::to_string(node_ptc_nums_[node][iptc]) + ",";
+    if (node_ptc_nums_.empty()) {
+        ret = std::to_string(node_storage_.node_ptc_num(node));
+    } else {
+        VTR_ASSERT(size_t(node) < node_ptc_nums_.size());
+        for (size_t iptc = 0; iptc < node_ptc_nums_[node].size(); iptc++) {
+            ret += std::to_string(node_ptc_nums_[node][iptc]) + ",";
+        }
+        /* Remove the last comma */
+        ret.pop_back();
     }
-    /* Remove the last comma */
-    ret.pop_back();
     return ret;
 }
-    
+
+bool RRGraphBuilder::node_contain_multiple_ptc(RRNodeId node) const {
+    if (node_ptc_nums_.empty()) {
+        return false;
+    }
+    return node_ptc_nums_[node].size() > 1;
+}
 
 void RRGraphBuilder::add_node_track_num(RRNodeId node, vtr::Point<size_t> node_offset, short track_id) {
     VTR_ASSERT(size_t(node) < node_storage_.size());

libs/librrgraph/src/base/rr_graph_builder.h

@@ -232,6 +232,9 @@ class RRGraphBuilder {
     /** @brief With a given node, output ptc numbers into a string (use comma as delima). This function is used by rr graph writer only. Not suggested for internal builder!!! */
     std::string node_ptc_nums_to_string(RRNodeId node) const;
 
+    /** @brief Identify if a node contains multiple ptc numbers. Mainly used by I/O reader only. Not suggest for internal builder */
+    bool node_contain_multiple_ptc(RRNodeId node) const;
+
     /** @brief Set the node direction; The node direction is only available of routing channel nodes, such as x-direction routing tracks (CHANX) and y-direction routing tracks (CHANY). For other nodes types, this value is not meaningful and should be set to NONE. */
     inline void set_node_direction(RRNodeId id, Direction new_direction) {
         node_storage_.set_node_direction(id, new_direction);

libs/librrgraph/src/io/rr_graph_uxsdcxx_serializer.h

@@ -1792,8 +1792,10 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
             auto node = (*rr_nodes_)[inode];
             rr_graph_builder.add_node_to_all_locs(node.id());
             /* Set track numbers as a node may have multiple ptc */
-            if (CHANX == rr_graph_->node_type(node.id()) || CHANY == rr_graph_->node_type(node.id())) {
-                rr_graph_builder.add_track_node_to_lookup(node.id());
+            if (rr_graph_builder.node_contain_multiple_ptc(node.id())) {
+                if (CHANX == rr_graph_->node_type(node.id()) || CHANY == rr_graph_->node_type(node.id())) {
+                    rr_graph_builder.add_track_node_to_lookup(node.id());
+                }
             }
         }
     }