Merge branch 'develop' into add_ioplacer

.gitmodules

@@ -18,3 +18,6 @@
 	path = src/opendp
 	url = https://github.com/The-OpenROAD-Project/OpenDP.git
 	branch = openroad
+[submodule "src/FastRoute4-lefdef"]
+	path = src/FastRoute4-lefdef
+	url = https://github.com/The-OpenROAD-Project/FastRoute4-lefdef.git

include/openroad/OpenRoad.hh

@@ -32,6 +32,10 @@ namespace ioPlacer {
 class IOPlacementKernel;
 }
 
+namespace FastRoute {
+class FastRouteKernel;
+}
+
 namespace opendp {
 class opendp_external;
 }
@@ -84,6 +88,7 @@ private:
   sta::Resizer *resizer_;
   ioPlacer::IOPlacementKernel *ioPlacer_;
   opendp::opendp_external *opendp_;
+  FastRoute::FastRouteKernel *fastRoute_;
 
   // Singleton used by tcl command interpreter.
   static OpenRoad *openroad_;

src/CMakeLists.txt

@@ -23,6 +23,8 @@ set(OPENDP_HOME ${PROJECT_SOURCE_DIR}/src/opendp)
 
 set(IOPLACER_HOME ${PROJECT_SOURCE_DIR}/src/ioPlacer)
 
+set(FASTROUTE_HOME ${PROJECT_SOURCE_DIR}/src/FastRoute4-lefdef)
+
 set(OPENROAD_WRAP ${CMAKE_CURRENT_BINARY_DIR}/OpenRoad_wrap.cc)
 set(OPENROAD_TCL_INIT ${CMAKE_CURRENT_BINARY_DIR}/OpenRoadTclInitVar.cc)
 
@@ -162,6 +164,7 @@ add_subdirectory(flute3)
 add_subdirectory(replace)
 add_subdirectory(opendp)
 add_subdirectory(ioPlacer)
+add_subdirectory(FastRoute4-lefdef)
 
 ################################################################
 
@@ -175,6 +178,7 @@ target_include_directories(openroad
   ${OPENROAD_HOME}/src
   ${OPENDB_HOME}/include
   ${OPENDP_HOME}/include
+  ${FASTROUTE_HOME}/include
   flute3
   )
 
@@ -187,6 +191,7 @@ target_link_libraries(openroad
   dbSta
   OpenSTA
   opendb
+  FR4lefdef
   zutil 
   zlib 
   tm

src/OpenRoad.cc

@@ -35,6 +35,8 @@
 #include "opendp/MakeOpendp.h"
 #include "replace/src/MakeReplace.h"
 
+#include "FastRoute4-lefdef/src/MakeFastRoute.h"
+
 namespace sta {
 extern const char *openroad_tcl_inits[];
 }
@@ -45,6 +47,7 @@ extern int Openroad_Init(Tcl_Interp *interp);
 extern int Opendbtcl_Init(Tcl_Interp *interp);
 extern int Replace_Init(Tcl_Interp *interp);
 extern int Ioplacer_Init(Tcl_Interp *interp);
+extern int Fastroute_Init(Tcl_Interp *interp);
 }
 
 namespace ord {
@@ -100,6 +103,7 @@ OpenRoad::init(Tcl_Interp *tcl_interp,
   ioPlacer_ = (ioPlacer::IOPlacementKernel*) makeIoplacer();
   resizer_ = makeResizer();
   opendp_ = makeOpendp();
+  fastRoute_ = (FastRoute::FastRouteKernel*) makeFastRoute();
 
   // Init components.
   Openroad_Init(tcl_interp);
@@ -114,7 +118,8 @@ OpenRoad::init(Tcl_Interp *tcl_interp,
   initFlute(prog_arg);
   initReplace(this);
   initOpendp(this);
-
+  initFastRoute(this);
+
   // Import exported commands to global namespace.
   Tcl_Eval(tcl_interp, "sta::define_sta_cmds");
   Tcl_Eval(tcl_interp, "namespace import sta::*");