extended_lookahead: cleaned code and reduced code duplication

Signed-off-by: Alessandro Comodi <[email protected]>

Author: acomodi

vpr/src/base/ShowSetup.cpp

@@ -445,6 +445,9 @@ static void ShowRouterOpts(const t_router_opts& RouterOpts) {
                 case e_router_lookahead::MAP:
                     VTR_LOG("MAP\n");
                     break;
+                case e_router_lookahead::EXTENDED_MAP:
+                    VTR_LOG("EXTENDED_MAP\n");
+                    break;
                 case e_router_lookahead::NO_OP:
                     VTR_LOG("NO_OP\n");
                     break;

vpr/src/route/router_lookahead_cost_map.cpp

@@ -11,7 +11,7 @@ class CostMap {
     void set_counts(size_t seg_count);
     void build_segment_map();
     int node_to_segment(int from_node_ind) const;
-    util::Cost_Entry find_cost(int from_seg_index, e_rr_type rr_type, int delta_x, int delta_y) const;
+    util::Cost_Entry find_cost(int from_seg_index, int delta_x, int delta_y) const;
     void set_cost_map(const util::RoutingCosts& delay_costs, const util::RoutingCosts& base_costs);
     std::pair<util::Cost_Entry, int> get_nearby_cost_entry(const vtr::NdMatrix<util::Cost_Entry, 2>& matrix, int cx, int cy, const vtr::Rect<int>& bounds);
     void read(const std::string& file);

vpr/src/route/router_lookahead_cost_map.h

@@ -1,5 +1,5 @@
-#ifndef CONNECTION_BOX_LOOKAHEAD_H_
-#define CONNECTION_BOX_LOOKAHEAD_H_
+#ifndef EXTENDED_MAP_LOOKAHEAD_H_
+#define EXTENDED_MAP_LOOKAHEAD_H_
 
 #include <vector>
 #include "physical_types.h"
@@ -10,8 +10,29 @@
 
 // Implementation of RouterLookahead based on source segment and destination connection box types
 class ExtendedMapLookahead : public RouterLookahead {
-  public:
+  private:
+    //Look-up table from SOURCE/OPIN to CHANX/CHANY of various types
+    util::t_src_opin_delays src_opin_delays;
+
+    //Look-up table from CHANX/CHANY to SINK/IPIN of various types
+    util::t_chan_ipins_delays chan_ipins_delays;
+
     std::pair<float, float> get_src_opin_delays(RRNodeId from_node, int delta_x, int delta_y, float criticality_fac) const;
+    float get_chan_ipin_delays(RRNodeId to_node) const;
+
+    template<typename Entry>
+    bool add_paths(int start_node_ind,
+                   Entry current,
+                   const std::vector<util::Search_Path>& paths,
+                   util::RoutingCosts* routing_costs);
+
+    template<typename Entry>
+    std::pair<float, int> run_dijkstra(int start_node_ind,
+                                       std::vector<bool>* node_expanded,
+                                       std::vector<util::Search_Path>* paths,
+                                       util::RoutingCosts* routing_costs);
+
+  public:
     float get_expected_cost(int node, int target_node, const t_conn_cost_params& params, float R_upstream) const override;
     float get_map_cost(int from_node_ind, int to_node_ind, float criticality_fac) const;
     void compute(const std::vector<t_segment_inf>& segment_inf) override;

vpr/src/route/router_lookahead_extended_map.cpp

@@ -4,8 +4,17 @@
 #include <limits>
 #include "vtr_ndmatrix.h"
 #include "router_lookahead.h"
+#include "router_lookahead_map_utils.h"
 
 class MapLookahead : public RouterLookahead {
+  private:
+    //Look-up table from SOURCE/OPIN to CHANX/CHANY of various types
+    util::t_src_opin_delays src_opin_delays;
+
+    /* queries the lookahead_map (should have been computed prior to routing) to get the expected cost
+     * from the specified source to the specified target */
+    float get_map_cost(RRNodeId from_node, RRNodeId to_node, float criticality_fac) const;
+
   protected:
     float get_expected_cost(int node, int target_node, const t_conn_cost_params& params, float R_upstream) const override;
     void compute(const std::vector<t_segment_inf>& segment_inf) override;
@@ -38,11 +47,3 @@ typedef vtr::NdMatrix<Cost_Entry, 4> t_wire_cost_map; //[0..1][[0..num_seg_types
 
 void read_router_lookahead(const std::string& file);
 void write_router_lookahead(const std::string& file);
-
-/* Computes the lookahead map to be used by the router. If a map was computed prior to this, a new one will not be computed again.
- * The rr graph must have been built before calling this function. */
-void compute_router_lookahead(const std::vector<t_segment_inf>& segment_inf);
-
-/* queries the lookahead_map (should have been computed prior to routing) to get the expected cost
- * from the specified source to the specified target */
-float get_lookahead_map_cost(RRNodeId from_node, RRNodeId to_node, float criticality_fac);