From 6975acd1a6e81175cd17bec7cb7cfbe2bb709fb9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 9 May 2024 21:25:10 +0200 Subject: [PATCH] rebase of the patches --- debian/patches/openmp-fix-runtimes-build.diff | 69 +++++++++---------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff index 87bcbeae..1860219c 100644 --- a/debian/patches/openmp-fix-runtimes-build.diff +++ b/debian/patches/openmp-fix-runtimes-build.diff @@ -2,10 +2,10 @@ include required runtimes as dependencies to openmp targets to make sure they are built first when included as part of a runtimes build since openmp can depend on them <<<<<<< Updated upstream -Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/llvm/runtimes/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/llvm/runtimes/CMakeLists.txt @@ -247,6 +247,7 @@ function(runtime_default_target) -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED} -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR} @@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/llvm/runtimes/CM -DCMAKE_C_COMPILER_WORKS=ON -DCMAKE_CXX_COMPILER_WORKS=ON -DCMAKE_ASM_COMPILER_WORKS=ON -@@ -555,7 +556,7 @@ if(runtimes) +@@ -557,7 +558,7 @@ if(runtimes) # build directory cannot find the C++ headers in certain configurations. # I need to build a mechanism for runtime projects to provide CMake code # that executes at LLVM configuration time to handle this case. @@ -23,11 +23,11 @@ Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/llvm/runtimes/CM # We need to add the runtimes as a dependency because compiler-rt can be # built as part of runtimes and we need the profile runtime for PGO add_dependencies(clang-bootstrap-deps runtimes) -Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/openmp/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/CMakeLists.txt -@@ -129,6 +129,28 @@ else() +--- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/openmp/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/CMakeLists.txt +@@ -119,6 +119,28 @@ else() get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include) endif() @@ -56,23 +56,20 @@ Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/CMakeList # Build host runtime library, after LIBOMPTARGET variables are set since they are needed # to enable time profiling support in the OpenMP runtime. add_subdirectory(runtime) -Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/plugins-nextgen/cuda/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/plugins-nextgen/cuda/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/offload/plugins-nextgen/cuda/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/plugins-nextgen/cuda/CMakeLists.txt -@@ -52,6 +52,8 @@ else() +--- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/offload/plugins-nextgen/cuda/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/plugins-nextgen/cuda/CMakeLists.txt +@@ -51,3 +51,5 @@ else() + libomptarget_say("Not generating NVIDIA tests, no supported devices detected." " Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.") endif() - -+add_runtimes_build_depends_if_needed(omptarget.rtl.cuda) + - # Install plugin under the lib destination folder. - install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OFFLOAD_INSTALL_LIBDIR}") - set_target_properties(omptarget.rtl.cuda PROPERTIES -Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/src/CMakeLists.txt ++add_runtimes_build_depends_if_needed(omptarget.rtl.cuda) +Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/offload/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/src/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/offload/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/src/CMakeLists.txt @@ -50,7 +50,10 @@ add_llvm_library(omptarget NO_INSTALL_RPATH BUILDTREE_ONLY @@ -85,10 +82,10 @@ Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/src/CMak ${LIBOMPTARGET_INCLUDE_DIR} ${LIBOMPTARGET_BINARY_INCLUDE_DIR} ) -Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/runtime/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/runtime/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/openmp/runtime/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/runtime/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/openmp/runtime/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/runtime/CMakeLists.txt @@ -323,6 +323,10 @@ if(LIBOMP_STATS) set(LIBOMP_USE_STDCPPLIB TRUE) endif() @@ -100,10 +97,10 @@ Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/runtime/C # Shared library can be switched to a static library set(LIBOMP_ENABLE_SHARED TRUE CACHE BOOL "Shared library instead of static library?") -Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/runtime/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/runtime/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/openmp/runtime/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/runtime/src/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/openmp/runtime/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/runtime/src/CMakeLists.txt @@ -152,6 +152,7 @@ set_source_files_properties(${LIBOMP_ASM if(NOT ${LIBOMP_USE_STDCPPLIB}) set(LIBOMP_LINKER_LANGUAGE C) @@ -121,10 +118,10 @@ Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/runtime/s # Get the library's location within the build tree for the unit tester if(NOT WIN32) get_target_property(LIBOMP_LIBRARY_DIR omp LIBRARY_OUTPUT_DIRECTORY) -Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/tools/archer/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/tools/archer/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/openmp/tools/archer/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/tools/archer/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/openmp/tools/archer/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/openmp/tools/archer/CMakeLists.txt @@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT AND LIBOMP_ARCHER target_link_libraries(archer ${CMAKE_DL_LIBS}) add_library(archer_static STATIC ompt-tsan.cpp) @@ -135,16 +132,16 @@ Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/openmp/tools/arc install(TARGETS archer archer_static LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR} ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR}) -Index: llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/plugins-nextgen/host/CMakeLists.txt +Index: llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/plugins-nextgen/host/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4.orig/offload/plugins-nextgen/host/CMakeLists.txt -+++ llvm-toolchain-snapshot_19~++20240430112652+10aab63c9cb4/offload/plugins-nextgen/host/CMakeLists.txt +--- llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233.orig/offload/plugins-nextgen/host/CMakeLists.txt ++++ llvm-toolchain-snapshot_19~++20240509091947+dcf92a249233/offload/plugins-nextgen/host/CMakeLists.txt @@ -31,6 +31,8 @@ else() target_include_directories(omptarget.rtl.host PRIVATE dynamic_ffi) endif() -+add_runtimes_build_depends_if_needed("omptarget.rtl.${machine}") +++add_runtimes_build_depends_if_needed("omptarget.rtl.${machine}") + - # Install plugin under the lib destination folder. - install(TARGETS omptarget.rtl.host - LIBRARY DESTINATION "${OFFLOAD_INSTALL_LIBDIR}") + target_include_directories(omptarget.rtl.host PRIVATE + ${LIBOMPTARGET_INCLUDE_DIR}) +