Merge remote-tracking branch 'private/master' into gpl-area-weight-by-pin

Author: gudeh

src/dpl/src/optimization/detailed_manager.cxx

@@ -1825,6 +1825,14 @@ bool DetailedMgr::alignPos(const Node* ndi, DbuX& xi, const DbuX xl, DbuX xr)
 
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
+bool DetailedMgr::checkSiteOrientation(Node* node, DbuX x, DbuY y)
+{
+  odb::dbSite* site = node->getDbInst()->getMaster()->getSite();
+  const auto grid_x = grid_->gridX(x);
+  const auto grid_y = grid_->gridSnapDownY(y);
+  return grid_->getSiteOrientation(grid_x, grid_y, site).has_value();
+}
+
 bool DetailedMgr::shift(std::vector<Node*>& cells,
                         std::vector<DbuX>& targetLeft,
                         std::vector<DbuX>& posLeft,
@@ -2468,6 +2476,7 @@ bool DetailedMgr::tryMove2(Node* ndi,
     if (!alignPos(ndi, xj, lx, rx)) {
       return false;
     }
+
     if (!addToMoveList(ndi, ndi->getLeft(), ndi->getBottom(), si, xj, yj, sj)) {
       return false;
     }
@@ -2486,6 +2495,7 @@ bool DetailedMgr::tryMove2(Node* ndi,
     if (!alignPos(ndi, xj, lx, rx)) {
       return false;
     }
+
     if (!addToMoveList(ndi, ndi->getLeft(), ndi->getBottom(), si, xj, yj, sj)) {
       return false;
     }
@@ -2873,6 +2883,7 @@ bool DetailedMgr::trySwap1(Node* ndi,
   const DbuX x2 = ndj->getLeft();
   const DbuY y2 = ndj->getBottom();
   // Build move list.
+
   if (!addToMoveList(ndi, x1, y1, si, xj, y2, sj)) {
     return false;
   }
@@ -2905,6 +2916,10 @@ bool DetailedMgr::addToMoveList(Node* ndi,
     return false;
   }
 
+  if (!checkSiteOrientation(ndi, newLeft, newBottom)) {
+    return false;
+  }
+
   // Easy to observe displacement limit if using the
   // manager to compose a move list.  We can check
   // only here whether or not a cell will violate its
@@ -2946,6 +2961,11 @@ bool DetailedMgr::addToMoveList(Node* ndi,
   if (journal_.size() >= moveLimit_) {
     return false;
   }
+
+  if (!checkSiteOrientation(ndi, newLeft, newBottom)) {
+    return false;
+  }
+
   // commit move and add to journal
   eraseFromGrid(ndi);
   for (const auto& curSeg : curSegs) {
@@ -2989,6 +3009,7 @@ void DetailedMgr::paintInGrid(Node* node)
   const auto grid_x = grid_->gridX(node);
   const auto grid_y = grid_->gridSnapDownY(node);
   odb::dbSite* site = node->getDbInst()->getMaster()->getSite();
+
   const auto orientation
       = grid_->getSiteOrientation(grid_x, grid_y, site).value();
   grid_->paintPixel(node, grid_x, grid_y);

src/dpl/src/optimization/detailed_manager.h

@@ -298,6 +298,7 @@ class DetailedMgr
   bool trySwap1(Node* ndi, DbuX xi, DbuY yi, int si, DbuX xj, DbuY yj, int sj);
 
   // Helper routines for making moves and swaps.
+  bool checkSiteOrientation(Node* node, DbuX x, DbuY y);
   bool shift(std::vector<Node*>& cells,
              std::vector<DbuX>& targetLeft,
              std::vector<DbuX>& posLeft,

src/gpl/src/graphicsImpl.cpp

@@ -91,9 +91,10 @@ void GraphicsImpl::debugForNesterovPlace(
         region_names.reserve(nbVec_.size());
         for (size_t i = 0; i < nbVec_.size(); ++i) {
           std::string name;
-          if (nbVec_[i] && nbVec_[i]->getPb() && nbVec_[i]->getPb()->group()) {
+          if (nbVec_[i] && nbVec_[i]->getPb()
+              && nbVec_[i]->getPb()->getGroup()) {
             name = fmt::format(
-                "nb[{}] {}", i, nbVec_[i]->getPb()->group()->getName());
+                "nb[{}] {}", i, nbVec_[i]->getPb()->getGroup()->getName());
           } else {
             name = fmt::format("nb[{}]", i);
           }

src/gpl/src/nesterovBase.cpp

@@ -1876,7 +1876,7 @@ NesterovBase::NesterovBase(NesterovBaseVars nbVars,
   log_->info(GPL,
              33,
              "Initializing Nesterov region: {}",
-             pb_->group() ? pb_->group()->getName() : "Top-level");
+             pb_->getGroup() ? pb_->getGroup()->getName() : "Top-level");
 
   // Set a fixed seed
   srand(42);
@@ -2943,11 +2943,11 @@ void NesterovBase::updateNextIter(const int iter)
     prev_reported_overflow_unscaled_ = sum_overflow_unscaled_;
 
     std::string group_name;
-    if (pb_->group()) {
-      group_name = fmt::format(" ({})", pb_->group()->getName());
+    if (pb_->getGroup()) {
+      group_name = fmt::format(" ({})", pb_->getGroup()->getName());
     }
 
-    if ((iter == 0 || reprint_iter_header_) && !pb_->group()) {
+    if ((iter == 0 || reprint_iter_header_) && !pb_->getGroup()) {
       if (iter == 0) {
         log_->info(GPL, 31, "HPWL: Half-Perimeter Wirelength");
       }
@@ -3106,8 +3106,8 @@ bool NesterovBase::checkConvergence(int gpl_iter_count,
     return true;
   }
   if (sum_overflow_unscaled_ <= npVars_->targetOverflow) {
-    const bool has_group = pb_->group();
-    const std::string group_name = has_group ? pb_->group()->getName() : "";
+    const bool has_group = pb_->getGroup();
+    const std::string group_name = has_group ? pb_->getGroup()->getName() : "";
     const int final_iter = gpl_iter_count;
     dbBlock* block = pb_->db()->getChip()->getBlock();
 

src/gpl/src/nesterovBase.h

@@ -1132,6 +1132,8 @@ class NesterovBase
 
   std::shared_ptr<PlacerBase> getPb() const { return pb_; }
 
+  odb::dbGroup* getGroup() const { return pb_->getGroup(); }
+
  private:
   NesterovBaseVars nbVars_;
   std::shared_ptr<PlacerBase> pb_;

src/gpl/src/placerBase.h

@@ -389,7 +389,7 @@ class PlacerBase
   int64_t stdInstsArea() const { return stdInstsArea_; }
 
   odb::dbDatabase* db() const { return db_; }
-  odb::dbGroup* group() const { return group_; }
+  odb::dbGroup* getGroup() const { return group_; }
 
   void unlockAll();