Fixed bug and eliminated SINK error checking

Author: Nathan Shreve

libs/librrgraph/src/base/check_rr_graph.cpp

@@ -394,10 +394,10 @@ void check_rr_node(const RRGraphView& rr_graph,
                 VPR_FATAL_ERROR(VPR_ERROR_ROUTE,
                                 "in check_rr_node: node %d (type %d) is at an illegal clb location (%d, %d).\n", inode, rr_type, xlow, ylow);
             }
-            if (xlow != (xhigh - type->width + 1) || ylow != (yhigh - type->height + 1)) {
-                VPR_FATAL_ERROR(VPR_ERROR_ROUTE,
-                                "in check_rr_node: node %d (type %d) has endpoints (%d,%d) and (%d,%d)\n", inode, rr_type, xlow, ylow, xhigh, yhigh);
-            }
+            //            if (xlow != (xhigh - type->width + 1) || ylow != (yhigh - type->height + 1)) {
+            //                VPR_FATAL_ERROR(VPR_ERROR_ROUTE,
+            //                                "in check_rr_node: node %d (type %d) has endpoints (%d,%d) and (%d,%d)\n", inode, rr_type, xlow, ylow, xhigh, yhigh);
+            //            }
             break;
         case IPIN:
         case OPIN:

libs/librrgraph/src/base/rr_graph_utils.cpp

@@ -17,10 +17,12 @@ static void walk_cluster_recursive(const RRGraphView& rr_graph,
                                    std::unordered_map<RRNodeId, std::unordered_set<RRNodeId>>& sink_ipins,
                                    RRNodeId curr,
                                    RRNodeId origin) {
-    // Check that curr is SINK in the same cluster as origin
+    // Make sure SINK in the same cluster as origin. This might not be the case when we have direct-connect between blocks
     int curr_x = rr_graph.node_xlow(curr);
     int curr_y = rr_graph.node_ylow(curr);
-    VTR_ASSERT_SAFE(!((curr_x < rr_graph.node_xlow(origin)) || (curr_x > rr_graph.node_xhigh(origin)) || (curr_y < rr_graph.node_ylow(origin)) || (curr_y > rr_graph.node_yhigh(origin))));
+    if ((curr_x < rr_graph.node_xlow(origin)) || (curr_x > rr_graph.node_xhigh(origin)) || (curr_y < rr_graph.node_ylow(origin)) || (curr_y > rr_graph.node_yhigh(origin)))
+        return;
+
     VTR_ASSERT_SAFE(rr_graph.node_type(origin) == e_rr_type::SINK);
 
     // We want to go "backward" to the cluster IPINs connected to the origin node
@@ -174,16 +176,16 @@ void set_sink_locs(const RRGraphView& rr_graph, RRGraphBuilder& rr_graph_builder
         walk_cluster_recursive(rr_graph, node_fanins, sink_ipins, node_id, node_id);
     }
 
-    // Set SINK locations based on "cluster-edge" OPINs and IPINs
+    // Set SINK locations based on "cluster-edge" IPINs
     for (const auto& node_pins : sink_ipins) {
         const auto& pin_set = node_pins.second;
 
         if (pin_set.empty())
             continue;
 
         // Use float so that we can take average later
-        std::vector<float> x_coords(pin_set.size());
-        std::vector<float> y_coords(pin_set.size());
+        std::vector<float> x_coords;
+        std::vector<float> y_coords;
 
         // Add coordinates of each "cluster-edge" pin to vectors
         for (const auto& pin : pin_set) {

vpr/src/route/rr_graph.cpp

@@ -1437,7 +1437,7 @@ static void build_rr_graph(const t_graph_type graph_type,
         delete[] clb_to_clb_directs;
     }
 
-    // Get better locations for SOURCE and SINK nodes
+    // Get better locations for SINK nodes
     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