Merge pull request The-OpenROAD-Project#7184 from osamahammad21/dpl-dpo-merge

Merge DPL and DPO

Author: osamahammad21

.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|dpo|drt|dst|fin|gpl|grt|gui|ifp|mpl|mpl2|odb|ord|pad|par|pdn|ppl|psm|rcx|rmp|rsz|stt|tap|upf|utl)/.*"
+HeaderFilterRegex: "(?!build/.*)/(ant|cts|dbSta|dft|dpl|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: "*"

BUILD.bazel

@@ -444,15 +444,6 @@ tcl_encode(
     namespace = "stt",
 )
 
-tcl_encode(
-    name = "dpo_tcl",
-    srcs = [
-        "src/dpo/src/Optdp.tcl",
-    ],
-    char_array_name = "dpo_tcl_inits",
-    namespace = "dpo",
-)
-
 tcl_encode(
     name = "upf_tcl",
     srcs = [
@@ -805,20 +796,6 @@ tcl_wrap_cc(
     ],
 )
 
-tcl_wrap_cc(
-    name = "dpo_swig",
-    srcs = [
-        "src/dpo/src/Optdp.i",
-        ":error_swig",
-    ],
-    module = "dpo",
-    namespace_prefix = "dpo",
-    root_swig_src = "src/dpo/src/Optdp.i",
-    swig_includes = [
-        "src/dpo/src",
-    ],
-)
-
 tcl_wrap_cc(
     name = "dft_swig",
     srcs = [

bazel/build_helper.bzl

@@ -86,9 +86,6 @@ OPENROAD_BINARY_SRCS_WITHOUT_MAIN = [
     #Distributed
     ":dst_swig",
     ":dst_tcl",
-    #Dpo
-    ":dpo_swig",
-    ":dpo_tcl",
     #Pad
     ":pad_swig",
     ":pad_tcl",
@@ -151,8 +148,6 @@ OPENROAD_LIBRARY_HDRS_INCLUDE = [
     "src/rmp/include/rmp/*.h",
     #Distributed
     "src/dst/include/dst/*.h",
-    #Dpo
-    "src/dpo/include/dpo/*.h",
     #pad
     "src/pad/include/pad/*.h",
     #dft
@@ -243,9 +238,6 @@ OPENROAD_LIBRARY_INCLUDES = [
     #Distributed
     "src/dst/include",
     "src/dst/include/dst",
-    #Dpo
-    "src/dpo/include",
-    "src/dpo/include/dpo",
     #pad
     "src/pad/include",
     #utl
@@ -291,7 +283,11 @@ OPENROAD_LIBRARY_SRCS_INCLUDE = [
     "src/rsz/src/*.h",
     #OpenDP
     "src/dpl/src/*.cpp",
+    "src/dpl/src/*.cxx",
     "src/dpl/src/*.h",
+    "src/dpl/src/**/*.h",
+    "src/dpl/src/**/*.cpp",
+    "src/dpl/src/**/*.cxx",
     #finale
     "src/fin/src/*.cpp",
     "src/fin/src/*.h",
@@ -345,10 +341,6 @@ OPENROAD_LIBRARY_SRCS_INCLUDE = [
     #Distributed
     "src/dst/src/*.cc",
     "src/dst/src/*.h",
-    #Dpo
-    "src/dpo/src/*.cpp",
-    "src/dpo/src/*.cxx",
-    "src/dpo/src/*.h",
     #pad
     "src/pad/src/*.cpp",
     "src/pad/src/*.h",

docs/src/scripts/md_roff_compat.py

@@ -52,7 +52,6 @@
     "dbSta",
     "dft",
     "dpl",
-    "dpo",
     "drt",
     "dst",
     "fin",

include/ord/Design.h

@@ -67,10 +67,6 @@ namespace drt {
 class TritonRoute;
 }
 
-namespace dpo {
-class Optdp;
-}
-
 namespace fin {
 class Finale;
 }
@@ -160,7 +156,6 @@ class Design
   cts::TritonCTS* getTritonCts();
   dft::Dft* getDft();
   dpl::Opendp* getOpendp();
-  dpo::Optdp* getOptdp();
   drt::TritonRoute* getTritonRoute();
   fin::Finale* getFinale();
   gpl::Replace* getReplace();

include/ord/OpenRoad.hh

@@ -55,10 +55,6 @@ namespace dpl {
 class Opendp;
 }
 
-namespace dpo {
-class Optdp;
-}
-
 namespace fin {
 class Finale;
 }
@@ -144,7 +140,6 @@ class OpenRoad
   cts::TritonCTS* getTritonCts() { return tritonCts_; }
   dbVerilogNetwork* getVerilogNetwork() { return verilog_network_; }
   dpl::Opendp* getOpendp() { return opendp_; }
-  dpo::Optdp* getOptdp() { return optdp_; }
   fin::Finale* getFinale() { return finale_; }
   tap::Tapcell* getTapcell() { return tapcell_; }
   mpl::MacroPlacer* getMacroPlacer() { return macro_placer_; }
@@ -234,7 +229,6 @@ class OpenRoad
   rsz::Resizer* resizer_ = nullptr;
   ppl::IOPlacer* ioPlacer_ = nullptr;
   dpl::Opendp* opendp_ = nullptr;
-  dpo::Optdp* optdp_ = nullptr;
   fin::Finale* finale_ = nullptr;
   mpl::MacroPlacer* macro_placer_ = nullptr;
   grt::GlobalRouter* global_router_ = nullptr;

src/CMakeLists.txt

@@ -251,7 +251,6 @@ add_subdirectory(rsz)
 add_subdirectory(stt)
 add_subdirectory(gpl)
 add_subdirectory(dpl)
-add_subdirectory(dpo)
 add_subdirectory(fin)
 add_subdirectory(ppl)
 add_subdirectory(rmp)
@@ -307,7 +306,6 @@ target_link_libraries(openroad
   ord
   gpl
   dpl
-  dpo
   fin
   rsz
   ppl
@@ -398,7 +396,6 @@ if (Python3_FOUND AND BUILD_PYTHON)
     tap_py
     cts_py
     drt_py
-    dpo_py
     fin_py
     rcx_py
     rmp_py

src/Design.cc

@@ -273,11 +273,6 @@ drt::TritonRoute* Design::getTritonRoute()
   return getOpenRoad()->getTritonRoute();
 }
 
-dpo::Optdp* Design::getOptdp()
-{
-  return getOpenRoad()->getOptdp();
-}
-
 fin::Finale* Design::getFinale()
 {
   return getOpenRoad()->getFinale();

src/Main.cc

@@ -62,7 +62,6 @@ using std::string;
   X(tap)                                 \
   X(cts)                                 \
   X(drt)                                 \
-  X(dpo)                                 \
   X(fin)                                 \
   X(par)                                 \
   X(rcx)                                 \

src/OpenRoad.cc

@@ -23,7 +23,6 @@
 #include "db_sta/dbSta.hh"
 #include "dft/MakeDft.hh"
 #include "dpl/MakeOpendp.h"
-#include "dpo/MakeOptdp.h"
 #include "dst/MakeDistributed.h"
 #include "fin/MakeFinale.h"
 #include "gpl/MakeReplace.h"
@@ -93,7 +92,6 @@ OpenRoad::~OpenRoad()
   deleteIoplacer(ioPlacer_);
   deleteResizer(resizer_);
   deleteOpendp(opendp_);
-  deleteOptdp(optdp_);
   deleteGlobalRouter(global_router_);
   deleteRestructure(restructure_);
   deleteTritonCts(tritonCts_);
@@ -160,7 +158,6 @@ void OpenRoad::init(Tcl_Interp* tcl_interp,
   ioPlacer_ = makeIoplacer();
   resizer_ = makeResizer();
   opendp_ = makeOpendp();
-  optdp_ = makeOptdp();
   finale_ = makeFinale();
   global_router_ = makeGlobalRouter();
   restructure_ = makeRestructure();
@@ -196,7 +193,6 @@ void OpenRoad::init(Tcl_Interp* tcl_interp,
   initIoplacer(this);
   initReplace(this);
   initOpendp(this);
-  initOptdp(this);
   initFinale(this);
   initGlobalRouter(this);
   initTritonCts(this);