oops

Author: duck2

vpr/src/pack/sync_netlists_to_routing_flat.cpp

@@ -41,7 +41,7 @@ inline ClusterBlockId get_cluster_block_from_rr_node(RRNodeId inode){
 
     auto [_, subtile] = get_sub_tile_from_pin_physical_num(physical_tile, source_pin);
 
-    ClusterBlockId clb = place_ctx.grid_blocks.block_at_location({
+    ClusterBlockId clb = place_ctx.grid_blocks().block_at_location({
         rr_graph.node_xlow(inode),
         rr_graph.node_ylow(inode),
         subtile,
@@ -151,7 +151,7 @@ static void sync_pb_routes_to_routing(void){
     auto& device_ctx = g_vpr_ctx.device();
     auto& atom_ctx = g_vpr_ctx.atom();
     auto& cluster_ctx = g_vpr_ctx.mutable_clustering();
-    auto& placement_ctx = g_vpr_ctx.placement();
+    auto& place_ctx = g_vpr_ctx.placement();
     auto& route_ctx = g_vpr_ctx.routing();
     auto& rr_graph = device_ctx.rr_graph;
 
@@ -193,7 +193,7 @@ static void sync_pb_routes_to_routing(void){
 
             auto [_, subtile] = get_sub_tile_from_pin_physical_num(physical_tile, source_pin);
 
-            ClusterBlockId clb = placement_ctx.grid_blocks.block_at_location({
+            ClusterBlockId clb = place_ctx.grid_blocks().block_at_location({
                 rr_graph.node_xlow(source_inode),
                 rr_graph.node_ylow(source_inode),
                 subtile,
@@ -297,7 +297,7 @@ static void sync_clustered_netlist_to_routing(void){
 
             auto [_, subtile] = get_sub_tile_from_pin_physical_num(physical_tile, pin_index);
 
-            ClusterBlockId clb = place_ctx.grid_blocks.block_at_location({
+            ClusterBlockId clb = place_ctx.grid_blocks().block_at_location({
                 rr_graph.node_xlow(rt_node.inode),
                 rr_graph.node_ylow(rt_node.inode),
                 subtile,
@@ -338,11 +338,12 @@ static void sync_clustered_netlist_to_routing(void){
     rebuild_atom_nets_lookup(remapped);
     /* 5. Rebuild place_ctx.physical_pins lookup
      * TODO: maybe we don't need this fn and pin_index is enough? */
-    place_ctx.physical_pins.clear();
+    auto& blk_loc_registry = place_ctx.mutable_blk_loc_registry();
+    auto& physical_pins = place_ctx.mutable_physical_pins();
+    physical_pins.clear();
     for(auto clb: clb_netlist.blocks()){
-        place_sync_external_block_connections(clb);
+        blk_loc_registry.place_sync_external_block_connections(clb);
     }
-    /* TODO: Remove rr_nodes added by the flat router */
 }
 
 /** Fix up pin rotation maps and the atom pin -> pb graph pin lookup for every block */