[Infra] Updated Header Files Based on Comments

Moved to pragma once symantics and cleaned up some less than ideal
code.

Author: AlexandreSinger

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/route_path_manager.h

@@ -1,5 +1,4 @@
-#ifndef _PATH_MANAGER_H
-#define _PATH_MANAGER_H
+#pragma once
 
 #include "rr_graph_fwd.h"
 
@@ -113,5 +112,3 @@ class PathManager {
     // Required by RCV so the router doesn't expand already visited nodes
     std::set<RRNodeId> route_tree_nodes_;
 };
-
-#endif

vpr/src/route/route_utilization.h

@@ -1,5 +1,4 @@
-#ifndef VPR_ROUTE_UTIL_H
-#define VPR_ROUTE_UTIL_H
+#pragma once
 
 #include "rr_node_types.h"
 #include "vtr_ndmatrix.h"
@@ -17,5 +16,3 @@ vtr::Matrix<float> calculate_routing_avail(e_rr_type rr_type);
  */
 vtr::Matrix<float> calculate_routing_usage(e_rr_type rr_type, bool is_flat, bool is_print);
 float routing_util(float used, float avail);
-
-#endif

vpr/src/route/route_utils.cpp

@@ -16,6 +16,7 @@
 #include "route_debug.h"
 
 #include "VprTimingGraphResolver.h"
+#include "route_tree.h"
 #include "rr_graph.h"
 #include "tatum/TimingReporter.hpp"
 
@@ -525,7 +526,7 @@ size_t calculate_wirelength_available() {
 
     size_t available_wirelength = 0;
     // But really what's happening is that this for loop iterates over every node and determines the available wirelength
-    for (const RRNodeId& rr_id : device_ctx.rr_graph.nodes()) {
+    for (RRNodeId rr_id : device_ctx.rr_graph.nodes()) {
         const e_rr_type channel_type = rr_graph.node_type(rr_id);
         if (channel_type == e_rr_type::CHANX || channel_type == e_rr_type::CHANY) {
             available_wirelength += rr_graph.node_capacity(rr_id) * rr_graph.node_length(rr_id);
@@ -586,7 +587,7 @@ t_bb calc_current_bb(const RouteTree& tree) {
     bb.ymax = 0;
     bb.layer_max = 0;
 
-    for (auto& rt_node : tree.all_nodes()) {
+    for (const RouteTreeNode& rt_node : tree.all_nodes()) {
         //The router interprets RR nodes which cross the boundary as being
         //'within' of the BB. Only those which are *strictly* out side the
         //box are excluded, hence we use the nodes xhigh/yhigh for xmin/xmax,
@@ -615,7 +616,7 @@ void init_net_delay_from_lookahead(const RouterLookahead& router_lookahead,
     t_conn_cost_params cost_params;
     cost_params.criticality = 1.; // Ensures lookahead returns delay value
 
-    for (auto net_id : net_list.nets()) {
+    for (ParentNetId net_id : net_list.nets()) {
         if (net_list.net_is_ignored(net_id)) continue;
 
         RRNodeId source_rr = net_rr_terminals[net_id][0];
@@ -627,7 +628,7 @@ void init_net_delay_from_lookahead(const RouterLookahead& router_lookahead,
                                                       rr_graph,
                                                       source_rr,
                                                       sink_rr,
-                                                      0.,
+                                                      0.0f /* R_upstream */,
                                                       cost_params,
                                                       is_flat);
             VTR_ASSERT(std::isfinite(est_delay) && est_delay < std::numeric_limits<float>::max());

vpr/src/route/router_delay_profiling.h

@@ -1,5 +1,4 @@
-#ifndef ROUTER_DELAY_PROFILING_H_
-#define ROUTER_DELAY_PROFILING_H_
+#pragma once
 
 #include "d_ary_heap.h"
 #include "netlist.h"
@@ -63,5 +62,3 @@ void alloc_routing_structs(const t_chan_width& chan_width,
                            bool is_flat);
 
 void free_routing_structs();
-
-#endif /* ROUTER_DELAY_PROFILING_H_ */

vpr/src/route/spatial_route_tree_lookup.h

@@ -1,5 +1,4 @@
-#ifndef VPR_SPATIAL_ROUTE_TREE_LOOKUP_H
-#define VPR_SPATIAL_ROUTE_TREE_LOOKUP_H
+#pragma once
 
 #include <vector>
 
@@ -23,5 +22,3 @@ size_t grid_to_bin_x(size_t grid_x, const SpatialRouteTreeLookup& spatial_lookup
 size_t grid_to_bin_y(size_t grid_y, const SpatialRouteTreeLookup& spatial_lookup);
 
 bool validate_route_tree_spatial_lookup(const RouteTreeNode& rt_node, const SpatialRouteTreeLookup& spatial_lookup);
-
-#endif