https://github.com/DavidSpickett created https://github.com/llvm/llvm-project/pull/125834
This cherry picks [mlir][cmake] Add missing MLIRTestDialect dependency (#125004) (72b73c9af694198096b2e0c47a1625e5b94c76a5) and [mlir] Fix build race condition in Pass Manager tests (d906da5ead2764579395e5006c517f2ec9afd46f) to the 20.x release branch. Both of these are addressing issues that started with https://github.com/llvm/llvm-project/pull/123910, which is already on the 20.x branch. In each case the cherry-picked changes correct problems that would otherwise be a race condition in certain builds. Linaro noticed this on our flang dylib (shared library) build bot. Failures look like: In file included from /home/tcwg-buildbot/worker/flang-aarch64-dylib/llvm-project/mlir/test/lib/Pass/TestPassManager.cpp:10: /home/tcwg-buildbot/worker/flang-aarch64-dylib/llvm-project/mlir/test/lib/Pass/../Dialect/Test/TestOps.h:148:10: fatal error: 'TestOps.h.inc' file not found 148 | #include "TestOps.h.inc" | ^~~~~~~~~~~~~~~ We have tested these changes on the buildbot for the last 2 days and had no problems. Whereas before it was failing maybe 1 in 10 builds, enough that multiple people in the community noticed it. Reported in https://github.com/llvm/llvm-project/issues/124485 and https://github.com/llvm/llvm-project/issues/124335. >From ab3bc7eeb7ff89ec53a2eeee62ad9b52ab46599c Mon Sep 17 00:00:00 2001 From: Diego Caballero <dieg0ca6all...@gmail.com> Date: Thu, 30 Jan 2025 16:09:19 -0800 Subject: [PATCH] [mlir][cmake] Add missing MLIRTestDialect dependencies This cherry picks [mlir][cmake] Add missing MLIRTestDialect dependency (#125004) (72b73c9af694198096b2e0c47a1625e5b94c76a5) and [mlir] Fix build race condition in Pass Manager tests (d906da5ead2764579395e5006c517f2ec9afd46f) to the 20.x release branch. Both of these are addressing issues that started with https://github.com/llvm/llvm-project/pull/123910, which is already on the 20.x branch. In each case the cherry-picked changes correct problems that would otherwise be a race condition in certain builds. Linaro noticed this on our flang dylib (shared library) build bot. Failures look like: In file included from /home/tcwg-buildbot/worker/flang-aarch64-dylib/llvm-project/mlir/test/lib/Pass/TestPassManager.cpp:10: /home/tcwg-buildbot/worker/flang-aarch64-dylib/llvm-project/mlir/test/lib/Pass/../Dialect/Test/TestOps.h:148:10: fatal error: 'TestOps.h.inc' file not found 148 | #include "TestOps.h.inc" | ^~~~~~~~~~~~~~~ We have tested these changes on the buildbot for the last 2 days and had no problems. Whereas before it was failing maybe 1 in 10 builds, enough that multiple people in the community noticed it. Reported in https://github.com/llvm/llvm-project/issues/124485 and https://github.com/llvm/llvm-project/issues/124335. Co-authored-by: Diego Caballero <dieg0ca6all...@gmail.com> --- mlir/test/lib/IR/CMakeLists.txt | 4 ++++ mlir/test/lib/Pass/CMakeLists.txt | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mlir/test/lib/IR/CMakeLists.txt b/mlir/test/lib/IR/CMakeLists.txt index e5416da70d50080..eeb9cf1e34fc8c0 100644 --- a/mlir/test/lib/IR/CMakeLists.txt +++ b/mlir/test/lib/IR/CMakeLists.txt @@ -27,7 +27,11 @@ add_mlir_library(MLIRTestIR TestVisitorsGeneric.cpp EXCLUDE_FROM_LIBMLIR + + DEPENDS + MLIRTestDialect ) + mlir_target_link_libraries(MLIRTestIR PUBLIC MLIRPass MLIRBytecodeReader diff --git a/mlir/test/lib/Pass/CMakeLists.txt b/mlir/test/lib/Pass/CMakeLists.txt index 6698af86b8ae66d..c5d0bab8ec74946 100644 --- a/mlir/test/lib/Pass/CMakeLists.txt +++ b/mlir/test/lib/Pass/CMakeLists.txt @@ -10,12 +10,14 @@ add_mlir_library(MLIRTestPass ADDITIONAL_HEADER_DIRS ${MLIR_MAIN_INCLUDE_DIR}/mlir/Pass + + LINK_LIBS PUBLIC + MLIRTestDialect ) mlir_target_link_libraries(MLIRTestPass PUBLIC ${conversion_libs} MLIRIR MLIRPass - MLIRTestDialect ) target_include_directories(MLIRTestPass _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
