Merge pull request #317 from proppy/openroad-refresh-patches

proppy · web-flow · commit 392505fec942 · 2023-04-08T10:06:02.000+09:00
pnr/openroad: refresh obsolete patches
diff --git a/pnr/openroad/build.sh b/pnr/openroad/build.sh
@@ -44,5 +44,5 @@ cmake -B build  -DCMAKE_INSTALL_PREFIX=$PREFIX .
 cmake --build build -j $CPU_COUNT --target install
 
 cd $SRC_DIR
-cmake -B build -DTCL_LIB_PATHS="$BUILD_PREFIX;$PREFIX" -DCMAKE_FIND_ROOT_PATH="$BUILD_PREFIX;$PREFIX" -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=ONLY -DUSE_SYSTEM_BOOST=ON -DINSTALL_LIBOPENSTA=OFF -DBUILD_MPL2=OFF -DBUILD_PAR=OFF -DCMAKE_INSTALL_PREFIX=$PREFIX .
+cmake -B build -DTCL_LIB_PATHS="$BUILD_PREFIX;$PREFIX" -DCMAKE_FIND_ROOT_PATH="$BUILD_PREFIX;$PREFIX" -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=ONLY -DUSE_SYSTEM_BOOST=ON -DINSTALL_LIBOPENSTA=OFF -DBUILD_MPL2=OFF -DBUILD_PAR=OFF -DENABLE_TESTS=OFF -DCMAKE_INSTALL_PREFIX=$PREFIX .
 cmake --build build -j $CPU_COUNT --target install
diff --git a/pnr/openroad/disable-mpl2-and-par.patch b/pnr/openroad/disable-mpl2-and-par.patch
@@ -1,8 +1,8 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 293ea212c..d4df13f4a 100755
+index 1b51a5a1a..ca6bfd14b 100755
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -168,6 +168,9 @@ message(STATUS "boost: ${Boost_VERSION}")
+@@ -169,6 +169,9 @@ message(STATUS "boost: ${Boost_VERSION}")
  find_package(Python3 COMPONENTS Development REQUIRED)
  option(BUILD_PYTHON "Build the Python3 interface" ON)
  
