verilog-to-routing · vaughnbetz · May 13, 2021 · Apr 7, 2021 · Apr 8, 2021 · Apr 8, 2021
diff --git a/vpr/src/place/centroid_move_generator.cpp b/vpr/src/place/centroid_move_generator.cpp
@@ -2,6 +2,7 @@
 #include "vpr_types.h"
 #include "globals.h"
 #include "directed_moves_util.h"
+#include "place_constraints.h"
 
 e_create_move CentroidMoveGenerator::propose_move(t_pl_blocks_to_be_moved& blocks_affected, e_move_type& /*move_type*/, float rlim, const t_placer_opts& placer_opts, const PlacerCriticalities* /*criticalities*/) {
     /* Pick a random block to be swapped with another random block.   */
@@ -35,5 +36,19 @@ e_create_move CentroidMoveGenerator::propose_move(t_pl_blocks_to_be_moved& block
         return e_create_move::ABORT;
     }
 
-    return ::create_move(blocks_affected, b_from, to);
+    e_create_move create_move;
+    create_move = ::create_move(blocks_affected, b_from, to);
+
+    //Check if the move is legal from a floorplan perspective
+    //Check that all of the blocks affected by the move would still be in a legal floorplan region after the swap
+    bool floorplan_legal = true;
+    for (int i = 0; i < blocks_affected.num_moved_blocks; i++) {
+        floorplan_legal = cluster_floorplanning_legal(blocks_affected.moved_blocks[i].block_num, blocks_affected.moved_blocks[i].new_loc);
+        if (!floorplan_legal) {
+            VTR_LOG("Move aborted for block %zu, location tried was x: %d, y: %d, subtile: %d \n", size_t(blocks_affected.moved_blocks[i].block_num), blocks_affected.moved_blocks[i].new_loc.x, blocks_affected.moved_blocks[i].new_loc.y, blocks_affected.moved_blocks[i].new_loc.sub_tile);
+            return e_create_move::ABORT;
+        }
+    }
+
+    return create_move;
 }
diff --git a/vpr/src/place/critical_uniform_move_generator.cpp b/vpr/src/place/critical_uniform_move_generator.cpp
@@ -1,5 +1,6 @@
 #include "critical_uniform_move_generator.h"
 #include "globals.h"
+#include "place_constraints.h"
 
 e_create_move CriticalUniformMoveGenerator::propose_move(t_pl_blocks_to_be_moved& blocks_affected, e_move_type& /*move_type*/, float rlim, const t_placer_opts& /*placer_opts*/, const PlacerCriticalities* /*criticalities*/) {
     auto& place_ctx = g_vpr_ctx.placement();
@@ -33,5 +34,19 @@ e_create_move CriticalUniformMoveGenerator::propose_move(t_pl_blocks_to_be_moved
         return e_create_move::ABORT;
     }
 
-    return ::create_move(blocks_affected, b_from, to);
+    e_create_move create_move;
+    create_move = ::create_move(blocks_affected, b_from, to);
+
+    //Check if the move is legal from a floorplan perspective
+    //Check that all of the blocks affected by the move would still be in a legal floorplan region after the swap
+    bool floorplan_legal = true;
+    for (int i = 0; i < blocks_affected.num_moved_blocks; i++) {
+        floorplan_legal = cluster_floorplanning_legal(blocks_affected.moved_blocks[i].block_num, blocks_affected.moved_blocks[i].new_loc);
+        if (!floorplan_legal) {
+            VTR_LOG("Move aborted for block %zu, location tried was x: %d, y: %d, subtile: %d \n", size_t(blocks_affected.moved_blocks[i].block_num), blocks_affected.moved_blocks[i].new_loc.x, blocks_affected.moved_blocks[i].new_loc.y, blocks_affected.moved_blocks[i].new_loc.sub_tile);
+            return e_create_move::ABORT;
+        }
+    }
+
+    return create_move;
 }
diff --git a/vpr/src/place/feasible_region_move_generator.cpp b/vpr/src/place/feasible_region_move_generator.cpp
@@ -2,6 +2,7 @@
 #include "globals.h"
 #include <algorithm>
 #include "math.h"
