From 9ac2d0a9b9ef8893216e8f0b2afb14bcd0a539ff Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Thu, 8 Jan 2026 13:10:46 +0100 Subject: [PATCH] Revert "[OpenMP] Remove LLVM_ENABLE_PROJECTS=openmp build mode (#152189)" This reverts commit 20d0ec849804218d75647aeafbe23f8a02a83b56. The publish-sphinx-docs buildbot still uses LLVM_ENABLE_PROJECTS=openmp. --- .github/workflows/docs.yml | 4 ++-- clang/utils/analyzer/entrypoint.py | 2 +- flang-rt/README.md | 4 ++-- flang/tools/f18/CMakeLists.txt | 19 +++++++++++++++++-- llvm/CMakeLists.txt | 23 +++++++++++++---------- llvm/runtimes/CMakeLists.txt | 7 +++++++ openmp/docs/ReleaseNotes.rst | 1 - 7 files changed, 42 insertions(+), 18 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 11a453b84418..1b1f027be1a7 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -186,10 +186,10 @@ jobs: steps.docs-changed-subprojects.outputs.openmp_any_changed == 'true' || steps.docs-changed-subprojects.outputs.workflow_any_changed == 'true' run: | - cmake -B openmp-build -GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_RUNTIMES="openmp" -DLLVM_ENABLE_SPHINX=ON -DLLVM_INCLUDE_TESTS=OFF ./runtimes + cmake -B openmp-build -GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS="clang;openmp" -DLLVM_ENABLE_SPHINX=ON ./llvm TZ=UTC ninja -C openmp-build docs-openmp-html mkdir built-docs/openmp - cp -r openmp-build/openmp/docs/* built-docs/openmp/ + cp -r openmp-build/docs/* built-docs/openmp/ - name: Build Polly docs if: | steps.docs-changed-subprojects.outputs.polly_any_changed == 'true' || diff --git a/clang/utils/analyzer/entrypoint.py b/clang/utils/analyzer/entrypoint.py index ef8f20c7f0b0..c8dfc1a9f2ed 100644 --- a/clang/utils/analyzer/entrypoint.py +++ b/clang/utils/analyzer/entrypoint.py @@ -53,7 +53,7 @@ def is_cmake_needed(): CMAKE_COMMAND = ( "cmake -G Ninja -DCMAKE_BUILD_TYPE=Release " "-DCMAKE_INSTALL_PREFIX=/analyzer -DLLVM_TARGETS_TO_BUILD=X86 " - '-DLLVM_ENABLE_PROJECTS="clang" -DLLVM_BUILD_RUNTIME=OFF ' + '-DLLVM_ENABLE_PROJECTS="clang;openmp" -DLLVM_BUILD_RUNTIME=OFF ' "-DCLANG_ENABLE_STATIC_ANALYZER=ON" ) diff --git a/flang-rt/README.md b/flang-rt/README.md index eecb7b8cbfdf..4fe66a85a269 100644 --- a/flang-rt/README.md +++ b/flang-rt/README.md @@ -58,8 +58,8 @@ not provide all C-ABI functionality (such as Windows). cmake -S /llvm \ -GNinja \ -DCMAKE_BUILD_TYPE=Release \ - -DLLVM_ENABLE_PROJECTS="clang;flang" \ - -DLLVM_ENABLE_RUNTIMES="compiler-rt;flang-rt;openmp" \ + -DLLVM_ENABLE_PROJECTS="clang;flang;openmp" \ + -DLLVM_ENABLE_RUNTIMES="compiler-rt;flang-rt" \ ... ``` diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt index ffd92f033840..58ea782ce213 100644 --- a/flang/tools/f18/CMakeLists.txt +++ b/flang/tools/f18/CMakeLists.txt @@ -135,7 +135,18 @@ if (NOT CMAKE_CROSSCOMPILING) # Special case for omp_lib.mod, because its source comes from openmp/runtime/src/include. # It also produces two module files: omp_lib.mod and omp_lib_kinds.mod. Compile these # files only if OpenMP support has been configured. - if ("openmp" IN_LIST LLVM_ENABLE_RUNTIMES) + if (LLVM_TOOL_OPENMP_BUILD) + message(STATUS "OpenMP runtime support enabled via LLVM_ENABLE_PROJECTS, building omp_lib.mod") + set(base ${FLANG_INTRINSIC_MODULES_DIR}/omp_lib) + add_custom_command(OUTPUT ${base}.mod ${base}_kinds.mod + COMMAND ${CMAKE_COMMAND} -E make_directory ${FLANG_INTRINSIC_MODULES_DIR} + COMMAND flang -cpp -fsyntax-only ${opts} -module-dir ${FLANG_INTRINSIC_MODULES_DIR} + ${CMAKE_BINARY_DIR}/projects/openmp/runtime/src/omp_lib.F90 + DEPENDS flang ${FLANG_INTRINSIC_MODULES_DIR}/iso_c_binding.mod ${CMAKE_BINARY_DIR}/projects/openmp/runtime/src/omp_lib.F90 ${depends} + ) + list(APPEND MODULE_FILES ${base}.mod ${base}_kinds.mod) + install(FILES ${base}.mod ${base}_kinds.mod DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/flang" COMPONENT flang-module-interfaces) + elseif ("openmp" IN_LIST LLVM_ENABLE_RUNTIMES) message(STATUS "OpenMP runtime support enabled via LLVM_ENABLE_RUNTIMES, assuming omp_lib.mod is built there") else() message(WARNING "Not building omp_lib.mod, no OpenMP runtime in either LLVM_ENABLE_PROJECTS or LLVM_ENABLE_RUNTIMES") @@ -149,7 +160,11 @@ set_target_properties(module_files PROPERTIES FOLDER "Flang/Resources") # TODO Move this to a more suitable location # Copy the generated omp_lib.h header file, if OpenMP support has been configured. -if ("openmp" IN_LIST LLVM_ENABLE_RUNTIMES) +if (LLVM_TOOL_OPENMP_BUILD) + message(STATUS "OpenMP runtime support enabled via LLVM_ENABLE_PROJECTS, building omp_lib.h") + file(COPY ${CMAKE_BINARY_DIR}/projects/openmp/runtime/src/omp_lib.h DESTINATION "${CMAKE_BINARY_DIR}/include/flang/OpenMP/" FILE_PERMISSIONS OWNER_READ OWNER_WRITE) + install(FILES ${CMAKE_BINARY_DIR}/include/flang/OpenMP/omp_lib.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/flang/OpenMP") +elseif ("openmp" IN_LIST LLVM_ENABLE_RUNTIMES) message(STATUS "OpenMP runtime support enabled via LLVM_ENABLE_RUNTIMES, assuming omp_lib.h is built there") else() message(STATUS "Not copying omp_lib.h, no OpenMP runtime in either LLVM_ENABLE_PROJECTS or LLVM_ENABLE_RUNTIMES") diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 0cbb57149526..f0e4f5d7d6f6 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -109,7 +109,12 @@ endif() # This allows an easy way of setting up a build directory for llvm and another # one for llvm+clang+... using the same sources. # These projects will be included when "all" is included in LLVM_ENABLE_PROJECTS. -set(LLVM_ALL_PROJECTS "bolt;clang;clang-tools-extra;compiler-rt;cross-project-tests;libclc;lld;lldb;mlir;polly") +set(LLVM_ALL_PROJECTS "bolt;clang;clang-tools-extra;compiler-rt;cross-project-tests;libclc;lld;lldb;mlir;openmp;polly") +if ("${CMAKE_SYSTEM_NAME}" MATCHES "AIX") + # Disallow 'openmp' as a LLVM PROJECT on AIX as the supported way is to use + # LLVM_ENABLE_RUNTIMES. + list(REMOVE_ITEM LLVM_ALL_PROJECTS openmp) +endif() # The "libc" project, which is not part of "all" projects, could be included in # LLVM_ENABLE_PROJECTS. It is preferred to include "libc" in @@ -126,15 +131,6 @@ if( LLVM_ENABLE_PROJECTS STREQUAL "all" ) set( LLVM_ENABLE_PROJECTS ${LLVM_ALL_PROJECTS}) endif() -if ("openmp" IN_LIST LLVM_ENABLE_PROJECTS) - message(FATAL_ERROR " -Support for the LLVM_ENABLE_PROJECTS=openmp build mode has been removed. Please switch to the bootstrapping build - cmake -S /llvm -B build -DLLVM_ENABLE_PROJECTS=clang -DLLVM_ENABLE_RUNTIMES=openmp -or to the runtimes default build - cmake -S /runtimes -B build -DLLVM_ENABLE_RUNTIMES=openmp -") -endif() - foreach(proj ${LLVM_ENABLE_PROJECTS}) if (NOT proj STREQUAL "llvm" AND NOT "${proj}" IN_LIST LLVM_KNOWN_PROJECTS) MESSAGE(FATAL_ERROR "${proj} isn't a known project: ${LLVM_KNOWN_PROJECTS}. Did you mean to enable it as a runtime in LLVM_ENABLE_RUNTIMES?") @@ -204,6 +200,13 @@ if ("offload" IN_LIST LLVM_ENABLE_PROJECTS) "https://openmp.llvm.org/ for building the runtimes.") endif() +if ("openmp" IN_LIST LLVM_ENABLE_PROJECTS) + message(WARNING "Using LLVM_ENABLE_PROJECTS=openmp is deprecated now, and will " + "become a fatal error in a future release. Please use " + "-DLLVM_ENABLE_RUNTIMES=openmp or see the instructions at " + "https://openmp.llvm.org/ for building the runtimes.") +endif() + if ("flang-rt" IN_LIST LLVM_ENABLE_RUNTIMES) if (NOT "flang" IN_LIST LLVM_ENABLE_PROJECTS) message(FATAL_ERROR "Flang is not enabled, but is required for the Flang-RT runtime") diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt index c5d1417ce583..130233477761 100644 --- a/llvm/runtimes/CMakeLists.txt +++ b/llvm/runtimes/CMakeLists.txt @@ -688,6 +688,13 @@ if(build_runtimes) # 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) + # The bootstrap build will attempt to configure the offload runtime + # before the openmp project which will error out due to failing to + # find libomp.so. We must add omp as a dependency before runtimes + # are configured. + if("openmp" IN_LIST LLVM_ENABLE_PROJECTS AND "offload" IN_LIST LLVM_ENABLE_RUNTIMES) + add_dependencies(clang-bootstrap-deps omp) + endif() endif() if(LLVM_INCLUDE_TESTS) diff --git a/openmp/docs/ReleaseNotes.rst b/openmp/docs/ReleaseNotes.rst index b99947540acd..6c1a46caf1d8 100644 --- a/openmp/docs/ReleaseNotes.rst +++ b/openmp/docs/ReleaseNotes.rst @@ -27,4 +27,3 @@ Device Runtime always build support for AMDGPU and NVPTX targets. - Updated the offloading entry format but retained backwards compatibility with the old format. -- The LLVM_ENABLE_PROJECTS=openmp build mode has been removed. \ No newline at end of file