remove clock_fwd.h

Author: soheilshahrouz

vpr/src/route/route_utils.cpp

@@ -14,6 +14,7 @@
 #include "place_and_route.h"
 #include "route_common.h"
 #include "route_debug.h"
+#include "stats.h"
 
 #include "VprTimingGraphResolver.h"
 #include "route_tree.h"
@@ -31,7 +32,7 @@ bool check_net_delays(const Netlist<>& net_list, NetPinsMatrix<float>& net_delay
 
     load_net_delay_from_routing(net_list, net_delay_check);
 
-    for (auto net_id : net_list.nets()) {
+    for (ParentNetId net_id : net_list.nets()) {
         for (size_t ipin = 1; ipin < net_list.net_pins(net_id).size(); ipin++) {
             if (net_delay_check[net_id][ipin] == 0.) { /* Should be only GLOBAL nets */
                 if (fabs(net_delay[net_id][ipin]) > ERROR_TOL) {
@@ -77,7 +78,8 @@ bool check_net_delays(const Netlist<>& net_list, NetPinsMatrix<float>& net_delay
 //
 // Typically, only a small minority of nets (typically > 10%) have their BBs updated
 // each routing iteration.
-void dynamic_update_bounding_boxes(const std::vector<ParentNetId>& rerouted_nets, std::vector<ParentNetId> out_bb_updated_nets) {
+void dynamic_update_bounding_boxes(const std::vector<ParentNetId>& rerouted_nets,
+                                   std::vector<ParentNetId> out_bb_updated_nets) {
     auto& device_ctx = g_vpr_ctx.device();
     auto& route_ctx = g_vpr_ctx.mutable_routing();
 

vpr/src/route/rr_graph_generation/clock_connection_builders.cpp

@@ -24,7 +24,7 @@ void RoutingToClockConnection::set_clock_switch_point_name(std::string clock_swi
 void RoutingToClockConnection::set_switch_location(int x, int y, int layer /* =0 */) {
     switch_location.x = x;
     switch_location.y = y;
-    switch_location.layer = layer;
+    switch_location.layer_num = layer;
 }
 
 void RoutingToClockConnection::set_switch(int arch_switch_index) {
@@ -55,12 +55,12 @@ void RoutingToClockConnection::create_switches(const ClockRRGraphBuilder& clock_
     auto& rr_graph_builder = device_ctx.rr_graph_builder;
     const auto& node_lookup = device_ctx.rr_graph.node_lookup();
 
-    RRNodeId virtual_clock_network_root_idx = create_virtual_clock_network_sink_node(switch_location.layer, switch_location.x, switch_location.y);
+    RRNodeId virtual_clock_network_root_idx = create_virtual_clock_network_sink_node(switch_location.layer_num, switch_location.x, switch_location.y);
     rr_graph_builder.set_virtual_clock_network_root_idx(virtual_clock_network_root_idx);
 
     // rr_node indices for x and y channel routing wires and clock wires to connect to
-    auto x_wire_indices = node_lookup.find_channel_nodes(switch_location.layer, switch_location.x, switch_location.y, e_rr_type::CHANX);
-    auto y_wire_indices = node_lookup.find_channel_nodes(switch_location.layer, switch_location.x, switch_location.y, e_rr_type::CHANY);
+    auto x_wire_indices = node_lookup.find_channel_nodes(switch_location.layer_num, switch_location.x, switch_location.y, e_rr_type::CHANX);
+    auto y_wire_indices = node_lookup.find_channel_nodes(switch_location.layer_num, switch_location.x, switch_location.y, e_rr_type::CHANY);
     auto clock_indices = clock_graph.get_rr_node_indices_at_switch_location(
         clock_to_connect_to, switch_point_name, switch_location.x, switch_location.y);
 
@@ -168,13 +168,12 @@ size_t ClockToClockConneciton::estimate_additional_nodes() {
 void ClockToClockConneciton::create_switches(const ClockRRGraphBuilder& clock_graph, t_rr_edge_info_set* rr_edges_to_create) {
     auto& grid = clock_graph.grid();
 
-    auto to_locations = clock_graph.get_switch_locations(to_clock, to_switch);
+    std::set<std::pair<int, int>> to_locations = clock_graph.get_switch_locations(to_clock, to_switch);
 
-    for (auto location : to_locations) {
-        auto x = location.first;
-        auto y = location.second;
+    for (auto [x, y] : to_locations) {
 
-        auto to_rr_node_indices = clock_graph.get_rr_node_indices_at_switch_location(
+
+        std::vector<int> to_rr_node_indices = clock_graph.get_rr_node_indices_at_switch_location(
             to_clock,
             to_switch,
             x,
@@ -257,20 +256,20 @@ void ClockToPinsConnection::create_switches(const ClockRRGraphBuilder& clock_gra
                 continue;
             }
 
-            auto type = grid.get_physical_type({x, y, layer_num});
+            t_physical_tile_type_ptr type = grid.get_physical_type({x, y, layer_num});
 
             // Skip EMPTY type
             if (is_empty_type(type)) {
                 continue;
             }
 
-            auto width_offset = grid.get_width_offset({x, y, layer_num});
-            auto height_offset = grid.get_height_offset({x, y, layer_num});
+            int width_offset = grid.get_width_offset({x, y, layer_num});
+            int height_offset = grid.get_height_offset({x, y, layer_num});
 
             // Ignore grid locations that do not have blocks
             bool has_pb_type = false;
-            auto equivalent_sites = get_equivalent_sites_set(type);
-            for (auto logical_block : equivalent_sites) {
+            std::unordered_set<t_logical_block_type_ptr> equivalent_sites = get_equivalent_sites_set(type);
+            for (t_logical_block_type_ptr logical_block : equivalent_sites) {
                 if (logical_block->pb_type) {
                     has_pb_type = true;
                     break;
@@ -287,7 +286,7 @@ void ClockToPinsConnection::create_switches(const ClockRRGraphBuilder& clock_gra
                     continue;
                 }
 
-                for (auto clock_pin_idx : type->get_clock_pins_indices()) {
+                for (int clock_pin_idx : type->get_clock_pins_indices()) {
                     //Can't do anything if pin isn't at this location
                     if (0 == type->pinloc[width_offset][height_offset][side][clock_pin_idx]) {
                         continue;
@@ -308,14 +307,14 @@ void ClockToPinsConnection::create_switches(const ClockRRGraphBuilder& clock_gra
                         clock_y_offset = -1; // pick the chanx below the block
                     }
 
-                    auto clock_pin_node_idx = node_lookup.find_node(layer_num,
-                                                                    x,
-                                                                    y,
-                                                                    e_rr_type::IPIN,
-                                                                    clock_pin_idx,
-                                                                    side);
+                    RRNodeId clock_pin_node_idx = node_lookup.find_node(layer_num,
+                                                                        x,
+                                                                        y,
+                                                                        e_rr_type::IPIN,
+                                                                        clock_pin_idx,
+                                                                        side);
 
-                    auto clock_network_indices = clock_graph.get_rr_node_indices_at_switch_location(
+                    std::vector<int> clock_network_indices = clock_graph.get_rr_node_indices_at_switch_location(
                         clock_to_connect_from,
                         switch_point_name,
                         x + clock_x_offset,

vpr/src/route/rr_graph_generation/clock_connection_builders.h

@@ -2,8 +2,7 @@
 
 #include <string>
 
-#include "clock_fwd.h"
-
+#include "physical_types.h"
 #include "rr_graph2.h"
 #include "rr_graph_clock.h"
 
@@ -34,7 +33,7 @@ class RoutingToClockConnection : public ClockConnection {
   private:
     std::string clock_to_connect_to;
     std::string switch_point_name;
-    Coordinates switch_location;
+    t_physical_tile_loc switch_location;
     int arch_switch_idx = OPEN;
     float fc = 0.;
 

vpr/src/route/rr_graph_generation/clock_fwd.h

@@ -3,8 +3,6 @@
 #include <string>
 #include <vector>
 
-#include "clock_fwd.h"
-
 #include "vpr_types.h"
 
 #include "rr_graph_builder.h"
@@ -63,14 +61,14 @@ struct SpineTaps {
 
 struct HtreeDrive {
     std::string name;
-    Coordinates offset;
+    t_physical_tile_loc offset;
     int switch_idx = OPEN;
 };
 
 struct HtreeTaps {
     std::string name;
-    Coordinates offset;
-    Coordinates increment;
+    t_physical_tile_loc offset;
+    t_physical_tile_loc increment;
 };
 
 class ClockNetwork {

vpr/src/route/rr_graph_generation/clock_network_builders.h

@@ -8,7 +8,6 @@
 #include <utility>
 
 #include "rr_graph_builder.h"
-#include "clock_fwd.h"
 
 #include "clock_network_builders.h"
 #include "clock_connection_builders.h"
@@ -18,15 +17,15 @@ class ClockConnection;
 class t_rr_graph_storage;
 
 class SwitchPoint {
-    /* A switch point object: keeps information on the location and and rr_node indices
+    /* A switch point object: keeps information on the location and rr_node indices
      * for a certain clock switch. clock connections are grouped with their own unique
      * name; this object holds information for only one such grouping.
      * Examples of SwitchPoint(s) are rib-to-spine, driver-to-spine. */
   public:
     // [grid_width][grid_height][0..nodes_at_this_location-1]
     std::vector<std::vector<std::vector<int>>> rr_node_indices;
     // Set of all the locations for this switch point. Used to quickly find
-    // if the switch point exists at a certian location.
+    // if the switch point exists at a certain location.
     std::set<std::pair<int, int>> locations; // x,y
   public:
     /** Accessors **/
@@ -50,7 +49,7 @@ class SwitchPoints {
 
     /* Example: x,y = middle of the chip, switch_point_name == name of main drive
      * of global clock spine, returns the rr_nodes of all the clock spines that
-     * start the newtork there*/
+     * start the network there*/
     std::vector<int> get_rr_node_indices_at_location(std::string switch_point_name,
                                                      int x,
                                                      int y) const;
@@ -70,7 +69,7 @@ class ClockRRGraphBuilder {
     int get_and_increment_chany_ptc_num();
 
     /* Reverse lookup for to find the clock source and tap locations for each clock_network
-     * The map key is the the clock network name and value are all the switch points*/
+     * The map key is the clock network name and value are all the switch points*/
     std::unordered_map<std::string, SwitchPoints> clock_name_to_switch_points;
 
   public:
@@ -113,7 +112,7 @@ class ClockRRGraphBuilder {
     static size_t estimate_additional_nodes(const DeviceGrid& grid);
 
     /* AA: map the segment indices in all networks to corresponding indices in axis based segment vectors as defined in build_rr_graph
-     * Reffer to clock_network_builders.h: map_relative_seg_indices*/
+     * Refer to clock_network_builders.h: map_relative_seg_indices*/
 
     static void map_relative_seg_indices(const t_unified_to_parallel_seg_index& indices_map);
 
@@ -132,7 +131,7 @@ class ClockRRGraphBuilder {
                   bool edge_remapped) const;
 
   public:
-    /* Creates the routing resourse (rr) graph of the clock network and appends it to the
+    /* Creates the routing resource (rr) graph of the clock network and appends it to the
      * existing rr graph created in build_rr_graph for inter-block and intra-block routing. */
     void create_and_append_clock_rr_graph(int num_segments_x,
                                           t_rr_edge_info_set* rr_edges_to_create);