merge

Signed-off-by: Lucas Yuki Imamura <[email protected]>
The-OpenROAD-Project · Jan 5, 2025 · c673bdd · c673bdd
2 parents 8981056 + 845c124
commit c673bdd
Show file tree

Hide file tree

Showing 333 changed files with 74,621 additions and 70,509 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -64,7 +64,8 @@ CheckOptions:
      value:           _t
 
 # All modules but sta
-HeaderFilterRegex: ".*/(ant|cts|dbSta|dft|dpl|dpo|drt|dst|fin|gpl|grt|gui|ifp|mpl|mpl2|odb|ord|pad|par|pdn|ppl|psm|rcx|rmp|rsz|stt|tap|upf|utl)/.*"
+# Exclude build as there is too much noise from swig generated code
+HeaderFilterRegex: "(?!build/.*)/(ant|cts|dbSta|dft|dpl|dpo|drt|dst|fin|gpl|grt|gui|ifp|mpl|mpl2|odb|ord|pad|par|pdn|ppl|psm|rcx|rmp|rsz|stt|tap|upf|utl)/.*"
 
 # Not currently handling identifier naming
 # WarningsAsErrors: "*"

diff --git a/src/dbSta/CMakeLists.txt b/src/dbSta/CMakeLists.txt
@@ -34,4 +34,4 @@
 ###############################################################################
 
 add_subdirectory(src)
-add_subdirectory(test)
+add_subdirectory(test)
diff --git a/src/dbSta/include/db_sta/dbNetwork.hh b/src/dbSta/include/db_sta/dbNetwork.hh
@@ -195,7 +195,7 @@ class dbNetwork : public ConcreteNetwork
                            const char* connection_name);
 
   void getParentHierarchy(dbModule* start_module,
-                          std::vector<dbModule*>& parent_hierarchy);
+                          std::vector<dbModule*>& parent_hierarchy) const;
   dbModule* findHighestCommonModule(std::vector<dbModule*>& itree1,
                                     std::vector<dbModule*>& itree2);
   Instance* findHierInstance(const char* name);
@@ -219,6 +219,10 @@ class dbNetwork : public ConcreteNetwork
   // Name local to containing cell/instance.
   const char* name(const Instance* instance) const override;
   const char* name(const Port* port) const override;
+  // Path name functions needed hierarchical verilog netlists.
+  using ConcreteNetwork::pathName;
+  const char* pathName(const Net* net) const override;
+
   const char* busName(const Port* port) const override;
   ObjectId id(const Instance* instance) const override;
   Cell* cell(const Instance* instance) const override;
@@ -234,6 +238,7 @@ class dbNetwork : public ConcreteNetwork
   void setAttribute(Instance* instance,
                     const string& key,
                     const string& value) override;
+  dbModNet* findRelatedModNet(const dbNet*) const;
 
   ////////////////////////////////////////////////////////////////
   // Pin functions

diff --git a/src/dbSta/include/db_sta/dbSta.hh b/src/dbSta/include/db_sta/dbSta.hh
@@ -221,8 +221,8 @@ class dbSta : public Sta, public ord::OpenRoadObserver
 
 // Utilities for TestCell
 
-sta::LibertyPort* getLibertyScanEnable(const TestCell* test_cell);
-sta::LibertyPort* getLibertyScanIn(const TestCell* test_cell);
-sta::LibertyPort* getLibertyScanOut(const TestCell* test_cell);
+sta::LibertyPort* getLibertyScanEnable(const LibertyCell* lib_cell);
+sta::LibertyPort* getLibertyScanIn(const LibertyCell* lib_cell);
+sta::LibertyPort* getLibertyScanOut(const LibertyCell* lib_cell);
 
 }  // namespace sta