From b53274086a60ab4174ec5bddc5e45fb52108f283 Mon Sep 17 00:00:00 2001 From: Christopher Bate Date: Wed, 28 Aug 2024 22:34:14 -0600 Subject: [PATCH] Reapply "[mlir] NFC: fix dependence of (Tensor|Linalg|MemRef|Complex) dialects on LLVM Dialect and LLVM Core in CMake build (#104832)" (#105703) Reapply the commit 43b508566799751aa180f1eaaafc5be693f2f1ae with additional fixes for building with BUILD_SHARED_LIBS=ON. --- mlir/lib/Conversion/AffineToStandard/CMakeLists.txt | 3 --- mlir/lib/Conversion/ComplexToLLVM/CMakeLists.txt | 1 + mlir/lib/Conversion/ControlFlowToSCF/CMakeLists.txt | 4 ---- mlir/lib/Conversion/SCFToControlFlow/CMakeLists.txt | 3 --- mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt | 1 + mlir/lib/Conversion/VectorToSCF/CMakeLists.txt | 4 ---- mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt | 1 - mlir/lib/Dialect/Complex/IR/CMakeLists.txt | 1 - mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt | 2 -- mlir/lib/Dialect/MemRef/IR/CMakeLists.txt | 3 --- mlir/lib/Dialect/MemRef/TransformOps/CMakeLists.txt | 1 + mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt | 1 + mlir/lib/Dialect/SparseTensor/Transforms/CMakeLists.txt | 1 + mlir/lib/Dialect/Tensor/IR/CMakeLists.txt | 3 --- 14 files changed, 5 insertions(+), 24 deletions(-) diff --git a/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt b/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt index f41e3ca27ee4dde..cd8193aee8da326 100644 --- a/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt +++ b/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt @@ -7,9 +7,6 @@ add_mlir_conversion_library(MLIRAffineToStandard DEPENDS MLIRConversionPassIncGen - LINK_COMPONENTS - Core - LINK_LIBS PUBLIC MLIRAffineDialect MLIRAffineTransforms diff --git a/mlir/lib/Conversion/ComplexToLLVM/CMakeLists.txt b/mlir/lib/Conversion/ComplexToLLVM/CMakeLists.txt index b6fae75c15b9567..d3a5bf2aa2f05be 100644 --- a/mlir/lib/Conversion/ComplexToLLVM/CMakeLists.txt +++ b/mlir/lib/Conversion/ComplexToLLVM/CMakeLists.txt @@ -11,6 +11,7 @@ add_mlir_conversion_library(MLIRComplexToLLVM Core LINK_LIBS PUBLIC + MLIRArithAttrToLLVMConversion MLIRComplexDialect MLIRLLVMCommonConversion MLIRLLVMDialect diff --git a/mlir/lib/Conversion/ControlFlowToSCF/CMakeLists.txt b/mlir/lib/Conversion/ControlFlowToSCF/CMakeLists.txt index 679eca3dfa988c5..e2f1677b1d0695b 100644 --- a/mlir/lib/Conversion/ControlFlowToSCF/CMakeLists.txt +++ b/mlir/lib/Conversion/ControlFlowToSCF/CMakeLists.txt @@ -6,10 +6,6 @@ add_mlir_conversion_library(MLIRControlFlowToSCF DEPENDS MLIRConversionPassIncGen - intrinsics_gen - - LINK_COMPONENTS - Core LINK_LIBS PUBLIC MLIRAnalysis diff --git a/mlir/lib/Conversion/SCFToControlFlow/CMakeLists.txt b/mlir/lib/Conversion/SCFToControlFlow/CMakeLists.txt index 63c5199af9290c9..47366c38bb1d8fe 100644 --- a/mlir/lib/Conversion/SCFToControlFlow/CMakeLists.txt +++ b/mlir/lib/Conversion/SCFToControlFlow/CMakeLists.txt @@ -7,9 +7,6 @@ add_mlir_conversion_library(MLIRSCFToControlFlow DEPENDS MLIRConversionPassIncGen - LINK_COMPONENTS - Core - LINK_LIBS PUBLIC MLIRArithDialect MLIRControlFlowDialect diff --git a/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt b/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt index a0fce139f274661..aef3cf467fb6597 100644 --- a/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt +++ b/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt @@ -13,6 +13,7 @@ add_mlir_conversion_library(MLIRVectorToLLVM Core LINK_LIBS PUBLIC + MLIRArithAttrToLLVMConversion MLIRArithDialect MLIRLLVMCommonConversion MLIRLLVMDialect diff --git a/mlir/lib/Conversion/VectorToSCF/CMakeLists.txt b/mlir/lib/Conversion/VectorToSCF/CMakeLists.txt index 83bbc4a4bc395a6..0915270e453dfdb 100644 --- a/mlir/lib/Conversion/VectorToSCF/CMakeLists.txt +++ b/mlir/lib/Conversion/VectorToSCF/CMakeLists.txt @@ -4,12 +4,8 @@ add_mlir_conversion_library(MLIRVectorToSCF ADDITIONAL_HEADER_DIRS ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/VectorToSCF - LINK_COMPONENTS - Core - LINK_LIBS PUBLIC MLIRArithDialect - MLIRLLVMDialect MLIRMemRefDialect MLIRTransforms MLIRVectorDialect diff --git a/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt index 60d14a373348d38..772f15335d907f2 100644 --- a/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt @@ -39,6 +39,5 @@ add_mlir_dialect_library(MLIRAffineTransforms MLIRValueBoundsOpInterface MLIRVectorDialect MLIRVectorUtils - MLIRVectorToLLVM ) diff --git a/mlir/lib/Dialect/Complex/IR/CMakeLists.txt b/mlir/lib/Dialect/Complex/IR/CMakeLists.txt index 3ee0d26f3225f72..a90f34ec1684d90 100644 --- a/mlir/lib/Dialect/Complex/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/Complex/IR/CMakeLists.txt @@ -10,7 +10,6 @@ add_mlir_dialect_library(MLIRComplexDialect MLIRComplexAttributesIncGen LINK_LIBS PUBLIC - MLIRArithAttrToLLVMConversion MLIRArithDialect MLIRDialect MLIRInferTypeOpInterface diff --git a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt index a7dcc29b5b9be18..47af392def94ac0 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt @@ -60,7 +60,6 @@ add_mlir_dialect_library(MLIRLinalgTransforms MLIRDestinationStyleOpInterface MLIRDialectUtils MLIRFuncDialect - MLIRFuncToLLVM MLIRFuncTransforms MLIRIndexDialect MLIRInferTypeOpInterface @@ -87,6 +86,5 @@ add_mlir_dialect_library(MLIRLinalgTransforms MLIRVectorDialect MLIRVectorTransforms MLIRVectorUtils - MLIRX86VectorTransforms MLIRVectorToSCF ) diff --git a/mlir/lib/Dialect/MemRef/IR/CMakeLists.txt b/mlir/lib/Dialect/MemRef/IR/CMakeLists.txt index fd2fed28badd63f..845914ebd107a26 100644 --- a/mlir/lib/Dialect/MemRef/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/MemRef/IR/CMakeLists.txt @@ -10,9 +10,6 @@ add_mlir_dialect_library(MLIRMemRefDialect DEPENDS MLIRMemRefOpsIncGen - LINK_COMPONENTS - Core - LINK_LIBS PUBLIC MLIRArithDialect MLIRArithUtils diff --git a/mlir/lib/Dialect/MemRef/TransformOps/CMakeLists.txt b/mlir/lib/Dialect/MemRef/TransformOps/CMakeLists.txt index e379663f3b0a01f..4c9e3d3c813f7a6 100644 --- a/mlir/lib/Dialect/MemRef/TransformOps/CMakeLists.txt +++ b/mlir/lib/Dialect/MemRef/TransformOps/CMakeLists.txt @@ -19,4 +19,5 @@ add_mlir_dialect_library(MLIRMemRefTransformOps MLIRNVGPUDialect MLIRTransformDialect MLIRVectorDialect + MLIRVectorTransforms ) diff --git a/mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt b/mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt index f150ac7ac2d634a..4c7f42745ce8bb4 100644 --- a/mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt @@ -35,6 +35,7 @@ add_mlir_dialect_library(MLIRMemRefTransforms MLIRInferTypeOpInterface MLIRLoopLikeInterface MLIRMemRefDialect + MLIRMemRefUtils MLIRNVGPUDialect MLIRPass MLIRTensorDialect diff --git a/mlir/lib/Dialect/SparseTensor/Transforms/CMakeLists.txt b/mlir/lib/Dialect/SparseTensor/Transforms/CMakeLists.txt index e4acfa8889e5f86..43e5c3251c5258c 100644 --- a/mlir/lib/Dialect/SparseTensor/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/SparseTensor/Transforms/CMakeLists.txt @@ -40,6 +40,7 @@ add_mlir_dialect_library(MLIRSparseTensorTransforms MLIRLLVMDialect MLIRLinalgDialect MLIRLinalgTransforms + MLIRLLVMCommonConversion MLIRMemRefDialect MLIRPass MLIRSCFDialect diff --git a/mlir/lib/Dialect/Tensor/IR/CMakeLists.txt b/mlir/lib/Dialect/Tensor/IR/CMakeLists.txt index 549b9f10388bd47..cfdd3847761a49a 100644 --- a/mlir/lib/Dialect/Tensor/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/Tensor/IR/CMakeLists.txt @@ -17,9 +17,6 @@ add_mlir_dialect_library(MLIRTensorDialect DEPENDS MLIRTensorOpsIncGen - LINK_COMPONENTS - Core - LINK_LIBS PUBLIC MLIRAffineDialect MLIRArithDialect