Merge branch 'master' into api_set_node_rc_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

@@ -107,6 +107,21 @@ class RRGraphBuilder {
         node_storage_.set_node_rc_index(id, new_rc_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);
+    }
+
+    /** @brief Counts the number of rr switches needed based on fan in to support mux
+     * size dependent switch delays. */
+    inline size_t count_rr_switches(
+        size_t num_arch_switches,
+        t_arch_switch_inf* arch_switch_inf,
+        t_arch_switch_fanin& arch_switch_fanins) {
+        return node_storage_.count_rr_switches(num_arch_switches, arch_switch_inf, arch_switch_fanins);
+    }
+
     /* -- Internal data storage -- */
   private:
     /* TODO: When the refactoring effort finishes, 

vpr/src/route/rr_graph.cpp

@@ -819,7 +819,7 @@ static void alloc_rr_switch_inf(t_arch_switch_fanin& arch_switch_fanins) {
     auto& device_ctx = g_vpr_ctx.mutable_device();
 
     /* allocate space for the rr_switch_inf array */
-    size_t num_rr_switches = device_ctx.rr_nodes.count_rr_switches(
+    size_t num_rr_switches = device_ctx.rr_graph_builder.count_rr_switches(
         device_ctx.num_arch_switches,
         device_ctx.arch_switch_inf,
         arch_switch_fanins);
@@ -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_cost_index(RRIndexedDataId new_cost_index) {
     storage_->set_node_cost_index(id_, new_cost_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_cost_index(RRIndexedDataId);
 
     void set_side(e_side);
-    void add_side(e_side);
 
     void next_node() {
         id_ = RRNodeId((size_t)(id_) + 1);