Added function to directly update a cluster's PartitionRegion that is passed in, rather than returning a new PartitionRegion. This function is a more efficient version of the PartitionRegion intersection function, and is now used during the atom floorplanning checks that happen during clustering

Author: sfkhalid

vpr/src/base/partition_region.cpp

@@ -9,6 +9,10 @@ std::vector<Region> PartitionRegion::get_partition_region() {
     return partition_region;
 }
 
+void PartitionRegion::set_partition_region(std::vector<Region> pr) {
+    partition_region = pr;
+}
+
 bool PartitionRegion::empty() {
     return partition_region.size() == 0;
 }
@@ -46,6 +50,20 @@ PartitionRegion intersection(const PartitionRegion& cluster_pr, const PartitionR
     return pr;
 }
 
+void update_cluster_part_reg(PartitionRegion& cluster_pr, const PartitionRegion& new_pr) {
+    Region intersect_region;
+    std::vector<Region> int_regions;
+    for (unsigned int i = 0; i < cluster_pr.partition_region.size(); i++) {
+        for (unsigned int j = 0; j < new_pr.partition_region.size(); j++) {
+            intersect_region = intersection(cluster_pr.partition_region[i], new_pr.partition_region[j]);
+            if (!intersect_region.empty()) {
+                int_regions.push_back(intersect_region);
+            }
+        }
+    }
+    cluster_pr.set_partition_region(int_regions);
+}
+
 void print_partition_region(FILE* fp, PartitionRegion pr) {
     std::vector<Region> part_region = pr.get_partition_region();
 

vpr/src/base/partition_region.h

@@ -27,6 +27,11 @@ class PartitionRegion {
      */
     std::vector<Region> get_partition_region();
 
+    /**
+     * @brief Set the union of regions
+     */
+    void set_partition_region(std::vector<Region> pr);
+
     /**
      * @brief Check if the PartitionRegion is empty (meaning there is no constraint on the object the PartitionRegion belongs to)
      */
@@ -43,11 +48,20 @@ class PartitionRegion {
     /**
      * @brief Global friend function that returns the intersection of two PartitionRegions
      *
-     *   @param pr1     One of the PartitionRegions to be intersected
-     *   @param pr2     One of the PartitionRegions to be intersected
+     *   @param cluster_pr     One of the PartitionRegions to be intersected
+     *   @param new_pr         One of the PartitionRegions to be intersected
      */
     friend PartitionRegion intersection(const PartitionRegion& cluster_pr, const PartitionRegion& new_pr);
 
+    /**
+     * @brief Global friend function that updates the PartitionRegion of a cluster with the intersection
+     *        of the cluster PartitionRegion and a new PartitionRegion
+     *
+     *   @param cluster_pr     The cluster PartitionRegion that is to be updated
+     *   @param new_pr         The new PartitionRegion that the cluster PartitionRegion will be intersected with
+     */
+    friend void update_cluster_part_reg(PartitionRegion& cluster_pr, const PartitionRegion& new_pr);
+
   private:
     std::vector<Region> partition_region; ///< union of rectangular regions that a partition can be placed in
 };

vpr/src/pack/cluster.cpp

@@ -1735,7 +1735,6 @@ static enum e_block_pack_status atom_cluster_floorplanning_check(const AtomBlock
 
     PartitionRegion atom_pr;
     PartitionRegion cluster_pr;
-    PartitionRegion intersect_pr;
 
     //if the atom does not belong to a partition, it can be put in the cluster
     //regardless of what the cluster's PartitionRegion is because it has no constraints
@@ -1760,18 +1759,20 @@ static enum e_block_pack_status atom_cluster_floorplanning_check(const AtomBlock
             }
             return BLK_PASSED;
         } else {
-            intersect_pr = intersection(cluster_pr, atom_pr);
+            //update cluster_pr with the intersection of the cluster's PartitionRegion
+            //and the atom's PartitionRegion
+            update_cluster_part_reg(cluster_pr, atom_pr);
         }
 
-        if (intersect_pr.empty() == true) {
+        if (cluster_pr.empty() == true) {
             if (verbosity > 3) {
                 VTR_LOG("\t\t\t Intersect: Atom block %d failed floorplanning check for cluster %d \n", blk_id, clb_index);
             }
             cluster_pr_needs_update = false;
             return BLK_FAILED_FLOORPLANNING;
         } else {
             //update the cluster's PartitionRegion with the intersecting PartitionRegion
-            temp_cluster_pr = intersect_pr;
+            temp_cluster_pr = cluster_pr;
             cluster_pr_needs_update = true;
             if (verbosity > 3) {
                 VTR_LOG("\t\t\t Intersect: Atom block %d passed cluster %d, cluster PR was updated with intersection result \n", blk_id, clb_index);

vpr/src/place/place_constraints.h

@@ -9,7 +9,6 @@
 #include "region.h"
 #include "clustered_netlist_utils.h"
 
-
 #ifndef VPR_SRC_PLACE_PLACE_CONSTRAINTS_H_
 #    define VPR_SRC_PLACE_PLACE_CONSTRAINTS_H_