Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drt: decoupling of the Graphics classes and stable drt_lib #6550

Merged
merged 12 commits into from
Jan 28, 2025
15 changes: 6 additions & 9 deletions src/dpl/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -40,6 +40,12 @@ include("openroad")
find_package(TCL)
find_package(Boost)

swig_lib(NAME dpl
NAMESPACE dpl
I_FILE src/Opendp.i
SCRIPTS src/Opendp.tcl
)

add_library(dpl_lib
src/Opendp.cpp
src/dbToOpendp.cpp
@@ -61,18 +67,11 @@ target_link_libraries(dpl_lib
utl_lib
)


target_include_directories(dpl_lib
PUBLIC
include
)

swig_lib(NAME dpl
NAMESPACE dpl
I_FILE src/Opendp.i
SCRIPTS src/Opendp.tcl
)

target_sources(dpl
PRIVATE
src/MakeOpendp.cpp
@@ -90,9 +89,7 @@ target_include_directories(dpl
target_link_libraries(dpl
PRIVATE
${TCL_LIBRARY}
odb
dpl_lib
OpenSTA
gui
)

182 changes: 99 additions & 83 deletions src/drt/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -50,105 +50,99 @@ find_package(Boost REQUIRED COMPONENTS serialization)
find_package(OpenMP REQUIRED)
find_package(VTune)

set(FLEXROUTE_HOME ${PROJECT_SOURCE_DIR})

swig_lib(NAME drt
NAMESPACE drt
I_FILE src/TritonRoute.i
SCRIPTS src/TritonRoute.tcl
)

set(FLEXROUTE_HOME ${PROJECT_SOURCE_DIR})

target_sources(drt
PRIVATE
src/gr/FlexGRCMap.cpp
src/gr/FlexGR.cpp
src/gr/FlexGR_end.cpp
src/gr/FlexGRGridGraph.cpp
src/gr/FlexGRGridGraph_maze.cpp
src/gr/FlexGR_init.cpp
src/gr/FlexGR_maze.cpp
src/gr/FlexGR_rq.cpp
src/gr/FlexGR_topo.cpp
src/dr/FlexDR_conn.cpp
src/dr/FlexDR_init.cpp
src/dr/FlexDR.cpp
src/db/drObj/drNet.cpp
src/dr/FlexDR_maze.cpp
src/dr/FlexGridGraph_maze.cpp
src/dr/FlexGridGraph.cpp
src/dr/FlexDR_rq.cpp
src/dr/FlexDR_end.cpp
src/dr/FlexDR_graphics.cpp
src/ta/FlexTA_end.cpp
src/ta/FlexTA_init.cpp
src/ta/FlexTA_rq.cpp
src/ta/FlexTA_assign.cpp
src/ta/FlexTA.cpp
src/ta/FlexTA_graphics.cpp
src/global.cpp
src/gc/FlexGC_end.cpp
src/gc/FlexGC_rq.cpp
src/gc/FlexGC.cpp
src/gc/FlexGC_init.cpp
src/gc/FlexGC_main.cpp
src/gc/FlexGC_eol.cpp
src/gc/FlexGC_inf.cpp
src/gc/FlexGC_cut.cpp
src/gc/FlexGC_metspc.cpp
src/db/drObj/drAccessPattern.cpp
src/db/drObj/drPin.cpp
src/db/drObj/drShape.cpp
src/db/drObj/drVia.cpp
src/db/infra/frTime_helper.cpp
src/db/infra/frTime.cpp
src/db/infra/KDTree.cpp
src/db/taObj/taShape.cpp
src/db/obj/frShape.cpp
src/db/obj/frInst.cpp
src/db/obj/frVia.cpp
src/db/obj/frAccess.cpp
src/db/obj/frRPin.cpp
src/db/obj/frNode.cpp
src/db/obj/frInstTerm.cpp
src/db/obj/frNet.cpp
src/db/tech/frConstraint.cc
src/db/obj/frMarker.cpp
src/db/tech/frLayer.cc
src/frRegionQuery.cpp
src/io/io_pin.cpp
src/io/io.cpp
src/io/GuideProcessor.cpp
src/io/io_parser_helper.cpp
src/pa/FlexPA_init.cpp
src/pa/FlexPA.cpp
src/pa/FlexPA_acc_point.cpp
src/pa/FlexPA_acc_pattern.cpp
src/pa/FlexPA_row_pattern.cpp
src/pa/FlexPA_unique.cpp
src/pa/FlexPA_graphics.cpp
src/rp/FlexRP_init.cpp
src/rp/FlexRP.cpp
src/rp/FlexRP_prep.cpp
src/distributed/frArchive.cpp
src/distributed/drUpdate.cpp
src/distributed/paUpdate.cpp
src/TritonRoute.cpp
src/MakeTritonRoute.cpp
src/frBaseTypes.cpp
src/DesignCallBack.cpp
add_library(drt_lib
src/gr/FlexGRCMap.cpp
src/gr/FlexGR.cpp
src/gr/FlexGR_end.cpp
src/gr/FlexGRGridGraph.cpp
src/gr/FlexGRGridGraph_maze.cpp
src/gr/FlexGR_init.cpp
src/gr/FlexGR_maze.cpp
src/gr/FlexGR_rq.cpp
src/gr/FlexGR_topo.cpp
src/dr/FlexDR_conn.cpp
src/dr/FlexDR_init.cpp
src/dr/FlexDR.cpp
src/db/drObj/drNet.cpp
src/dr/FlexDR_maze.cpp
src/dr/FlexGridGraph_maze.cpp
src/dr/FlexGridGraph.cpp
src/dr/FlexDR_rq.cpp
src/dr/FlexDR_end.cpp
src/ta/FlexTA_end.cpp
src/ta/FlexTA_init.cpp
src/ta/FlexTA_rq.cpp
src/ta/FlexTA_assign.cpp
src/ta/FlexTA.cpp
src/global.cpp
src/gc/FlexGC_end.cpp
src/gc/FlexGC_rq.cpp
src/gc/FlexGC.cpp
src/gc/FlexGC_init.cpp
src/gc/FlexGC_main.cpp
src/gc/FlexGC_eol.cpp
src/gc/FlexGC_inf.cpp
src/gc/FlexGC_cut.cpp
src/gc/FlexGC_metspc.cpp
src/db/drObj/drAccessPattern.cpp
src/db/drObj/drPin.cpp
src/db/drObj/drShape.cpp
src/db/drObj/drVia.cpp
src/db/infra/frTime_helper.cpp
src/db/infra/frTime.cpp
src/db/infra/KDTree.cpp
src/db/taObj/taShape.cpp
src/db/obj/frShape.cpp
src/db/obj/frInst.cpp
src/db/obj/frVia.cpp
src/db/obj/frAccess.cpp
src/db/obj/frRPin.cpp
src/db/obj/frNode.cpp
src/db/obj/frInstTerm.cpp
src/db/obj/frNet.cpp
src/db/tech/frConstraint.cc
src/db/obj/frMarker.cpp
src/db/tech/frLayer.cc
src/frRegionQuery.cpp
src/io/io_pin.cpp
src/io/io.cpp
src/io/GuideProcessor.cpp
src/io/io_parser_helper.cpp
src/pa/FlexPA_init.cpp
src/pa/FlexPA.cpp
src/pa/FlexPA_acc_point.cpp
src/pa/FlexPA_acc_pattern.cpp
src/pa/FlexPA_row_pattern.cpp
src/pa/FlexPA_unique.cpp
src/rp/FlexRP_init.cpp
src/rp/FlexRP.cpp
src/rp/FlexRP_prep.cpp
src/distributed/frArchive.cpp
src/distributed/drUpdate.cpp
src/distributed/paUpdate.cpp
src/TritonRoute.cpp
src/frBaseTypes.cpp
src/DesignCallBack.cpp
)

target_include_directories(drt
target_include_directories(drt_lib
PUBLIC
include

PRIVATE
src
)

target_link_libraries(drt
target_link_libraries(drt_lib
PUBLIC
gui
odb
stt
OpenSTA
@@ -161,6 +155,28 @@ target_link_libraries(drt
ZLIB::ZLIB
)

target_sources(drt
PRIVATE
src/dr/FlexDR_graphics.cpp
src/ta/FlexTA_graphics.cpp
src/pa/FlexPA_graphics.cpp
src/MakeTritonRoute.cpp
)

target_include_directories(drt
PUBLIC
include

PRIVATE
src
)

target_link_libraries(drt
PUBLIC
drt_lib
gui
)

messages(
TARGET drt
)
20 changes: 16 additions & 4 deletions src/drt/include/triton_route/TritonRoute.h
Original file line number Diff line number Diff line change
@@ -69,13 +69,17 @@ namespace drt {
class frDesign;
class DesignCallBack;
class FlexDR;
class FlexPA;
class FlexTA;
class FlexDRWorker;
class drUpdate;
struct frDebugSettings;
class FlexDR;
struct FlexDRViaData;
class frMarker;
struct RouterConfiguration;
class AbstractPAGraphics;
class AbstractTAGraphics;
class AbstractDRGraphics;

struct ParamStruct
{
@@ -107,13 +111,16 @@ class TritonRoute
public:
TritonRoute();
~TritonRoute();
void init(Tcl_Interp* tcl_interp,
odb::dbDatabase* db,
void init(odb::dbDatabase* db,
utl::Logger* logger,
dst::Distributed* dist,
stt::SteinerTreeBuilder* stt_builder);
stt::SteinerTreeBuilder* stt_builder,
std::unique_ptr<AbstractDRGraphics> dr_graphics,
std::unique_ptr<AbstractPAGraphics> pa_graphics,
std::unique_ptr<AbstractTAGraphics> ta_graphics);

frDesign* getDesign() const { return design_.get(); }
utl::Logger* getLogger() const { return logger_; }
RouterConfiguration* getRouterConfiguration() const
{
return router_cfg_.get();
@@ -221,6 +228,11 @@ class TritonRoute
int results_sz_{0};
unsigned int cloud_sz_{0};
std::optional<boost::asio::thread_pool> dist_pool_;
std::unique_ptr<drt::FlexPA> pa_{nullptr};
std::unique_ptr<drt::FlexTA> ta_{nullptr};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do these need to be persistent now?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They don't need now, but at least PA needs to be persistent to allow for PA with ODB callbacks, I was just starting to prepare things

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think incremental PA will capture a dirty list during the callbacks and then re-run in a single invocation for efficiency. We would still have an entry point in which to setup

std::unique_ptr<drt::AbstractDRGraphics> dr_graphics_{nullptr};
std::unique_ptr<drt::AbstractPAGraphics> pa_graphics_{nullptr};
std::unique_ptr<drt::AbstractTAGraphics> ta_graphics_{nullptr};

void initDesign();
void gr();
53 changes: 48 additions & 5 deletions src/drt/src/MakeTritonRoute.cpp
Original file line number Diff line number Diff line change
@@ -33,9 +33,22 @@

#include "triton_route/MakeTritonRoute.h"

#include "dr/FlexDR_graphics.h"
#include "ord/OpenRoad.hh"
#include "pa/FlexPA_graphics.h"
#include "sta/StaMain.hh"
#include "ta/FlexTA_graphics.h"
#include "triton_route/TritonRoute.h"

namespace sta {
// Tcl files encoded into strings.
extern const char* drt_tcl_inits[];
} // namespace sta

extern "C" {
extern int Drt_Init(Tcl_Interp* interp);
}

namespace ord {

drt::TritonRoute* makeTritonRoute()
@@ -50,11 +63,41 @@ void deleteTritonRoute(drt::TritonRoute* router)

void initTritonRoute(OpenRoad* openroad)
{
openroad->getTritonRoute()->init(openroad->tclInterp(),
openroad->getDb(),
openroad->getLogger(),
openroad->getDistributed(),
openroad->getSteinerTreeBuilder());
// Define swig TCL commands.
auto tcl_interp = openroad->tclInterp();
Drt_Init(tcl_interp);
sta::evalTclInit(tcl_interp, sta::drt_tcl_inits);

drt::TritonRoute* router = openroad->getTritonRoute();
std::unique_ptr<drt::FlexDRGraphics> dr_graphics = nullptr;
std::unique_ptr<drt::FlexPAGraphics> pa_graphics = nullptr;
std::unique_ptr<drt::FlexTAGraphics> ta_graphics = nullptr;

if (drt::FlexDRGraphics::guiActive()) {
dr_graphics
= std::make_unique<drt::FlexDRGraphics>(router->getDebugSettings(),
router->getDesign(),
router->getDb(),
router->getLogger());

pa_graphics = std::make_unique<drt::FlexPAGraphics>(
router->getDebugSettings(),
router->getDesign(),
router->getDb(),
router->getLogger(),
router->getRouterConfiguration());

ta_graphics = std::make_unique<drt::FlexTAGraphics>(
router->getDebugSettings(), router->getDesign(), router->getDb());
}

router->init(openroad->getDb(),
openroad->getLogger(),
openroad->getDistributed(),
openroad->getSteinerTreeBuilder(),
std::move(dr_graphics),
std::move(pa_graphics),
std::move(ta_graphics));
}

} // namespace ord
4 changes: 3 additions & 1 deletion src/drt/src/TritonRoute-py.i
Original file line number Diff line number Diff line change
@@ -33,6 +33,8 @@
//
///////////////////////////////////////////////////////////////////////////////

%ignore drt::TritonRoute::init;

%{

#include "ord/OpenRoad.hh"
@@ -42,4 +44,4 @@

%include <std_string.i>
%include "../../Exception-py.i"
%include "triton_route/TritonRoute.h"
%include "triton_route/TritonRoute.h"
Loading