make format

Author: soheilshahrouz

vpr/src/base/SetupVPR.cpp

@@ -489,7 +489,6 @@ static void SetupRouterOpts(const t_options& Options, t_router_opts* RouterOpts)
     RouterOpts->initial_acc_cost_chan_congestion_threshold = Options.router_initial_acc_cost_chan_congestion_threshold;
     RouterOpts->initial_acc_cost_chan_congestion_weight = Options.router_initial_acc_cost_chan_congestion_weight;
 
-
     RouterOpts->max_convergence_count = Options.router_max_convergence_count;
     RouterOpts->reconvergence_cpd_threshold = Options.router_reconvergence_cpd_threshold;
     RouterOpts->initial_timing = Options.router_initial_timing;

vpr/src/place/net_cost_handler.cpp

@@ -1762,16 +1762,12 @@ std::pair<vtr::Matrix<double>, vtr::Matrix<double>> NetCostHandler::estimate_rou
     const auto& cluster_ctx = g_vpr_ctx.clustering();
     const auto& device_ctx = g_vpr_ctx.device();
 
-    auto chanx_util = vtr::Matrix<double>({{
-                                              device_ctx.grid.width(),
-                                              device_ctx.grid.height()
-                                          }},
+    auto chanx_util = vtr::Matrix<double>({{device_ctx.grid.width(),
+                                            device_ctx.grid.height()}},
                                           0);
 
-    auto chany_util = vtr::Matrix<double>({{
-                                              device_ctx.grid.width(),
-                                              device_ctx.grid.height()
-                                          }},
+    auto chany_util = vtr::Matrix<double>({{device_ctx.grid.width(),
+                                            device_ctx.grid.height()}},
                                           0);
 
     for (ClusterNetId net_id : cluster_ctx.clb_nlist.nets()) {
@@ -1813,4 +1809,4 @@ std::pair<vtr::Matrix<double>, vtr::Matrix<double>> NetCostHandler::estimate_rou
     }
 
     return {chanx_util, chany_util};
-}
+}

vpr/src/route/connection_router.tpp

@@ -231,7 +231,7 @@ float ConnectionRouter<Heap>::compute_node_cost_using_rcv(const t_conn_cost_para
     const t_conn_delay_budget* delay_budget = cost_params.delay_budget;
     // TODO: This function is not tested for is_flat == true
     VTR_ASSERT(is_flat_ != true);
-    const auto[expected_delay, expected_cong] = router_lookahead_.get_expected_delay_and_cong(to_node, target_node, cost_params, R_upstream);
+    const auto [expected_delay, expected_cong] = router_lookahead_.get_expected_delay_and_cong(to_node, target_node, cost_params, R_upstream);
 
     float expected_total_cong = expected_cong + backwards_cong;
     float expected_total_delay = expected_delay + backwards_delay;

vpr/src/route/route_common.cpp

@@ -437,7 +437,7 @@ static float comp_initial_acc_cost(RRNodeId node_id, const t_router_opts& route_
                 max_util = std::max(max_util, route_ctx.chanx_util[x][y]);
             }
 
-        } else  {
+        } else {
             VTR_ASSERT_SAFE(rr_type == e_rr_type::CHANY);
             int x = rr_graph.node_xlow(node_id);
             for (int y = rr_graph.node_ylow(node_id); y <= rr_graph.node_yhigh(node_id); y++) {

vpr/src/route/router_delay_profiling.cpp

@@ -93,7 +93,7 @@ bool RouterDelayProfiler::calculate_delay(RRNodeId source_node,
                                      -1,
                                      false,
                                      std::unordered_map<RRNodeId, int>());
-                                     
+
     std::tie(found_path, std::ignore, cheapest) = router_.timing_driven_route_connection_from_route_tree(
         tree.root(),
         sink_node,

vpr/src/route/router_lookahead_extended_map.cpp

@@ -428,7 +428,7 @@ void ExtendedMapLookahead::compute(const std::vector<t_segment_inf>& segment_inf
     vtr::ScopedStartFinishTimer timer("Computing connection box lookahead map");
 
     // Initialize rr_node_route_inf if not already
-//    alloc_and_load_rr_node_route_structs();
+    //    alloc_and_load_rr_node_route_structs();
 
     size_t num_segments = segment_inf.size();
     std::vector<SampleRegion> sample_regions = find_sample_regions(num_segments);

vpr/src/route/router_lookahead_map.cpp

@@ -391,32 +391,7 @@ std::pair<float, float> MapLookahead::get_expected_delay_and_cong(RRNodeId from_
     } else { /* Change this if you want to investigate route-throughs */
         return std::make_pair(0., 0.);
     }
-
-//    if (!acc_chanx_util_.empty()) {
-//
-//        auto [from_x, from_y] = util::get_adjusted_rr_position(from_node);
-//        auto [to_x, to_y] = util::get_adjusted_rr_position(to_node);
-//
-//        const auto [min_x, max_x] = std::minmax(from_x, to_x);
-//        const auto [min_y, max_y] = std::minmax(from_y, to_y);
-//
-//        int distance_x = max_x - min_x + 1;
-//        int distance_y = max_y - min_y + 1;
-//        int total_channel_segments = distance_x * distance_y;
-//
-//        float avg_x_chan_util = acc_chanx_util_.get_sum(min_x, min_y, max_x, max_y) / (float)total_channel_segments;
-//        float avg_y_chan_util = acc_chany_util_.get_sum(min_x, min_y, max_x, max_y) / (float)total_channel_segments;
-//
-//        float x_cong = std::max(avg_x_chan_util - chan_util_threshold_, 0.f);
-//        float y_cong = std::max(avg_y_chan_util - chan_util_threshold_, 0.f);
-//
-//        float x_factor = (float)distance_x / (float)(distance_x + distance_y);
-//        float y_factor = 1.f - x_factor;
-//        float cong = (x_factor * x_cong) + (y_factor * y_cong);
-//
-//        expected_cong_cost *= (1.f + cong) * congestion_weight_;
-//    }
-
+    
     return std::make_pair(expected_delay_cost, expected_cong_cost);
 }
 

vpr/src/route/router_lookahead_map_utils.h

@@ -368,5 +368,4 @@ void dump_readable_router_lookahead_map(const std::string& file_name, const std:
  */
 std::pair<int, int> get_adjusted_rr_position(RRNodeId rr);
 
-
 } // namespace util