From 73f72d361b93961a5171cc53f7ceeb26627fdbae Mon Sep 17 00:00:00 2001 From: Maksim Levental Date: Thu, 11 Sep 2025 07:53:48 -0700 Subject: [PATCH 01/14] [CI] Update monolithic-linux.sh --- .ci/monolithic-linux.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.ci/monolithic-linux.sh b/.ci/monolithic-linux.sh index 5abb8d72df028..f16cbcd5b2904 100755 --- a/.ci/monolithic-linux.sh +++ b/.ci/monolithic-linux.sh @@ -62,7 +62,10 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \ -D LLDB_ENFORCE_STRICT_TEST_REQUIREMENTS=ON \ -D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \ -D CMAKE_EXE_LINKER_FLAGS="-no-pie" \ - -D LLVM_ENABLE_WERROR=ON + -D LLVM_ENABLE_WERROR=ON \ + -DLLVM_BUILD_UTILS=ON \ + -DLLVM_INCLUDE_UTILS=ON \ + -DLLVM_INSTALL_UTILS=ON start-group "ninja" From 86c4f7f6f1a30446d0bb198a352b9be83e1b6a1c Mon Sep 17 00:00:00 2001 From: Maksim Levental Date: Thu, 11 Sep 2025 07:55:30 -0700 Subject: [PATCH 02/14] Update monolithic-windows.sh --- .ci/monolithic-windows.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.ci/monolithic-windows.sh b/.ci/monolithic-windows.sh index f85d6e3d51b57..c1249d3196961 100755 --- a/.ci/monolithic-windows.sh +++ b/.ci/monolithic-windows.sh @@ -49,7 +49,10 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \ -D CMAKE_EXE_LINKER_FLAGS="/MANIFEST:NO" \ -D CMAKE_MODULE_LINKER_FLAGS="/MANIFEST:NO" \ -D CMAKE_SHARED_LINKER_FLAGS="/MANIFEST:NO" \ - -D LLVM_ENABLE_RUNTIMES="${runtimes}" + -D LLVM_ENABLE_RUNTIMES="${runtimes}" \ + -DLLVM_BUILD_UTILS=ON \ + -DLLVM_INCLUDE_UTILS=ON \ + -DLLVM_INSTALL_UTILS=ON start-group "ninja" From 755bba24f2b1b8256db2083b35f4b35e6c764326 Mon Sep 17 00:00:00 2001 From: Maksim Levental Date: Thu, 11 Sep 2025 18:19:14 -0700 Subject: [PATCH 03/14] Update monolithic-linux.sh --- .ci/monolithic-linux.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ci/monolithic-linux.sh b/.ci/monolithic-linux.sh index f16cbcd5b2904..4e5f1a2d0b3a8 100755 --- a/.ci/monolithic-linux.sh +++ b/.ci/monolithic-linux.sh @@ -72,6 +72,8 @@ start-group "ninja" # Targets are not escaped as they are passed as separate arguments. ninja -C "${BUILD_DIR}" -k 0 ${targets} |& tee ninja.log +ninja -C "${BUILD_DIR}" -k 0 install + if [[ "${runtime_targets}" != "" ]]; then start-group "ninja Runtimes" From 2dfd6d0d73afd543f66ffa0aed405eaa2f9e9bfa Mon Sep 17 00:00:00 2001 From: Maksim Levental Date: Thu, 11 Sep 2025 20:56:08 -0500 Subject: [PATCH 04/14] Update monolithic-windows.sh --- .ci/monolithic-windows.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ci/monolithic-windows.sh b/.ci/monolithic-windows.sh index c1249d3196961..a36346ee4c565 100755 --- a/.ci/monolithic-windows.sh +++ b/.ci/monolithic-windows.sh @@ -54,6 +54,8 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \ -DLLVM_INCLUDE_UTILS=ON \ -DLLVM_INSTALL_UTILS=ON +ninja -C "${BUILD_DIR}" -k 0 install + start-group "ninja" # Targets are not escaped as they are passed as separate arguments. From 02963e620cc68e5336eec01a165327b2d0b39097 Mon Sep 17 00:00:00 2001 From: Maksim Levental Date: Thu, 11 Sep 2025 20:56:28 -0500 Subject: [PATCH 05/14] Update monolithic-windows.sh --- .ci/monolithic-windows.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/monolithic-windows.sh b/.ci/monolithic-windows.sh index a36346ee4c565..2473d2d29b020 100755 --- a/.ci/monolithic-windows.sh +++ b/.ci/monolithic-windows.sh @@ -54,13 +54,13 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \ -DLLVM_INCLUDE_UTILS=ON \ -DLLVM_INSTALL_UTILS=ON -ninja -C "${BUILD_DIR}" -k 0 install - start-group "ninja" # Targets are not escaped as they are passed as separate arguments. ninja -C "${BUILD_DIR}" -k 0 ${targets} |& tee ninja.log +ninja -C "${BUILD_DIR}" -k 0 install + if [[ "${runtime_targets}" != "" ]]; then start-group "ninja runtimes" From 910f8f195e886e9ce78da2acd84d81c58f1cdd88 Mon Sep 17 00:00:00 2001 From: Maksim Levental Date: Thu, 11 Sep 2025 20:56:44 -0500 Subject: [PATCH 06/14] Update monolithic-linux.sh --- .ci/monolithic-linux.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.ci/monolithic-linux.sh b/.ci/monolithic-linux.sh index 4e5f1a2d0b3a8..6a8902ac00d70 100755 --- a/.ci/monolithic-linux.sh +++ b/.ci/monolithic-linux.sh @@ -63,8 +63,6 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \ -D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \ -D CMAKE_EXE_LINKER_FLAGS="-no-pie" \ -D LLVM_ENABLE_WERROR=ON \ - -DLLVM_BUILD_UTILS=ON \ - -DLLVM_INCLUDE_UTILS=ON \ -DLLVM_INSTALL_UTILS=ON start-group "ninja" From 4d09ee161acfa6a314dbd6dd41014b53e91e5fe0 Mon Sep 17 00:00:00 2001 From: Maksim Levental Date: Thu, 11 Sep 2025 20:56:57 -0500 Subject: [PATCH 07/14] Update monolithic-linux.sh --- .ci/monolithic-linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/monolithic-linux.sh b/.ci/monolithic-linux.sh index 6a8902ac00d70..292d2aed97eaf 100755 --- a/.ci/monolithic-linux.sh +++ b/.ci/monolithic-linux.sh @@ -63,7 +63,7 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \ -D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \ -D CMAKE_EXE_LINKER_FLAGS="-no-pie" \ -D LLVM_ENABLE_WERROR=ON \ - -DLLVM_INSTALL_UTILS=ON + -D LLVM_INSTALL_UTILS=ON start-group "ninja" From 627cd983f85768275a962e948ff1a3fead53c34e Mon Sep 17 00:00:00 2001 From: Maksim Levental Date: Thu, 11 Sep 2025 20:57:10 -0500 Subject: [PATCH 08/14] Update monolithic-windows.sh --- .ci/monolithic-windows.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/monolithic-windows.sh b/.ci/monolithic-windows.sh index 2473d2d29b020..ed46bbca0ff18 100755 --- a/.ci/monolithic-windows.sh +++ b/.ci/monolithic-windows.sh @@ -50,9 +50,9 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \ -D CMAKE_MODULE_LINKER_FLAGS="/MANIFEST:NO" \ -D CMAKE_SHARED_LINKER_FLAGS="/MANIFEST:NO" \ -D LLVM_ENABLE_RUNTIMES="${runtimes}" \ - -DLLVM_BUILD_UTILS=ON \ - -DLLVM_INCLUDE_UTILS=ON \ - -DLLVM_INSTALL_UTILS=ON + -D LLVM_BUILD_UTILS=ON \ + -D LLVM_INCLUDE_UTILS=ON \ + -D LLVM_INSTALL_UTILS=ON start-group "ninja" From d19151a21f02c2d420e52924efddac39ace12bd3 Mon Sep 17 00:00:00 2001 From: Maksim Levental Date: Thu, 11 Sep 2025 21:43:10 -0500 Subject: [PATCH 09/14] Update test.toy --- mlir/test/Examples/standalone/test.toy | 1 + 1 file changed, 1 insertion(+) diff --git a/mlir/test/Examples/standalone/test.toy b/mlir/test/Examples/standalone/test.toy index e99bab5f0affc..c4d220c4cbdc2 100644 --- a/mlir/test/Examples/standalone/test.toy +++ b/mlir/test/Examples/standalone/test.toy @@ -1,3 +1,4 @@ +# RUN: "%cmake_exe" --build . --target install # RUN: "%cmake_exe" "%mlir_src_root/examples/standalone" -G "%cmake_generator" \ # RUN: -DCMAKE_CXX_COMPILER=%host_cxx -DCMAKE_C_COMPILER=%host_cc \ # RUN: -DLLVM_ENABLE_LIBCXX=%enable_libcxx -DMLIR_DIR=%mlir_cmake_dir \ From 97135c919a0acbad499ae72b7cc5e307b787f55f Mon Sep 17 00:00:00 2001 From: Maksim Levental Date: Thu, 11 Sep 2025 21:43:33 -0500 Subject: [PATCH 10/14] Update lit.site.cfg.py.in --- mlir/test/lit.site.cfg.py.in | 1 + 1 file changed, 1 insertion(+) diff --git a/mlir/test/lit.site.cfg.py.in b/mlir/test/lit.site.cfg.py.in index 8a742a227847b..84ea75897cc50 100644 --- a/mlir/test/lit.site.cfg.py.in +++ b/mlir/test/lit.site.cfg.py.in @@ -4,6 +4,7 @@ import sys config.target_triple = "@LLVM_TARGET_TRIPLE@" config.llvm_src_root = "@LLVM_SOURCE_DIR@" +config.llvm_obj_root = "@LLVM_BINARY_DIR@" config.llvm_tools_dir = lit_config.substitute("@LLVM_TOOLS_DIR@") config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@" config.spirv_tools_tests = @LLVM_INCLUDE_SPIRV_TOOLS_TESTS@ From 71a1fec43490bfd6bde61b2596e8d1cc2d045ea3 Mon Sep 17 00:00:00 2001 From: Maksim Levental Date: Thu, 11 Sep 2025 21:44:10 -0500 Subject: [PATCH 11/14] Update test.toy --- mlir/test/Examples/standalone/test.toy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mlir/test/Examples/standalone/test.toy b/mlir/test/Examples/standalone/test.toy index c4d220c4cbdc2..c309e7167f1f2 100644 --- a/mlir/test/Examples/standalone/test.toy +++ b/mlir/test/Examples/standalone/test.toy @@ -1,4 +1,4 @@ -# RUN: "%cmake_exe" --build . --target install +# RUN: "%cmake_exe" --build "%llvm_obj_root" --target install # RUN: "%cmake_exe" "%mlir_src_root/examples/standalone" -G "%cmake_generator" \ # RUN: -DCMAKE_CXX_COMPILER=%host_cxx -DCMAKE_C_COMPILER=%host_cc \ # RUN: -DLLVM_ENABLE_LIBCXX=%enable_libcxx -DMLIR_DIR=%mlir_cmake_dir \ From 4503cc3b3ca304d70eded563ed5932cf4f24a5ef Mon Sep 17 00:00:00 2001 From: Maksim Levental Date: Thu, 11 Sep 2025 22:04:02 -0500 Subject: [PATCH 12/14] Update lit.local.cfg --- mlir/test/Examples/standalone/lit.local.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/mlir/test/Examples/standalone/lit.local.cfg b/mlir/test/Examples/standalone/lit.local.cfg index fe8397c6b9a10..b46d0d06400f2 100644 --- a/mlir/test/Examples/standalone/lit.local.cfg +++ b/mlir/test/Examples/standalone/lit.local.cfg @@ -10,3 +10,4 @@ config.substitutions.append(("%host_cc", config.host_cc)) config.substitutions.append(("%enable_libcxx", config.enable_libcxx)) config.substitutions.append(("%mlir_cmake_dir", config.mlir_cmake_dir)) config.substitutions.append(("%llvm_use_linker", config.llvm_use_linker)) +config.substitutions.append(("%llvm_obj_root", config.llvm_obj_root)) From 4549764d887449036ea0e1d00c18fef2610be9f6 Mon Sep 17 00:00:00 2001 From: Maksim Levental Date: Thu, 11 Sep 2025 22:30:26 -0500 Subject: [PATCH 13/14] Update monolithic-windows.sh --- .ci/monolithic-windows.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.ci/monolithic-windows.sh b/.ci/monolithic-windows.sh index ed46bbca0ff18..a7822a5360b94 100755 --- a/.ci/monolithic-windows.sh +++ b/.ci/monolithic-windows.sh @@ -49,18 +49,13 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \ -D CMAKE_EXE_LINKER_FLAGS="/MANIFEST:NO" \ -D CMAKE_MODULE_LINKER_FLAGS="/MANIFEST:NO" \ -D CMAKE_SHARED_LINKER_FLAGS="/MANIFEST:NO" \ - -D LLVM_ENABLE_RUNTIMES="${runtimes}" \ - -D LLVM_BUILD_UTILS=ON \ - -D LLVM_INCLUDE_UTILS=ON \ - -D LLVM_INSTALL_UTILS=ON + -D LLVM_ENABLE_RUNTIMES="${runtimes}" start-group "ninja" # Targets are not escaped as they are passed as separate arguments. ninja -C "${BUILD_DIR}" -k 0 ${targets} |& tee ninja.log -ninja -C "${BUILD_DIR}" -k 0 install - if [[ "${runtime_targets}" != "" ]]; then start-group "ninja runtimes" From 1237bb2b6259a663ca1088782e37cadf48576650 Mon Sep 17 00:00:00 2001 From: Maksim Levental Date: Thu, 11 Sep 2025 22:30:41 -0500 Subject: [PATCH 14/14] Update monolithic-windows.sh --- .ci/monolithic-windows.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/monolithic-windows.sh b/.ci/monolithic-windows.sh index a7822a5360b94..f85d6e3d51b57 100755 --- a/.ci/monolithic-windows.sh +++ b/.ci/monolithic-windows.sh @@ -49,7 +49,7 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \ -D CMAKE_EXE_LINKER_FLAGS="/MANIFEST:NO" \ -D CMAKE_MODULE_LINKER_FLAGS="/MANIFEST:NO" \ -D CMAKE_SHARED_LINKER_FLAGS="/MANIFEST:NO" \ - -D LLVM_ENABLE_RUNTIMES="${runtimes}" + -D LLVM_ENABLE_RUNTIMES="${runtimes}" start-group "ninja"