final comments and rr_graph argument has been added

Author: umariqbal-rs

vpr/src/route/router_lookahead_extended_map.cpp

@@ -399,7 +399,7 @@ std::pair<float, int> ExtendedMapLookahead::run_dijkstra(RRNodeId start_node,
             path_count++;
             this->add_paths<Entry>(start_node, current, *paths, routing_costs);
         } else {
-            util::expand_dijkstra_neighbours(current, paths, node_expanded, &pq);
+            util::expand_dijkstra_neighbours(rr_graph, current, paths, node_expanded, &pq);
             (*node_expanded)[size_t(node)] = true;
         }
     }

vpr/src/route/router_lookahead_map_utils.cpp

@@ -252,14 +252,13 @@ util::Cost_Entry util::Expansion_Cost_Entry::get_median_entry() const {
 }
 
 template<typename Entry>
-void expand_dijkstra_neighbours(const Entry& parent_entry,
+void expand_dijkstra_neighbours(const RRGraphView& rr_graph,
+                                const Entry& parent_entry,
                                 std::vector<util::Search_Path>* paths,
                                 std::vector<bool>* node_expanded,
                                 std::priority_queue<Entry,
                                                     std::vector<Entry>,
                                                     std::greater<Entry>>* pq) {
-    auto& device_ctx = g_vpr_ctx.device();
-    const auto& rr_graph = device_ctx.rr_graph;
     RRNodeId parent = parent_entry.rr_node;
 
     for (int iedge = 0; iedge < rr_graph.num_edges(parent); iedge++) {
@@ -285,13 +284,15 @@ void expand_dijkstra_neighbours(const Entry& parent_entry,
     }
 }
 
-template void expand_dijkstra_neighbours(const PQ_Entry_Delay& parent_entry,
+template void expand_dijkstra_neighbours(const RRGraphView& rr_graph,
+                                         const PQ_Entry_Delay& parent_entry,
                                          std::vector<Search_Path>* paths,
                                          std::vector<bool>* node_expanded,
                                          std::priority_queue<PQ_Entry_Delay,
                                                              std::vector<PQ_Entry_Delay>,
                                                              std::greater<PQ_Entry_Delay>>* pq);
-template void expand_dijkstra_neighbours(const PQ_Entry_Base_Cost& parent_entry,
+template void expand_dijkstra_neighbours(const RRGraphView& rr_graph,
+                                         const PQ_Entry_Base_Cost& parent_entry,
                                          std::vector<Search_Path>* paths,
                                          std::vector<bool>* node_expanded,
                                          std::priority_queue<PQ_Entry_Base_Cost,

vpr/src/route/router_lookahead_map_utils.h

@@ -23,6 +23,7 @@
 #include "vpr_types.h"
 #include "vtr_geometry.h"
 #include "rr_node.h"
+#include "rr_graph_view.h"
 
 namespace util {
 
@@ -238,7 +239,8 @@ struct Search_Path {
 
 /* iterates over the children of the specified node and selectively pushes them onto the priority queue */
 template<typename Entry>
-void expand_dijkstra_neighbours(const Entry& parent_entry,
+void expand_dijkstra_neighbours(const RRGraphView& rr_graph,
+                                const Entry& parent_entry,
                                 std::vector<Search_Path>* paths,
                                 std::vector<bool>* node_expanded,
                                 std::priority_queue<Entry,

vpr/src/route/rr_node.cpp

@@ -10,7 +10,7 @@ short t_rr_node::length() const {
         storage_->node_yhigh(id_) - storage_->node_ylow(id_),
         storage_->node_xhigh(id_) - storage_->node_xlow(id_));
 }
-
+/* TODO: This API should be reworked once rr_switch APIs are in RRGraphView. */
 bool t_rr_node::edge_is_configurable(t_edge_size iedge) const {
     auto& device_ctx = g_vpr_ctx.device();
     const auto& rr_graph = device_ctx.rr_graph;