Get new SINK locations for 1x1 blocks as well

Author: Nathan Shreve

libs/librrgraph/src/base/rr_graph_utils.cpp

@@ -147,13 +147,6 @@ void set_sink_locs(const RRGraphView& rr_graph, RRGraphBuilder& rr_graph_builder
         if (rr_graph.node_type((RRNodeId)node_id) != e_rr_type::SINK)
             continue;
 
-        // Skip if tile dimensions are 1x1
-        int tile_width = rr_graph.node_xhigh(node_id) - rr_graph.node_xlow(node_id);
-        int tile_height = rr_graph.node_yhigh(node_id) - rr_graph.node_ylow(node_id);
-
-        if (tile_width <= 1 && tile_height <= 1)
-            continue;
-
         sink_ipins[node_id] = {};
         walk_cluster_recursive(rr_graph, node_fanins, sink_ipins[node_id], node_id, node_id);
     }
@@ -186,6 +179,9 @@ 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());
 
+        VTR_ASSERT(x_avg >= 0);
+        VTR_ASSERT(y_avg >= 0);
+
         RRNodeId node = node_pins.first;
         rr_graph_builder.set_node_coordinates(node, x_avg, y_avg, x_avg, y_avg);
     }

terminal_out.txt

@@ -0,0 +1,10 @@
+Cleaning files..
+cd build && /usr/local/bin/cmake -DCMAKE_BUILD_TYPE=release -G 'Unix Makefiles'  /home/shrevena/Documents/vtr/vtr-verilog-to-routing
+-- Using ccache binary found @ /usr/bin/ccache
+-- CMAKE_BUILD_TYPE: release
+-- Building with IPO: on
+-- Performing Test CXX_COMPILER_SUPPORTS_-Wformat=2
+-- Performing Test CXX_COMPILER_SUPPORTS_-Wformat=2 - Success
+-- Performing Test CXX_COMPILER_SUPPORTS_-Wcatch-value=3
+-- Performing Test CXX_COMPILER_SUPPORTS_-Wcatch-value=3 - Success
+-- Performing Test CXX_COMPILER_SUPPORTS_-Wimplicit-fallthrough=3

vpr/src/route/rr_graph2.cpp

@@ -1525,8 +1525,8 @@ bool verify_rr_node_indices(const DeviceGrid& grid,
                              */
                         } else {
                             // Previously, SINKs had co-ordinates covering the entire block they are in. Now, their locations
-                            // are the average of the IPINs they are connected to, so we cannot do the same check that we did
-                            // for SOURCEs.
+                            // are the average of the IPINs they are connected to; but, this does not affect where they are in
+                            // the spatial lookup. So, we cannot do this check.
 
                             VTR_ASSERT(rr_graph.node_type(inode) == SINK);
                         }