add grid_block.h

Author: soheilshahrouz

vpr/src/base/blk_loc_registry.h

@@ -4,9 +4,19 @@
 #include "clustered_netlist_fwd.h"
 #include "vtr_vector_map.h"
 #include "vpr_types.h"
+#include "grid_block.h"
 
 struct t_block_loc;
 
+/**
+ * @class BlkLocRegistry contains information about the placement of clustered blocks.
+ * More specifically:
+ *      1) block_locs stores the location where each clustered blocks is placed at.
+ *      2) grid_blocks stores which blocks (if any) are placed at a given location.
+ *      3) physical_pins stores the mapping between the pins of a clustered block and
+ *      the pins of the physical tile where the clustered blocks is placed.
+ *
+ */
 class BlkLocRegistry {
   public:
     BlkLocRegistry() = default;

vpr/src/base/grid_block.h

@@ -0,0 +1,81 @@
+#ifndef VTR_GRID_BLOCK_H
+#define VTR_GRID_BLOCK_H
+
+#include "clustered_netlist_fwd.h"
+#include "physical_types.h"
+#include "vpr_types.h"
+
+#include <vector>
+
+/* Defining macros for the placement_ctx t_grid_blocks. Assumes that ClusterBlockId's won't exceed positive 32-bit integers */
+constexpr auto EMPTY_BLOCK_ID = ClusterBlockId(-1);
+constexpr auto INVALID_BLOCK_ID = ClusterBlockId(-2);
+
+///@brief Stores the clustered blocks placed at a particular grid location
+struct t_grid_blocks {
+    int usage; ///<How many valid blocks are in use at this location
+
+    /**
+     * @brief The clustered blocks associated with this grid location.
+     *
+     * Index range: [0..device_ctx.grid[x_loc][y_loc].type->capacity]
+     */
+    std::vector<ClusterBlockId> blocks;
+
+    /**
+     * @brief Test if a subtile at a grid location is occupied by a block.
+     *
+     * Returns true if the subtile corresponds to the passed-in id is not
+     * occupied by a block at this grid location. The subtile id serves
+     * as the z-dimensional offset in the grid indexing.
+     */
+    inline bool subtile_empty(size_t isubtile) const {
+        return blocks[isubtile] == EMPTY_BLOCK_ID;
+    }
+};
+
+class GridBlock {
+  public:
+    GridBlock() = default;
+
+    GridBlock(size_t width, size_t height, size_t layers) {
+        grid_blocks_.resize({layers, width, height});
+    }
+
+    inline void initialized_grid_block_at_location(const t_physical_tile_loc& loc, int num_sub_tiles) {
+        grid_blocks_[loc.layer_num][loc.x][loc.y].blocks.resize(num_sub_tiles, EMPTY_BLOCK_ID);
+    }
+
+    inline void set_block_at_location(const t_pl_loc& loc, ClusterBlockId blk_id) {
+        grid_blocks_[loc.layer][loc.x][loc.y].blocks[loc.sub_tile] = blk_id;
+    }
+
+    inline ClusterBlockId block_at_location(const t_pl_loc& loc) const {
+        return grid_blocks_[loc.layer][loc.x][loc.y].blocks[loc.sub_tile];
+    }
+
+    inline size_t num_blocks_at_location(const t_physical_tile_loc& loc) const {
+        return grid_blocks_[loc.layer_num][loc.x][loc.y].blocks.size();
+    }
+
+    inline int set_usage(const t_physical_tile_loc loc, int usage) {
+        return grid_blocks_[loc.layer_num][loc.x][loc.y].usage = usage;
+    }
+
+    inline int get_usage(const t_physical_tile_loc loc) const {
+        return grid_blocks_[loc.layer_num][loc.x][loc.y].usage;
+    }
+
+    inline bool is_sub_tile_empty(const t_physical_tile_loc loc, int sub_tile) const {
+        return grid_blocks_[loc.layer_num][loc.x][loc.y].subtile_empty(sub_tile);
+    }
+
+    inline void clear() {
+        grid_blocks_.clear();
+    }
+
+  private:
+    vtr::NdMatrix<t_grid_blocks, 3> grid_blocks_;
+};
+
+#endif //VTR_GRID_BLOCK_H

vpr/src/base/vpr_types.h

@@ -95,12 +95,6 @@ enum class ScreenUpdatePriority {
 /* Used to avoid floating-point errors when comparing values close to 0 */
 #define EPSILON 1.e-15
 
-#define FIRST_ITER_WIRELENTH_LIMIT 0.85 /* If used wirelength exceeds this value in first iteration of routing, do not route */
-
-/* Defining macros for the placement_ctx t_grid_blocks. Assumes that ClusterBlockId's won't exceed positive 32-bit integers */
-constexpr auto EMPTY_BLOCK_ID = ClusterBlockId(-1);
-constexpr auto INVALID_BLOCK_ID = ClusterBlockId(-2);
-
 /*
  * Files
  */
@@ -840,74 +834,6 @@ struct t_block_loc {
     bool is_fixed = false;
 };
 
-///@brief Stores the clustered blocks placed at a particular grid location
-struct t_grid_blocks {
-    int usage; ///<How many valid blocks are in use at this location
-
-    /**
-     * @brief The clustered blocks associated with this grid location.
-     *
-     * Index range: [0..device_ctx.grid[x_loc][y_loc].type->capacity]
-     */
-    std::vector<ClusterBlockId> blocks;
-
-    /**
-     * @brief Test if a subtile at a grid location is occupied by a block.
-     *
-     * Returns true if the subtile corresponds to the passed-in id is not
-     * occupied by a block at this grid location. The subtile id serves
-     * as the z-dimensional offset in the grid indexing.
-     */
-    inline bool subtile_empty(size_t isubtile) const {
-        return blocks[isubtile] == EMPTY_BLOCK_ID;
-    }
-};
-
-class GridBlock {
-  public:
-    GridBlock() = default;
-
-    GridBlock(size_t width, size_t height, size_t layers) {
-        grid_blocks_.resize({layers, width, height});
-    }
-
-    inline void initialized_grid_block_at_location(const t_physical_tile_loc& loc, int num_sub_tiles) {
-        grid_blocks_[loc.layer_num][loc.x][loc.y].blocks.resize(num_sub_tiles, EMPTY_BLOCK_ID);
-    }
-
-    inline void set_block_at_location(const t_pl_loc& loc, ClusterBlockId blk_id) {
-        grid_blocks_[loc.layer][loc.x][loc.y].blocks[loc.sub_tile] = blk_id;
-    }
-
-    inline ClusterBlockId block_at_location(const t_pl_loc& loc) const {
-        return grid_blocks_[loc.layer][loc.x][loc.y].blocks[loc.sub_tile];
-    }
-
-    inline size_t num_blocks_at_location(const t_physical_tile_loc& loc) const {
-        return grid_blocks_[loc.layer_num][loc.x][loc.y].blocks.size();
-    }
-
-    inline int set_usage(const t_physical_tile_loc loc, int usage) {
-        return grid_blocks_[loc.layer_num][loc.x][loc.y].usage = usage;
-    }
-
-    inline int get_usage(const t_physical_tile_loc loc) const {
-        return grid_blocks_[loc.layer_num][loc.x][loc.y].usage;
-    }
-
-    inline bool is_sub_tile_empty(const t_physical_tile_loc loc, int sub_tile) const {
-        return grid_blocks_[loc.layer_num][loc.x][loc.y].subtile_empty(sub_tile);
-    }
-
-    inline void clear() {
-        grid_blocks_.clear();
-    }
-
-  private:
-    vtr::NdMatrix<t_grid_blocks, 3> grid_blocks_;
-};
-
-
 ///@brief Names of various files
 struct t_file_name_opts {
     std::string ArchFile;

vpr/src/place/move_transactions.cpp

@@ -3,6 +3,7 @@
 
 #include "globals.h"
 #include "place_util.h"
+#include "grid_block.h"
 #include "vtr_assert.h"
 
 t_pl_blocks_to_be_moved::t_pl_blocks_to_be_moved(size_t max_blocks){

vpr/src/place/move_transactions.h

@@ -5,6 +5,7 @@
 #include "clustered_netlist_utils.h"
 
 class BlkLocRegistry;
+class GridBlock;
 
 enum class e_block_move_result {
     VALID,       //Move successful