Merge pull request #3068 from AlexandreSinger/feature-include-cleanup

[Infra] Cleaned Up Includes in Analysis, Power, and Util Dirs

Author: AmirhosseinPoolad

vpr/src/analysis/timing_reports.cpp

@@ -1,14 +1,11 @@
 #include "timing_reports.h"
 
 #include <fstream>
-#include <sstream>
 
 #include "timing_reports.h"
-#include "rr_graph.h"
 
 #include "tatum/TimingReporter.hpp"
 
-#include "vtr_version.h"
 #include "vpr_types.h"
 #include "globals.h"
 

vpr/src/analysis/timing_reports.h

@@ -1,5 +1,4 @@
-#ifndef VPR_TIMING_REPORTS_H
-#define VPR_TIMING_REPORTS_H
+#pragma once
 
 #include "timing_info_fwd.h"
 #include "AnalysisDelayCalculator.h"
@@ -45,5 +44,3 @@ void generate_hold_timing_stats(const std::string& prefix,
 void generate_net_timing_report(const std::string& prefix,
                                 const SetupHoldTimingInfo& timing_info,
                                 const AnalysisDelayCalculator& delay_calc);
-
-#endif

vpr/src/power/PowerSpicedComponent.h

@@ -15,8 +15,7 @@
  *
  ********************************************************************/
 
-#ifndef __POWER_POWERSPICEDCOMPONENT_NMOS_H__
-#define __POWER_POWERSPICEDCOMPONENT_NMOS_H__
+#pragma once
 
 #include <vector>
 #include <string>
@@ -85,5 +84,3 @@ class PowerSpicedComponent {
     bool is_done_callibration();
     void print(FILE* fp);
 };
-
-#endif

vpr/src/power/power.h

@@ -22,8 +22,6 @@
  */
 
 /************************* INCLUDES *********************************/
-#include <list>
-
 #include "vpr_types.h"
 #include "PowerSpicedComponent.h"
 

vpr/src/power/power_callibrate.cpp

@@ -20,16 +20,11 @@
  */
 
 /************************* INCLUDES *********************************/
-#include <iostream>
-
 #include "vtr_assert.h"
-#include "vtr_memory.h"
 
 #include "power_callibrate.h"
 #include "power_components.h"
-#include "power_lowlevel.h"
 #include "power_util.h"
-#include "power_cmos_tech.h"
 #include "globals.h"
 
 /************************* FUNCTION DECLARATIONS ********************/

vpr/src/power/power_callibrate.h

@@ -21,9 +21,6 @@
 
 #pragma once
 
-/************************* INCLUDES *********************************/
-#include "power.h"
-
 /************************* DEFINES **********************************/
 const float power_callib_period = 5e-9;
 

vpr/src/power/power_cmos_tech.cpp

@@ -29,17 +29,12 @@
 #include "pugixml.hpp"
 #include "pugixml_util.hpp"
 
-#include "vtr_util.h"
-#include "vtr_memory.h"
-#include "vtr_math.h"
-
 #include "vpr_error.h"
 
 #include "globals.h"
 #include "power_cmos_tech.h"
 #include "power.h"
 #include "power_util.h"
-#include "read_xml_util.h"
 #include "PowerSpicedComponent.h"
 #include "power_callibrate.h"
 

vpr/src/power/power_cmos_tech.h

@@ -22,8 +22,7 @@
  * these data structures.
  */
 
-#ifndef __POWER_CMOS_TECH_H__
-#define __POWER_CMOS_TECH_H__
+#pragma once
 
 /************************* INCLUDES *********************************/
 #include "power.h"
@@ -50,4 +49,3 @@ void power_find_buffer_sc_levr(t_power_buffer_sc_levr_inf** lower,
                                t_power_buffer_sc_levr_inf** upper,
                                t_power_buffer_strength_inf* buffer_sc,
                                int input_mux_size);
-#endif

vpr/src/power/power_components.cpp

@@ -27,7 +27,6 @@
 
 #include "vtr_math.h"
 #include "vtr_assert.h"
-#include "vtr_memory.h"
 
 #include "power_components.h"
 #include "power_lowlevel.h"

vpr/src/power/power_components.h

@@ -20,13 +20,11 @@
  * within the FPGA (flip-flops, LUTs, interconnect structures, etc).
  */
 
-#ifndef __POWER_COMPONENTS_H__
-#define __POWER_COMPONENTS_H__
+#pragma once
 
 /************************* INCLUDES *********************************/
 #include <string>
 #include "power.h"
-#include "clustered_netlist.h"
 
 /************************* Defines **********************************/
 
@@ -93,5 +91,3 @@ void power_usage_mux_multilevel(t_power_usage* power_usage,
                                 bool output_level_restored,
                                 float period);
 void power_usage_buffer(t_power_usage* power_usage, float size, float in_prob, float in_dens, bool level_restored, float period);
-
-#endif

vpr/src/power/power_lowlevel.h

@@ -20,11 +20,11 @@
  * components (inverters, simple multiplexers, etc)
  */
 
-#ifndef __POWER_LOW_LEVEL_H__
-#define __POWER_LOW_LEVEL_H__
+#pragma once
 
 /************************* INCLUDES *********************************/
-#include "power.h"
+#include "physical_types.h"
+#include "vpr_types.h"
 
 /************************* GLOBALS **********************************/
 
@@ -89,5 +89,3 @@ float power_calc_mux_v_out(int num_inputs, float transistor_size, float v_in, fl
 float power_calc_node_switching(float capacitance, float density, float period);
 
 float power_calc_buffer_size_from_Cout(float C_out);
-
-#endif

vpr/src/power/power_sizing.cpp

@@ -28,13 +28,13 @@
 #include "logic_types.h"
 #include "vtr_util.h"
 #include "vtr_assert.h"
-#include "vtr_memory.h"
 
 #include "power_sizing.h"
 #include "power.h"
 #include "globals.h"
 #include "power_util.h"
 #include "vpr_utils.h"
+
 /************************ FILE SCOPE *********************************/
 static double f_MTA_area;
 

vpr/src/power/power_sizing.h

@@ -20,11 +20,7 @@
  * FPGA, for physical size estimations
  */
 
-#ifndef __POWER_TRANSISTOR_CNT_H__
-#define __POWER_TRANSISTOR_CNT_H__
-
-/************************* INCLUDES *********************************/
-#include "physical_types.h"
+#pragma once
 
 /************************* DEFINES **********************************/
 
@@ -42,4 +38,3 @@
 void power_sizing_init();
 double power_count_transistors_buffer(float buffer_size);
 double power_transistor_area(double num_transistors);
-#endif

vpr/src/power/power_util.cpp

@@ -26,7 +26,6 @@
 #include <string>
 
 #include "vtr_assert.h"
-#include "vtr_memory.h"
 
 #include "power_util.h"
 #include "globals.h"

vpr/src/power/power_util.h

@@ -19,15 +19,12 @@
  * This file provides utility functions used by power estimation.
  */
 
-#ifndef __POWER_UTIL_H__
-#define __POWER_UTIL_H__
+#pragma once
 
 /************************* INCLUDES *********************************/
 #include <string>
 #include "power.h"
-#include "power_components.h"
 #include "atom_netlist.h"
-#include "clustered_netlist.h"
 
 /************************* FUNCTION DECLARATIONS ********************/
 
@@ -75,5 +72,3 @@ void output_log(t_log* log_ptr, FILE* fp);
 void output_logs(FILE* fp, t_log* logs, int num_logs);
 
 void power_print_title(FILE* fp, const char* title);
-
-#endif

vpr/src/util/hash.cpp

@@ -1,7 +1,6 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "vtr_memory.h"
 #include "vtr_log.h"
 
 #include "hash.h"

vpr/src/util/hash.h

@@ -1,5 +1,7 @@
+#pragma once
+
 #define HASHSIZE 5000001
-#include <iostream>
+
 #include <string>
 
 struct t_hash {

vpr/src/util/vpr_net_pins_matrix.h

@@ -1,7 +1,6 @@
-#ifndef VPR_NET_PINS_MATRIX_H
-#define VPR_NET_PINS_MATRIX_H
+#pragma once
 
-#include "atom_netlist_fwd.h"
+#include "atom_netlist.h"
 #include "clustered_netlist.h"
 #include "clustered_netlist_fwd.h"
 #include "netlist_fwd.h"
@@ -45,5 +44,3 @@ NetPinsMatrix<T> make_net_pins_matrix(const Netlist<>& nlist, T default_value =
 
     return NetPinsMatrix<T>(nlist.nets().size(), pins_in_net, default_value);
 }
-
-#endif