[VPR] Added a new API add_node_to_all_locs to RRGraphBuilder

Author: tangxifan

vpr/src/device/rr_graph_builder.cpp

@@ -1,3 +1,4 @@
+#include "vtr_log.h"
 #include "rr_graph_builder.h"
 
 RRGraphBuilder::RRGraphBuilder(t_rr_graph_storage* node_storage,
@@ -13,3 +14,37 @@ t_rr_graph_storage& RRGraphBuilder::node_storage() {
 RRSpatialLookup& RRGraphBuilder::node_lookup() {
     return node_lookup_;
 }
+
+void RRGraphBuilder::add_node_to_all_locs(RRNodeId node) {
+    t_rr_type node_type = node_storage_.node_type(node);
+    short node_ptc_num = node_storage_.node_ptc_num(node);
+    for (int ix = node_storage_.node_xlow(node); ix <= node_storage_.node_xhigh(node); ix++) {
+        for (int iy = node_storage_.node_ylow(node); iy <= node_storage_.node_yhigh(node); iy++) {
+            switch (node_type) {
+                case SOURCE:
+                case SINK:
+                case CHANY:
+                    node_lookup_.add_node(node, ix, iy, node_type, node_ptc_num, SIDES[0]);
+                    break;
+                case CHANX:
+                    /* Currently need to swap x and y for CHANX because of chan, seg convention 
+                     * TODO: Once the builders is reworked for use consistent (x, y) convention,
+                     * the following swapping can be removed
+                     */
+                    node_lookup_.add_node(node, iy, ix, node_type, node_ptc_num, SIDES[0]);
+                    break;
+                case OPIN:
+                case IPIN:
+                    for (const e_side& side : SIDES) {
+                        if (node_storage_.is_node_on_specific_side(node, side)) {
+                            node_lookup_.add_node(node, ix, iy, node_type, node_ptc_num, side);
+                        }
+                    }
+                    break;
+                default:
+                    VTR_LOG_ERROR("Invalid node type for node '%lu' in the routing resource graph file", size_t(node));
+                    break;
+            }
+        }
+    }
+}

vpr/src/device/rr_graph_builder.h

@@ -37,6 +37,15 @@ class RRGraphBuilder {
     t_rr_graph_storage& node_storage();
     /* Return a writable object for update the fast look-up of rr_node */
     RRSpatialLookup& node_lookup();
+    /* Add an existing rr_node in the node storage to the node look-up
+     * This function requires a valid node which has already been allocated in the node storage, with
+     * - a valid node id
+     * - valid geometry information: xlow/ylow/xhigh/yhigh
+     * - a valid node type
+     * - a valid node ptc number
+     * - a valid side (applicable to OPIN and IPIN nodes only
+     */
+    void add_node_to_all_locs(RRNodeId node);
 
     /* -- Internal data storage -- */
   private:

vpr/src/route/rr_graph_uxsdcxx_serializer.h

@@ -1566,7 +1566,6 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
     /*Allocates and load the rr_node look up table. SINK and SOURCE, IPIN and OPIN
      *share the same look up table. CHANX and CHANY have individual look ups */
     void process_rr_node_indices() {
-        const auto& rr_graph = (*rr_graph_);
         auto& rr_graph_builder = (*rr_graph_builder_);
 
         /* Alloc the lookup table */
@@ -1581,35 +1580,7 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
         /* Add the correct node into the vector */
         for (size_t inode = 0; inode < rr_nodes_->size(); inode++) {
             auto node = (*rr_nodes_)[inode];
-            for (int ix = node.xlow(); ix <= node.xhigh(); ix++) {
-                for (int iy = node.ylow(); iy <= node.yhigh(); iy++) {
-                    switch (rr_graph.node_type(node.id())) {
-                        case SOURCE:
-                        case SINK:
-                        case CHANY:
-                            rr_graph_builder.node_lookup().add_node(node.id(), ix, iy, rr_graph.node_type(node.id()), node.ptc_num(), SIDES[0]);
-                            break;
-                        case CHANX:
-                            /* Currently need to swap x and y for CHANX because of chan, seg convention 
-                             * TODO: Once the builders is reworked for use consistent (x, y) convention,
-                             * the following swapping can be removed
-                             */
-                            rr_graph_builder.node_lookup().add_node(node.id(), iy, ix, rr_graph.node_type(node.id()), node.ptc_num(), SIDES[0]);
-                            break;
-                        case OPIN:
-                        case IPIN:
-                            for (const e_side& side : SIDES) {
-                                if (node.is_node_on_specific_side(side)) {
-                                    rr_graph_builder.node_lookup().add_node(node.id(), ix, iy, rr_graph.node_type(node.id()), node.ptc_num(), side);
-                                }
-                            }
-                            break;
-                        default:
-                            report_error("Invalid node type for node '%lu' in the routing resource graph file", size_t(node.id()));
-                            break;
-                    }
-                }
-            }
+            rr_graph_builder.add_node_to_all_locs(node.id());
         }
     }