Merge branch 'master' into vpr_viewer_and_flat_routing_on

Author: w0lek

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/route/NestedNetlistRouter.h

@@ -2,6 +2,7 @@
 
 /** @file Nested parallel case for NetlistRouter */
 #include "netlist_routers.h"
+#include "partition_tree.h"
 #include "vtr_optional.h"
 #include "vtr_thread_pool.h"
 #include "serial_connection_router.h"

vpr/src/route/SerialNetlistRouter.tpp

@@ -3,7 +3,9 @@
 /** @file Templated implementations for SerialNetlistRouter */
 
 #include "SerialNetlistRouter.h"
+#include "partition_tree.h"
 #include "route_net.h"
+#include "route_utils.h"
 #include "vtr_time.h"
 
 template<typename HeapType>

vpr/src/route/annotate_routing.cpp

@@ -3,13 +3,12 @@
  * from VPR to OpenFPGA. (i.e. create a mapping from RRNodeIds to ClusterNetIds)
  *******************************************************************/
 
+#include "describe_rr_node.h"
 #include "vpr_error.h"
-#include "vtr_assert.h"
 #include "vtr_time.h"
 #include "vtr_log.h"
 
 #include "route_utils.h"
-#include "rr_graph.h"
 
 #include "annotate_routing.h"
 

vpr/src/route/annotate_routing.h

@@ -1,7 +1,13 @@
 #ifndef ANNOTATE_ROUTING_H
 #define ANNOTATE_ROUTING_H
 
-#include "vpr_context.h"
+#include "clustered_netlist_fwd.h"
+#include "rr_graph_fwd.h"
+#include "vtr_vector.h"
+
+struct AtomContext;
+struct ClusteringContext;
+struct DeviceContext;
 
 /********************************************************************
  * Create a mapping between each rr_node and its mapped nets

vpr/src/route/check_route.h

@@ -1,8 +1,8 @@
 #ifndef VPR_CHECK_ROUTE_H
 #define VPR_CHECK_ROUTE_H
-#include "physical_types.h"
+
+#include "netlist.h"
 #include "vpr_types.h"
-#include "route_common.h"
 
 void check_route(const Netlist<>& net_list,
                  enum e_route_type route_type,

vpr/src/route/connection_based_routing.h

@@ -1,10 +1,10 @@
 #pragma once
+
 #include <vector>
 #include <unordered_map>
-#include "route_tree_fwd.h"
-#include "vpr_types.h"
 #include "timing_info.h"
 #include "vpr_net_pins_matrix.h"
+#include "connection_based_routing_fwd.h"
 
 /***************** Connection based rerouting **********************/
 // encompasses both incremental rerouting through route tree pruning

vpr/src/route/connection_router.h

@@ -22,12 +22,12 @@
  */
 
 #include "connection_router_interface.h"
+#include "globals.h"
 #include "rr_graph_storage.h"
-#include "route_common.h"
 #include "router_lookahead.h"
 #include "route_tree.h"
-#include "rr_rc_data.h"
 #include "router_stats.h"
+#include "rr_graph_view.h"
 #include "spatial_route_tree_lookup.h"
 
 /**

vpr/src/route/connection_router.tpp

@@ -4,6 +4,7 @@
 
 #include <algorithm>
 #include "describe_rr_node.h"
+#include "route_common.h"
 #include "rr_graph_fwd.h"
 #include "vpr_utils.h"
 

vpr/src/route/connection_router_interface.h

@@ -1,9 +1,6 @@
 #ifndef _CONNECTION_ROUTER_INTERFACE_H
 #define _CONNECTION_ROUTER_INTERFACE_H
 
-#include <utility>
-
-#include "heap_type.h"
 #include "route_tree_fwd.h"
 #include "rr_graph_fwd.h"
 #include "vpr_types.h"

vpr/src/route/edge_groups.cpp

@@ -2,6 +2,7 @@
 
 #include <stack>
 #include "rr_graph_fwd.h"
+#include "vpr_context.h"
 
 // Adds non-configurable (undirected) edge to be grouped.
 //

vpr/src/route/edge_groups.h

@@ -7,7 +7,8 @@
 #include <cstddef>
 
 #include "vpr_types.h"
-#include "vpr_context.h"
+
+struct DeviceContext;
 
 // Class for identifying the components of a graph as sets of nodes.
 // Each node is reachable from any other node in the same set, and

vpr/src/route/heap_type.h

@@ -2,10 +2,7 @@
 #define _HEAP_TYPE_H
 
 #include <cstdint>
-#include "physical_types.h"
 #include "device_grid.h"
-#include "vtr_memory.h"
-#include "vtr_array_view.h"
 #include "rr_graph_fwd.h"
 #include "route_path_manager.h"
 

vpr/src/route/multi_queue_d_ary_heap.h

@@ -17,8 +17,7 @@
  * Modified: February 2025
  ********************************************************************/
 
-#ifndef _MULTI_QUEUE_D_ARY_HEAP_H
-#define _MULTI_QUEUE_D_ARY_HEAP_H
+#pragma once
 
 #include "device_grid.h"
 #include "heap_type.h"
@@ -129,5 +128,3 @@ class MultiQueueDAryHeap {
   private:
     std::unique_ptr<MQ_IO> pq_;
 };
-
-#endif

vpr/src/route/netlist_routers.h

@@ -19,13 +19,11 @@
 #include "NetPinTimingInvalidator.h"
 #include "clustered_netlist_utils.h"
 #include "connection_based_routing_fwd.h"
-#include "globals.h"
+#include "d_ary_heap.h"
 #include "heap_type.h"
 #include "netlist_fwd.h"
-#include "partition_tree.h"
 #include "routing_predictor.h"
 #include "route_budgets.h"
-#include "route_utils.h"
 #include "router_stats.h"
 #include "timing_info.h"
 #include "vpr_net_pins_matrix.h"

vpr/src/route/overuse_report.cpp

@@ -1,6 +1,7 @@
 #include "overuse_report.h"
 
 #include <fstream>
+#include "globals.h"
 #include "physical_types_util.h"
 #include "vpr_utils.h"
 #include "vtr_log.h"