Author: Morris Hafner Date: 2026-10-21T22:09:00Z New Revision: 7177ec5f62b3e963c8d63d823901c8aaefcd33ed
URL: https://github.com/llvm/llvm-project/commit/7177ec5f62b3e963c8d63d823901c8aaefcd33ed DIFF: https://github.com/llvm/llvm-project/commit/7177ec5f62b3e963c8d63d823901c8aaefcd33ed.diff LOG: [CIR] Add missing MLIR TableGen dependencies to CIR CMake targets (#187692) CIR targets include MLIR headers that depend on TableGen-generated .inc files (BuiltinLocationAttributes.h.inc, BytecodeOpInterface.h.inc), but do not declare build dependencies on the corresponding TableGen targets. This causes intermittent build failures with parallel builds when the .inc files have not yet been generated by the time CIR sources compile. Add MLIRBuiltinLocationAttributesIncGen and MLIRBytecodeOpInterfaceIncGen to DEPENDS in all affected CIR CMake targets: - clangCIRLoweringCommon - clangCIRLoweringDirectToLLVM - clangCIRFrontendAction - MLIRCIRInterfaces - MLIRCIR (Dialect/IR) - MLIRCIRTransforms - MLIRCIRTargetLowering - CIROpenACCSupport - clangCIR (CodeGen) Fixes #234321. Added: Modified: clang/lib/CIR/CMakeLists.txt clang/lib/CIR/CodeGen/CMakeLists.txt clang/lib/CIR/Dialect/Analysis/CMakeLists.txt clang/lib/CIR/Dialect/IR/CMakeLists.txt clang/lib/CIR/Dialect/OpenACC/CMakeLists.txt clang/lib/CIR/Dialect/OpenMP/CMakeLists.txt clang/lib/CIR/Dialect/Transforms/CMakeLists.txt clang/lib/CIR/Dialect/Transforms/TargetLowering/CMakeLists.txt clang/lib/CIR/FrontendAction/CMakeLists.txt clang/lib/CIR/Interfaces/CMakeLists.txt clang/lib/CIR/Lowering/CMakeLists.txt clang/lib/CIR/Lowering/DirectToLLVM/CMakeLists.txt Removed: ################################################################################ diff --git a/clang/lib/CIR/CMakeLists.txt b/clang/lib/CIR/CMakeLists.txt index c63c84afc8fa31..9795c0bae67df8 100644 --- a/clang/lib/CIR/CMakeLists.txt +++ b/clang/lib/CIR/CMakeLists.txt @@ -10,6 +10,9 @@ add_subdirectory(Lowering) add_clang_library(CIRRegisterAllDialects RegisterAllDialects.cpp + DEPENDS + MLIRArithOpsIncGen + LINK_LIBS PUBLIC MLIRCIR CIROpenACCSupport diff --git a/clang/lib/CIR/CodeGen/CMakeLists.txt b/clang/lib/CIR/CodeGen/CMakeLists.txt index 6d84faf70d11da..fdb2c66eb1f749 100644 --- a/clang/lib/CIR/CodeGen/CMakeLists.txt +++ b/clang/lib/CIR/CodeGen/CMakeLists.txt @@ -68,6 +68,8 @@ add_clang_library(clangCIR DEPENDS MLIRCIR MLIRCIROpInterfacesIncGen + MLIRBuiltinLocationAttributesIncGen + MLIRBytecodeOpInterfaceIncGen LINK_LIBS clangAST diff --git a/clang/lib/CIR/Dialect/Analysis/CMakeLists.txt b/clang/lib/CIR/Dialect/Analysis/CMakeLists.txt index 888583416dde72..169323557facf6 100644 --- a/clang/lib/CIR/Dialect/Analysis/CMakeLists.txt +++ b/clang/lib/CIR/Dialect/Analysis/CMakeLists.txt @@ -2,6 +2,9 @@ add_clang_library(MLIRCIRAnalysis CIRAliasAnalysis.cpp CIRBasicAliasAnalysis.cpp + DEPENDS + MLIRPtrMemorySpaceInterfacesIncGen + LINK_LIBS PUBLIC MLIRCIR MLIRIR diff --git a/clang/lib/CIR/Dialect/IR/CMakeLists.txt b/clang/lib/CIR/Dialect/IR/CMakeLists.txt index bea09ab9ba03f9..34345d765c67c6 100644 --- a/clang/lib/CIR/Dialect/IR/CMakeLists.txt +++ b/clang/lib/CIR/Dialect/IR/CMakeLists.txt @@ -14,6 +14,8 @@ add_clang_library(MLIRCIR MLIRCIREnumsGen MLIRCIROpInterfacesIncGen MLIRCIRLoopOpInterfaceIncGen + MLIRBuiltinLocationAttributesIncGen + MLIRBytecodeOpInterfaceIncGen LINK_COMPONENTS TargetParser diff --git a/clang/lib/CIR/Dialect/OpenACC/CMakeLists.txt b/clang/lib/CIR/Dialect/OpenACC/CMakeLists.txt index de27f4cb27c594..d15624e1f21a20 100644 --- a/clang/lib/CIR/Dialect/OpenACC/CMakeLists.txt +++ b/clang/lib/CIR/Dialect/OpenACC/CMakeLists.txt @@ -4,6 +4,10 @@ add_clang_library(CIROpenACCSupport DEPENDS MLIRCIRTypeConstraintsIncGen + MLIRArithOpsIncGen + MLIRBuiltinLocationAttributesIncGen + MLIRBytecodeOpInterfaceIncGen + MLIRCallInterfacesIncGen LINK_LIBS PUBLIC MLIRIR diff --git a/clang/lib/CIR/Dialect/OpenMP/CMakeLists.txt b/clang/lib/CIR/Dialect/OpenMP/CMakeLists.txt index f6f4017f0f1f64..a06f6ff7a52e9c 100644 --- a/clang/lib/CIR/Dialect/OpenMP/CMakeLists.txt +++ b/clang/lib/CIR/Dialect/OpenMP/CMakeLists.txt @@ -3,6 +3,7 @@ add_clang_library(CIROpenMPSupport DEPENDS MLIRCIROpsIncGen + MLIRMemorySlotInterfacesIncGen LINK_LIBS PUBLIC MLIRIR diff --git a/clang/lib/CIR/Dialect/Transforms/CMakeLists.txt b/clang/lib/CIR/Dialect/Transforms/CMakeLists.txt index 42fceb0590efda..968382bf9f516e 100644 --- a/clang/lib/CIR/Dialect/Transforms/CMakeLists.txt +++ b/clang/lib/CIR/Dialect/Transforms/CMakeLists.txt @@ -21,6 +21,8 @@ add_clang_library(MLIRCIRTransforms DEPENDS MLIRCIRPassIncGen + MLIRBuiltinLocationAttributesIncGen + MLIRBytecodeOpInterfaceIncGen LINK_COMPONENTS ABI diff --git a/clang/lib/CIR/Dialect/Transforms/TargetLowering/CMakeLists.txt b/clang/lib/CIR/Dialect/Transforms/TargetLowering/CMakeLists.txt index e6785de3143059..7bad234541d354 100644 --- a/clang/lib/CIR/Dialect/Transforms/TargetLowering/CMakeLists.txt +++ b/clang/lib/CIR/Dialect/Transforms/TargetLowering/CMakeLists.txt @@ -11,6 +11,8 @@ add_clang_library(MLIRCIRTargetLowering DEPENDS clangBasic + MLIRBuiltinLocationAttributesIncGen + MLIRBytecodeOpInterfaceIncGen LINK_COMPONENTS TargetParser diff --git a/clang/lib/CIR/FrontendAction/CMakeLists.txt b/clang/lib/CIR/FrontendAction/CMakeLists.txt index d19496939af60b..f83e5b04b9ada5 100644 --- a/clang/lib/CIR/FrontendAction/CMakeLists.txt +++ b/clang/lib/CIR/FrontendAction/CMakeLists.txt @@ -13,6 +13,8 @@ add_clang_library(clangCIRFrontendAction DEPENDS MLIRCIROpsIncGen MLIRCIROpInterfacesIncGen + MLIRBuiltinLocationAttributesIncGen + MLIRBytecodeOpInterfaceIncGen MLIRBuiltinOpsIncGen LINK_LIBS diff --git a/clang/lib/CIR/Interfaces/CMakeLists.txt b/clang/lib/CIR/Interfaces/CMakeLists.txt index 43a35d2516e834..960dd0dcca5f4c 100644 --- a/clang/lib/CIR/Interfaces/CMakeLists.txt +++ b/clang/lib/CIR/Interfaces/CMakeLists.txt @@ -13,6 +13,8 @@ add_clang_library(MLIRCIRInterfaces MLIRCIRTypeInterfacesIncGen MLIRCIRLoopOpInterfaceIncGen MLIRCIROpInterfacesIncGen + MLIRBuiltinLocationAttributesIncGen + MLIRBytecodeOpInterfaceIncGen MLIRCIROpsIncGen MLIRCIRTypeConstraintsIncGen # CIR interface headers include generated core MLIR interfaces without diff --git a/clang/lib/CIR/Lowering/CMakeLists.txt b/clang/lib/CIR/Lowering/CMakeLists.txt index 2713af9ba3d6c8..93ca5436d96f92 100644 --- a/clang/lib/CIR/Lowering/CMakeLists.txt +++ b/clang/lib/CIR/Lowering/CMakeLists.txt @@ -7,6 +7,10 @@ add_clang_library(clangCIRLoweringCommon CIRPasses.cpp LoweringHelpers.cpp + DEPENDS + MLIRBuiltinLocationAttributesIncGen + MLIRBytecodeOpInterfaceIncGen + LINK_LIBS clangCIR MLIRCIR diff --git a/clang/lib/CIR/Lowering/DirectToLLVM/CMakeLists.txt b/clang/lib/CIR/Lowering/DirectToLLVM/CMakeLists.txt index 4b9186e5fedba8..ff68221ad59df8 100644 --- a/clang/lib/CIR/Lowering/DirectToLLVM/CMakeLists.txt +++ b/clang/lib/CIR/Lowering/DirectToLLVM/CMakeLists.txt @@ -13,6 +13,8 @@ add_clang_library(clangCIRLoweringDirectToLLVM CIRLowering MLIRCIREnumsGen MLIRCIROpsIncGen + MLIRBuiltinLocationAttributesIncGen + MLIRBytecodeOpInterfaceIncGen MLIRCIROpInterfacesIncGen LINK_LIBS _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