@@ -12,7 +12,7 @@ index 293ea212c..d4df13f4a 100755
  option(ALLOW_WARNINGS "Flag to allow compilation with compiler warnings: on by default" ON)
  if (NOT ALLOW_WARNINGS)
    add_compile_options(
-@@ -250,10 +253,14 @@ add_subdirectory(cts)
+@@ -251,10 +254,14 @@ add_subdirectory(cts)
  add_subdirectory(grt)
  add_subdirectory(tap)
  add_subdirectory(mpl)
@@ -22,161 +22,46 @@ index 293ea212c..d4df13f4a 100755
 +endif()
  add_subdirectory(rcx)
  add_subdirectory(psm)
-+if (BUILD_PAR)
- add_subdirectory(par)
+-add_subdirectory(par)
++if ((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND BUILD_PAR)
++  add_subdirectory(par)
 +endif()
  add_subdirectory(ant)
  add_subdirectory(gui)
  add_subdirectory(drt)
-@@ -319,7 +326,6 @@ target_link_libraries(openroad
-   mpl
-   psm
-   ant
--  par
-   upf
-   utl
-   pdn
-@@ -329,12 +335,19 @@ target_link_libraries(openroad
+@@ -329,15 +336,23 @@ target_link_libraries(openroad
    ${CMAKE_THREAD_LIBS_INIT}
  )
  
 -if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 +if ((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND BUILD_MPL2)
-   # mpl2 aborts with link error on darwin so do not link it.
-   target_link_libraries(openroad mpl2)
+   # mpl2 aborts with link error on darwin and par causes abseil link error at startup on apple silicon so do not link it.
+-  target_link_libraries(openroad mpl2 par)
++  target_link_libraries(openroad mpl2)
    target_compile_definitions(openroad PRIVATE ENABLE_MPL2)
- else()
--  message(STATUS "Removing MPL2 to avoid run time fatal error.")
-+  message(STATUS "MPL2 macro placer disabled.")
++else()
++  message(STATUS "Removing MPL2 to avoid run time fatal error.")
 +endif()
 +
-+if (BUILD_PAR)
++if ((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND BUILD_PAR)
++  # mpl2 aborts with link error on darwin and par causes abseil link error at startup on apple silicon so do not link it.
 +  target_link_libraries(openroad par)
-+  target_compile_definitions(openroad PRIVATE ENABLE_PAR)
-+else()
-+  message(STATUS "PAR partitioner disabled.")
+   target_compile_definitions(openroad PRIVATE ENABLE_PAR)
+ else()
+-  message(STATUS "Removing MPL2 and PAR to avoid run time fatal error.")
++  message(STATUS "Removing PAR to avoid run time fatal error.")
  endif()
  
++
  # tclReadline
-@@ -398,7 +411,6 @@ if (Python3_FOUND AND BUILD_PYTHON)
-     drt_py
-     dpo_py
-     fin_py
--    par_py
-     rcx_py
-     rmp_py
-     stt_py
-@@ -406,10 +418,17 @@ if (Python3_FOUND AND BUILD_PYTHON)
-     pdn_py
+ if (TCL_READLINE_LIBRARY AND TCL_READLINE_H)
+   target_compile_definitions(openroad PRIVATE ENABLE_READLINE)
+@@ -407,7 +422,7 @@ if (Python3_FOUND AND BUILD_PYTHON)
      dft_py
    )
-+  if (BUILD_PAR)
-+    target_link_libraries(openroad par_py)
-+  else()
-+    message(STATUS "PAR partitioner disabled.")
-+  endif()
- else()
-   message(STATUS "Python3 disabled")
- endif()
- 
-+
-+
- messages(
-   TARGET openroad
-   SOURCE_DIR .
-diff --git a/src/Main.cc b/src/Main.cc
-index 255699ee0..b934b6b1e 100644
---- a/src/Main.cc
-+++ b/src/Main.cc
-@@ -93,7 +93,6 @@ using std::string;
-   X(drt)                                 \
-   X(dpo)                                 \
-   X(fin)                                 \
--  X(par)                                 \
-   X(rcx)                                 \
-   X(rmp)                                 \
-   X(stt)                                 \
-@@ -108,6 +107,9 @@ using std::string;
- extern "C" {
- #define X(name) extern PyObject* PyInit__##name##_py();
- FOREACH_TOOL(X)
-+#ifdef ENABLE_PAR
-+X(par)
-+#endif
- #undef X
- }
- #endif
-@@ -126,6 +128,9 @@ static void showSplash();
- namespace sta {
- #define X(name) extern const char* name##_py_python_inits[];
- FOREACH_TOOL(X)
-+#ifdef ENABLE_PAR
-+X(par)
-+#endif
- #undef X
- }  // namespace sta
  
-@@ -137,6 +142,9 @@ static void initPython()
-     exit(1);                                                                \
-   }
-   FOREACH_TOOL(X)
-+#ifdef ENABLE_PAR
-+  X(par)
-+#endif
- #undef X
-   Py_Initialize();
- #define X(name)                                                       \
-@@ -157,6 +165,9 @@ static void initPython()
-     delete[] unencoded;                                               \
-   }
-   FOREACH_TOOL_WITHOUT_OPENROAD(X)
-+#ifdef ENABLE_PAR
-+  X(par)
-+#endif
- #undef X
- #undef FOREACH_TOOL
- #undef FOREACH_TOOL_WITHOUT_OPENROAD
-diff --git a/src/OpenRoad.cc b/src/OpenRoad.cc
-index c90e40db9..c8a9a8109 100644
---- a/src/OpenRoad.cc
-+++ b/src/OpenRoad.cc
-@@ -70,7 +70,9 @@
- #include "odb/lefout.h"
- #include "ord/InitOpenRoad.hh"
- #include "pad/MakeICeWall.h"
-+#ifdef ENABLE_PAR
- #include "par/MakePartitionMgr.h"
-+#endif
- #include "pdn/MakePdnGen.hh"
- #include "ppl/MakeIoplacer.h"
- #include "psm/MakePDNSim.hh"
-@@ -175,7 +177,9 @@ OpenRoad::~OpenRoad()
-   deleteFinale(finale_);
-   deleteAntennaChecker(antenna_checker_);
-   odb::dbDatabase::destroy(db_);
-+#ifdef ENABLE_PAR
-   deletePartitionMgr(partitionMgr_);
-+#endif
-   deletePdnGen(pdngen_);
-   deleteICeWall(icewall_);
-   deleteDistributed(distributer_);
-@@ -231,7 +235,9 @@ void OpenRoad::init(Tcl_Interp* tcl_interp)
-   replace_ = makeReplace();
-   pdnsim_ = makePDNSim();
-   antenna_checker_ = makeAntennaChecker();
-+#ifdef ENABLE_PAR
-   partitionMgr_ = makePartitionMgr();
-+#endif
-   pdngen_ = makePdnGen();
-   icewall_ = makeICeWall();
-   distributer_ = makeDistributed();
-@@ -270,7 +276,9 @@ void OpenRoad::init(Tcl_Interp* tcl_interp)
-   initTritonRoute(this);
-   initPDNSim(this);
-   initAntennaChecker(this);
-+#ifdef ENABLE_PAR
-   initPartitionMgr(this);
-+#endif
-   initPdnGen(this);
-   initDistributed(this);
-   initSteinerTreeBuilder(this);
+-  if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
++  if ((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND BUILD_PAR)
+     # par_py causes abseil link error at startup on apple silicon so do not link it.
+     target_link_libraries(openroad par_py)
+   else()
diff --git a/pnr/openroad/find-tcl-library.patch b/pnr/openroad/find-tcl-library.patch
@@ -0,0 +1,43 @@
+diff --git a/src/dpl/CMakeLists.txt b/src/dpl/CMakeLists.txt
+index bd2ab1b56..5d7a47b63 100644
+--- a/src/dpl/CMakeLists.txt
++++ b/src/dpl/CMakeLists.txt
+@@ -37,7 +37,7 @@
+ ###########################################################################
+ 
+ include("openroad")
+-
++find_package(TCL)
+ 
+ add_library(dpl_lib
+   src/Opendp.cpp
+@@ -53,7 +53,7 @@ target_link_libraries(dpl_lib
+   PUBLIC
+     odb
+     OpenSTA
+-    tcl
++    ${TCL_LIBRARY}
+   PRIVATE
+     utl
+ )
+diff --git a/src/dst/CMakeLists.txt b/src/dst/CMakeLists.txt
+index bbce29086..b3077513e 100644
+--- a/src/dst/CMakeLists.txt
++++ b/src/dst/CMakeLists.txt
+@@ -34,6 +34,7 @@
+ ###############################################################################
+ include("openroad")
+ include(FindZLIB)
++find_package(TCL)
+ 
+ project(dst
+   LANGUAGES CXX
+@@ -64,7 +65,7 @@ target_link_libraries(dst
+   PUBLIC
+     utl
+     OpenSTA
+-    tcl
++    ${TCL_LIBRARY}
+     ${ZLIB_LIBRARIES}
+     Boost::serialization
+     Boost::system
diff --git a/pnr/openroad/meta.yaml b/pnr/openroad/meta.yaml
@@ -10,10 +10,10 @@ source:
   - git_url: https://github.com/The-OpenROAD-Project/OpenROAD.git
     git_rev: master
     patches:
-      - odb-drt-disable-tests.patch # until tests are added to the recope
       - sta-add-install-options.patch # to enable sta binary distribution
       - disable-mpl2-and-par.patch # until or-tools dep is added
       - remove-boost-span-deps.patch # to allow older boost
+      - find-tcl-library.patch # to find installed tcl library
   - url: http://lemon.cs.elte.hu/pub/sources/lemon-{{ lemon_version }}.tar.gz
     md5: {{ lemon_md5 }}
     folder: third_party/lemon
diff --git a/pnr/openroad/odb-drt-disable-tests.patch b/pnr/openroad/odb-drt-disable-tests.patch
diff --git a/pnr/openroad/remove-boost-span-deps.patch b/pnr/openroad/remove-boost-span-deps.patch
@@ -1,5 +1,5 @@
 diff --git a/src/odb/test/parseTest.cpp b/src/odb/test/parseTest.cpp
-index 38e372a20..08cf44ee8 100644
+index f2e7d900d..08cf44ee8 100644
 --- a/src/odb/test/parseTest.cpp
 +++ b/src/odb/test/parseTest.cpp
 @@ -55,36 +55,4 @@ int notice(int code, const char* msg, ...)
@@ -8,11 +8,11 @@ index 38e372a20..08cf44ee8 100644
  
 -BOOST_AUTO_TEST_CASE(parser_init_and_parse_line_with_integers)
 -{
--  Ath__parser parser;
+-  utl::Logger logger;
+-  Ath__parser parser(&logger);
 -
 -  BOOST_TEST(parser.getLineNum() == 0);
 -
--  utl::Logger logger;
 -  utl::ScopedTemporaryFile scoped_temp_file(&logger);
 -  const std::string kContents = "1 2 3 4";
 -  boost::span<const uint8_t> contents(
@@ -40,7 +40,7 @@ index 38e372a20..08cf44ee8 100644
 -
  }  // namespace odb
 diff --git a/src/utl/CMakeLists.txt b/src/utl/CMakeLists.txt
-index a795da4d1..db52c9dd4 100644
+index 464e5b3ca..603696be1 100644
 --- a/src/utl/CMakeLists.txt
 +++ b/src/utl/CMakeLists.txt
 @@ -35,7 +35,7 @@
@@ -52,6 +52,13 @@ index a795da4d1..db52c9dd4 100644
  
  swig_lib(NAME      utl
           NAMESPACE utl
+@@ -121,4 +121,4 @@ if(ENABLE_TESTS)
+   target_link_libraries(CFileUtilsTest
+     utl
+   )
+-endif()
+\ No newline at end of file
++endif()
 diff --git a/src/utl/include/utl/CFileUtils.h b/src/utl/include/utl/CFileUtils.h
 index a3c6d8024..192b1a89d 100644
 --- a/src/utl/include/utl/CFileUtils.h
