add increment_usage() and decrement_usage() to GridBlock

Author: soheilshahrouz

vpr/src/base/blk_loc_registry.cpp

@@ -74,8 +74,7 @@ void BlkLocRegistry::set_block_location(ClusterBlockId blk_id, const t_pl_loc& l
 
     //Mark the grid location and usage of the block
     grid_blocks_.set_block_at_location(location, blk_id);
-    grid_blocks_.set_usage({location.x, location.y, location.layer},
-                          grid_blocks_.get_usage({location.x, location.y, location.layer}) + 1);
+    grid_blocks_.increment_usage({location.x, location.y, location.layer});
 
     place_sync_external_block_connections(blk_id);
 }

vpr/src/base/grid_block.h

@@ -75,6 +75,10 @@ class GridBlock {
      */
     void zero_initialize();
 
+    int increment_usage(const t_physical_tile_loc& loc);
+
+    int decrement_usage(const t_physical_tile_loc& loc);
+
   private:
     vtr::NdMatrix<t_grid_blocks, 3> grid_blocks_;
 };

vpr/src/grid_block.cpp

@@ -24,3 +24,17 @@ void GridBlock::zero_initialize() {
         }
     }
 }
+
+int GridBlock::increment_usage(const t_physical_tile_loc& loc) {
+    int curr_usage = get_usage(loc);
+    int updated_usage = set_usage(loc, curr_usage + 1);
+
+    return updated_usage;
+}
+
+int GridBlock::decrement_usage(const t_physical_tile_loc& loc) {
+    int curr_usage = get_usage(loc);
+    int updated_usage = set_usage(loc, curr_usage - 1);
+
+    return updated_usage;
+}

vpr/src/place/cut_spreader.cpp

@@ -969,8 +969,7 @@ void CutSpreader::bind_tile(t_pl_loc sub_tile, ClusterBlockId blk) {
     VTR_ASSERT(block_locs[blk].is_fixed == false);
     grid_blocks.set_block_at_location(sub_tile, blk);
     block_locs[blk].loc = sub_tile;
-    grid_blocks.set_usage({sub_tile.x, sub_tile.y, sub_tile.layer},
-                          grid_blocks.get_usage({sub_tile.x, sub_tile.y, sub_tile.layer}) + 1);
+    grid_blocks.increment_usage({sub_tile.x, sub_tile.y, sub_tile.layer});
     ap->blk_locs[blk].loc = sub_tile;
 }
 
@@ -987,8 +986,7 @@ void CutSpreader::unbind_tile(t_pl_loc sub_tile) {
     VTR_ASSERT(block_locs[blk].is_fixed == false);
     block_locs[blk].loc = t_pl_loc{};
     grid_blocks.set_block_at_location(sub_tile, ClusterBlockId::INVALID());
-    grid_blocks.set_usage({sub_tile.x, sub_tile.y, sub_tile.layer},
-                          grid_blocks.get_usage({sub_tile.x, sub_tile.y, sub_tile.layer}) - 1);
+    grid_blocks.decrement_usage({sub_tile.x, sub_tile.y, sub_tile.layer});
 }
 
 /*

vpr/src/place/move_transactions.cpp

@@ -110,15 +110,13 @@ void commit_move_blocks(const t_pl_blocks_to_be_moved& blocks_affected,
         //Remove from old location only if it hasn't already been updated by a previous block update
         if (grid_blocks.block_at_location(from) == blk) {
             grid_blocks.set_block_at_location(from, ClusterBlockId::INVALID());
-            grid_blocks.set_usage({from.x, from.y, from.layer},
-                                  grid_blocks.get_usage({from.x, from.y, from.layer}) - 1);
+            grid_blocks.decrement_usage({from.x, from.y, from.layer});
         }
 
         //Add to new location
         if (grid_blocks.block_at_location(to) == ClusterBlockId::INVALID()) {
             //Only need to increase usage if previously unused
-            grid_blocks.set_usage({to.x, to.y, to.layer},
-                                  grid_blocks.get_usage({to.x, to.y, to.layer}) + 1);
+            grid_blocks.increment_usage({to.x, to.y, to.layer});
         }
         grid_blocks.set_block_at_location(to, blk);
 

vpr/src/place/place_util.cpp

@@ -287,8 +287,7 @@ void load_grid_blocks_from_block_locs(GridBlock& grid_blocks,
         VTR_ASSERT(location.y < (int)device_ctx.grid.height());
 
         grid_blocks.set_block_at_location(location, blk_id);
-        grid_blocks.set_usage({location.x, location.y, location.layer},
-                              grid_blocks.get_usage({location.x, location.y, location.layer}) + 1);
+        grid_blocks.increment_usage({location.x, location.y, location.layer});
     }
 }
 

vpr/src/util/vpr_utils.cpp

@@ -186,8 +186,7 @@ void sync_grid_to_blocks() {
         for (int width = 0; width < type->width; ++width) {
             for (int height = 0; height < type->height; ++height) {
                 grid_blocks.set_block_at_location({blk_x + width, blk_y + height, blk_z, blk_layer}, blk_id);
-                grid_blocks.set_usage({blk_x + width, blk_y + height, blk_layer},
-                                      grid_blocks.get_usage({blk_x + width, blk_y + height, blk_layer}) + 1);
+                grid_blocks.increment_usage({blk_x + width, blk_y + height, blk_layer});
 
                 VTR_ASSERT(device_ctx.grid.get_width_offset({blk_x + width, blk_y + height, blk_layer}) == width);
                 VTR_ASSERT(device_ctx.grid.get_height_offset({blk_x + width, blk_y + height, blk_layer}) == height);