Fixed bug where reading in RR graph produced using new SINK locs failed during placement

Author: Nathan Shreve

vpr/src/place/timing_place_lookup.cpp

@@ -398,7 +398,8 @@ static float route_connection_delay(
             VTR_ASSERT(sink_ptc != OPEN);
             RRNodeId sink_rr_node = device_ctx.rr_graph.node_lookup().find_node(layer_num, sink_x, sink_y, SINK, sink_ptc);
 
-            VTR_ASSERT(sink_rr_node != RRNodeId::INVALID());
+            if (sink_rr_node == RRNodeId::INVALID())
+                continue;
 
             if (!measure_directconnect && directconnect_exists(source_rr_node, sink_rr_node)) {
                 //Skip if we shouldn't measure direct connects and a direct connect exists

vpr/src/route/rr_graph.cpp

@@ -715,9 +715,6 @@ void create_rr_graph(const t_graph_type graph_type,
                                                                       router_opts.reorder_rr_graph_nodes_threshold,
                                                                       router_opts.reorder_rr_graph_nodes_seed);
                 }
-
-                if (det_routing_arch->write_rr_graph_filename.empty())
-                    set_sink_locs(device_ctx.rr_graph, mutable_device_ctx.rr_graph_builder);
             }
         } else {
             free_rr_graph();
@@ -1444,9 +1441,7 @@ static void build_rr_graph(const t_graph_type graph_type,
     }
 
     // Get better locations for SINK nodes
-    // Note: this function is also called after load_rr_file() in create_rr_graph()
-    if (!writing_graph_out)
-        set_sink_locs(rr_graph, device_ctx.rr_graph_builder);
+    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