Merge pull request #7178 from bnmfw/drt_abutment_debug

drt: PA skips abutment

Author: osamahammad21

src/drt/src/db/obj/frNet.h

@@ -214,8 +214,10 @@ class frNet : public frBlockObject
     }
     absPriorityLvl = max;
   }
-  bool isSpecial() const { return isSpecial_; }
-  void setIsSpecial(bool s) { isSpecial_ = s; }
+  bool isSpecial() const { return is_special_; }
+  void setIsSpecial(bool s) { is_special_ = s; }
+  bool isConnectedByAbutment() const { return is_connected_by_abutment_; }
+  void setIsConnectedByAbutment(bool s) { is_connected_by_abutment_ = s; }
   frPinFig* getPinFig(const int& id) { return all_pinfigs_[id]; }
   void setOrigGuides(const std::vector<frRect>& guides)
   {
@@ -254,7 +256,8 @@ class frNet : public frBlockObject
   int absPriorityLvl{0};  // absolute priority level: will be checked in net
                           // ordering before other criteria
   bool isClock_{false};
-  bool isSpecial_{false};
+  bool is_special_{false};
+  bool is_connected_by_abutment_{false};
   bool hasInitialRouting_{false};
   bool isFixed_{false};
 

src/drt/src/io/io.cpp

@@ -964,6 +964,7 @@ frNet* io::Parser::addNet(odb::dbNet* db_net)
 {
   bool is_special = db_net->isSpecial();
   bool has_jumpers = db_net->hasJumpers();
+  bool is_abuted = db_net->isConnectedByAbutment();
   if (!is_special && db_net->getSigType().isSupply()) {
     logger_->error(DRT,
                    305,
@@ -972,31 +973,30 @@ frNet* io::Parser::addNet(odb::dbNet* db_net)
                    db_net->getName(),
                    db_net->getSigType().getString());
   }
-  std::unique_ptr<frNet> uNetIn
+  std::unique_ptr<frNet> net_in
       = std::make_unique<frNet>(db_net->getName(), router_cfg_);
-  auto netIn = uNetIn.get();
   if (db_net->getNonDefaultRule()) {
-    uNetIn->updateNondefaultRule(
+    net_in->updateNondefaultRule(
         getTech()->getNondefaultRule(db_net->getNonDefaultRule()->getName()));
   }
   if (db_net->getSigType() == dbSigType::CLOCK) {
-    uNetIn->updateIsClock(true);
+    net_in->updateIsClock(true);
   }
   if (is_special) {
-    uNetIn->setIsSpecial(true);
+    net_in->setIsSpecial(true);
   }
-  if (has_jumpers) {
-    uNetIn->setHasJumpers(has_jumpers);
-  }
-  updateNetRouting(netIn, db_net);
-  netIn->setType(db_net->getSigType());
+  net_in->setHasJumpers(has_jumpers);
+  net_in->setIsConnectedByAbutment(is_abuted);
+  updateNetRouting(net_in.get(), db_net);
+  net_in->setType(db_net->getSigType());
+  frNet* raw_net_in = net_in.get();
   if (is_special) {
-    getBlock()->addSNet(std::move(uNetIn));
+    getBlock()->addSNet(std::move(net_in));
   } else {
-    getBlock()->addNet(std::move(uNetIn));
+    getBlock()->addNet(std::move(net_in));
   }
 
-  return netIn;
+  return raw_net_in;
 }
 
 void updatefrAccessPoint(odb::dbAccessPoint* db_ap,

src/drt/src/pa/FlexPA.cpp

@@ -253,8 +253,8 @@ void FlexPA::setDistributed(const std::string& rhost,
   cloud_sz_ = cloud_sz;
 }
 
-// Skip power pins, pins connected to special nets, and dangling pins
-// (since we won't route these).
+// Skip power pins, pins connected to special nets, dangling pins and pins
+// connected by abuttment (since we won't route these).
 //
 // Checks only this inst_term and not an equivalent ones.  This
 // is a helper to isSkipInstTerm and initSkipInstTerm.
@@ -265,6 +265,9 @@ bool FlexPA::isSkipInstTermLocal(frInstTerm* in)
     return true;
   }
   auto in_net = in->getNet();
+  if (in_net && in_net->isConnectedByAbutment()) {
+    return true;
+  }
   if (in_net && !in_net->isSpecial()) {
     return false;
   }

src/drt/src/pa/FlexPA_unique.cpp

@@ -278,6 +278,24 @@ bool UniqueInsts::hasUnique(frInst* inst) const
   return inst_to_unique_.find(inst) != inst_to_unique_.end();
 }
 
+void UniqueInsts::forceInstAsClassHead(frInst* target_inst)
+{
+  UniqueInsts::InstSet& unique_class = *inst_to_class_[target_inst];
+  UniqueInsts::InstSet temporary_set;
+  for (frInst* inst : unique_class) {
+    if (inst != target_inst) {
+      temporary_set.insert(inst);
+    }
+  }
+  for (frInst* inst : temporary_set) {
+    deleteInst(inst);
+  }
+  // target inst is now the only inst in the set, therefore its head
+  for (frInst* inst : temporary_set) {
+    addInst(inst);
+  }
+}
+
 // deleteInst has to be called both when an instance is deleted and might
 // be needed when moved
 frInst* UniqueInsts::deleteInst(frInst* inst)

src/drt/src/pa/FlexPA_unique.h

@@ -78,6 +78,13 @@ class UniqueInsts
    */
   frInst* deleteInst(frInst* inst);
 
+  /**
+   * @brief this function if for debugging. It makes the inst the class head.
+   * This is relevant when debugguin with the gui, this is the inst that will
+   * fail in PA, not other inst in its family
+   */
+  void forceInstAsClassHead(frInst* inst);
+
   void report() const;
   void setDesign(frDesign* design) { design_ = design; }
 

src/odb/include/odb/db.h

@@ -2331,7 +2331,7 @@ class dbNet : public dbObject
   void clearSpecial();
 
   ///
-  /// Returns true if this dbNet have its pins connected by abutment
+  /// Returns true if this dbNet has its pins connected by abutment
   ///
   bool isConnectedByAbutment();