update search_range in intersect_range_limit_with_floorplan_constraints()

Author: soheilshahrouz

vpr/src/place/move_utils.cpp

@@ -1265,27 +1265,9 @@ bool intersect_range_limit_with_floorplan_constraints(t_logical_block_type_ptr t
                                                       t_bb& search_range,
                                                       int& delta_cx,
                                                       int layer_num) {
-    //Retrieve the compressed block grid for this block type
-    const auto& compressed_block_grid = g_vpr_ctx.placement().compressed_block_grids[type->index];
-
-    auto min_grid_loc = compressed_block_grid.compressed_loc_to_grid_loc({search_range.xmin,
-                                                                          search_range.ymin,
-                                                                          layer_num});
-
-    auto max_grid_loc = compressed_block_grid.compressed_loc_to_grid_loc({search_range.xmax,
-                                                                          search_range.ymax,
-                                                                          layer_num});
-
-    Region range_reg;
-    range_reg.set_region_rect({min_grid_loc.x,
-                               min_grid_loc.y,
-                               max_grid_loc.x,
-                               max_grid_loc.y,
-                               layer_num});
-
     const auto& floorplanning_ctx = g_vpr_ctx.floorplanning();
 
-    const PartitionRegion& pr = floorplanning_ctx.cluster_constraints[b_from];
+    const PartitionRegion& pr = floorplanning_ctx.compressed_cluster_constraints[b_from];
     const std::vector<Region>& regions = pr.get_regions();
     Region intersect_reg;
     /*
@@ -1296,22 +1278,27 @@ bool intersect_range_limit_with_floorplan_constraints(t_logical_block_type_ptr t
      * complicated case to get correct functionality during place moves.
      */
     if (regions.size() == 1) {
+        Region range_reg;
+        range_reg.set_region_rect({search_range.xmin, search_range.ymin,
+                                   search_range.xmax, search_range.ymax,
+                                   layer_num});
+
         intersect_reg = intersection(regions[0], range_reg);
 
         if (intersect_reg.empty()) {
-            VTR_LOGV_DEBUG(g_vpr_ctx.placement().f_placer_debug, "\tCouldn't find an intersection between floorplan constraints and search region\n");
+            VTR_LOGV_DEBUG(g_vpr_ctx.placement().f_placer_debug,
+                           "\tCouldn't find an intersection between floorplan constraints and search region\n");
             return false;
         } else {
             const auto intersect_coord = intersect_reg.get_region_rect();
             VTR_ASSERT(intersect_coord.layer_num == layer_num);
-            auto min_compressed_loc = compressed_block_grid.grid_loc_to_compressed_loc_approx({intersect_coord.xmin,
-                                                                                               intersect_coord.ymin,
-                                                                                               layer_num});
-
-            auto max_compressed_loc = compressed_block_grid.grid_loc_to_compressed_loc_approx({intersect_coord.xmax,
-                                                                                               intersect_coord.ymax,
-                                                                                               layer_num});
-            delta_cx = max_compressed_loc.x - min_compressed_loc.x;
+
+            delta_cx = intersect_coord.xmax -  intersect_coord.xmin;
+            search_range.xmin = intersect_coord.xmin;
+            search_range.ymin = intersect_coord.ymin;
+            search_range.xmax = intersect_coord.xmax;
+            search_range.ymax = intersect_coord.ymax;
+            search_range.layer_max = search_range.layer_min = layer_num;
         }
     }