Skip to content

Commit ef5e5ef

Browse files
authored
[MLIR][Bazel] correctly fix bazel build after 59e74a0 (llvm#160539)
llvm#160508 wasn't the correct fix - the fix just disabled the test because https://github.com/llvm/llvm-project/blob/59e74a0749203998b3e5fd9bc6525de148db28ab/mlir/test/Examples/standalone/lit.local.cfg#L18 is now always `False` (`if not "0"` is always `False`). This PR is the correct fix.
1 parent 4d4cb75 commit ef5e5ef

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

mlir/test/lit.site.cfg.py.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ config.mlir_run_cuda_sm80_tests = @MLIR_RUN_CUDA_SM80_TESTS@
6060
config.mlir_run_cuda_sm80_lt_tests = @MLIR_RUN_CUDA_SM80_LT_TESTS@
6161
config.mlir_run_cuda_sm90_tests = @MLIR_RUN_CUDA_SM90_TESTS@
6262
config.mlir_include_integration_tests = @MLIR_INCLUDE_INTEGRATION_TESTS@
63-
config.llvm_shared_libs_build = "@BUILD_SHARED_LIBS@"
63+
config.llvm_shared_libs_build = @BUILD_SHARED_LIBS@
6464
config.arm_emulator_executable = "@ARM_EMULATOR_EXECUTABLE@"
6565
# Some tests marked with 'UNSUPPORTED: target=aarch64{{.*}}' are still run when
6666
# configured with ARM_EMULATOR_EXECUTABLE and the default target is not aarch64.

utils/bazel/llvm-project-overlay/mlir/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7713,8 +7713,8 @@ cc_library(
77137713
"lib/Transforms/*.cpp",
77147714
]),
77157715
hdrs = [
7716-
"include/mlir/Transforms/CSE.h",
77177716
"include/mlir/Transforms/BubbleDownMemorySpaceCasts.h",
7717+
"include/mlir/Transforms/CSE.h",
77187718
"include/mlir/Transforms/EndomorphismSimplification.h",
77197719
"include/mlir/Transforms/HomomorphismSimplification.h",
77207720
"include/mlir/Transforms/LocationSnapshot.h",
@@ -12704,8 +12704,8 @@ cc_library(
1270412704
deps = [
1270512705
":DialectUtils",
1270612706
":IR",
12707-
":Support",
1270812707
":MemOpInterfacesIncGen",
12708+
":Support",
1270912709
],
1271012710
)
1271112711

utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ expand_template(
3131
"@LIT_SITE_CFG_IN_HEADER@": LIT_SITE_CFG_IN_HEADER,
3232
"@LLVM_TOOLS_DIR@": package_path("//llvm:BUILD"),
3333
"@ENABLE_SHARED@": "1",
34+
"@BUILD_SHARED_LIBS@": "1",
3435
"@ENABLE_ASSERTIONS@": "1",
3536
"@MLIR_SOURCE_DIR@": package_path("//mlir:BUILD"),
3637
"@MLIR_TOOLS_DIR@": package_path("//mlir:BUILD"),

0 commit comments

Comments
 (0)