Merge pull request #8050 from The-OpenROAD-Project-staging/secure-integrate-hier-fixes4

Enhanced hierarchicalConnect()

Author: maliberty

src/dbSta/BUILD

@@ -17,6 +17,8 @@ cc_library(
         "src/dbReadVerilog.cc",
         "src/dbSdcNetwork.cc",
         "src/dbSdcNetwork.hh",
+        "src/dbEditHierarchy.cc",
+        "src/dbEditHierarchy.hh",
         "src/dbSta.cc",
     ],
     hdrs = [

src/dbSta/include/db_sta/dbNetwork.hh

@@ -40,6 +40,8 @@ using odb::dbSigType;
 using odb::Point;
 
 class dbNetwork;
+class dbEditHierarchy;
+
 // This class handles callbacks from the network to the listeners
 class dbNetworkObserver
 {
@@ -58,6 +60,8 @@ class dbNetworkObserver
 // ConcreteNetwork is used for library/cell/port functions only.
 class dbNetwork : public ConcreteNetwork
 {
+  friend class dbEditHierarchy;
+
  public:
   dbNetwork();
   ~dbNetwork() override;
@@ -168,20 +172,10 @@ class dbNetwork : public ConcreteNetwork
                                      bool hier = false);
   Instance* getOwningInstanceParent(Pin* pin);
 
-  bool ConnectionToModuleExists(dbITerm* source_pin,
-                                dbModule* dest_module,
-                                dbModBTerm*& dest_modbterm,
-                                dbModITerm*& dest_moditerm);
-
   bool connected(Pin* source_pin, Pin* dest_pin);
   void hierarchicalConnect(dbITerm* source_pin,
                            dbITerm* dest_pin,
-                           const char* connection_name);
-
-  void getParentHierarchy(dbModule* start_module,
-                          std::vector<dbModule*>& parent_hierarchy) const;
-  dbModule* findHighestCommonModule(std::vector<dbModule*>& itree1,
-                                    std::vector<dbModule*>& itree2);
+                           const char* connection_name = "net");
   Instance* findHierInstance(const char* name);
   void replaceHierModule(dbModInst* mod_inst, dbModule* module);
   void removeUnusedPortsAndPinsOnModuleInstances();
@@ -418,6 +412,7 @@ class dbNetwork : public ConcreteNetwork
   bool hierarchy_ = false;
   std::set<const Cell*> concrete_cells_;
   std::set<const Port*> concrete_ports_;
+  std::unique_ptr<dbEditHierarchy> hierarchy_editor_;
 };
 
 }  // namespace sta

src/dbSta/src/CMakeLists.txt

@@ -7,6 +7,7 @@ add_library(dbSta_lib
   dbSta.cc
   dbNetwork.cc
   dbSdcNetwork.cc
+  dbEditHierarchy.cc
   dbReadVerilog.cc
   SpefWriter.cc
 )