remove unused header includes

Author: soheilshahrouz

vpr/src/place/place_macro.cpp

@@ -1,5 +1,4 @@
 #include <cstdio>
-#include <ctime>
 #include <cmath>
 #include <sstream>
 #include <map>
@@ -12,8 +11,6 @@
 #include "vpr_error.h"
 #include "physical_types.h"
 #include "globals.h"
-#include "place.h"
-#include "read_xml_arch_file.h"
 #include "place_macro.h"
 #include "vpr_utils.h"
 #include "echo_files.h"

vpr/src/place/place_timing_update.cpp

@@ -168,7 +168,7 @@ void update_timing_cost(const PlaceDelayModel* delay_model,
                         PlacerState& placer_state,
                         double* timing_cost) {
 #ifdef INCR_COMP_TD_COSTS
-    update_td_costs(delay_model, *criticalities, block_locs, timing_cost);
+    update_td_costs(delay_model, *criticalities, placer_state, timing_cost);
 #else
     comp_td_costs(delay_model, *criticalities, placer_state, timing_cost);
 #endif
@@ -298,7 +298,7 @@ void update_td_costs(const PlaceDelayModel* delay_model,
 
 #ifdef VTR_ASSERT_DEBUG_ENABLED
     double check_timing_cost = 0.;
-    comp_td_costs(delay_model, place_crit, &check_timing_cost);
+    comp_td_costs(delay_model, place_crit, placer_state, &check_timing_cost);
     VTR_ASSERT_DEBUG_MSG(check_timing_cost == *timing_cost,
                          "Total timing cost calculated incrementally in update_td_costs() is "
                          "not consistent with value calculated from scratch in comp_td_costs()");

vpr/src/place/simpleRL_move_generator.cpp

@@ -1,11 +1,15 @@
+
 #include "simpleRL_move_generator.h"
+
 #include "globals.h"
+#include "vtr_random.h"
+#include "vtr_time.h"
+
 #include <algorithm>
 #include <numeric>
 #include <utility>
 
-#include "vtr_random.h"
-#include "vtr_time.h"
+
 /* File-scope routines */
 //a scaled and clipped exponential function
 static float scaled_clipped_exp(float x) { return std::exp(std::min(1000 * x, float(3.0))); }
@@ -50,7 +54,7 @@ KArmedBanditAgent::KArmedBanditAgent(std::vector<e_move_type> available_moves, e
 }
 
 /*
- * If the agent selects both move type and block type, the would lool like this:
+ * If the agent selects both move type and block type, the action table would look like this:
  *
  *    +---------------+---------------+---------------+---------------+
  *    | (blk0, move0) | (blk0, move1) | ............. | (blk0, moveN) |

vpr/src/place/timing_place.cpp

@@ -3,18 +3,13 @@
  * @brief Stores the method definitions of classes defined in timing_place.h.
  */
 
-#include <cstdio>
 #include <cmath>
 
 #include "vtr_util.h"
-#include "vtr_memory.h"
-#include "vtr_log.h"
 
 #include "vpr_types.h"
 #include "vpr_utils.h"
-#include "globals.h"
 #include "net_delay.h"
-#include "timing_place_lookup.h"
 #include "timing_place.h"
 #include "placer_state.h"
 

vpr/src/place/timing_place_lookup.cpp

@@ -1,7 +1,5 @@
-#include <cstdio>
-#include <cstring>
+
 #include <cmath>
-#include <time.h>
 #include <limits>
 
 #include "rr_graph_fwd.h"
@@ -15,20 +13,14 @@
 #include "vtr_geometry.h"
 
 #include "arch_util.h"
-
 #include "vpr_types.h"
 #include "globals.h"
 #include "place_and_route.h"
-#include "route_common.h"
 #include "route_net.h"
-#include "route_export.h"
-#include "rr_graph.h"
 #include "timing_place_lookup.h"
 #include "read_xml_arch_file.h"
-#include "echo_files.h"
 #include "atom_netlist.h"
-#include "rr_graph2.h"
-#include "place_util.h"
+
 // all functions in profiling:: namespace, which are only activated if PROFILE is defined
 #include "route_profiling.h"
 #include "router_delay_profiling.h"
@@ -167,7 +159,7 @@ static int get_longest_segment_length(std::vector<t_segment_inf>& segment_inf);
 static void fix_empty_coordinates(vtr::NdMatrix<float, 3>& delta_delays);
 static void fix_uninitialized_coordinates(vtr::NdMatrix<float, 3>& delta_delays);
 
-static float find_neightboring_average(vtr::NdMatrix<float, 3>& matrix, t_physical_tile_loc tile_loc, int max_distance);
+static float find_neighboring_average(vtr::NdMatrix<float, 3>& matrix, t_physical_tile_loc tile_loc, int max_distance);
 
 /******* Globally Accessible Functions **********/
 
@@ -894,7 +886,7 @@ float delay_reduce(std::vector<float>& delays, e_reducer reducer) {
  * If no legal values are found to average over with a range of max_distance,
  * we return IMPOSSIBLE_DELTA.
  */
-static float find_neightboring_average(
+static float find_neighboring_average(
     vtr::NdMatrix<float, 3>& matrix,
     t_physical_tile_loc tile_loc,
     int max_distance) {
@@ -949,7 +941,7 @@ static void fix_empty_coordinates(vtr::NdMatrix<float, 3>& delta_delays) {
         for (int delta_x = 0; delta_x < (int)delta_delays.dim_size(1); ++delta_x) {
             for (int delta_y = 0; delta_y < (int)delta_delays.dim_size(2); ++delta_y) {
                 if (delta_delays[layer_num][delta_x][delta_y] == EMPTY_DELTA) {
-                    delta_delays[layer_num][delta_x][delta_y] = find_neightboring_average(delta_delays, {delta_x, delta_y, layer_num}, kMaxAverageDistance);
+                    delta_delays[layer_num][delta_x][delta_y] = find_neighboring_average(delta_delays, {delta_x, delta_y, layer_num}, kMaxAverageDistance);
                 }
             }
         }
@@ -987,7 +979,7 @@ static void fill_impossible_coordinates(vtr::NdMatrix<float, 3>& delta_delays) {
         for (int delta_x = 0; delta_x < (int)delta_delays.dim_size(1); ++delta_x) {
             for (int delta_y = 0; delta_y < (int)delta_delays.dim_size(2); ++delta_y) {
                 if (delta_delays[layer_num][delta_x][delta_y] == IMPOSSIBLE_DELTA) {
-                    delta_delays[layer_num][delta_x][delta_y] = find_neightboring_average(
+                    delta_delays[layer_num][delta_x][delta_y] = find_neighboring_average(
                         delta_delays, {delta_x, delta_y, layer_num}, kMaxAverageDistance);
                 }
             }