Merge branch 'master' into api_set_node_cost_index

Author: Muhammad Haris Zafar

.gitignore

@@ -14,14 +14,15 @@ CMakeFiles
 build
 
 #
-#VTR Tasks
+#VTR Flow/Tasks
 #
 vtr_flow/tasks/**/run[0-9]*
 vtr_flow/tasks/**/run_latest
 vtr_flow/tasks/**/latest
 vtr_flow/tasks/**/qor_geomean.txt
 vtr_flow/tasks/**/task_summary/
 quick_test/*
+temp/
 
 #
 # Titan benchmarks

vpr/src/device/rr_graph_builder.h

@@ -69,15 +69,16 @@ class RRGraphBuilder {
         node_storage_.set_node_coordinates(id, x1, y1, x2, y2);
     }
 
-    /** @brief @note Set the node_ptc_num; This API is very powerful and developers should not use it unless it is necessary,
-     * e.g the node type is unknown. If the node type is known, the more specific routines, `set_node_pin_num()`,
-     * `set_node_track_num()`and `set_node_class_num()`, for different types of nodes should be used.*/
-
     /** @brief The ptc_num carries different meanings for different node types
      * (true in VPR RRG that is currently supported, may not be true in customized RRG)
      * CHANX or CHANY: the track id in routing channels
      * OPIN or IPIN: the index of pins in the logic block data structure
-     * SOURCE and SINK: the class id of a pin (indicating logic equivalence of pins) in the logic block data structure */
+     * SOURCE and SINK: the class id of a pin (indicating logic equivalence of pins) in the logic block data structure 
+     * @note 
+     * This API is very powerful and developers should not use it unless it is necessary,
+     * e.g the node type is unknown. If the node type is known, the more specific routines, `set_node_pin_num()`,
+     * `set_node_track_num()`and `set_node_class_num()`, for different types of nodes should be used.*/
+
     inline void set_node_ptc_num(RRNodeId id, short new_ptc_num) {
         node_storage_.set_node_ptc_num(id, new_ptc_num);
     }
@@ -110,6 +111,12 @@ class RRGraphBuilder {
         node_storage_.set_node_cost_index(id, new_cost_index);
     }
 
+    /** @brief Add the side where the node physically locates on a logic block.
+     * Mainly applicable to IPIN and OPIN nodes.*/
+    inline void add_node_side(RRNodeId id, e_side new_side) {
+        node_storage_.add_node_side(id, new_side);
+    }
+
     /* -- Internal data storage -- */
   private:
     /* TODO: When the refactoring effort finishes, 

vpr/src/route/rr_graph.cpp

@@ -1494,7 +1494,7 @@ static void build_rr_sinks_sources(RRGraphBuilder& rr_graph_builder,
                             //for the pin on all sides at which it exists
                             //As such, multipler driver problem can be avoided.
                             rr_graph_builder.set_node_coordinates(inode, i + width_offset, j + height_offset, i + width_offset, j + height_offset);
-                            L_rr_node.add_node_side(inode, side);
+                            rr_graph_builder.add_node_side(inode, side);
 
                             // Sanity check
                             VTR_ASSERT(rr_graph.is_node_on_specific_side(RRNodeId(inode), side));

vpr/src/route/rr_graph_uxsdcxx_serializer.h

@@ -630,6 +630,7 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
 
     inline void set_node_loc_side(uxsd::enum_loc_side side, int& inode) final {
         auto node = (*rr_nodes_)[inode];
+        RRNodeId node_id = node.id();
         const auto& rr_graph = (*rr_graph_);
 
         if (uxsd::enum_loc_side::UXSD_INVALID == side) {
@@ -643,7 +644,7 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
             std::bitset<NUM_SIDES> sides_to_add = from_uxsd_loc_side(side);
             for (const e_side& side_to_add : SIDES) {
                 if (sides_to_add[side_to_add]) {
-                    node.add_side(side_to_add);
+                    rr_graph_builder_->add_node_side(node_id, side_to_add);
                 }
             }
         }

vpr/src/route/rr_node.cpp

@@ -54,7 +54,3 @@ bool t_rr_node::validate() const {
 void t_rr_node::set_rc_index(short new_rc_index) {
     storage_->set_node_rc_index(id_, new_rc_index);
 }
-
-void t_rr_node::add_side(e_side new_side) {
-    storage_->add_node_side(id_, new_side);
-}

vpr/src/route/rr_node.h

@@ -109,7 +109,6 @@ class t_rr_node {
     void set_rc_index(short);
 
     void set_side(e_side);
-    void add_side(e_side);
 
     void next_node() {
         id_ = RRNodeId((size_t)(id_) + 1);