@@ -149,7 +149,7 @@ void set_sink_locs(const RRGraphView& rr_graph, RRGraphBuilder& rr_graph_builder
149
149
if (x == new_sink_loc.x () && y == new_sink_loc.y ()) /* The new sink location */
150
150
continue ;
151
151
152
- if (rr_graph_builder.node_lookup ().find_node ((int )layer, (int )x, (int )y, SINK, (int )ptc) == RRNodeId::INVALID ())
152
+ if (rr_graph_builder.node_lookup ().find_node ((int )layer, (int )x, (int )y, SINK, (int )ptc) == RRNodeId::INVALID ()) /* Already removed */
153
153
continue ;
154
154
155
155
rr_graph_builder.node_lookup ().remove_node (node, (int )layer, (int )x, (int )y, SINK, (int )ptc);
@@ -169,10 +169,11 @@ void set_sink_locs(const RRGraphView& rr_graph, RRGraphBuilder& rr_graph_builder
169
169
size_t node_ylow = rr_graph.node_ylow (node_id);
170
170
171
171
size_t tile_layer = rr_graph.node_layer (node_id);
172
- t_physical_tile_type_ptr tile_type = grid.get_physical_type ({(int )node_xlow, (int )node_ylow, (int )tile_layer});
172
+ t_physical_tile_loc tile_loc = {(int )node_xlow, (int )node_ylow, (int )tile_layer};
173
+ t_physical_tile_type_ptr tile_type = grid.get_physical_type (tile_loc);
173
174
174
- size_t tile_xlow = node_xlow - grid.get_width_offset ({( int )node_xlow, ( int )node_ylow, ( int )tile_layer} );
175
- size_t tile_ylow = node_ylow - grid.get_height_offset ({( int )node_xlow, ( int )node_ylow, ( int )tile_layer} );
175
+ size_t tile_xlow = node_xlow - grid.get_width_offset (tile_loc );
176
+ size_t tile_ylow = node_ylow - grid.get_height_offset (tile_loc );
176
177
size_t tile_xhigh = tile_xlow + tile_type->width - 1 ;
177
178
size_t tile_yhigh = tile_ylow + tile_type->height - 1 ;
178
179
0 commit comments