[Mlir-commits] [mlir] c4c8fbd - [MLIR] Remove redundant library dependencies
Stephen Neuendorffer
llvmlistbot at llvm.org
Sat Feb 29 10:53:45 PST 2020
Author: Stephen Neuendorffer
Date: 2020-02-29T10:47:27-08:00
New Revision: c4c8fbde649af8359cbfcbb5cef90fbe195c16fc
URL: https://github.com/llvm/llvm-project/commit/c4c8fbde649af8359cbfcbb5cef90fbe195c16fc
DIFF: https://github.com/llvm/llvm-project/commit/c4c8fbde649af8359cbfcbb5cef90fbe195c16fc.diff
LOG: [MLIR] Remove redundant library dependencies
In cmake, it is redundant to have a target list under target_link_libraries()
and add_dependency(). This patch removes the redundant dependency from
add_dependency().
Differential Revision: https://reviews.llvm.org/D74929
Added:
Modified:
mlir/lib/Analysis/CMakeLists.txt
mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
mlir/lib/Conversion/LoopToStandard/CMakeLists.txt
mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt
mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt
mlir/lib/Dialect/AffineOps/CMakeLists.txt
mlir/lib/Dialect/FxpMathOps/CMakeLists.txt
mlir/lib/Dialect/GPU/CMakeLists.txt
mlir/lib/Dialect/LLVMIR/CMakeLists.txt
mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt
mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt
mlir/lib/Dialect/Linalg/IR/CMakeLists.txt
mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt
mlir/lib/Dialect/LoopOps/CMakeLists.txt
mlir/lib/Dialect/QuantOps/CMakeLists.txt
mlir/lib/Dialect/SDBM/CMakeLists.txt
mlir/lib/Dialect/StandardOps/CMakeLists.txt
mlir/lib/EDSC/CMakeLists.txt
mlir/lib/IR/CMakeLists.txt
mlir/lib/Parser/CMakeLists.txt
mlir/lib/Pass/CMakeLists.txt
mlir/lib/Quantizer/CMakeLists.txt
mlir/test/lib/IR/CMakeLists.txt
Removed:
################################################################################
diff --git a/mlir/lib/Analysis/CMakeLists.txt b/mlir/lib/Analysis/CMakeLists.txt
index 23dcd0521e06..8c049882d711 100644
--- a/mlir/lib/Analysis/CMakeLists.txt
+++ b/mlir/lib/Analysis/CMakeLists.txt
@@ -31,10 +31,8 @@ add_llvm_library(MLIRAnalysis
LLVMSupport
)
add_dependencies(MLIRAnalysis
- MLIRAffineOps
MLIRCallOpInterfacesIncGen
MLIRTypeInferOpInterfaceIncGen
- MLIRLoopOps
)
add_llvm_library(MLIRLoopAnalysis
@@ -56,8 +54,6 @@ add_llvm_library(MLIRLoopAnalysis
LLVMSupport
)
add_dependencies(MLIRLoopAnalysis
- MLIRAffineOps
MLIRCallOpInterfacesIncGen
MLIRTypeInferOpInterfaceIncGen
- MLIRLoopOps
)
diff --git a/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt b/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
index 73ea74df5af3..8f4e00ef5fcc 100644
--- a/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
+++ b/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
@@ -14,12 +14,3 @@ add_mlir_conversion_library(MLIRAffineToStandard
LLVMCore
LLVMSupport
)
-add_dependencies(
- MLIRAffineToStandard
-
- MLIRAffineOps
- MLIRStandardOps
- MLIRIR
- LLVMCore
- LLVMSupport
-)
diff --git a/mlir/lib/Conversion/LoopToStandard/CMakeLists.txt b/mlir/lib/Conversion/LoopToStandard/CMakeLists.txt
index db17dd82ad9b..b027485fd604 100644
--- a/mlir/lib/Conversion/LoopToStandard/CMakeLists.txt
+++ b/mlir/lib/Conversion/LoopToStandard/CMakeLists.txt
@@ -13,11 +13,3 @@ add_mlir_conversion_library(MLIRLoopToStandard
LLVMCore
LLVMSupport
)
-add_dependencies(
- MLIRLoopToStandard
-
- MLIRLoopOps
- MLIRTransforms
- LLVMCore
- LLVMSupport
-)
diff --git a/mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt b/mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt
index 739c5b89b14b..a23fc130714f 100644
--- a/mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt
+++ b/mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt
@@ -1,4 +1,11 @@
-set(LIBS
+add_mlir_conversion_library(MLIRLoopsToGPU
+ LoopsToGPU.cpp
+ LoopsToGPUPass.cpp
+
+ ADDITIONAL_HEADER_DIRS
+ ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LoopsToGPU
+
+ LINK_LIBS
MLIRAffineOps
MLIRAffineToStandard
MLIRGPU
@@ -11,16 +18,4 @@ set(LIBS
MLIRTransforms
MLIRTransformUtils
LLVMSupport
-)
-
-add_mlir_conversion_library(MLIRLoopsToGPU
- LoopsToGPU.cpp
- LoopsToGPUPass.cpp
-
- ADDITIONAL_HEADER_DIRS
- ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LoopsToGPU
-
- LINK_LIBS
- ${LIBS}
)
-add_dependencies(MLIRLoopsToGPU ${LIBS})
diff --git a/mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt b/mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt
index 36f9d601ec80..904ad37693ce 100644
--- a/mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt
@@ -13,11 +13,3 @@ add_mlir_conversion_library(MLIRStandardToLLVM
LLVMCore
LLVMSupport
)
-add_dependencies(
- MLIRStandardToLLVM
-
- MLIRLLVMIR
- MLIRTransforms
- LLVMCore
- LLVMSupport
-)
diff --git a/mlir/lib/Dialect/AffineOps/CMakeLists.txt b/mlir/lib/Dialect/AffineOps/CMakeLists.txt
index 749e7e283f3c..51017de16c1c 100644
--- a/mlir/lib/Dialect/AffineOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/AffineOps/CMakeLists.txt
@@ -13,10 +13,6 @@ add_mlir_dialect_library(MLIRAffineOps
LLVMSupport
)
add_dependencies(MLIRAffineOps
-
MLIRAffineOpsIncGen
- MLIREDSC
- MLIRIR
MLIRLoopLikeInterfaceIncGen
- MLIRStandardOps
)
diff --git a/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt b/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt
index e631fc67b534..057290149a1b 100644
--- a/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt
@@ -16,9 +16,5 @@ add_mlir_dialect_library(MLIRFxpMathOps
LLVMSupport
)
add_dependencies(MLIRFxpMathOps
- MLIRFxpMathOpsIncGen
- MLIRQuantOps
- MLIRIR
- MLIRPass
- MLIRSupport
- MLIRStandardOps)
+ MLIRFxpMathOpsIncGen
+ )
diff --git a/mlir/lib/Dialect/GPU/CMakeLists.txt b/mlir/lib/Dialect/GPU/CMakeLists.txt
index 595f8b737ac9..018291a7b7ae 100644
--- a/mlir/lib/Dialect/GPU/CMakeLists.txt
+++ b/mlir/lib/Dialect/GPU/CMakeLists.txt
@@ -21,10 +21,4 @@ add_mlir_dialect_library(MLIRGPU
)
add_dependencies(MLIRGPU
MLIRGPUOpsIncGen
- MLIREDSC
- MLIRIR
- MLIRLLVMIR
- MLIRLoopOps
- MLIRSupport
- MLIRTransformUtils
- LLVMSupport)
+ )
diff --git a/mlir/lib/Dialect/LLVMIR/CMakeLists.txt b/mlir/lib/Dialect/LLVMIR/CMakeLists.txt
index eb32510c722a..71465c164eae 100644
--- a/mlir/lib/Dialect/LLVMIR/CMakeLists.txt
+++ b/mlir/lib/Dialect/LLVMIR/CMakeLists.txt
@@ -11,7 +11,10 @@ add_mlir_dialect_library(MLIRLLVMIR
MLIRIR
MLIRSupport
)
-add_dependencies(MLIRLLVMIR MLIRLLVMOpsIncGen MLIRLLVMConversionsIncGen LLVMAsmParser LLVMCore LLVMSupport)
+add_dependencies(MLIRLLVMIR
+ MLIRLLVMOpsIncGen
+ MLIRLLVMConversionsIncGen
+ )
add_mlir_dialect_library(MLIRNVVMIR
IR/NVVMDialect.cpp
@@ -26,7 +29,11 @@ add_mlir_dialect_library(MLIRNVVMIR
LLVMSupport
LLVMCore
)
-add_dependencies(MLIRNVVMIR MLIRNVVMOpsIncGen MLIRNVVMConversionsIncGen LLVMAsmParser LLVMCore LLVMSupport)
+add_dependencies(MLIRNVVMIR
+ MLIRNVVMOpsIncGen
+ MLIRNVVMConversionsIncGen
+ )
+
add_mlir_dialect_library(MLIRROCDLIR
@@ -41,4 +48,7 @@ add_mlir_dialect_library(MLIRROCDLIR
LLVMSupport
MLIRIR
)
-add_dependencies(MLIRROCDLIR MLIRROCDLOpsIncGen MLIRROCDLConversionsIncGen LLVMAsmParser LLVMCore LLVMSupport)
+add_dependencies(MLIRROCDLIR
+ MLIRROCDLOpsIncGen
+ MLIRROCDLConversionsIncGen
+ )
diff --git a/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt
index 629e071e7b57..53a9c79fd1bc 100644
--- a/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt
@@ -1,21 +1,15 @@
-set(LIBS
- MLIRIR
- MLIRLinalgOps
- MLIRStandardOps
- LLVMSupport
- )
-
-
add_mlir_dialect_library(MLIRLinalgAnalysis
DependenceAnalysis.cpp
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
+
DEPENDS
intrinsics_gen
LINK_LIBS
- ${LIBS}
+ MLIRIR
+ MLIRLinalgOps
+ MLIRStandardOps
+ LLVMSupport
)
-
-add_dependencies(MLIRLinalgAnalysis ${LIBS})
diff --git a/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt b/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt
index 6c0cc3cfe617..e6b347971eed 100644
--- a/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt
@@ -1,24 +1,18 @@
-set(LIBS
-
- MLIREDSC
- MLIRIR
- MLIRAffineOps
- MLIRLinalgOps
- MLIRLoopOps
- MLIRStandardOps
- LLVMSupport
- )
-
add_mlir_dialect_library(MLIRLinalgEDSC
Builders.cpp
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
+
DEPENDS
intrinsics_gen
LINK_LIBS
- ${LIBS}
+ MLIREDSC
+ MLIRIR
+ MLIRAffineOps
+ MLIRLinalgOps
+ MLIRLoopOps
+ MLIRStandardOps
+ LLVMSupport
)
-
-add_dependencies(MLIRLinalgEDSC ${LIBS})
diff --git a/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt b/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt
index 3988daa66b8c..70daa7c52ab5 100644
--- a/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt
@@ -1,16 +1,10 @@
-set(LIBS
- MLIRIR
- MLIRStandardOps
- MLIRSupport
- LLVMSupport
- )
-
add_mlir_dialect_library(MLIRLinalgOps
LinalgOps.cpp
LinalgTypes.cpp
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
+
DEPENDS
intrinsics_gen
@@ -20,10 +14,7 @@ add_mlir_dialect_library(MLIRLinalgOps
MLIRSupport
LLVMSupport
)
-
add_dependencies(MLIRLinalgOps
-
- ${LIBS}
MLIRLinalgOpsIncGen
MLIRLinalgStructuredOpsIncGen
MLIRLinalgStructuredOpsInterfaceIncGen
diff --git a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
index 5c1df0451c10..7287324faa6b 100644
--- a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
@@ -1,5 +1,16 @@
-set(LIBS
+add_mlir_dialect_library(MLIRLinalgTransforms
+ Fusion.cpp
+ LinalgTransforms.cpp
+ LinalgToLoops.cpp
+ Promotion.cpp
+ Tiling.cpp
+ ADDITIONAL_HEADER_DIRS
+ ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
+ DEPENDS
+ intrinsics_gen
+
+ LINK_LIBS
MLIRAffineOps
MLIRAnalysis
MLIREDSC
@@ -16,25 +27,6 @@ set(LIBS
MLIRVectorOps
LLVMSupport
)
-
-add_mlir_dialect_library(MLIRLinalgTransforms
- Fusion.cpp
- LinalgTransforms.cpp
- LinalgToLoops.cpp
- Promotion.cpp
- Tiling.cpp
-
- ADDITIONAL_HEADER_DIRS
- ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
- DEPENDS
- intrinsics_gen
-
- LINK_LIBS
- ${LIBS}
- )
-
add_dependencies(MLIRLinalgTransforms
-
- ${LIBS}
MLIRLinalgTransformPatternsIncGen
)
diff --git a/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt
index 2bf36d0a3236..754688ff2688 100644
--- a/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt
@@ -1,4 +1,13 @@
-set(LIBS
+add_mlir_dialect_library(MLIRLinalgUtils
+ Utils.cpp
+
+ ADDITIONAL_HEADER_DIRS
+ ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
+
+ DEPENDS
+ intrinsics_gen
+
+ LINK_LIBS
MLIRAffineOps
MLIREDSC
MLIRIR
@@ -9,17 +18,3 @@ set(LIBS
MLIRTransformUtils
LLVMSupport
)
-
-add_mlir_dialect_library(MLIRLinalgUtils
-
- Utils.cpp
-
- ADDITIONAL_HEADER_DIRS
- ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
- DEPENDS
- intrinsics_gen
-
- LINK_LIBS
- ${LIBS})
-
-add_dependencies(MLIRLinalgUtils ${LIBS})
diff --git a/mlir/lib/Dialect/LoopOps/CMakeLists.txt b/mlir/lib/Dialect/LoopOps/CMakeLists.txt
index e228654ced25..635bbdeb58a6 100644
--- a/mlir/lib/Dialect/LoopOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/LoopOps/CMakeLists.txt
@@ -13,12 +13,8 @@ add_mlir_dialect_library(MLIRLoopOps
LLVMSupport
)
add_dependencies(MLIRLoopOps
-
- MLIREDSC
MLIRLoopLikeInterfaceIncGen
MLIRLoopOpsIncGen
- MLIRStandardOps
- LLVMSupport
)
add_subdirectory(Transforms)
diff --git a/mlir/lib/Dialect/QuantOps/CMakeLists.txt b/mlir/lib/Dialect/QuantOps/CMakeLists.txt
index 14acb913ec85..c9d104114465 100644
--- a/mlir/lib/Dialect/QuantOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/QuantOps/CMakeLists.txt
@@ -21,8 +21,5 @@ add_mlir_dialect_library(MLIRQuantOps
LLVMSupport
)
add_dependencies(MLIRQuantOps
- MLIRIR
- MLIRPass
- MLIRQuantOpsIncGen
- MLIRSupport
- MLIRStandardOps)
+ MLIRQuantOpsIncGen
+ )
diff --git a/mlir/lib/Dialect/SDBM/CMakeLists.txt b/mlir/lib/Dialect/SDBM/CMakeLists.txt
index b75e257daf77..2c753d677f10 100644
--- a/mlir/lib/Dialect/SDBM/CMakeLists.txt
+++ b/mlir/lib/Dialect/SDBM/CMakeLists.txt
@@ -10,4 +10,3 @@ add_mlir_dialect_library(MLIRSDBM
MLIRSupport
LLVMSupport
)
-add_dependencies(MLIRSDBM MLIRIR)
diff --git a/mlir/lib/Dialect/StandardOps/CMakeLists.txt b/mlir/lib/Dialect/StandardOps/CMakeLists.txt
index e802e0c0fb03..acf47df6eb8d 100644
--- a/mlir/lib/Dialect/StandardOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/StandardOps/CMakeLists.txt
@@ -14,10 +14,6 @@ add_mlir_dialect_library(MLIRStandardOps
LLVMSupport
)
add_dependencies(MLIRStandardOps
-
MLIRCallOpInterfacesIncGen
- MLIREDSC
- MLIRIR
MLIRStandardOpsIncGen
- LLVMSupport
)
diff --git a/mlir/lib/EDSC/CMakeLists.txt b/mlir/lib/EDSC/CMakeLists.txt
index 3d0290a61dc1..660efc5bccee 100644
--- a/mlir/lib/EDSC/CMakeLists.txt
+++ b/mlir/lib/EDSC/CMakeLists.txt
@@ -27,4 +27,3 @@ add_llvm_library(MLIREDSCInterface
MLIRParser
LLVMSupport
)
-add_dependencies(MLIREDSCInterface MLIRIR)
diff --git a/mlir/lib/IR/CMakeLists.txt b/mlir/lib/IR/CMakeLists.txt
index 8802f6c986d2..f3788e2ca0ab 100644
--- a/mlir/lib/IR/CMakeLists.txt
+++ b/mlir/lib/IR/CMakeLists.txt
@@ -10,4 +10,7 @@ add_llvm_library(MLIRIR
LLVMSupport
${LLVM_PTHREAD_LIB}
)
-add_dependencies(MLIRIR MLIRCallOpInterfacesIncGen MLIROpAsmInterfacesIncGen MLIRSupport LLVMSupport)
+add_dependencies(MLIRIR
+ MLIRCallOpInterfacesIncGen
+ MLIROpAsmInterfacesIncGen
+ )
diff --git a/mlir/lib/Parser/CMakeLists.txt b/mlir/lib/Parser/CMakeLists.txt
index 36ede655daaa..978a6748f22e 100644
--- a/mlir/lib/Parser/CMakeLists.txt
+++ b/mlir/lib/Parser/CMakeLists.txt
@@ -11,4 +11,3 @@ add_llvm_library(MLIRParser
MLIRAnalysis
LLVMSupport
)
-add_dependencies(MLIRParser MLIRIR MLIRAnalysis)
diff --git a/mlir/lib/Pass/CMakeLists.txt b/mlir/lib/Pass/CMakeLists.txt
index 54407d98503b..9df404c36536 100644
--- a/mlir/lib/Pass/CMakeLists.txt
+++ b/mlir/lib/Pass/CMakeLists.txt
@@ -12,4 +12,3 @@ add_llvm_library(MLIRPass
LLVMIRReader
LLVMSupport
)
-add_dependencies(MLIRPass MLIRAnalysis MLIRIR LLVMSupport)
diff --git a/mlir/lib/Quantizer/CMakeLists.txt b/mlir/lib/Quantizer/CMakeLists.txt
index d87b7da0a10e..34d0effc9362 100644
--- a/mlir/lib/Quantizer/CMakeLists.txt
+++ b/mlir/lib/Quantizer/CMakeLists.txt
@@ -18,12 +18,6 @@ add_llvm_library(MLIRQuantizerSupport
LLVMSupport
)
-add_dependencies(MLIRQuantizerSupport
- MLIRIR
- MLIRQuantOps
- MLIRSupport
- MLIRStandardOps)
-
# Configurations.
add_llvm_library(MLIRQuantizerFxpMathConfig
Configurations/FxpMathConfig.cpp
@@ -41,8 +35,8 @@ add_llvm_library(MLIRQuantizerFxpMathConfig
)
add_dependencies(MLIRQuantizerFxpMathConfig
- MLIRFxpMathOpsIncGen
- MLIRQuantizerSupport)
+ MLIRFxpMathOpsIncGen
+ )
# Transforms.
add_llvm_library(MLIRQuantizerTransforms
@@ -62,7 +56,3 @@ add_llvm_library(MLIRQuantizerTransforms
MLIRTransformUtils
LLVMSupport
)
-add_dependencies(MLIRQuantizerTransforms
- MLIRQuantizerFxpMathConfig
- MLIRQuantizerSupport
- MLIRPass)
diff --git a/mlir/test/lib/IR/CMakeLists.txt b/mlir/test/lib/IR/CMakeLists.txt
index 355faccc6927..121ba4485ca5 100644
--- a/mlir/test/lib/IR/CMakeLists.txt
+++ b/mlir/test/lib/IR/CMakeLists.txt
@@ -13,6 +13,3 @@ add_llvm_library(MLIRTestIR
)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../TestDialect)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/../TestDialect)
-add_dependencies(MLIRTestIR
- MLIRTestDialect
- )
More information about the Mlir-commits
mailing list