From 1666d13078e4799df2d8eaa101ccf02acd031427 Mon Sep 17 00:00:00 2001 From: BARRET <41060790+Adnios@users.noreply.github.com> Date: Mon, 7 Oct 2024 21:52:43 +0800 Subject: [PATCH] [CMake]: Remove unnecessary dependencies on LLVM/MLIR (#111255) Previous https://github.com/llvm/llvm-project/pull/110362 (reverted) caused breakage. Here is the PR with fix. My build cmdline: ``` cmake ../llvm \ -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=install \ -DCMAKE_C_COMPILER=gcc-9 \ -DCMAKE_CXX_COMPILER=g++-9 \ -DCMAKE_CUDA_COMPILER=$(which nvcc) \ -DLLVM_ENABLE_LLD=OFF \ -DLLVM_ENABLE_ASSERTIONS=ON \ -DLLVM_BUILD_EXAMPLES=ON \ -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \ -DLLVM_CCACHE_BUILD=ON \ -DMLIR_ENABLE_BINDINGS_PYTHON=ON \ -DBUILD_SHARED_LIBS=ON \ -DLLVM_ENABLE_PROJECTS='llvm;mlir' ``` --- llvm/lib/MC/CMakeLists.txt | 1 - mlir/lib/Conversion/ConvertToLLVM/CMakeLists.txt | 1 - mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt | 1 - mlir/lib/Dialect/Arith/Transforms/CMakeLists.txt | 2 -- mlir/lib/Dialect/Linalg/IR/CMakeLists.txt | 2 -- mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt | 7 ------- mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt | 3 --- mlir/lib/Dialect/Mesh/Transforms/CMakeLists.txt | 1 - mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt | 2 -- mlir/lib/Dialect/Tensor/Transforms/CMakeLists.txt | 2 -- mlir/lib/Dialect/Tosa/CMakeLists.txt | 1 - mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt | 2 -- mlir/lib/Target/SPIRV/CMakeLists.txt | 4 ---- mlir/lib/Target/SPIRV/Serialization/CMakeLists.txt | 2 -- mlir/lib/Transforms/CMakeLists.txt | 1 - 15 files changed, 32 deletions(-) diff --git a/llvm/lib/MC/CMakeLists.txt b/llvm/lib/MC/CMakeLists.txt index a089d2bff94f..e1d19196c876 100644 --- a/llvm/lib/MC/CMakeLists.txt +++ b/llvm/lib/MC/CMakeLists.txt @@ -79,7 +79,6 @@ add_llvm_component_library(LLVMMC Support TargetParser BinaryFormat - DebugInfoCodeView DEPENDS intrinsics_gen diff --git a/mlir/lib/Conversion/ConvertToLLVM/CMakeLists.txt b/mlir/lib/Conversion/ConvertToLLVM/CMakeLists.txt index df7e3f995303..de3d850d520c 100644 --- a/mlir/lib/Conversion/ConvertToLLVM/CMakeLists.txt +++ b/mlir/lib/Conversion/ConvertToLLVM/CMakeLists.txt @@ -20,7 +20,6 @@ add_mlir_conversion_library(MLIRConvertToLLVMPass MLIRConversionPassIncGen LINK_LIBS PUBLIC - MLIRConvertToLLVMInterface MLIRIR MLIRLLVMCommonConversion MLIRLLVMDialect diff --git a/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt b/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt index 35576732c82c..330474a718e3 100644 --- a/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt +++ b/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt @@ -35,7 +35,6 @@ add_mlir_conversion_library(MLIRVectorToLLVMPass MLIRVectorToLLVM MLIRArmNeonDialect - MLIRArmSMEDialect MLIRArmSVEDialect MLIRArmSVETransforms MLIRAMXDialect diff --git a/mlir/lib/Dialect/Arith/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Arith/Transforms/CMakeLists.txt index 6b8bde8dc2aa..93a004d31916 100644 --- a/mlir/lib/Dialect/Arith/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Arith/Transforms/CMakeLists.txt @@ -20,8 +20,6 @@ add_mlir_dialect_library(MLIRArithTransforms LINK_LIBS PUBLIC MLIRAnalysis MLIRArithDialect - MLIRBufferizationDialect - MLIRBufferizationTransforms MLIRFuncDialect MLIRFuncTransforms MLIRInferIntRangeInterface diff --git a/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt b/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt index c187563b8f0c..f1fcb22fb8d5 100644 --- a/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt @@ -25,14 +25,12 @@ add_mlir_dialect_library(MLIRLinalgDialect MLIRInferTypeOpInterface MLIRIR MLIRParser - MLIRShardingInterface MLIRSideEffectInterfaces MLIRSparseTensorDialect MLIRSCFDialect MLIRMathDialect MLIRMemRefDialect MLIRTensorDialect - MLIRTilingInterface MLIRValueBoundsOpInterface MLIRViewLikeInterface ) diff --git a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt index b3cd5537aad9..d7c63cdd8198 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt @@ -49,14 +49,11 @@ add_mlir_dialect_library(MLIRLinalgTransforms LINK_LIBS PUBLIC MLIRAffineDialect - MLIRAffineTransforms MLIRAffineUtils MLIRAnalysis MLIRArithDialect MLIRArithTransforms MLIRArithUtils - MLIRBufferizationDialect - MLIRBufferizationTransforms MLIRComplexDialect MLIRDestinationStyleOpInterface MLIRDialectUtils @@ -67,20 +64,16 @@ add_mlir_dialect_library(MLIRLinalgTransforms MLIRIR MLIRMemRefDialect MLIRMemRefTransforms - MLIRMeshDialect MLIRMeshTransforms MLIRLinalgDialect MLIRLinalgUtils MLIRSCFDialect MLIRSCFTransforms - MLIRSCFUtils MLIRPass - MLIRShardingInterface MLIRSubsetOpInterface MLIRSparseTensorDialect MLIRTensorDialect MLIRTensorTilingInterfaceImpl - MLIRTensorTransforms MLIRTransforms MLIRTransformUtils MLIRValueBoundsOpInterface diff --git a/mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt b/mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt index 4c7f42745ce8..ecab97bc2b8e 100644 --- a/mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt @@ -22,13 +22,10 @@ add_mlir_dialect_library(MLIRMemRefTransforms MLIRMemRefPassIncGen LINK_LIBS PUBLIC - MLIRAffineDialect MLIRAffineTransforms MLIRAffineUtils MLIRArithDialect MLIRArithTransforms - MLIRBufferizationDialect - MLIRBufferizationTransforms MLIRDialectUtils MLIRFuncDialect MLIRGPUDialect diff --git a/mlir/lib/Dialect/Mesh/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Mesh/Transforms/CMakeLists.txt index 212ea6d6948b..381bc9afede0 100644 --- a/mlir/lib/Dialect/Mesh/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Mesh/Transforms/CMakeLists.txt @@ -23,7 +23,6 @@ add_mlir_dialect_library(MLIRMeshTransforms MLIRIR MLIRMeshDialect MLIRPass - MLIRShardingInterface MLIRSupport MLIRTensorDialect MLIRTosaShardingInterfaceImpl diff --git a/mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt b/mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt index 8c73515c608f..5dc7c60792b9 100644 --- a/mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt @@ -40,9 +40,7 @@ add_mlir_dialect_library(MLIRSCFTransforms MLIRSCFUtils MLIRSideEffectInterfaces MLIRSupport - MLIRTensorDialect MLIRTensorTransforms - MLIRTilingInterface MLIRTransforms MLIRTransformUtils ) diff --git a/mlir/lib/Dialect/Tensor/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Tensor/Transforms/CMakeLists.txt index ce32dea09bb0..cc6275fee671 100644 --- a/mlir/lib/Dialect/Tensor/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Tensor/Transforms/CMakeLists.txt @@ -24,8 +24,6 @@ add_mlir_dialect_library(MLIRTensorTransforms MLIRAffineUtils MLIRArithDialect MLIRArithUtils - MLIRBufferizationDialect - MLIRBufferizationTransforms MLIRDialectUtils MLIRIR MLIRLinalgDialect diff --git a/mlir/lib/Dialect/Tosa/CMakeLists.txt b/mlir/lib/Dialect/Tosa/CMakeLists.txt index 1911405c63cd..e6999f6fa0d8 100644 --- a/mlir/lib/Dialect/Tosa/CMakeLists.txt +++ b/mlir/lib/Dialect/Tosa/CMakeLists.txt @@ -19,7 +19,6 @@ add_mlir_dialect_library(MLIRTosaDialect MLIRDialect MLIRCallInterfaces MLIRControlFlowInterfaces - MLIRQuantDialect MLIRQuantUtils MLIRSideEffectInterfaces MLIRTensorDialect diff --git a/mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt index 2639a67e1c8b..b7e8724c3c25 100644 --- a/mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt @@ -35,8 +35,6 @@ add_mlir_dialect_library(MLIRVectorTransforms MLIRAffineAnalysis MLIRAffineUtils MLIRArithDialect - MLIRBufferizationDialect - MLIRBufferizationTransforms MLIRDialectUtils MLIRGPUDialect MLIRIR diff --git a/mlir/lib/Target/SPIRV/CMakeLists.txt b/mlir/lib/Target/SPIRV/CMakeLists.txt index 22d6d195a249..2926320ed286 100644 --- a/mlir/lib/Target/SPIRV/CMakeLists.txt +++ b/mlir/lib/Target/SPIRV/CMakeLists.txt @@ -12,7 +12,6 @@ add_mlir_translation_library(MLIRSPIRVBinaryUtils LINK_LIBS PUBLIC MLIRIR - MLIRSPIRVDialect MLIRSupport ) @@ -21,11 +20,9 @@ add_mlir_translation_library(MLIRSPIRVTranslateRegistration LINK_LIBS PUBLIC MLIRIR - MLIRSPIRVDialect MLIRSPIRVSerialization MLIRSPIRVDeserialization MLIRSupport - MLIRTranslateLib ) add_mlir_dialect_library(MLIRSPIRVTarget @@ -34,7 +31,6 @@ add_mlir_dialect_library(MLIRSPIRVTarget LINK_LIBS PUBLIC MLIRIR MLIRGPUDialect - MLIRSPIRVDialect MLIRSPIRVSerialization MLIRSupport ) diff --git a/mlir/lib/Target/SPIRV/Serialization/CMakeLists.txt b/mlir/lib/Target/SPIRV/Serialization/CMakeLists.txt index 71580d8fcb97..e912efee0876 100644 --- a/mlir/lib/Target/SPIRV/Serialization/CMakeLists.txt +++ b/mlir/lib/Target/SPIRV/Serialization/CMakeLists.txt @@ -13,5 +13,3 @@ add_mlir_translation_library(MLIRSPIRVSerialization MLIRSupport MLIRTranslateLib ) - - diff --git a/mlir/lib/Transforms/CMakeLists.txt b/mlir/lib/Transforms/CMakeLists.txt index 90c0298fb5e4..058039e47313 100644 --- a/mlir/lib/Transforms/CMakeLists.txt +++ b/mlir/lib/Transforms/CMakeLists.txt @@ -29,7 +29,6 @@ add_mlir_library(MLIRTransforms LINK_LIBS PUBLIC MLIRAnalysis - MLIRCopyOpInterface MLIRFunctionInterfaces MLIRLoopLikeInterface MLIRMemorySlotInterfaces