[LLVM] Restore building of MLIR host tools

They are still needed and shouldn't be affected by MLIR bug on 32-bit architectures, because they're built for the (64-bit) host.
JuliaPackaging · Sep 2, 2023 · 206111c · 206111c
1 parent 392794c
commit 206111c
Showing 1 changed file with 10 additions and 20 deletions.
diff --git a/L/LLVM/common.jl b/L/LLVM/common.jl
@@ -107,12 +107,10 @@ CMAKE_FLAGS=()
 CMAKE_FLAGS+=(-DLLVM_TARGETS_TO_BUILD:STRING=host)
 CMAKE_FLAGS+=(-DLLVM_HOST_TRIPLE=${MACHTYPE})
 CMAKE_FLAGS+=(-DCMAKE_BUILD_TYPE=Release)
-# Note: we disable building MLIR on 32-bit archs because of <https://github.com/llvm/llvm-project/issues/61581>.
-if [[ "${LLVM_MAJ_VER}" -gt "11" && $nbits != 32 ]]; then
+if [[ "${LLVM_MAJ_VER}" -gt "11" ]]; then
     CMAKE_FLAGS+=(-DLLVM_ENABLE_PROJECTS='llvm;clang;clang-tools-extra;mlir')
-else
-    CMAKE_FLAGS+=(-DLLVM_ENABLE_PROJECTS='llvm;clang;clang-tools-extra')
 fi
+# Note: we disable building MLIR dylib on 32-bit archs because of <https://github.com/llvm/llvm-project/issues/61581>.
 if [[ "${LLVM_MAJ_VER}" -gt "13" && "${nbits}" != "32" ]]; then
     CMAKE_FLAGS+=(-DMLIR_BUILD_MLIR_C_DYLIB:BOOL=ON)
 fi
@@ -121,22 +119,16 @@ CMAKE_FLAGS+=(-DCMAKE_TOOLCHAIN_FILE=${CMAKE_HOST_TOOLCHAIN})
 
 cmake -GNinja ${LLVM_SRCDIR} ${CMAKE_FLAGS[@]}
 if [[ ("${LLVM_MAJ_VER}" -eq "12" && "${LLVM_PATCH_VER}" -gt "0") || "${LLVM_MAJ_VER}" -gt "12" ]]; then
-    ninja -j${nproc} llvm-tblgen clang-tblgen llvm-config
-    if [[ "${nbits}" != 32 ]]; then
-        ninja -j${nproc} mlir-tblgen
-    fi
+    ninja -j${nproc} llvm-tblgen clang-tblgen mlir-tblgen llvm-config
 fi
-if [[ ("${LLVM_MAJ_VER}" -eq "12") || ("${LLVM_MAJ_VER}" -eq "13") && $nbits != 32 ]]; then
+if [[ ("${LLVM_MAJ_VER}" -eq "12") || ("${LLVM_MAJ_VER}" -eq "13") ]]; then
     ninja -j${nproc} mlir-linalg-ods-gen
 fi
-if [[ "${LLVM_MAJ_VER}" -gt "12" && $nbits != 32 ]]; then
+if [[ "${LLVM_MAJ_VER}" -gt "12" && ]]; then
     ninja -j${nproc} mlir-linalg-ods-yaml-gen
 fi
 if [[ "${LLVM_MAJ_VER}" -gt "14" ]]; then
-    ninja -j${nproc} clang-tidy-confusable-chars-gen clang-pseudo-gen
-    if [[ "${LLVM_MAJ_VER}" -gt "14" && "${nbits}" != "32" ]]; then
-        ninja -j${nproc} mlir-pdll
-    fi
+    ninja -j${nproc} clang-tidy-confusable-chars-gen clang-pseudo-gen mlir-pdll
 fi
 popd
 
@@ -257,21 +249,19 @@ fi
 CMAKE_FLAGS+=(-DLLVM_TABLEGEN=${WORKSPACE}/bootstrap/bin/llvm-tblgen)
 CMAKE_FLAGS+=(-DCLANG_TABLEGEN=${WORKSPACE}/bootstrap/bin/clang-tblgen)
 CMAKE_FLAGS+=(-DLLVM_CONFIG_PATH=${WORKSPACE}/bootstrap/bin/llvm-config)
-if [[ ( "${LLVM_MAJ_VER}" -eq "12" && "${LLVM_PATCH_VER}" -gt "0" ) || "${LLVM_MAJ_VER}" -gt "12" && "${nbits}" != "32" ]]; then
+if [[ ( "${LLVM_MAJ_VER}" -eq "12" && "${LLVM_PATCH_VER}" -gt "0" ) || "${LLVM_MAJ_VER}" -gt "12" ]]; then
     CMAKE_FLAGS+=(-DMLIR_TABLEGEN=${WORKSPACE}/bootstrap/bin/mlir-tblgen)
 fi
-if [[ ("${LLVM_MAJ_VER}" -eq "12") || ("${LLVM_MAJ_VER}" -eq "13") && "${nbits}" != "32" ]]; then
+if [[ ("${LLVM_MAJ_VER}" -eq "12") || ("${LLVM_MAJ_VER}" -eq "13") ]]; then
     CMAKE_FLAGS+=(-DMLIR_LINALG_ODS_GEN=${WORKSPACE}/bootstrap/bin/mlir-linalg-ods-gen)
 fi
-if [[ "${LLVM_MAJ_VER}" -gt "12" && "${nbits}" != "32" ]]; then
+if [[ "${LLVM_MAJ_VER}" -gt "12" ]]; then
     CMAKE_FLAGS+=(-DMLIR_LINALG_ODS_YAML_GEN=${WORKSPACE}/bootstrap/bin/mlir-linalg-ods-yaml-gen)
 fi
 if [[ "${LLVM_MAJ_VER}" -gt "14" ]]; then
     CMAKE_FLAGS+=(-DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${WORKSPACE}/bootstrap/bin/clang-tidy-confusable-chars-gen)
     CMAKE_FLAGS+=(-DCLANG_PSEUDO_GEN=${WORKSPACE}/bootstrap/bin/clang-pseudo-gen)
-    if [[ "${nbits}" != "32" ]]; then
-        CMAKE_FLAGS+=(-DMLIR_PDLL_TABLEGEN=${WORKSPACE}/bootstrap/bin/mlir-pdll)
-    fi
+    CMAKE_FLAGS+=(-DMLIR_PDLL_TABLEGEN=${WORKSPACE}/bootstrap/bin/mlir-pdll)
 fi
 
 # Explicitly use our cmake toolchain file