make format

Author: soheilshahrouz

vpr/src/base/stats.cpp

@@ -267,8 +267,8 @@ static void get_channel_occupancy_stats(const Netlist<>& net_list, bool /***/) {
 }
 
 void write_channel_occupancy_table(const std::string_view filename,
-                                          const vtr::Matrix<int>& occupancy,
-                                          const std::vector<int>& capacity_list) {
+                                   const vtr::Matrix<int>& occupancy,
+                                   const std::vector<int>& capacity_list) {
     constexpr int w_coord = 6;
     constexpr int w_value = 12;
     constexpr int w_percent = 12;

vpr/src/base/stats.h

@@ -69,4 +69,4 @@ void print_device_utilization(const float target_device_utilization);
  */
 void write_channel_occupancy_table(const std::string_view filename,
                                    const vtr::Matrix<int>& occupancy,
-                                   const std::vector<int>& capacity_list);
+                                   const std::vector<int>& capacity_list);

vpr/src/place/annealer.cpp

@@ -682,17 +682,15 @@ void PlacementAnnealer::outer_loop_update_timing_info() {
         || (annealing_state_.rlim / MoveGenerator::first_rlim) < placer_opts_.congestion_acceptance_rate_trigger) {
         costs_.congestion_cost = net_cost_handler_.estimate_routing_chann_util();
 
-
         if (!congestion_modeling_started_) {
             VTR_LOG("Congestion modeling started. %f %f\n", placer_opts_.congestion_factor, placer_opts_.timing_tradeoff);
             placer_opts_.congestion_factor = congestion_factor_;
             placer_opts_.congestion_factor /= 1.f + congestion_factor_;
-//            placer_opts_.congestion_factor /= 1.f + placer_opts_.congestion_factor;
+            //            placer_opts_.congestion_factor /= 1.f + placer_opts_.congestion_factor;
             placer_opts_.timing_tradeoff /= 1.f + congestion_factor_;
             VTR_LOG("Congestion modeling started. %f %f\n", placer_opts_.congestion_factor, placer_opts_.timing_tradeoff);
             congestion_modeling_started_ = true;
         }
-
     }
 
     // Update the cost normalization factors

vpr/src/place/net_cost_handler.cpp

@@ -155,14 +155,14 @@ NetCostHandler::NetCostHandler(const t_placer_opts& placer_opts,
     alloc_and_load_chan_w_factors_for_place_cost_();
 
     chanx_util_ = vtr::Matrix<double>({{
-                                          device_ctx.grid.width(),     //[0 .. device_ctx.grid.width() - 1] (length of x channel)
-                                          device_ctx.grid.height()     //[0 .. device_ctx.grid.height() - 1] (# x channels)
+                                          device_ctx.grid.width(), //[0 .. device_ctx.grid.width() - 1] (length of x channel)
+                                          device_ctx.grid.height() //[0 .. device_ctx.grid.height() - 1] (# x channels)
                                       }},
                                       0);
 
     chany_util_ = vtr::Matrix<double>({{
-                                          device_ctx.grid.width(),     //[0 .. device_ctx.grid.width() - 1] (# y channels)
-                                          device_ctx.grid.height()     //[0 .. device_ctx.grid.height() - 1] (length of y channel)
+                                          device_ctx.grid.width(), //[0 .. device_ctx.grid.width() - 1] (# y channels)
+                                          device_ctx.grid.height() //[0 .. device_ctx.grid.height() - 1] (length of y channel)
                                       }},
                                       0);
 
@@ -342,8 +342,6 @@ std::tuple<double, double, double> NetCostHandler::comp_per_layer_bb_cost_(e_cos
         }
     }
 
-
-
     return {cost, expected_wirelength, cong_cost};
 }
 
@@ -1438,8 +1436,8 @@ double NetCostHandler::get_net_cube_cong_cost_(ClusterNetId net_id, bool use_ts)
     float x_chan_cong = (x_chan_util < threshold) ? 0.0f : x_chan_util - threshold;
     float y_chan_cong = (y_chan_util < threshold) ? 0.0f : y_chan_util - threshold;
 
-//    return (distance_x * x_chan_cong) + (distance_y * y_chan_cong);
-    return  x_chan_cong + y_chan_cong;
+    //    return (distance_x * x_chan_cong) + (distance_y * y_chan_cong);
+    return x_chan_cong + y_chan_cong;
 }
 
 double NetCostHandler::get_net_per_layer_bb_cost_(ClusterNetId net_id, bool use_ts) {
@@ -1772,15 +1770,13 @@ double NetCostHandler::estimate_routing_chann_util() {
         std::tie(chanx_width_, chany_width_) = calculate_channel_width();
     }
 
-
     for (size_t x = 0; x < chanx_util_.dim_size(0); ++x) {
         for (size_t y = 0; y < chanx_util_.dim_size(1); ++y) {
             if (chanx_width_[0][x][y] > 0) {
                 chanx_util_[x][y] /= chanx_width_[0][x][y];
             } else {
                 chanx_util_[x][y] = 1.;
             }
-
         }
     }
 

vpr/src/place/net_cost_handler.h

@@ -251,7 +251,6 @@ class NetCostHandler {
     vtr::NdMatrix<int, 3> chanx_width_;
     vtr::NdMatrix<int, 3> chany_width_;
 
-
     /**
      * @brief The matrix below is used to calculate a chanz_place_cost_fac based on the average channel width in 
      * the cross-die-layer direction over a 2D (x,y) region. We don't assume the inter-die connectivity is the same at all (x,y) locations, so we

vpr/src/place/placer.cpp

@@ -123,7 +123,7 @@ Placer::Placer(const Netlist<>& net_list,
     } else {
         VTR_ASSERT(placer_opts.place_algorithm == e_place_algorithm::BOUNDING_BOX_PLACE);
         // Timing cost is not used
-        costs_.timing_cost = std::numeric_limits<double>::quiet_NaN();;
+        costs_.timing_cost = std::numeric_limits<double>::quiet_NaN();
     }
 
     costs_.update_norm_factors();