Merge pull request verilog-to-routing#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