diff --git a/.gitmodules b/.gitmodules index e12b83e126e..5af06bacebe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,6 +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 +[submodule "src/FastRoute"] + path = src/FastRoute + url = https://github.com/The-OpenROAD-Project/FastRoute.git diff --git a/jenkins/test.sh b/jenkins/test.sh index 540c378e7b8..61c0a5fa306 100755 --- a/jenkins/test.sh +++ b/jenkins/test.sh @@ -1 +1,2 @@ -docker run -v $(pwd):/OpenROAD openroad/openroad bash -c "/OpenROAD/test/regression fast && /OpenROAD/src/resizer/test/regression fast" +docker run -v $(pwd):/OpenROAD openroad/openroad bash -c "/OpenROAD/test/regression fast && /OpenROAD/src/resizer/test/regression fast && /OpenROAD/src/opendp/test/regression fast" +docker run -v $(pwd):/OpenROAD openroad/openroad bash -c "cd /OpenROAD/src/replace/test && python3 regression.py run openroad" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3c0e29a7180..8f25a162d8e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,7 +23,7 @@ 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(FASTROUTE_HOME ${PROJECT_SOURCE_DIR}/src/FastRoute) set(OPENROAD_WRAP ${CMAKE_CURRENT_BINARY_DIR}/OpenRoad_wrap.cc) set(OPENROAD_TCL_INIT ${CMAKE_CURRENT_BINARY_DIR}/OpenRoadTclInitVar.cc) @@ -164,7 +164,7 @@ add_subdirectory(flute3) add_subdirectory(replace) add_subdirectory(opendp) add_subdirectory(ioPlacer) -add_subdirectory(FastRoute4-lefdef) +add_subdirectory(FastRoute) ################################################################ @@ -191,7 +191,7 @@ target_link_libraries(openroad dbSta OpenSTA opendb - FR4lefdef + FastRoute zutil zlib tm diff --git a/src/FastRoute b/src/FastRoute new file mode 160000 index 00000000000..dadd51e35f5 --- /dev/null +++ b/src/FastRoute @@ -0,0 +1 @@ +Subproject commit dadd51e35f5c0e26beec78655289956e231d1eb1 diff --git a/src/FastRoute4-lefdef b/src/FastRoute4-lefdef deleted file mode 160000 index a8f23f2d25e..00000000000 --- a/src/FastRoute4-lefdef +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a8f23f2d25eacdfc21430ccc81e648f6f4492f62 diff --git a/src/OpenRoad.cc b/src/OpenRoad.cc index 1a9a633a433..e17b28f5387 100644 --- a/src/OpenRoad.cc +++ b/src/OpenRoad.cc @@ -35,7 +35,7 @@ #include "opendp/MakeOpendp.h" #include "replace/src/MakeReplace.h" -#include "FastRoute4-lefdef/src/MakeFastRoute.h" +#include "FastRoute/src/MakeFastRoute.h" namespace sta { extern const char *openroad_tcl_inits[]; diff --git a/src/ioPlacer b/src/ioPlacer index 819289d6a47..eb265b65a84 160000 --- a/src/ioPlacer +++ b/src/ioPlacer @@ -1 +1 @@ -Subproject commit 819289d6a47f900f4bb0e95cd625b4714be6c0a3 +Subproject commit eb265b65a845147fa014a2f88ef458832f9d3fdc diff --git a/src/opendp b/src/opendp index a431bb942aa..3e5f3b7de8a 160000 --- a/src/opendp +++ b/src/opendp @@ -1 +1 @@ -Subproject commit a431bb942aa9ed83298f87ccf4b5e31ed49a5b0b +Subproject commit 3e5f3b7de8a9fdf967389e52e5714be833b1f495 diff --git a/src/replace b/src/replace index 50cba64d357..f3ad9f7a607 160000 --- a/src/replace +++ b/src/replace @@ -1 +1 @@ -Subproject commit 50cba64d357ef92918e5112bd893b96ff0e8dff8 +Subproject commit f3ad9f7a607d93b30c7e9677cb8f3982eabe5847