From 4c4ae26ffe5ff6c45728725a75fa2ee61b067715 Mon Sep 17 00:00:00 2001 From: Eder Matheus Rodrigues Monteiro Date: Fri, 6 Dec 2019 17:38:23 -0300 Subject: [PATCH 01/14] Update FastRoute repository name --- .gitmodules | 6 +++--- src/CMakeLists.txt | 4 ++-- src/FastRoute | 1 + src/FastRoute4-lefdef | 1 - src/OpenRoad.cc | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) create mode 160000 src/FastRoute delete mode 160000 src/FastRoute4-lefdef 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/src/CMakeLists.txt b/src/CMakeLists.txt index 3c0e29a7180..afa21888f70 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) ################################################################ diff --git a/src/FastRoute b/src/FastRoute new file mode 160000 index 00000000000..d6d9f5d2f71 --- /dev/null +++ b/src/FastRoute @@ -0,0 +1 @@ +Subproject commit d6d9f5d2f712a49dd129246c2de17793f95033b3 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[]; From c473893e37ced120a04b21c9f27383f5a206997c Mon Sep 17 00:00:00 2001 From: Eder Matheus Rodrigues Monteiro Date: Fri, 6 Dec 2019 18:41:44 -0300 Subject: [PATCH 02/14] Update FastRoute submodule --- src/CMakeLists.txt | 2 +- src/FastRoute | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index afa21888f70..8f25a162d8e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -191,7 +191,7 @@ target_link_libraries(openroad dbSta OpenSTA opendb - FR4lefdef + FastRoute zutil zlib tm diff --git a/src/FastRoute b/src/FastRoute index d6d9f5d2f71..dadd51e35f5 160000 --- a/src/FastRoute +++ b/src/FastRoute @@ -1 +1 @@ -Subproject commit d6d9f5d2f712a49dd129246c2de17793f95033b3 +Subproject commit dadd51e35f5c0e26beec78655289956e231d1eb1 From 9aa737433ccccf01bdff98753b6b16d41c30a486 Mon Sep 17 00:00:00 2001 From: mgwoo Date: Fri, 6 Dec 2019 16:41:58 -0800 Subject: [PATCH 03/14] replace regression updated --- jenkins/test.sh | 1 + src/replace | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/jenkins/test.sh b/jenkins/test.sh index 540c378e7b8..0d9b019fb5f 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 "cd /OpenROAD/src/replace/test && python3 regression.py run openroad" diff --git a/src/replace b/src/replace index 50cba64d357..016d4559afc 160000 --- a/src/replace +++ b/src/replace @@ -1 +1 @@ -Subproject commit 50cba64d357ef92918e5112bd893b96ff0e8dff8 +Subproject commit 016d4559afc841199a771d1bf64557fcbd5f53ea From b024722b4768eba98b1c5c7d2ca7a0511bd340fe Mon Sep 17 00:00:00 2001 From: mgwoo Date: Fri, 6 Dec 2019 16:53:42 -0800 Subject: [PATCH 04/14] Update openroad app locations --- src/replace | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/replace b/src/replace index 016d4559afc..f3ad9f7a607 160000 --- a/src/replace +++ b/src/replace @@ -1 +1 @@ -Subproject commit 016d4559afc841199a771d1bf64557fcbd5f53ea +Subproject commit f3ad9f7a607d93b30c7e9677cb8f3982eabe5847 From 34a64af1db3c68c9f6f046331b92f509be3af840 Mon Sep 17 00:00:00 2001 From: mgwoo Date: Sat, 7 Dec 2019 01:43:43 -0800 Subject: [PATCH 05/14] Update OpenDP unit testcases for top-level app Update OpenDP unit testcases for top-level app --- jenkins/test.sh | 1 + src/opendp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/jenkins/test.sh b/jenkins/test.sh index 0d9b019fb5f..ca20e02a79a 100755 --- a/jenkins/test.sh +++ b/jenkins/test.sh @@ -1,2 +1,3 @@ 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 "cd /OpenROAD/src/replace/test && python3 regression.py run openroad" +docker run -v $(pwd):/OpenROAD openroad/openroad bash -c "cd /OpenROAD/src/opendp/test && python3 regression.py run openroad" diff --git a/src/opendp b/src/opendp index a431bb942aa..fae445e1aeb 160000 --- a/src/opendp +++ b/src/opendp @@ -1 +1 @@ -Subproject commit a431bb942aa9ed83298f87ccf4b5e31ed49a5b0b +Subproject commit fae445e1aebf93fa6d03b1a94710a032f1f3d2cf From 3fc9ffa9d91060821efef22674785e45300a3522 Mon Sep 17 00:00:00 2001 From: mgwoo Date: Sat, 7 Dec 2019 18:39:03 -0800 Subject: [PATCH 06/14] Fix OpenDP bugs --- src/opendp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opendp b/src/opendp index a431bb942aa..f19f3233cfc 160000 --- a/src/opendp +++ b/src/opendp @@ -1 +1 @@ -Subproject commit a431bb942aa9ed83298f87ccf4b5e31ed49a5b0b +Subproject commit f19f3233cfc81c8f5ad6433aca46b91df2f587d4 From 5d4da58d050a9a2c01a06134afbb5b6e48a4d9d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateus=20Foga=C3=A7a?= Date: Sun, 8 Dec 2019 17:52:18 -0300 Subject: [PATCH 07/14] Remove boost from ioPlacer --- src/ioPlacer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ioPlacer b/src/ioPlacer index 819289d6a47..fe179886ff1 160000 --- a/src/ioPlacer +++ b/src/ioPlacer @@ -1 +1 @@ -Subproject commit 819289d6a47f900f4bb0e95cd625b4714be6c0a3 +Subproject commit fe179886ff1819d2bbe024d4caefc7a9124223c2 From a338751698dde53370eacb2e16aa68131d951354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateus=20Foga=C3=A7a?= Date: Sun, 8 Dec 2019 19:15:15 -0300 Subject: [PATCH 08/14] Removes OpenMP --- src/ioPlacer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ioPlacer b/src/ioPlacer index fe179886ff1..eb265b65a84 160000 --- a/src/ioPlacer +++ b/src/ioPlacer @@ -1 +1 @@ -Subproject commit fe179886ff1819d2bbe024d4caefc7a9124223c2 +Subproject commit eb265b65a845147fa014a2f88ef458832f9d3fdc From d194f145f05c287a8a94fe7a55f1f1c5e30f7b89 Mon Sep 17 00:00:00 2001 From: James Cherry Date: Sun, 8 Dec 2019 17:43:56 -0700 Subject: [PATCH 09/14] replace cmake boost ref --- src/replace | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/replace b/src/replace index 50cba64d357..0e5e94ebc4a 160000 --- a/src/replace +++ b/src/replace @@ -1 +1 @@ -Subproject commit 50cba64d357ef92918e5112bd893b96ff0e8dff8 +Subproject commit 0e5e94ebc4ae0044677e483136cc6599df0210ba From 374173a7990ec02801e6f13144ec85224a989e1d Mon Sep 17 00:00:00 2001 From: mgwoo Date: Sun, 8 Dec 2019 22:58:32 -0800 Subject: [PATCH 10/14] Update opendp pointers to have simple regression testcases --- jenkins/test.sh | 3 +-- src/opendp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/jenkins/test.sh b/jenkins/test.sh index ca20e02a79a..61c0a5fa306 100755 --- a/jenkins/test.sh +++ b/jenkins/test.sh @@ -1,3 +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" -docker run -v $(pwd):/OpenROAD openroad/openroad bash -c "cd /OpenROAD/src/opendp/test && python3 regression.py run openroad" diff --git a/src/opendp b/src/opendp index fae445e1aeb..ce2cde3f3af 160000 --- a/src/opendp +++ b/src/opendp @@ -1 +1 @@ -Subproject commit fae445e1aebf93fa6d03b1a94710a032f1f3d2cf +Subproject commit ce2cde3f3afa610713d26cb11577907ef2078c5c From 6a2738c10cbdb6d4710d37e5aa026056812be4c6 Mon Sep 17 00:00:00 2001 From: mgwoo Date: Fri, 6 Dec 2019 16:41:58 -0800 Subject: [PATCH 11/14] replace regression updated --- jenkins/test.sh | 1 + src/opendp | 2 +- src/replace | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/jenkins/test.sh b/jenkins/test.sh index 540c378e7b8..0d9b019fb5f 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 "cd /OpenROAD/src/replace/test && python3 regression.py run openroad" diff --git a/src/opendp b/src/opendp index f19f3233cfc..ce2cde3f3af 160000 --- a/src/opendp +++ b/src/opendp @@ -1 +1 @@ -Subproject commit f19f3233cfc81c8f5ad6433aca46b91df2f587d4 +Subproject commit ce2cde3f3afa610713d26cb11577907ef2078c5c diff --git a/src/replace b/src/replace index 0e5e94ebc4a..f3ad9f7a607 160000 --- a/src/replace +++ b/src/replace @@ -1 +1 @@ -Subproject commit 0e5e94ebc4ae0044677e483136cc6599df0210ba +Subproject commit f3ad9f7a607d93b30c7e9677cb8f3982eabe5847 From 8516aa4d7ff0dd04b46c3fefc8924da34513af3e Mon Sep 17 00:00:00 2001 From: mgwoo Date: Sat, 7 Dec 2019 01:43:43 -0800 Subject: [PATCH 12/14] Update OpenDP unit testcases for top-level app Update OpenDP unit testcases for top-level app --- jenkins/test.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/jenkins/test.sh b/jenkins/test.sh index 0d9b019fb5f..ca20e02a79a 100755 --- a/jenkins/test.sh +++ b/jenkins/test.sh @@ -1,2 +1,3 @@ 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 "cd /OpenROAD/src/replace/test && python3 regression.py run openroad" +docker run -v $(pwd):/OpenROAD openroad/openroad bash -c "cd /OpenROAD/src/opendp/test && python3 regression.py run openroad" From e3ff52c34672ae47893aea3d58bae833d4e7936c Mon Sep 17 00:00:00 2001 From: mgwoo Date: Sun, 8 Dec 2019 22:58:32 -0800 Subject: [PATCH 13/14] Update opendp pointers to have simple regression testcases --- jenkins/test.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jenkins/test.sh b/jenkins/test.sh index ca20e02a79a..61c0a5fa306 100755 --- a/jenkins/test.sh +++ b/jenkins/test.sh @@ -1,3 +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" -docker run -v $(pwd):/OpenROAD openroad/openroad bash -c "cd /OpenROAD/src/opendp/test && python3 regression.py run openroad" From 39d7f6ccfe708f401bea45c793bf021b6c5db057 Mon Sep 17 00:00:00 2001 From: mgwoo Date: Sun, 8 Dec 2019 23:47:06 -0800 Subject: [PATCH 14/14] Change opendp pointer to have updated simple testcases --- src/opendp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opendp b/src/opendp index ce2cde3f3af..3e5f3b7de8a 160000 --- a/src/opendp +++ b/src/opendp @@ -1 +1 @@ -Subproject commit ce2cde3f3afa610713d26cb11577907ef2078c5c +Subproject commit 3e5f3b7de8a9fdf967389e52e5714be833b1f495