Merge pull request The-OpenROAD-Project#5050 from The-OpenROAD-Projec…

…t-staging/drt-frInst-getInstTerm drt: convert frInst::getInstTerm to index rather than name lookup
andyfox-rushc · May 5, 2024 · fd1b211 · fd1b211
2 parents 4efc41f + 205df32
commit fd1b211
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/src/drt/src/db/obj/frInst.cpp b/src/drt/src/db/obj/frInst.cpp
@@ -106,14 +106,9 @@ void frInst::updateXform(dbTransform& xform, Point& size)
   xform.setOffset(p);
 }
 
-frInstTerm* frInst::getInstTerm(const std::string& name)
+frInstTerm* frInst::getInstTerm(const int index)
 {
-  for (auto& it : instTerms_) {
-    if (it->getTerm()->getName() == name) {
-      return it.get();
-    }
-  }
-  return nullptr;
+  return instTerms_.at(index).get();
 }
 
 }  // namespace drt
diff --git a/src/drt/src/db/obj/frInst.h b/src/drt/src/db/obj/frInst.h
@@ -135,7 +135,7 @@ class frInst : public frRef
   static void updateXform(dbTransform& xform, Point& size);
   Rect getBoundaryBBox() const;
 
-  frInstTerm* getInstTerm(const std::string& name);
+  frInstTerm* getInstTerm(int index);
 
  private:
   frString name_;

diff --git a/src/drt/src/io/io.cpp b/src/drt/src/io/io.cpp
@@ -1170,8 +1170,9 @@ void io::Parser::setAccessPoints(odb::dbDatabase* db)
     if (inst == nullptr) {
       continue;
     }
+    int iterm_index = 0;
     for (auto db_term : db_inst->getITerms()) {
-      auto term = inst->getInstTerm(db_term->getMTerm()->getName());
+      auto term = inst->getInstTerm(iterm_index++);
       if (term == nullptr) {
         continue;
       }

diff --git a/src/drt/src/pa/FlexPA_prep.cpp b/src/drt/src/pa/FlexPA_prep.cpp
@@ -2241,7 +2241,7 @@ bool FlexPA::isSkipInstTerm(frInstTerm* in)
   auto instClass = unique_insts_.getClass(in->getInst());
   if (instClass != nullptr) {
     for (auto& inst : *instClass) {
-      frInstTerm* it = inst->getInstTerm(in->getTerm()->getName());
+      frInstTerm* it = inst->getInstTerm(in->getIndexInOwner());
       if (!in_net) {
         if (it->getNet()) {
           return false;

diff --git a/src/drt/src/pa/FlexPA_unique.h b/src/drt/src/pa/FlexPA_unique.h
@@ -97,7 +97,8 @@ class UniqueInsts
   // Mapp all instances to their representative unique instance
   std::map<frInst*, frInst*, frBlockObjectComp> inst2unique_;
   // Maps all instances to the set of instances with the same unique inst
-  std::map<frInst*, std::set<frInst*, frBlockObjectComp>*> inst2Class_;
+  std::unordered_map<frInst*, std::set<frInst*, frBlockObjectComp>*>
+      inst2Class_;
   // Maps a unique instance to its pin access index
   std::map<frInst*, int, frBlockObjectComp> unique2paidx_;
   // Maps a unique instance to its index in unique_