+#include "place_constraints.h"
 
 e_create_move FeasibleRegionMoveGenerator::propose_move(t_pl_blocks_to_be_moved& blocks_affected, e_move_type& /*move_type*/, float rlim, const t_placer_opts& placer_opts, const PlacerCriticalities* criticalities) {
     auto& place_ctx = g_vpr_ctx.placement();
@@ -122,5 +123,19 @@ e_create_move FeasibleRegionMoveGenerator::propose_move(t_pl_blocks_to_be_moved&
             return e_create_move::ABORT;
     }
 
-    return ::create_move(blocks_affected, b_from, to);
+    e_create_move create_move;
+    create_move = ::create_move(blocks_affected, b_from, to);
+
+    //Check if the move is legal from a floorplan perspective
+    //Check that all of the blocks affected by the move would still be in a legal floorplan region after the swap
+    bool floorplan_legal = true;
+    for (int i = 0; i < blocks_affected.num_moved_blocks; i++) {
+        floorplan_legal = cluster_floorplanning_legal(blocks_affected.moved_blocks[i].block_num, blocks_affected.moved_blocks[i].new_loc);
+        if (!floorplan_legal) {
+            VTR_LOG("Move aborted for block %zu, location tried was x: %d, y: %d, subtile: %d \n", size_t(blocks_affected.moved_blocks[i].block_num), blocks_affected.moved_blocks[i].new_loc.x, blocks_affected.moved_blocks[i].new_loc.y, blocks_affected.moved_blocks[i].new_loc.sub_tile);
+            return e_create_move::ABORT;
+        }
+    }
+
+    return create_move;
 }
