[llvm] [mlir] [MLIR][Bazel] correctly fix bazel build (PR #160539)

[Maksim Levental via llvm-commits]

https://github.com/makslevental updated https://github.com/llvm/llvm-project/pull/160539

>From 090bdfc6250517c6835d53b862971c8ab694338d Mon Sep 17 00:00:00 2001
From: makslevental <maksim.levental at gmail.com>
Date: Wed, 24 Sep 2025 07:47:24 -0700
Subject: [PATCH 1/3] Revert "[mlir] Fix bazel after `59e74a0`. (#160508)"

This reverts commit 2d6ce5148cf144ab800116e1f75a5d007e82cf58.
---
 mlir/test/lit.site.cfg.py.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mlir/test/lit.site.cfg.py.in b/mlir/test/lit.site.cfg.py.in
index c7a0bbe114fe2..1aaf7989e3ce5 100644
--- a/mlir/test/lit.site.cfg.py.in
+++ b/mlir/test/lit.site.cfg.py.in
@@ -60,7 +60,7 @@ config.mlir_run_cuda_sm80_tests = @MLIR_RUN_CUDA_SM80_TESTS@
 config.mlir_run_cuda_sm80_lt_tests = @MLIR_RUN_CUDA_SM80_LT_TESTS@
 config.mlir_run_cuda_sm90_tests = @MLIR_RUN_CUDA_SM90_TESTS@
 config.mlir_include_integration_tests = @MLIR_INCLUDE_INTEGRATION_TESTS@
-config.llvm_shared_libs_build = "@BUILD_SHARED_LIBS@"
+config.llvm_shared_libs_build = @BUILD_SHARED_LIBS@
 config.arm_emulator_executable = "@ARM_EMULATOR_EXECUTABLE@"
 # Some tests marked with 'UNSUPPORTED: target=aarch64{{.*}}' are still run when
 # configured with ARM_EMULATOR_EXECUTABLE and the default target is not aarch64.

>From 843567aec2b801dca672c76f0f6dfcc730c8c33d Mon Sep 17 00:00:00 2001
From: makslevental <maksim.levental at gmail.com>
Date: Wed, 24 Sep 2025 07:49:23 -0700
Subject: [PATCH 2/3] [MLIR][Bazel] correctly fix bazel build

---
 utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel
index 469fcee8d9748..196fd1e55eae5 100644
--- a/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel
@@ -31,6 +31,7 @@ expand_template(
         "@LIT_SITE_CFG_IN_HEADER@": LIT_SITE_CFG_IN_HEADER,
         "@LLVM_TOOLS_DIR@": package_path("//llvm:BUILD"),
         "@ENABLE_SHARED@": "1",
+        "@BUILD_SHARED_LIBS@": "1",
         "@ENABLE_ASSERTIONS@": "1",
         "@MLIR_SOURCE_DIR@": package_path("//mlir:BUILD"),
         "@MLIR_TOOLS_DIR@": package_path("//mlir:BUILD"),
@@ -57,7 +58,7 @@ expand_template(
         "@MLIR_RUN_CUDA_SM80_LT_TESTS@": "0",
         "@MLIR_RUN_CUDA_SM90_TESTS@": "0",
         "@MLIR_INCLUDE_INTEGRATION_TESTS@": "0",
-        "@SHLIBDIR@": package_path("//llvm:BUILD"),
+        "@SHLIBDIR@": package_path("//llvm:BUILD")
     },
     template = "lit.site.cfg.py.in",
 )

>From 3d0c4bb08078fc26195b13455f4448367aec303d Mon Sep 17 00:00:00 2001
From: Maksim Levental <maksim.levental at gmail.com>
Date: Wed, 24 Sep 2025 11:15:45 -0400
Subject: [PATCH 3/3] --amend

---
 utils/bazel/llvm-project-overlay/mlir/BUILD.bazel      | 2 +-
 utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
index fcd83380e62fb..b1eb064631f51 100644
--- a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
@@ -12700,8 +12700,8 @@ cc_library(
     deps = [
         ":DialectUtils",
         ":IR",
-        ":Support",
         ":MemOpInterfacesIncGen",
+        ":Support",
     ],
 )
 
diff --git a/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel
index 196fd1e55eae5..7e36d0ba787b6 100644
--- a/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel
@@ -58,7 +58,7 @@ expand_template(
         "@MLIR_RUN_CUDA_SM80_LT_TESTS@": "0",
         "@MLIR_RUN_CUDA_SM90_TESTS@": "0",
         "@MLIR_INCLUDE_INTEGRATION_TESTS@": "0",
-        "@SHLIBDIR@": package_path("//llvm:BUILD")
+        "@SHLIBDIR@": package_path("//llvm:BUILD"),
     },
     template = "lit.site.cfg.py.in",
 )