remove exclusivity_index and fix some typos

Author: soheilshahrouz

vpr/src/base/partition_region.cpp

@@ -36,22 +36,6 @@ bool PartitionRegion::is_loc_in_part_reg(const t_pl_loc& loc) const {
     return is_in_pr;
 }
 
-int PartitionRegion::get_exclusivity_index() const {
-    return exclusivity_index;
-}
-
-void PartitionRegion::set_exclusivity_index(int index) {
-    /* negative exclusivity index means this PartitionRegion is compatible
-     * with other PartitionsRegions as long as the intersection of their
-     * regions is not empty.
-     */
-    if (index < 0) {
-        index = -1;
-    }
-
-    exclusivity_index = index;
-}
-
 PartitionRegion intersection(const PartitionRegion& cluster_pr, const PartitionRegion& new_pr) {
     /**for N regions in part_region and M in the calling object you can get anywhere from
      * 0 to M*N regions in the resulting vector. Only intersection regions with non-zero area rectangles and
@@ -60,14 +44,6 @@ PartitionRegion intersection(const PartitionRegion& cluster_pr, const PartitionR
      */
     PartitionRegion pr;
 
-    const int cluster_exclusivity = cluster_pr.get_exclusivity_index();
-    const int new_exclusivity = new_pr.get_exclusivity_index();
-
-    // PartitionRegion are not compatible even if their regions overlap
-    if (cluster_exclusivity != new_exclusivity) {
-        return pr;
-    }
-
     auto& pr_regions = pr.get_mutable_regions();
 
     for (const auto& cluster_region : cluster_pr.get_regions()) {
@@ -85,19 +61,12 @@ PartitionRegion intersection(const PartitionRegion& cluster_pr, const PartitionR
 void update_cluster_part_reg(PartitionRegion& cluster_pr, const PartitionRegion& new_pr) {
     std::vector<Region> int_regions;
 
-    const int cluster_exclusivity = cluster_pr.get_exclusivity_index();
-    const int new_exclusivity = new_pr.get_exclusivity_index();
-
-    // check whether PartitionRegions are compatible in the first place
-    if (cluster_exclusivity == new_exclusivity) {
-
-        // now that we know PartitionRegions are compatible, look for overlapping regions
-        for (const auto& cluster_region : cluster_pr.get_regions()) {
-            for (const auto& new_region : new_pr.get_regions()) {
-                Region intersect_region = intersection(cluster_region, new_region);
-                if (!intersect_region.empty()) {
-                    int_regions.push_back(intersect_region);
-                }
+    // now that we know PartitionRegions are compatible, look for overlapping regions
+    for (const auto& cluster_region : cluster_pr.get_regions()) {
+        for (const auto& new_region : new_pr.get_regions()) {
+            Region intersect_region = intersection(cluster_region, new_region);
+            if (!intersect_region.empty()) {
+                int_regions.push_back(intersect_region);
             }
         }
     }

vpr/src/base/partition_region.h

@@ -50,13 +50,8 @@ class PartitionRegion {
      */
     bool is_loc_in_part_reg(const t_pl_loc& loc) const;
 
-    int get_exclusivity_index() const;
-
-    void set_exclusivity_index(int index);
-
   private:
     std::vector<Region> regions; ///< union of rectangular regions that a partition can be placed in
-    int exclusivity_index = -1;  ///< PartitionRegions with different exclusivity_index values are not compatible
 };
 
 ///@brief used to print data from a PartitionRegion

vpr/src/base/setup_noc.cpp

@@ -139,7 +139,7 @@ void create_noc_routers(const t_noc_inf& noc_info, NocStorage* noc_model, std::v
     double curr_logical_router_position_x;
     double curr_logical_router_position_y;
 
-    // keep track of the index of each physical router (this helps uniqely identify them)
+    // keep track of the index of each physical router (this helps uniquely identify them)
     int curr_physical_router_index = 0;
 
     // keep track of the ids of the routers that create the case where multiple routers have the same distance to a physical router tile
@@ -153,7 +153,7 @@ void create_noc_routers(const t_noc_inf& noc_info, NocStorage* noc_model, std::v
 
     // Below we create all the routers within the NoC //
 
-    // go through each user desctibed router in the arch file and assign it to a physical router on the FPGA
+    // go through each user described router in the arch file and assign it to a physical router on the FPGA
     for (auto logical_router = noc_info.router_list.begin(); logical_router != noc_info.router_list.end(); logical_router++) {
         // assign the shortest distance to a large value (this is done so that the first distance calculated and we can replace this)
         shortest_distance = LLONG_MAX;
@@ -173,7 +173,7 @@ void create_noc_routers(const t_noc_inf& noc_info, NocStorage* noc_model, std::v
         error_case_physical_router_index_2 = INVALID_PHYSICAL_ROUTER_INDEX;
 
         // determine the physical router tile that is closest to the current user described router in the arch file
-        for (auto & physical_router : noc_router_tiles) {
+        for (auto& physical_router : noc_router_tiles) {
             // get the position of the current physical router tile on the FPGA device
             curr_physical_router_pos_x = physical_router.tile_centroid_x;
             curr_physical_router_pos_y = physical_router.tile_centroid_y;
@@ -237,7 +237,7 @@ void create_noc_links(const t_noc_inf* noc_info, NocStorage* noc_model) {
     noc_model->make_room_for_noc_router_link_list();
 
     // go through each router and add its outgoing links to the NoC
-    for (const auto & router : noc_info->router_list) {
+    for (const auto& router : noc_info->router_list) {
         // get the converted id of the current source router
         source_router = noc_model->convert_router_id(router.id);
 

vpr/src/pack/attraction_groups.cpp

@@ -49,7 +49,7 @@ void AttractionInfo::create_att_groups_for_overfull_regions() {
 
     const auto& overfull_regions = floorplanning_ctx.overfull_regions;
     PartitionRegion overfull_regions_pr;
-    for (const auto & overfull_region : overfull_regions) {
+    for (const auto& overfull_region : overfull_regions) {
         overfull_regions_pr.add_to_part_region(overfull_region);
     }
     /*

vpr/src/pack/cluster_util.cpp

@@ -76,7 +76,7 @@ static void echo_clusters(char* filename) {
         cluster_atoms[clb_index].push_back(atom_blk_id);
     }
 
-    for (auto & cluster_atom : cluster_atoms) {
+    for (auto& cluster_atom : cluster_atoms) {
         const std::string& cluster_name = cluster_ctx.clb_nlist.block_name(cluster_atom.first);
         fprintf(fp, "Cluster %s Id: %zu \n", cluster_name.c_str(), size_t(cluster_atom.first));
         fprintf(fp, "\tAtoms in cluster: \n");
@@ -96,7 +96,7 @@ static void echo_clusters(char* filename) {
         const std::vector<Region>& regions = floorplanning_ctx.cluster_constraints[clb_id].get_regions();
         if (!regions.empty()) {
             fprintf(fp, "\nRegions in Cluster %zu:\n", size_t(clb_id));
-            for (const auto & region : regions) {
+            for (const auto& region : regions) {
                 print_region(fp, region);
             }
         }

vpr/src/place/place_constraints.cpp

@@ -41,7 +41,7 @@ bool is_macro_constrained(const t_pl_macro& pl_macro) {
     bool is_macro_constrained = false;
     bool is_member_constrained = false;
 
-    for (const auto & member : pl_macro.members) {
+    for (const auto& member : pl_macro.members) {
         ClusterBlockId iblk = member.blk_index;
         is_member_constrained = is_cluster_constrained(iblk);
 
@@ -61,7 +61,7 @@ PartitionRegion update_macro_head_pr(const t_pl_macro& pl_macro, const Partition
     int num_constrained_members = 0;
     auto& floorplanning_ctx = g_vpr_ctx.floorplanning();
 
-    for (const auto & member : pl_macro.members) {
+    for (const auto& member : pl_macro.members) {
         ClusterBlockId iblk = member.blk_index;
         is_member_constrained = is_cluster_constrained(iblk);
 
@@ -75,7 +75,7 @@ PartitionRegion update_macro_head_pr(const t_pl_macro& pl_macro, const Partition
             const PartitionRegion& block_pr = floorplanning_ctx.cluster_constraints[iblk];
             const std::vector<Region>& block_regions = block_pr.get_regions();
 
-            for (const auto & block_region : block_regions) {
+            for (const auto& block_region : block_regions) {
                 Region modified_reg;
                 auto offset = member.offset;
 
@@ -118,7 +118,7 @@ PartitionRegion update_macro_member_pr(PartitionRegion& head_pr, const t_pl_offs
     const std::vector<Region>& block_regions = head_pr.get_regions();
     PartitionRegion macro_pr;
 
-    for (const auto & block_region : block_regions) {
+    for (const auto& block_region : block_regions) {
         Region modified_reg;
 
         const auto block_reg_coord = block_region.get_region_rect();
@@ -153,7 +153,7 @@ void print_macro_constraint_error(const t_pl_macro& pl_macro) {
     VTR_LOG(
         "Feasible floorplanning constraints could not be calculated for the placement macro. \n"
         "The placement macro contains the following blocks: \n");
-    for (const auto & member : pl_macro.members) {
+    for (const auto& member : pl_macro.members) {
         std::string blk_name = cluster_ctx.clb_nlist.block_name((member.blk_index));
         VTR_LOG("Block %s (#%zu) ", blk_name.c_str(), size_t(member.blk_index));
     }
@@ -371,7 +371,7 @@ int region_tile_cover(const Region& reg, t_logical_block_type_ptr block_type, t_
 }
 
 /*
- * Used when marking fixed blocks to check whether the ParitionRegion associated with a block
+ * Used when marking fixed blocks to check whether the PartitionRegion associated with a block
  * covers one tile. If it covers one tile, it is marked as fixed. If it covers 0 tiles or
  * more than one tile, it will not be marked as fixed. As soon as it is known that the
  * PartitionRegion covers more than one tile, there is no need to check further regions
@@ -441,7 +441,7 @@ int get_part_reg_size(PartitionRegion& pr, t_logical_block_type_ptr block_type,
     const std::vector<Region>& regions = pr.get_regions();
     int num_tiles = 0;
 
-    for (const auto & region : regions) {
+    for (const auto& region : regions) {
         num_tiles += grid_tiles.region_tile_count(region, block_type);
     }