Merge pull request #1518 from verilog-to-routing/check_route_pin_done

Simplify and strengthen check_sink

Author: vaughnbetz

vpr/src/route/check_route.cpp

@@ -20,7 +20,7 @@
 /******************** Subroutines local to this module **********************/
 static void check_node_and_range(int inode, enum e_route_type route_type);
 static void check_source(int inode, ClusterNetId net_id);
-static void check_sink(int inode, ClusterNetId net_id, bool* pin_done);
+static void check_sink(int inode, int net_pin_index, ClusterNetId net_id, bool* pin_done);
 static void check_switch(t_trace* tptr, int num_switch);
 static bool check_adjacent(int from_node, int to_node);
 static int chanx_chany_adjacent(int chanx_node, int chany_node);
@@ -46,7 +46,7 @@ void check_route(enum e_route_type route_type, e_check_route_option check_route_
         return;
     }
 
-    int max_pins, inode, prev_node;
+    int max_pins, inode, net_pin_index, prev_node;
     unsigned int ipin;
     bool valid, connects;
     t_trace* tptr;
@@ -112,6 +112,7 @@ void check_route(enum e_route_type route_type, e_check_route_option check_route_
         size_t num_sinks = 0;
         while (tptr != nullptr) {
             inode = tptr->index;
+            net_pin_index = tptr->net_pin_index;
             check_node_and_range(inode, route_type);
             check_switch(tptr, num_switches);
 
@@ -135,7 +136,7 @@ void check_route(enum e_route_type route_type, e_check_route_option check_route_
                 connected_to_route[inode] = true; /* Mark as in path. */
 
                 if (device_ctx.rr_nodes[inode].type() == SINK) {
-                    check_sink(inode, net_id, pin_done.get());
+                    check_sink(inode, net_pin_index, net_id, pin_done.get());
                     num_sinks += 1;
                 }
 
@@ -177,48 +178,22 @@ void check_route(enum e_route_type route_type, e_check_route_option check_route_
 
 /* Checks that this SINK node is one of the terminals of inet, and marks   *
  * the appropriate pin as being reached.                                   */
-static void check_sink(int inode, ClusterNetId net_id, bool* pin_done) {
+static void check_sink(int inode, int net_pin_index, ClusterNetId net_id, bool* pin_done) {
     auto& device_ctx = g_vpr_ctx.device();
     auto& cluster_ctx = g_vpr_ctx.clustering();
-    auto& place_ctx = g_vpr_ctx.placement();
 
     VTR_ASSERT(device_ctx.rr_nodes[inode].type() == SINK);
-    int i = device_ctx.rr_nodes[inode].xlow();
-    int j = device_ctx.rr_nodes[inode].ylow();
-    auto type = device_ctx.grid[i][j].type;
-    /* For sinks, ptc_num is the class */
-    int ptc_num = device_ctx.rr_nodes[inode].ptc_num();
-    int ifound = 0;
-
-    for (auto bnum : place_ctx.grid_blocks[i][j].blocks) {
-        unsigned int ipin = 1;
-        for (auto pin_id : cluster_ctx.clb_nlist.net_sinks(net_id)) {
-            if (cluster_ctx.clb_nlist.pin_block(pin_id) == bnum) {
-                int pin_index = tile_pin_index(pin_id);
-                int iclass = type->pin_class[pin_index];
-                if (iclass == ptc_num) {
-                    /* Could connect to same pin class on the same clb more than once.  Only   *
-                     * update pin_done for a pin that hasn't been reached yet.                 */
-                    if (pin_done[ipin] == false) {
-                        ifound++;
-                        pin_done[ipin] = true;
-                        break;
-                    }
-                }
-            }
-            ipin++;
-        }
-    }
-
-    VTR_ASSERT(ifound <= 1);
 
-    if (ifound < 1) {
+    if (net_pin_index == OPEN) { /* If there is no legal net pin index associated with this sink node */
         VPR_FATAL_ERROR(VPR_ERROR_ROUTE,
                         "in check_sink: node %d does not connect to any terminal of net %s #%lu.\n"
                         "This error is usually caused by incorrectly specified logical equivalence in your architecture file.\n"
                         "You should try to respecify what pins are equivalent or turn logical equivalence off.\n",
                         inode, cluster_ctx.clb_nlist.net_name(net_id).c_str(), size_t(net_id));
     }
+
+    VTR_ASSERT(!pin_done[net_pin_index]); /* Should not have found a routed cnnection to it before */
+    pin_done[net_pin_index] = true;
 }
 
 /* Checks that the node passed in is a valid source for this net. */