Revert "set_sink_locs() now keeps track of tile types to avoid repeated calculations" as it resulted in a significant increase in runtime

This reverts commit 7bc80ac.

Author: Nathan Shreve

libs/librrgraph/src/base/rr_graph_utils.cpp

@@ -97,13 +97,9 @@ vtr::vector<RRNodeId, std::vector<RREdgeId>> get_fan_in_list(const RRGraphView&
     return node_fan_in_list;
 }
 
-void set_sink_locs(const RRGraphView& rr_graph, RRGraphBuilder& rr_graph_builder, const DeviceGrid& grid) {
+void set_sink_locs(const RRGraphView& rr_graph, RRGraphBuilder& rr_graph_builder) {
     auto node_fanins = get_fan_in_list(rr_graph);
 
-    // Keep track of offsets for SINKs for each tile type, to avoid repeated
-    // calculations
-    std::unordered_map<std::string, std::unordered_map<size_t, vtr::Point<int>>> physical_type_offsets;
-
     // Iterate over all SINK nodes
     for (size_t node = 0; node < rr_graph.num_nodes(); ++node) {
         auto node_id = RRNodeId(node);
@@ -117,24 +113,6 @@ void set_sink_locs(const RRGraphView& rr_graph, RRGraphBuilder& rr_graph_builder
         if (tile_width == 0 && tile_height == 0)
             continue;
 
-        // See if we have encountered this tile before
-        size_t tile_layer = rr_graph.node_layer(node_id);
-        size_t node_x = rr_graph.node_xhigh(node_id);
-        size_t node_y = rr_graph.node_yhigh(node_id);
-        std::string tile_name = grid.get_physical_type({(int)node_x, (int)node_y, (int)tile_layer})->name;
-
-        size_t sink_ptc = rr_graph.node_ptc_num(node_id);
-
-        if ((physical_type_offsets.find(tile_name) != physical_type_offsets.end()) && (physical_type_offsets[tile_name].find(sink_ptc) != physical_type_offsets[tile_name].end())) { /* We have seen this tile before */
-            auto new_x = (short)((int)node_x + physical_type_offsets[tile_name].at(sink_ptc).x());
-            auto new_y = (short)((int)node_y + physical_type_offsets[tile_name].at(sink_ptc).y());
-
-            // Set new coordinates
-            rr_graph_builder.set_node_coordinates(node_id, new_x, new_y, new_x, new_y);
-
-            continue;
-        }
-
         // The IPINs of the current SINK node
         std::unordered_set<RRNodeId> sink_ipins = {};
 
@@ -148,7 +126,7 @@ void set_sink_locs(const RRGraphView& rr_graph, RRGraphBuilder& rr_graph_builder
             // Make sure IPIN in the same cluster as origin
             int curr_x = rr_graph.node_xlow(pin);
             int curr_y = rr_graph.node_ylow(pin);
-            if ((curr_x < rr_graph.node_xlow(pin)) || (curr_x > rr_graph.node_xhigh(pin)) || (curr_y < rr_graph.node_ylow(pin)) || (curr_y > rr_graph.node_yhigh(pin)))
+            if ((curr_x < rr_graph.node_xlow(node_id)) || (curr_x > rr_graph.node_xhigh(node_id)) || (curr_y < rr_graph.node_ylow(node_id)) || (curr_y > rr_graph.node_yhigh(node_id)))
                 continue;
 
             sink_ipins.insert(pin);
@@ -168,8 +146,8 @@ void set_sink_locs(const RRGraphView& rr_graph, RRGraphBuilder& rr_graph_builder
             int pin_x = rr_graph.node_xlow(pin);
             int pin_y = rr_graph.node_ylow(pin);
 
-            VTR_ASSERT_SAFE(pin_x = rr_graph.node_xhigh(pin));
-            VTR_ASSERT_SAFE(pin_y = rr_graph.node_yhigh(pin));
+            VTR_ASSERT_SAFE(pin_x == rr_graph.node_xhigh(pin));
+            VTR_ASSERT_SAFE(pin_y == rr_graph.node_yhigh(pin));
 
             x_coords.push_back((float)pin_x);
             y_coords.push_back((float)pin_y);
@@ -178,13 +156,6 @@ void set_sink_locs(const RRGraphView& rr_graph, RRGraphBuilder& rr_graph_builder
         auto x_avg = (short)round(std::accumulate(x_coords.begin(), x_coords.end(), 0.f) / (double)x_coords.size());
         auto y_avg = (short)round(std::accumulate(y_coords.begin(), y_coords.end(), 0.f) / (double)y_coords.size());
 
-        // Save offset for this tile type
-        if (physical_type_offsets.find(tile_name) == physical_type_offsets.end())
-            physical_type_offsets[tile_name] = {};
-
-        physical_type_offsets[tile_name].insert({sink_ptc, {x_avg - (int)node_x, y_avg - (int)node_y}});
-
-        // Set new coordinates
         rr_graph_builder.set_node_coordinates(node_id, x_avg, y_avg, x_avg, y_avg);
     }
 }

libs/librrgraph/src/base/rr_graph_utils.h

@@ -14,7 +14,6 @@
 #include "rr_graph_fwd.h"
 #include "rr_node_types.h"
 #include "rr_graph_view.h"
-#include "device_grid.h"
 
 struct t_pin_chain_node {
     int pin_physical_num = OPEN;
@@ -74,7 +73,7 @@ vtr::vector<RRNodeId, std::vector<RREdgeId>> get_fan_in_list(const RRGraphView&
  * determined. However, this is quite a big issue, as choosing to write out the RR graph now significantly increases
  * runtime!
  */
-void set_sink_locs(const RRGraphView& rr_graph, RRGraphBuilder& rr_graph_builder, const DeviceGrid& grid);
+void set_sink_locs(const RRGraphView& rr_graph, RRGraphBuilder& rr_graph_builder);
 
 /**
  * @brief Returns the segment number (distance along the channel) of the connection box from from_rr_type (CHANX or

vpr/src/route/rr_graph.cpp

@@ -1438,7 +1438,7 @@ static void build_rr_graph(const t_graph_type graph_type,
     }
 
     // Get better locations for SINK nodes
-    set_sink_locs(rr_graph, device_ctx.rr_graph_builder, device_ctx.grid);
+    set_sink_locs(rr_graph, device_ctx.rr_graph_builder);
 
     // We are done with building the RR Graph. Thus, we can clear the storages only used
     // to build the RR Graph