From 0757877bc76ffa228bc872388c6346b3170132b6 Mon Sep 17 00:00:00 2001 From: Illia Silin <98187287+illsilin@users.noreply.github.com> Date: Fri, 27 Mar 2026 08:36:22 -0700 Subject: [PATCH] [CK] Fix error in dockerfile when building staging compiler. (#5829) ## Motivation ## Technical Details ## Test Plan ## Test Result ## Submission Checklist - [ ] Look over the contributing guidelines at https://github.com/ROCm/ROCm/blob/develop/CONTRIBUTING.md#pull-requests. --- Dockerfile.compiler | 64 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 6 deletions(-) diff --git a/Dockerfile.compiler b/Dockerfile.compiler index b8d5532db0..c27e016903 100644 --- a/Dockerfile.compiler +++ b/Dockerfile.compiler @@ -9,18 +9,70 @@ ENV compiler_commit=$compiler_commit RUN sh -c "echo compiler version = '$compiler_version'" && \ sh -c "echo compiler commit = '$compiler_commit'" -RUN if ( [ "$compiler_version" = "develop" ] || "$compiler_version" = "amd-staging" ] || [ "$compiler_version" = "amd-mainline" ] ) && [ "$compiler_commit" = "" ]; then \ +RUN if ( [ "$compiler_version" = "develop" ] || [ "$compiler_version" = "amd-staging" ] || [ "$compiler_version" = "amd-mainline" ] ) && [ "$compiler_commit" = "" ]; then \ git clone -b "$compiler_version" https://github.com/ROCm/llvm-project.git && \ cd llvm-project && git log -1 && mkdir build && cd build && \ - cmake -DCMAKE_INSTALL_PREFIX=/opt/rocm/llvm -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=1 -DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" -DLLVM_ENABLE_PROJECTS="clang;lld" -DLLVM_ENABLE_RUNTIMES="compiler-rt" ../llvm && \ - make -j 16 ; \ + cmake -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DLLVM_ENABLE_PROJECTS="clang;lld;clang-tools-extra;flang;mlir" \ + -DLLVM_LIT_ARGS="-vv --show-unsupported --show-xfail -j 32" \ + -DPACKAGE_VENDOR="AMD" \ + -DCMAKE_INSTALL_PREFIX=/home/$USER/rocm/pure_llvm_1.0 \ + -DLLVM_ENABLE_ASSERTIONS=ON \ + -DLLVM_BUILD_DOCS=ON \ + -DLLVM_TARGETS_TO_BUILD=all \ + -DLIBOMPTARGET_ENABLE_DEBUG=ON \ + -DOFFLOAD_ENABLE_EMISSARY_APIS=OFF \ + -DCLANG_DEFAULT_LINKER=lld \ + -DCLANG_DEFAULT_PIE_ON_LINUX=0 \ + -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;openmp;compiler-rt;libunwind;flang-rt" \ + -DLIBCXX_ENABLE_SHARED=OFF \ + -DLIBCXX_ENABLE_STATIC=ON \ + -DLIBCXX_INSTALL_LIBRARY=OFF \ + -DLIBCXX_INSTALL_HEADERS=OFF \ + -DLIBCXXABI_ENABLE_SHARED=OFF \ + -DLIBCXXABI_ENABLE_STATIC=ON \ + -DLIBCXXABI_INSTALL_STATIC_LIBRARY=OFF \ + -DLLVM_ENABLE_ASSERTIONS=1 \ + -DLLVM_ENABLE_Z3_SOLVER=OFF \ + -DLLVM_ENABLE_ZLIB=ON \ + -DLLVM_LINK_LLVM_DYLIB=OFF \ + -DCLANG_LINK_CLANG_DYLIB=OFF \ + ../llvm && \ + ninja -j16 ; \ else echo "using the release compiler"; \ fi -RUN if ( [ "$compiler_version" = "develop" ] || "$compiler_version" = "amd-staging" ] || [ "$compiler_version" = "amd-mainline" ] ) && [ "$compiler_commit" != "" ]; then \ +RUN if ( [ "$compiler_version" = "develop" ] || [ "$compiler_version" = "amd-staging" ] || [ "$compiler_version" = "amd-mainline" ] ) && [ "$compiler_commit" != "" ]; then \ git clone -b "$compiler_version" https://github.com/ROCm/llvm-project.git && \ cd llvm-project && git checkout "$compiler_commit" && echo "checking out commit $compiler_commit" && mkdir build && cd build && \ - cmake -DCMAKE_INSTALL_PREFIX=/opt/rocm/llvm -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=1 -DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" -DLLVM_ENABLE_PROJECTS="clang;lld" -DLLVM_ENABLE_RUNTIMES="compiler-rt" ../llvm && \ - make -j 16 ; \ + cmake -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DLLVM_ENABLE_PROJECTS="clang;lld;clang-tools-extra;flang;mlir" \ + -DLLVM_LIT_ARGS="-vv --show-unsupported --show-xfail -j 32" \ + -DPACKAGE_VENDOR="AMD" \ + -DCMAKE_INSTALL_PREFIX=/home/$USER/rocm/pure_llvm_1.0 \ + -DLLVM_ENABLE_ASSERTIONS=ON \ + -DLLVM_BUILD_DOCS=ON \ + -DLLVM_TARGETS_TO_BUILD=all \ + -DLIBOMPTARGET_ENABLE_DEBUG=ON \ + -DOFFLOAD_ENABLE_EMISSARY_APIS=OFF \ + -DCLANG_DEFAULT_LINKER=lld \ + -DCLANG_DEFAULT_PIE_ON_LINUX=0 \ + -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;openmp;compiler-rt;libunwind;flang-rt" \ + -DLIBCXX_ENABLE_SHARED=OFF \ + -DLIBCXX_ENABLE_STATIC=ON \ + -DLIBCXX_INSTALL_LIBRARY=OFF \ + -DLIBCXX_INSTALL_HEADERS=OFF \ + -DLIBCXXABI_ENABLE_SHARED=OFF \ + -DLIBCXXABI_ENABLE_STATIC=ON \ + -DLIBCXXABI_INSTALL_STATIC_LIBRARY=OFF \ + -DLLVM_ENABLE_ASSERTIONS=1 \ + -DLLVM_ENABLE_Z3_SOLVER=OFF \ + -DLLVM_ENABLE_ZLIB=ON \ + -DLLVM_LINK_LLVM_DYLIB=OFF \ + -DCLANG_LINK_CLANG_DYLIB=OFF \ + ../llvm && \ + ninja -j16 ; \ else echo "using the release compiler"; \ fi