diff --git a/vpr/src/place/initial_placement.cpp b/vpr/src/place/initial_placement.cpp
@@ -304,7 +304,7 @@ static void initial_placement_blocks(std::vector<std::vector<int>>& free_locatio
             // Make sure that the position is EMPTY_BLOCK before placing the block down
             VTR_ASSERT(place_ctx.grid_blocks[to.x][to.y].blocks[to.sub_tile] == EMPTY_BLOCK_ID);
 
-            bool floorplan_good = cluster_floorplanning_check(blk_id, to);
+            bool floorplan_good = cluster_floorplanning_legal(blk_id, to);
 
             if (floorplan_good) {
                 place_ctx.grid_blocks[to.x][to.y].blocks[to.sub_tile] = blk_id;

diff --git a/vpr/src/place/median_move_generator.cpp b/vpr/src/place/median_move_generator.cpp
@@ -1,7 +1,7 @@
 #include "median_move_generator.h"
 #include "globals.h"
 #include <algorithm>
-
+#include "place_constraints.h"
 #include "placer_globals.h"
 
 static bool get_bb_incrementally(ClusterNetId net_id, t_bb* bb_coord_new, int xold, int yold, int xnew, int ynew);
@@ -122,7 +122,21 @@ e_create_move MedianMoveGenerator::propose_move(t_pl_blocks_to_be_moved& blocks_
     if (!find_to_loc_centroid(cluster_from_type, from, median_point, range_limiters, to))
         return e_create_move::ABORT;
 
-    return ::create_move(blocks_affected, b_from, to);
+    e_create_move create_move;
+    create_move = ::create_move(blocks_affected, b_from, to);
+
+    //Check if the move is legal from a floorplan perspective
+    //Check that all of the blocks affected by the move would still be in a legal floorplan region after the swap
+    bool floorplan_legal = true;
+    for (int i = 0; i < blocks_affected.num_moved_blocks; i++) {
+        floorplan_legal = cluster_floorplanning_legal(blocks_affected.moved_blocks[i].block_num, blocks_affected.moved_blocks[i].new_loc);
+        if (!floorplan_legal) {
+            VTR_LOG("Move aborted for block %zu, location tried was x: %d, y: %d, subtile: %d \n", size_t(blocks_affected.moved_blocks[i].block_num), blocks_affected.moved_blocks[i].new_loc.x, blocks_affected.moved_blocks[i].new_loc.y, blocks_affected.moved_blocks[i].new_loc.sub_tile);
+            return e_create_move::ABORT;
+        }
+    }
+
+    return create_move;
 }
 
 /* Finds the bounding box of a net and stores its coordinates in the  *

diff --git a/vpr/src/place/move_transactions.h b/vpr/src/place/move_transactions.h
@@ -6,10 +6,8 @@
 /* Stores the information of the move for a block that is       *
  * moved during placement                                       *
  * block_num: the index of the moved block                      *
- * xold: the x_coord that the block is moved from               *
- * xnew: the x_coord that the block is moved to                 *
- * yold: the y_coord that the block is moved from               *
- * xnew: the x_coord that the block is moved to                 */
+ * old_loc: the location the block is moved from                *
+ * new_loc: the location the block is moved to                  */
 struct t_pl_moved_block {
     ClusterBlockId block_num;
     t_pl_loc old_loc;
@@ -26,7 +24,7 @@ struct t_pl_moved_block {
  *                   swapping two blocks.                       *
  * moved blocks: a list of moved blocks data structure with     *
  *               information on the move.                       *
- *               [0...num_moved_blocks-1]                       *
+ *               [0...max_blocks-1]                       *
  * affected_pins: pins affected by this move (used to           *
  *                incrementally invalidate parts of the timing  *
  *                graph.                                        */

diff --git a/vpr/src/place/place_constraints.cpp b/vpr/src/place/place_constraints.cpp
@@ -18,8 +18,8 @@ int check_placement_floorplanning() {
     auto& place_ctx = g_vpr_ctx.placement();
 
     for (auto blk_id : cluster_ctx.clb_nlist.blocks()) {
-        auto& loc = place_ctx.block_locs[blk_id].loc;
-        if (!cluster_floorplanning_check(blk_id, loc)) {
+        auto loc = place_ctx.block_locs[blk_id].loc;
+        if (!cluster_floorplanning_legal(blk_id, loc)) {
             error++;
             VTR_LOG_ERROR("Block %zu is not in correct floorplanning region.\n", size_t(blk_id));
         }
@@ -114,7 +114,7 @@ PartitionRegion constrained_macro_locs(t_pl_macro pl_macro) {
 }
 
 /*returns true if location is compatible with floorplanning constraints, false if not*/
-bool cluster_floorplanning_check(ClusterBlockId blk_id, t_pl_loc loc) {
+bool cluster_floorplanning_legal(ClusterBlockId blk_id, t_pl_loc& loc) {
     auto& floorplanning_ctx = g_vpr_ctx.floorplanning();
 
     bool floorplanning_good = false;

diff --git a/vpr/src/place/place_constraints.h b/vpr/src/place/place_constraints.h
@@ -23,7 +23,7 @@ bool is_cluster_constrained(ClusterBlockId blk_id);
 /*
  * Check if the placement location would respect floorplan constraints of the block, if it has any
  */
-bool cluster_floorplanning_check(ClusterBlockId blk_id, t_pl_loc loc);
+bool cluster_floorplanning_legal(ClusterBlockId blk_id, t_pl_loc& loc);
 
 /*
  * Check whether any member of the macro has floorplan constraints

diff --git a/vpr/src/place/uniform_move_generator.cpp b/vpr/src/place/uniform_move_generator.cpp
@@ -1,5 +1,6 @@
 #include "uniform_move_generator.h"
 #include "globals.h"
+#include "place_constraints.h"
 
 e_create_move UniformMoveGenerator::propose_move(t_pl_blocks_to_be_moved& blocks_affected, e_move_type& /*move_type*/, float rlim, const t_placer_opts& /*placer_opts*/, const PlacerCriticalities* /*criticalities*/) {
     /* Pick a random block to be swapped with another random block.   */
@@ -34,5 +35,19 @@ e_create_move UniformMoveGenerator::propose_move(t_pl_blocks_to_be_moved& blocks
     VTR_LOG("\n");
 #endif
 
-    return ::create_move(blocks_affected, b_from, to);
+    e_create_move create_move;
+    create_move = ::create_move(blocks_affected, b_from, to);
+
+    //Check if the move is legal from a floorplan perspective
+    //Check that all of the blocks affected by the move would still be in a legal floorplan region after the swap
+    bool floorplan_legal = true;
+    for (int i = 0; i < blocks_affected.num_moved_blocks; i++) {
+        floorplan_legal = cluster_floorplanning_legal(blocks_affected.moved_blocks[i].block_num, blocks_affected.moved_blocks[i].new_loc);
+        if (!floorplan_legal) {
+            VTR_LOG("Move aborted for block %zu, location tried was x: %d, y: %d, subtile: %d \n", size_t(blocks_affected.moved_blocks[i].block_num), blocks_affected.moved_blocks[i].new_loc.x, blocks_affected.moved_blocks[i].new_loc.y, blocks_affected.moved_blocks[i].new_loc.sub_tile);
+            return e_create_move::ABORT;
+        }
+    }
+
+    return create_move;
 }
diff --git a/vpr/src/place/weighted_centroid_move_generator.cpp b/vpr/src/place/weighted_centroid_move_generator.cpp
@@ -2,6 +2,7 @@
 #include "globals.h"
 #include <algorithm>
 #include "directed_moves_util.h"
+#include "place_constraints.h"
 
 e_create_move WeightedCentroidMoveGenerator::propose_move(t_pl_blocks_to_be_moved& blocks_affected, e_move_type& /*move_type*/, float rlim, const t_placer_opts& placer_opts, const PlacerCriticalities* criticalities) {
     /* Pick a random block to be swapped with another random block.   */
@@ -35,5 +36,19 @@ e_create_move WeightedCentroidMoveGenerator::propose_move(t_pl_blocks_to_be_move
         return e_create_move::ABORT;
     }
 
-    return ::create_move(blocks_affected, b_from, to);
+    e_create_move create_move;
+    create_move = ::create_move(blocks_affected, b_from, to);
+
+    //Check if the move is legal from a floorplan perspective
+    //Check that all of the blocks affected by the move would still be in a legal floorplan region after the swap
+    bool floorplan_legal = true;
+    for (int i = 0; i < blocks_affected.num_moved_blocks; i++) {
+        floorplan_legal = cluster_floorplanning_legal(blocks_affected.moved_blocks[i].block_num, blocks_affected.moved_blocks[i].new_loc);
+        if (!floorplan_legal) {
+            VTR_LOG("Move aborted for block %zu, location tried was x: %d, y: %d, subtile: %d \n", size_t(blocks_affected.moved_blocks[i].block_num), blocks_affected.moved_blocks[i].new_loc.x, blocks_affected.moved_blocks[i].new_loc.y, blocks_affected.moved_blocks[i].new_loc.sub_tile);
+            return e_create_move::ABORT;
+        }
+    }
+
+    return create_move;
 }
diff --git a/vpr/src/place/weighted_median_move_generator.cpp b/vpr/src/place/weighted_median_move_generator.cpp
@@ -2,6 +2,7 @@
 #include "globals.h"
 #include <algorithm>
 #include "math.h"
+#include "place_constraints.h"
 
 #define CRIT_MULT_FOR_W_MEDIAN 10
 
@@ -101,7 +102,23 @@ e_create_move WeightedMedianMoveGenerator::propose_move(t_pl_blocks_to_be_moved&
     if (!find_to_loc_centroid(cluster_from_type, from, w_median_point, range_limiters, to)) {
         return e_create_move::ABORT;
     }
-    return ::create_move(blocks_affected, b_from, to);
+    //return ::create_move(blocks_affected, b_from, to);
+
+    e_create_move create_move;
+    create_move = ::create_move(blocks_affected, b_from, to);
+
+    //Check if the move is legal from a floorplan perspective
+    //Check that all of the blocks affected by the move would still be in a legal floorplan region after the swap
+    bool floorplan_legal = true;
+    for (int i = 0; i < blocks_affected.num_moved_blocks; i++) {
+        floorplan_legal = cluster_floorplanning_legal(blocks_affected.moved_blocks[i].block_num, blocks_affected.moved_blocks[i].new_loc);
+        if (!floorplan_legal) {
+            VTR_LOG("Move aborted for block %zu, location tried was x: %d, y: %d, subtile: %d \n", size_t(blocks_affected.moved_blocks[i].block_num), blocks_affected.moved_blocks[i].new_loc.x, blocks_affected.moved_blocks[i].new_loc.y, blocks_affected.moved_blocks[i].new_loc.sub_tile);
+            return e_create_move::ABORT;
+        }
+    }
+
+    return create_move;
 }
 
 /**