mpl: RIP TritonMacroPlace (mpl)

include/ord/Design.h

@@ -79,10 +79,6 @@ namespace dpl {
 class Opendp;
 }
 
-namespace mpl {
-class MacroPlacer;
-}
-
 namespace mpl2 {
 class MacroPlacer2;
 }
@@ -202,7 +198,6 @@ class Design
   gpl::Replace* getReplace();
   grt::GlobalRouter* getGlobalRouter();
   ifp::InitFloorplan getFloorplan();
-  mpl::MacroPlacer* getMacroPlacer();
   mpl2::MacroPlacer2* getMacroPlacer2();
   odb::dbDatabase* getDb();
   pad::ICeWall* getICeWall();

include/ord/OpenRoad.hh

@@ -95,10 +95,6 @@ namespace fin {
 class Finale;
 }
 
-namespace mpl {
-class MacroPlacer;
-}
-
 namespace mpl2 {
 class MacroPlacer2;
 }
@@ -181,7 +177,6 @@ class OpenRoad
   dpo::Optdp* getOptdp() { return optdp_; }
   fin::Finale* getFinale() { return finale_; }
   tap::Tapcell* getTapcell() { return tapcell_; }
-  mpl::MacroPlacer* getMacroPlacer() { return macro_placer_; }
   mpl2::MacroPlacer2* getMacroPlacer2() { return macro_placer2_; }
   rcx::Ext* getOpenRCX() { return extractor_; }
   drt::TritonRoute* getTritonRoute() { return detailed_router_; }
@@ -273,7 +268,6 @@ class OpenRoad
   dpl::Opendp* opendp_ = nullptr;
   dpo::Optdp* optdp_ = nullptr;
   fin::Finale* finale_ = nullptr;
-  mpl::MacroPlacer* macro_placer_ = nullptr;
   mpl2::MacroPlacer2* macro_placer2_ = nullptr;
   grt::GlobalRouter* global_router_ = nullptr;
   rmp::Restructure* restructure_ = nullptr;

src/CMakeLists.txt

@@ -295,7 +295,6 @@ add_subdirectory(rmp)
 add_subdirectory(cts)
 add_subdirectory(grt)
 add_subdirectory(tap)
-add_subdirectory(mpl)
 add_subdirectory(rcx)
 add_subdirectory(psm)
 add_subdirectory(ant)
@@ -362,7 +361,6 @@ target_link_libraries(openroad
   gui
   drt
   dst
-  mpl
   psm
   ant
   upf
@@ -433,7 +431,6 @@ if (Python3_FOUND AND BUILD_PYTHON)
     grt_py
     gpl_py
     dpl_py
-    mpl_py
     ppl_py
     tap_py
     cts_py

src/Design.cc

@@ -283,11 +283,6 @@ mpl2::MacroPlacer2* Design::getMacroPlacer2()
   return getOpenRoad()->getMacroPlacer2();
 }
 
-mpl::MacroPlacer* Design::getMacroPlacer()
-{
-  return getOpenRoad()->getMacroPlacer();
-}
-
 ppl::IOPlacer* Design::getIOPlacer()
 {
   return getOpenRoad()->getIOPlacer();

src/Main.cc

@@ -89,7 +89,6 @@ using std::string;
   X(grt)                                 \
   X(gpl)                                 \
   X(dpl)                                 \
-  X(mpl)                                 \
   X(ppl)                                 \
   X(tap)                                 \
   X(cts)                                 \

src/OpenRoad.cc

@@ -60,7 +60,6 @@
 #include "grt/MakeGlobalRouter.h"
 #include "gui/MakeGui.h"
 #include "ifp//MakeInitFloorplan.hh"
-#include "mpl/MakeMacroPlacer.h"
 #include "mpl2/MakeMacroPlacer.h"
 #include "odb/cdl.h"
 #include "odb/db.h"
@@ -136,7 +135,6 @@ OpenRoad::~OpenRoad()
   deleteRestructure(restructure_);
   deleteTritonCts(tritonCts_);
   deleteTapcell(tapcell_);
-  deleteMacroPlacer(macro_placer_);
   deleteMacroPlacer2(macro_placer2_);
   deleteOpenRCX(extractor_);
   deleteTritonRoute(detailed_router_);
@@ -199,7 +197,6 @@ void OpenRoad::init(Tcl_Interp* tcl_interp)
   restructure_ = makeRestructure();
   tritonCts_ = makeTritonCts();
   tapcell_ = makeTapcell();
-  macro_placer_ = makeMacroPlacer();
   macro_placer2_ = makeMacroPlacer2();
   extractor_ = makeOpenRCX();
   detailed_router_ = makeTritonRoute();
@@ -235,7 +232,6 @@ void OpenRoad::init(Tcl_Interp* tcl_interp)
   initGlobalRouter(this);
   initTritonCts(this);
   initTapcell(this);
-  initMacroPlacer(this);
   initMacroPlacer2(this);
   initOpenRCX(this);
   initICeWall(this);

src/OpenRoad.i

@@ -133,13 +133,6 @@ getTritonCts()
   return openroad->getTritonCts();
 }
 
-mpl::MacroPlacer *
-getMacroPlacer()
-{
-  OpenRoad *openroad = getOpenRoad();
-  return openroad->getMacroPlacer();
-}
-
 mpl2::MacroPlacer2 *
 getMacroPlacer2()
 {

src/drt/test/stubs.cpp

@@ -45,7 +45,6 @@ OpenRoad::OpenRoad()
       opendp_(nullptr),
       optdp_(nullptr),
       finale_(nullptr),
-      macro_placer_(nullptr),
       macro_placer2_(nullptr),
       global_router_(nullptr),
       restructure_(nullptr),

src/dst/test/cpp/stubs.cpp

@@ -44,7 +44,6 @@ OpenRoad::OpenRoad()
       opendp_(nullptr),
       optdp_(nullptr),
       finale_(nullptr),
-      macro_placer_(nullptr),
       macro_placer2_(nullptr),
       global_router_(nullptr),
       restructure_(nullptr),