Merge branch 'secure-integrate-hier-fixes2' of https://github.com/The-OpenROAD-Project-private/OpenROAD into secure-integrate-hier-fixes2

Author: jhkim-pii

.clang-tidy

@@ -65,7 +65,7 @@ CheckOptions:
 
 # All modules but sta
 # Exclude build as there is too much noise from swig generated code
-HeaderFilterRegex: "(?!build/.*)/(ant|cts|dbSta|dft|dpl|drt|dst|exa|fin|gpl|grt|gui|ifp|mpl|odb|ord|pad|par|pdn|ppl|psm|rcx|rmp|rsz|stt|tap|upf|utl)/.*"
+HeaderFilterRegex: "(?!build/.*)/(ant|cts|dbSta|dft|dpl|drt|dst|est|exa|fin|gpl|grt|gui|ifp|mpl|odb|ord|pad|par|pdn|ppl|psm|rcx|rmp|rsz|stt|tap|upf|utl)/.*"
 
 # Not currently handling identifier naming
 # WarningsAsErrors: "*"

BUILD.bazel

@@ -62,6 +62,8 @@ OPENROAD_LIBRARY_DEPS = [
     "//src/drt:ui",
     "//src/dst",
     "//src/dst:ui",
+    "//src/est",
+    "//src/est:ui",
     "//src/exa",
     "//src/exa:ui",
     "//src/fin",

docs/contrib/DeveloperGuide.md

@@ -240,6 +240,7 @@ Tool namespaces are usually three-lettered lowercase letters.
 - Macro Placer ([mpl](../main/src/mpl/README.md))
 - RePlAce Global Placer ([gpl](../main/src/gpl/README.md))
 - Gate resizing and buffering ([rsz](../main/src/rsz/README.md))
+- Parasitics estimation ([est](../main/src/est/README.md))
 - Detailed placement ([dpl](../main/src/dpl/README.md))
 - Clock tree synthesis ([cts](../main/src/cts/README.md))
 - FastRoute Global routing ([grt](../main/src/grt/README.md))

include/ord/OpenRoad.hh

@@ -115,6 +115,10 @@ namespace dft {
 class Dft;
 }
 
+namespace est {
+class EstimateParasitics;
+}
+
 namespace ord {
 
 using std::string;
@@ -164,6 +168,10 @@ class OpenRoad
   dst::Distributed* getDistributed() { return distributer_; }
   stt::SteinerTreeBuilder* getSteinerTreeBuilder() { return stt_builder_; }
   dft::Dft* getDft() { return dft_; }
+  est::EstimateParasitics* getEstimateParasitics()
+  {
+    return estimate_parasitics_;
+  }
 
   // Return the bounding box of the db rows.
   odb::Rect getCore();
@@ -258,6 +266,7 @@ class OpenRoad
   dst::Distributed* distributer_ = nullptr;
   stt::SteinerTreeBuilder* stt_builder_ = nullptr;
   dft::Dft* dft_ = nullptr;
+  est::EstimateParasitics* estimate_parasitics_ = nullptr;
   utl::CallBackHandler* callback_handler_ = nullptr;
 
   int threads_ = 1;

src/CMakeLists.txt

@@ -279,6 +279,7 @@ add_subdirectory(pdn)
 add_subdirectory(dft)
 add_subdirectory(mpl)
 add_subdirectory(par)
+add_subdirectory(est)
 
 ################################################################
 
@@ -341,6 +342,7 @@ target_link_libraries(openroad
   dft
   mpl
   par
+  est
   ${ABC_LIBRARY}
   ${TCL_LIBRARY}
   ${CMAKE_THREAD_LIBS_INIT}

src/OpenRoad.cc

@@ -24,6 +24,8 @@
 #include "dft/MakeDft.hh"
 #include "dpl/MakeOpendp.h"
 #include "dst/MakeDistributed.h"
+#include "est/EstimateParasitics.h"
+#include "est/MakeEstimateParasitics.h"
 #include "exa/MakeExample.h"
 #include "fin/MakeFinale.h"
 #include "gpl/MakeReplace.h"
@@ -115,6 +117,7 @@ OpenRoad::~OpenRoad()
   deleteDistributed(distributer_);
   deleteSteinerTreeBuilder(stt_builder_);
   dft::deleteDft(dft_);
+  est::deleteEstimateParasitics(estimate_parasitics_);
   delete logger_;
   delete verilog_reader_;
   delete callback_handler_;
@@ -187,6 +190,7 @@ void OpenRoad::init(Tcl_Interp* tcl_interp,
   distributer_ = dst::makeDistributed();
   stt_builder_ = stt::makeSteinerTreeBuilder();
   dft_ = dft::makeDft();
+  estimate_parasitics_ = est::makeEstimateParasitics();
 
   // Init components.
   Ord_Init(tcl_interp);
@@ -207,7 +211,8 @@ void OpenRoad::init(Tcl_Interp* tcl_interp,
               sta_,
               stt_builder_,
               global_router_,
-              opendp_);
+              opendp_,
+              estimate_parasitics_);
   initDbVerilogNetwork(verilog_network_, sta_);
   initIoplacer(ioPlacer_, db_, logger_, tcl_interp);
   initReplace(
@@ -217,7 +222,6 @@ void OpenRoad::init(Tcl_Interp* tcl_interp,
   initGlobalRouter(global_router_,
                    db_,
                    sta_,
-                   resizer_,
                    antenna_checker_,
                    opendp_,
                    stt_builder_,
@@ -230,6 +234,7 @@ void OpenRoad::init(Tcl_Interp* tcl_interp,
                 sta_,
                 stt_builder_,
                 resizer_,
+                estimate_parasitics_,
                 logger_,
                 tcl_interp);
   initTapcell(tapcell_, db_, logger_, tcl_interp);
@@ -243,22 +248,37 @@ void OpenRoad::init(Tcl_Interp* tcl_interp,
   initExample(example_, db_, logger_, tcl_interp);
   initOpenRCX(extractor_, db_, logger_, getVersion(), tcl_interp);
   initICeWall(icewall_, db_, logger_, tcl_interp);
-  initRestructure(restructure_, logger_, sta_, db_, resizer_, tcl_interp);
+  initRestructure(restructure_,
+                  logger_,
+                  sta_,
+                  db_,
+                  resizer_,
+                  estimate_parasitics_,
+                  tcl_interp);
   initTritonRoute(detailed_router_,
                   db_,
                   logger_,
                   callback_handler_,
                   distributer_,
                   stt_builder_,
                   tcl_interp);
-  initPDNSim(pdnsim_, logger_, db_, sta_, resizer_, opendp_, tcl_interp);
+  initPDNSim(
+      pdnsim_, logger_, db_, sta_, estimate_parasitics_, opendp_, tcl_interp);
   initAntennaChecker(antenna_checker_, db_, logger_, tcl_interp);
   initPartitionMgr(
       partitionMgr_, db_, getDbNetwork(), sta_, logger_, tcl_interp);
   initPdnGen(pdngen_, db_, logger_, tcl_interp);
   initDistributed(distributer_, logger_, tcl_interp);
   initSteinerTreeBuilder(stt_builder_, db_, logger_, tcl_interp);
   dft::initDft(dft_, db_, sta_, logger_, tcl_interp);
+  initEstimateParasitics(estimate_parasitics_,
+                         tcl_interp,
+                         logger_,
+                         callback_handler_,
+                         db_,
+                         sta_,
+                         stt_builder_,
+                         global_router_);
 
   // Import exported commands to global namespace.
   Tcl_Eval(tcl_interp, "sta::define_sta_cmds");

src/OpenRoad.i

@@ -87,6 +87,13 @@ getResizer()
   return openroad->getResizer();
 }
 
+est::EstimateParasitics *
+getEstimateParasitics()
+{
+  OpenRoad *openroad = getOpenRoad();
+  return openroad->getEstimateParasitics();
+}
+
 rmp::Restructure *
 getRestructure()
 {

src/ant/BUILD

@@ -9,19 +9,6 @@ package(
     features = ["layering_check"],
 )
 
-cc_library(
-    name = "types",
-    hdrs = [
-        "include/ant/AntennaChecker.hh",
-    ],
-    includes = [
-        "include",
-    ],
-    deps = [
-        "//src/odb",
-    ],
-)
-
 cc_library(
     name = "ant",
     srcs = [
@@ -32,14 +19,16 @@ cc_library(
         "src/WireBuilder.cc",
         "src/WireBuilder.hh",
     ],
+    hdrs = [
+        "include/ant/AntennaChecker.hh",
+    ],
     copts = [
         "-fopenmp",
     ],
     includes = [
         "include",
     ],
     deps = [
-        ":types",
         "//src/odb",
         "//src/utl",
         "@boost.container_hash",

src/cts/BUILD

@@ -48,6 +48,7 @@ cc_library(
     deps = [
         ":private_hdrs",
         "//src/dbSta",
+        "//src/est",
         "//src/odb",
         "//src/rsz",
         "//src/sta:opensta_lib",
@@ -82,6 +83,7 @@ cc_library(
         ":private_hdrs",
         "//:ord",
         "//src/dbSta",
+        "//src/est",
         "//src/gui",
         "//src/odb",
         "//src/rsz",

src/cts/include/cts/MakeTritoncts.h

@@ -21,6 +21,10 @@ namespace stt {
 class SteinerTreeBuilder;
 }
 
+namespace est {
+class EstimateParasitics;
+}
+
 namespace rsz {
 class Resizer;
 }
@@ -40,6 +44,7 @@ void initTritonCts(cts::TritonCTS* cts,
                    sta::dbSta* sta,
                    stt::SteinerTreeBuilder* stt_builder,
                    rsz::Resizer* resizer,
+                   est::EstimateParasitics* estimate_parasitics,
                    utl::Logger* logger,
                    Tcl_Interp* tcl_interp);