Merge pull request #8434 from osamahammad21/gpl-regions

GPL: use regions instead of power domains

Author: osamahammad21

src/gpl/src/initialPlace.cpp

@@ -132,22 +132,22 @@ void InitialPlace::placeInstsCenter()
     const auto db_inst = inst->dbInst();
     const auto group = db_inst->getGroup();
 
-    if (group && group->getType() == odb::dbGroupType::POWER_DOMAIN) {
-      auto domain_region = group->getRegion();
-      int domain_x_min = std::numeric_limits<int>::max();
-      int domain_y_min = std::numeric_limits<int>::max();
-      int domain_x_max = std::numeric_limits<int>::min();
-      int domain_y_max = std::numeric_limits<int>::min();
-
-      for (auto boundary : domain_region->getBoundaries()) {
-        domain_x_min = std::min(domain_x_min, boundary->xMin());
-        domain_y_min = std::min(domain_y_min, boundary->yMin());
-        domain_x_max = std::max(domain_x_max, boundary->xMax());
-        domain_y_max = std::max(domain_y_max, boundary->yMax());
+    if (group && group->getRegion()) {
+      auto region = group->getRegion();
+      int region_x_min = std::numeric_limits<int>::max();
+      int region_y_min = std::numeric_limits<int>::max();
+      int region_x_max = std::numeric_limits<int>::min();
+      int region_y_max = std::numeric_limits<int>::min();
+
+      for (auto boundary : region->getBoundaries()) {
+        region_x_min = std::min(region_x_min, boundary->xMin());
+        region_y_min = std::min(region_y_min, boundary->yMin());
+        region_x_max = std::max(region_x_max, boundary->xMax());
+        region_y_max = std::max(region_y_max, boundary->yMax());
       }
 
-      inst->setCenterLocation(domain_x_max - (domain_x_max - domain_x_min) / 2,
-                              domain_y_max - (domain_y_max - domain_y_min) / 2);
+      inst->setCenterLocation(region_x_max - (region_x_max - region_x_min) / 2,
+                              region_y_max - (region_y_max - region_y_min) / 2);
       ++count_region_center;
     } else if (pbc_->isSkipIoMode() && db_inst->isPlaced()) {
       // It is helpful to pick up the placement from mpl if available,

src/gpl/src/placerBase.cpp

@@ -1068,7 +1068,6 @@ void PlacerBase::init()
 void PlacerBase::initInstsForUnusableSites()
 {
   dbSet<dbRow> rows = db_->getChip()->getBlock()->getRows();
-  dbSet<dbPowerDomain> pds = db_->getChip()->getBlock()->getPowerDomains();
 
   int64_t siteCountX = (die_.coreUx() - die_.coreLx()) / siteSizeX_;
   int64_t siteCountY = (die_.coreUy() - die_.coreLy()) / siteSizeY_;
@@ -1161,29 +1160,19 @@ void PlacerBase::initInstsForUnusableSites()
   // In the case of top level power domain i.e no group,
   // mark all other power domains as empty
   if (group_ == nullptr) {
-    for (dbPowerDomain* pd : pds) {
-      if (pd->getGroup() != nullptr) {
-        for (auto boundary : pd->getGroup()->getRegion()->getBoundaries()) {
-          Rect rect = boundary->getBox();
-
-          std::pair<int, int> pairX = getMinMaxIdx(rect.xMin(),
-                                                   rect.xMax(),
-                                                   die_.coreLx(),
-                                                   siteSizeX_,
-                                                   0,
-                                                   siteCountX);
-
-          std::pair<int, int> pairY = getMinMaxIdx(rect.yMin(),
-                                                   rect.yMax(),
-                                                   die_.coreLy(),
-                                                   siteSizeY_,
-                                                   0,
-                                                   siteCountY);
-
-          for (int i = pairX.first; i < pairX.second; i++) {
-            for (int j = pairY.first; j < pairY.second; j++) {
-              siteGrid[j * siteCountX + i] = Empty;
-            }
+    for (auto region : db_->getChip()->getBlock()->getRegions()) {
+      for (auto boundary : region->getBoundaries()) {
+        Rect rect = boundary->getBox();
+
+        std::pair<int, int> pairX = getMinMaxIdx(
+            rect.xMin(), rect.xMax(), die_.coreLx(), siteSizeX_, 0, siteCountX);
+
+        std::pair<int, int> pairY = getMinMaxIdx(
+            rect.yMin(), rect.yMax(), die_.coreLy(), siteSizeY_, 0, siteCountY);
+
+        for (int i = pairX.first; i < pairX.second; i++) {
+          for (int j = pairY.first; j < pairY.second; j++) {
+            siteGrid[j * siteCountX + i] = Empty;
           }
         }
       }

src/gpl/src/replace.cpp

@@ -112,10 +112,9 @@ void Replace::doIncrementalPlace(int threads)
 
     pbVec_.push_back(std::make_shared<PlacerBase>(db_, pbc_, log_));
 
-    for (auto pd : db_->getChip()->getBlock()->getPowerDomains()) {
-      if (pd->getGroup()) {
-        pbVec_.push_back(
-            std::make_shared<PlacerBase>(db_, pbc_, log_, pd->getGroup()));
+    for (auto pd : db_->getChip()->getBlock()->getRegions()) {
+      for (auto group : pd->getGroups()) {
+        pbVec_.push_back(std::make_shared<PlacerBase>(db_, pbc_, log_, group));
       }
     }
 
@@ -191,10 +190,9 @@ void Replace::doInitialPlace(int threads)
 
     pbVec_.push_back(std::make_shared<PlacerBase>(db_, pbc_, log_));
 
-    for (auto pd : db_->getChip()->getBlock()->getPowerDomains()) {
-      if (pd->getGroup()) {
-        pbVec_.push_back(
-            std::make_shared<PlacerBase>(db_, pbc_, log_, pd->getGroup()));
+    for (auto pd : db_->getChip()->getBlock()->getRegions()) {
+      for (auto group : pd->getGroups()) {
+        pbVec_.push_back(std::make_shared<PlacerBase>(db_, pbc_, log_, group));
       }
     }
 
@@ -244,10 +242,9 @@ bool Replace::initNesterovPlace(int threads)
 
     pbVec_.push_back(std::make_shared<PlacerBase>(db_, pbc_, log_));
 
-    for (auto pd : db_->getChip()->getBlock()->getPowerDomains()) {
-      if (pd->getGroup()) {
-        pbVec_.push_back(
-            std::make_shared<PlacerBase>(db_, pbc_, log_, pd->getGroup()));
+    for (auto pd : db_->getChip()->getBlock()->getRegions()) {
+      for (auto group : pd->getGroups()) {
+        pbVec_.push_back(std::make_shared<PlacerBase>(db_, pbc_, log_, group));
       }
     }