Merge pull request #7268 from The-OpenROAD-Project-staging/ord-startup

Pass the specific modules to Make* rather than the whole app

Author: maliberty

src/OpenRoad.cc

@@ -26,6 +26,7 @@
 #include "dst/MakeDistributed.h"
 #include "fin/MakeFinale.h"
 #include "gpl/MakeReplace.h"
+#include "grt/GlobalRouter.h"
 #include "grt/MakeGlobalRouter.h"
 #include "gui/MakeGui.h"
 #include "ifp/MakeInitFloorplan.hh"
@@ -156,29 +157,29 @@ void OpenRoad::init(Tcl_Interp* tcl_interp,
 
   // Make components.
   utl::Progress::setBatchMode(batch_mode);
-  logger_ = makeLogger(log_filename, metrics_filename);
+  logger_ = utl::makeLogger(log_filename, metrics_filename);
   db_->setLogger(logger_);
-  sta_ = makeDbSta();
+  sta_ = sta::makeDbSta();
   verilog_network_ = makeDbVerilogNetwork();
-  ioPlacer_ = makeIoplacer();
-  resizer_ = makeResizer();
-  opendp_ = makeOpendp();
-  finale_ = makeFinale();
-  global_router_ = makeGlobalRouter();
-  restructure_ = makeRestructure();
-  tritonCts_ = makeTritonCts();
-  tapcell_ = makeTapcell();
-  macro_placer_ = makeMacroPlacer();
-  extractor_ = makeOpenRCX();
-  detailed_router_ = makeTritonRoute();
-  replace_ = makeReplace();
-  pdnsim_ = makePDNSim();
-  antenna_checker_ = makeAntennaChecker();
-  partitionMgr_ = makePartitionMgr();
-  pdngen_ = makePdnGen();
-  icewall_ = makeICeWall();
-  distributer_ = makeDistributed();
-  stt_builder_ = makeSteinerTreeBuilder();
+  ioPlacer_ = ppl::makeIoplacer();
+  resizer_ = rsz::makeResizer();
+  opendp_ = dpl::makeOpendp();
+  finale_ = fin::makeFinale();
+  global_router_ = grt::makeGlobalRouter();
+  restructure_ = rmp::makeRestructure();
+  tritonCts_ = cts::makeTritonCts();
+  tapcell_ = tap::makeTapcell();
+  macro_placer_ = mpl::makeMacroPlacer();
+  extractor_ = rcx::makeOpenRCX();
+  detailed_router_ = drt::makeTritonRoute();
+  replace_ = gpl::makeReplace();
+  pdnsim_ = psm::makePDNSim();
+  antenna_checker_ = ant::makeAntennaChecker();
+  partitionMgr_ = par::makePartitionMgr();
+  pdngen_ = pdn::makePdnGen();
+  icewall_ = pad::makeICeWall();
+  distributer_ = dst::makeDistributed();
+  stt_builder_ = stt::makeSteinerTreeBuilder();
   dft_ = dft::makeDft();
 
   // Init components.
@@ -188,32 +189,64 @@ void OpenRoad::init(Tcl_Interp* tcl_interp,
 
   initLogger(logger_, tcl_interp);
   // GUI first so we can register our sink with the logger
-  initGui(tcl_interp, db_, sta_, logger_);
-  initOdb(tcl_interp);
-  initUpf(this);
-  initInitFloorplan(this);
-  initDbSta(this);
-  initResizer(this);
-  initDbVerilogNetwork(this);
-  initIoplacer(this);
-  initReplace(this);
-  initOpendp(this);
-  initFinale(this);
-  initGlobalRouter(this);
-  initTritonCts(this);
-  initTapcell(this);
-  initMacroPlacer(this);
-  initOpenRCX(this);
-  initICeWall(this);
-  initRestructure(this);
-  initTritonRoute(this);
-  initPDNSim(this);
-  initAntennaChecker(this);
-  initPartitionMgr(this);
-  initPdnGen(this);
-  initDistributed(this);
-  initSteinerTreeBuilder(this);
-  dft::initDft(this);
+  gui::initGui(tcl_interp, db_, sta_, logger_);
+  odb::initOdb(tcl_interp);
+  upf::initUpf(tcl_interp);
+  ifp::initInitFloorplan(tcl_interp);
+  initDbSta(sta_, logger_, tcl_interp, db_);
+  initResizer(resizer_,
+              tcl_interp,
+              logger_,
+              db_,
+              sta_,
+              stt_builder_,
+              global_router_,
+              opendp_);
+  initDbVerilogNetwork(verilog_network_, sta_);
+  initIoplacer(ioPlacer_, db_, logger_, tcl_interp);
+  initReplace(
+      replace_, db_, sta_, resizer_, global_router_, logger_, tcl_interp);
+  initOpendp(opendp_, db_, logger_, tcl_interp);
+  initFinale(finale_, db_, logger_, tcl_interp);
+  initGlobalRouter(global_router_,
+                   db_,
+                   sta_,
+                   resizer_,
+                   antenna_checker_,
+                   opendp_,
+                   stt_builder_,
+                   logger_,
+                   tcl_interp);
+  initTritonCts(tritonCts_,
+                db_,
+                getDbNetwork(),
+                sta_,
+                stt_builder_,
+                resizer_,
+                logger_,
+                tcl_interp);
+  initTapcell(tapcell_, db_, logger_, tcl_interp);
+  initMacroPlacer(macro_placer_,
+                  getDbNetwork(),
+                  db_,
+                  sta_,
+                  logger_,
+                  partitionMgr_,
+                  tcl_interp);
+  initOpenRCX(extractor_, db_, logger_, getVersion(), tcl_interp);
+  initICeWall(icewall_, db_, logger_, tcl_interp);
+  initRestructure(restructure_, logger_, sta_, db_, resizer_, tcl_interp);
+  initTritonRoute(
+      detailed_router_, db_, logger_, distributer_, stt_builder_, tcl_interp);
+  initPDNSim(pdnsim_, logger_, db_, sta_, resizer_, opendp_, tcl_interp);
+  initAntennaChecker(
+      antenna_checker_, db_, global_router_, 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);
 
   // Import exported commands to global namespace.
   Tcl_Eval(tcl_interp, "sta::define_sta_cmds");
@@ -462,7 +495,7 @@ void OpenRoad::readVerilog(const char* filename)
   if (verilog_reader_ == nullptr) {
     verilog_reader_ = new sta::VerilogReader(verilog_network_);
   }
-  setDbNetworkLinkFunc(this, verilog_reader_);
+  setDbNetworkLinkFunc(getVerilogNetwork(), verilog_reader_);
   verilog_reader_->read(filename);
 }
 

src/ant/include/ant/MakeAntennaChecker.hh

@@ -3,18 +3,29 @@
 
 #pragma once
 
-namespace ant {
-class AntennaChecker;
+#include <tcl.h>
+
+namespace odb {
+class dbDatabase;
 }
 
-namespace ord {
+namespace utl {
+class Logger;
+}
 
-class OpenRoad;
+namespace ant {
+
+class AntennaChecker;
+class GlobalRouteSource;
 
-ant::AntennaChecker* makeAntennaChecker();
+AntennaChecker* makeAntennaChecker();
 
 void deleteAntennaChecker(ant::AntennaChecker* antennachecker);
 
-void initAntennaChecker(OpenRoad* openroad);
+void initAntennaChecker(ant::AntennaChecker* antenna_checker,
+                        odb::dbDatabase* db,
+                        ant::GlobalRouteSource* global_route_source,
+                        utl::Logger* logger,
+                        Tcl_Interp* tcl_interp);
 
-}  // namespace ord
+}  // namespace ant

src/ant/src/MakeAntennaChecker.cc

@@ -5,19 +5,16 @@
 
 #include "ant/AntennaChecker.hh"
 #include "grt/GlobalRouter.h"
-#include "ord/OpenRoad.hh"
 #include "utl/decode.h"
 
-namespace ant {
-// Tcl files encoded into strings.
-extern const char* ant_tcl_inits[];
-}  // namespace ant
-
 extern "C" {
 extern int Ant_Init(Tcl_Interp* interp);
 }
 
-namespace ord {
+namespace ant {
+
+// Tcl files encoded into strings.
+extern const char* ant_tcl_inits[];
 
 ant::AntennaChecker* makeAntennaChecker()
 {
@@ -29,14 +26,15 @@ void deleteAntennaChecker(ant::AntennaChecker* antenna_checker)
   delete antenna_checker;
 }
 
-void initAntennaChecker(OpenRoad* openroad)
+void initAntennaChecker(ant::AntennaChecker* antenna_checker,
+                        odb::dbDatabase* db,
+                        ant::GlobalRouteSource* global_route_source,
+                        utl::Logger* logger,
+                        Tcl_Interp* tcl_interp)
 {
-  Tcl_Interp* tcl_interp = openroad->tclInterp();
-
   Ant_Init(tcl_interp);
   utl::evalTclInit(tcl_interp, ant::ant_tcl_inits);
-  openroad->getAntennaChecker()->init(
-      openroad->getDb(), openroad->getGlobalRouter(), openroad->getLogger());
+  antenna_checker->init(db, global_route_source, logger);
 }
 
-}  // namespace ord
+}  // namespace ant

src/cts/include/cts/MakeTritoncts.h

@@ -3,18 +3,46 @@
 
 #pragma once
 
-namespace cts {
-class TritonCTS;
+#include <tcl.h>
+
+namespace odb {
+class dbDatabase;
+}
+
+namespace sta {
+class dbNetwork;
+}
+
+namespace sta {
+class dbSta;
 }
 
-namespace ord {
+namespace stt {
+class SteinerTreeBuilder;
+}
+
+namespace rsz {
+class Resizer;
+}
 
-class OpenRoad;
+namespace utl {
+class Logger;
+}
+
+namespace cts {
+class TritonCTS;
 
 cts::TritonCTS* makeTritonCts();
 
-void initTritonCts(OpenRoad* openroad);
+void initTritonCts(cts::TritonCTS* cts,
+                   odb::dbDatabase* db,
+                   sta::dbNetwork* network,
+                   sta::dbSta* sta,
+                   stt::SteinerTreeBuilder* stt_builder,
+                   rsz::Resizer* resizer,
+                   utl::Logger* logger,
+                   Tcl_Interp* tcl_interp);
 
 void deleteTritonCts(cts::TritonCTS* tritoncts);
 
-}  // namespace ord
+}  // namespace cts

src/cts/src/MakeTritoncts.cpp

@@ -6,42 +6,39 @@
 #include "CtsOptions.h"
 #include "cts/TritonCTS.h"
 #include "odb/db.h"
-#include "ord/OpenRoad.hh"
 #include "utl/decode.h"
 
-namespace cts {
-// Tcl files encoded into strings.
-extern const char* cts_tcl_inits[];
-}  // namespace cts
-
 extern "C" {
 extern int Cts_Init(Tcl_Interp* interp);
 }
 
-namespace ord {
+namespace cts {
+
+extern const char* cts_tcl_inits[];
 
 cts::TritonCTS* makeTritonCts()
 {
   return new cts::TritonCTS();
 }
 
-void initTritonCts(OpenRoad* openroad)
+void initTritonCts(cts::TritonCTS* cts,
+                   odb::dbDatabase* db,
+                   sta::dbNetwork* network,
+                   sta::dbSta* sta,
+                   stt::SteinerTreeBuilder* stt_builder,
+                   rsz::Resizer* resizer,
+                   utl::Logger* logger,
+                   Tcl_Interp* tcl_interp)
 {
-  Tcl_Interp* tcl_interp = openroad->tclInterp();
   // Define swig TCL commands.
   Cts_Init(tcl_interp);
   utl::evalTclInit(tcl_interp, cts::cts_tcl_inits);
-  openroad->getTritonCts()->init(openroad->getLogger(),
-                                 openroad->getDb(),
-                                 openroad->getDbNetwork(),
-                                 openroad->getSta(),
-                                 openroad->getSteinerTreeBuilder(),
-                                 openroad->getResizer());
+  cts->init(logger, db, network, sta, stt_builder, resizer);
 }
 
 void deleteTritonCts(cts::TritonCTS* tritoncts)
 {
   delete tritoncts;
 }
 
-}  // namespace ord
+}  // namespace cts

src/dbSta/include/db_sta/MakeDbSta.hh

@@ -3,16 +3,25 @@
 
 #pragma once
 
-namespace sta {
-class dbSta;
+#include <tcl.h>
+
+namespace utl {
+class Logger;
 }
 
-namespace ord {
+namespace odb {
+class dbDatabase;
+}
 
-class OpenRoad;
+namespace sta {
+
+class dbSta;
 
 sta::dbSta* makeDbSta();
 void deleteDbSta(sta::dbSta* sta);
-void initDbSta(OpenRoad* openroad);
+void initDbSta(sta::dbSta* sta,
+               utl::Logger* logger,
+               Tcl_Interp* tcl_interp,
+               odb::dbDatabase* db);
 
-}  // namespace ord
+}  // namespace sta