Fixed bug that arose due to RRSpatialLookup update

verilog-to-routing · Jul 6, 2024 · d5f50fc · d5f50fc
1 parent a080780
commit d5f50fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/libs/librrgraph/src/base/rr_graph_utils.cpp b/libs/librrgraph/src/base/rr_graph_utils.cpp
@@ -175,8 +175,8 @@ void set_sink_locs(const RRGraphView& rr_graph, RRGraphBuilder& rr_graph_builder
             size_t pin_x = rr_graph.node_xlow(pin);
             size_t 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 == (size_t)rr_graph.node_xhigh(pin));
+            VTR_ASSERT_SAFE(pin_y == (size_t)rr_graph.node_yhigh(pin));
 
             x_coords.push_back((float)pin_x);
             y_coords.push_back((float)pin_y);
@@ -191,7 +191,7 @@ void set_sink_locs(const RRGraphView& rr_graph, RRGraphBuilder& rr_graph_builder
                 if (x == (size_t)x_avg && y == (size_t)y_avg)
                     continue;
 
-                rr_graph_builder.node_lookup().remove_node(node_id, tile_layer, x, y, SINK, sink_ptc);
+                rr_graph_builder.node_lookup().remove_node(node_id, (int)tile_layer, (int)x, (int)y, SINK, sink_ptc);
             }
         }
 

diff --git a/vpr/src/place/timing_place_lookup.cpp b/vpr/src/place/timing_place_lookup.cpp
@@ -523,7 +523,8 @@ static void generic_compute_matrix_dijkstra_expansion(
                         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