Skip to content

Conversation

Meinersbur
Copy link
Member

Reverts #129692

The builder amdgpu-offload-rhel-8-cmake-build-only fails because its version of Ninja is too old. At least Ninja 1.10 is required for its support for dependencies between Fortran modules.

https://lab.llvm.org/buildbot/#/builders/204/builds/2696

@Meinersbur Meinersbur merged commit e296fb8 into main Mar 7, 2025
8 of 12 checks passed
@Meinersbur Meinersbur deleted the revert-129692-users/meinersbur/flang_runtime_amdgpu-offload branch March 7, 2025 11:30
@llvmbot
Copy link
Member

llvmbot commented Mar 7, 2025

@llvm/pr-subscribers-offload

@llvm/pr-subscribers-backend-amdgpu

Author: Michael Kruse (Meinersbur)

Changes

Reverts llvm/llvm-project#129692

The builder amdgpu-offload-rhel-8-cmake-build-only fails because its version of Ninja is too old. At least Ninja 1.10 is required for its support for dependencies between Fortran modules.

https://lab.llvm.org/buildbot/#/builders/204/builds/2696


Full diff: https://github.com/llvm/llvm-project/pull/130274.diff

1 Files Affected:

  • (modified) offload/cmake/caches/AMDGPUBot.cmake (+1-1)
diff --git a/offload/cmake/caches/AMDGPUBot.cmake b/offload/cmake/caches/AMDGPUBot.cmake
index 0236f5f0b6987..521841166be82 100644
--- a/offload/cmake/caches/AMDGPUBot.cmake
+++ b/offload/cmake/caches/AMDGPUBot.cmake
@@ -10,7 +10,7 @@ set(CMAKE_C_COMPILER_LAUNCHER ccache CACHE STRING "")
 set(CMAKE_CXX_COMPILER_LAUNCHER ccache CACHE STRING "")
 
 set(LLVM_ENABLE_PROJECTS "clang;lld;mlir;flang" CACHE STRING "")
-set(LLVM_ENABLE_RUNTIMES "compiler-rt;openmp;offload;flang-rt" CACHE STRING "")
+set(LLVM_ENABLE_RUNTIMES "compiler-rt;openmp;offload" CACHE STRING "")
 
 set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR ON CACHE BOOL "")
 set(LLVM_ENABLE_ASSERTIONS ON CACHE BOOL "")

Meinersbur added a commit that referenced this pull request Mar 13, 2025
…ffload-*" (#130274)

Enable the LLVM_ENABLE_RUNTIMES=flang-rt build of the Fortran runtime
for the amdgpu-offload-* buildbots. This pre-population cmake cache
files is referred to by the llvm-zorg annotated builder factory
[script](https://github.com/llvm/llvm-zorg/blob/872f477610d83821c9f1368c969006789b21011b/zorg/buildbot/builders/annotated/amdgpu-offload-cmake.py#L26).

The corresponding change in llvm-zorg is
llvm/llvm-zorg#402

This reverts commit e296fb8.

The worker of amdgpu-offload-rhel-8-cmake-build-only has been updated
with a newer version of Ninja that supports Fortran.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants