maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[MLIR] Remove redundant library dependencies" 

This reverts commit e1cb15c8f9.
This commit is contained in:
Stephen Neuendorffer 2020-02-28 14:04:58 -08:00
parent 43830790d7
commit fed2acc7f5
24 changed files with 171 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mlir/lib/Analysis/CMakeLists.txt
View File

@ -31,8 +31,10 @@ add_llvm_library(MLIRAnalysis
LLVMSupport
)
add_dependencies(MLIRAnalysis
MLIRAffineOps
MLIRCallOpInterfacesIncGen
MLIRTypeInferOpInterfaceIncGen
MLIRLoopOps
)
add_llvm_library(MLIRLoopAnalysis
@ -54,6 +56,8 @@ add_llvm_library(MLIRLoopAnalysis
LLVMSupport
)
add_dependencies(MLIRLoopAnalysis
MLIRAffineOps
MLIRCallOpInterfacesIncGen
MLIRTypeInferOpInterfaceIncGen
MLIRLoopOps
)

9
mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
View File

@ -14,3 +14,12 @@ add_mlir_conversion_library(MLIRAffineToStandard
LLVMCore
LLVMSupport
)
add_dependencies(
MLIRAffineToStandard
MLIRAffineOps
MLIRStandardOps
MLIRIR
LLVMCore
LLVMSupport
)

8
mlir/lib/Conversion/LoopToStandard/CMakeLists.txt
View File

@ -13,3 +13,11 @@ add_mlir_conversion_library(MLIRLoopToStandard
LLVMCore
LLVMSupport
)
add_dependencies(
MLIRLoopToStandard
MLIRLoopOps
MLIRTransforms
LLVMCore
LLVMSupport
)

21
mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt
View File

@ -1,11 +1,4 @@
add_mlir_conversion_library(MLIRLoopsToGPU
LoopsToGPU.cpp
LoopsToGPUPass.cpp
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LoopsToGPU
LINK_LIBS
set(LIBS
MLIRAffineOps
MLIRAffineToStandard
MLIRGPU
@ -18,4 +11,16 @@ add_mlir_conversion_library(MLIRLoopsToGPU
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})

8
mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt
View File

@ -13,3 +13,11 @@ add_mlir_conversion_library(MLIRStandardToLLVM
LLVMCore
LLVMSupport
)
add_dependencies(
MLIRStandardToLLVM
MLIRLLVMIR
MLIRTransforms
LLVMCore
LLVMSupport
)

4
mlir/lib/Dialect/AffineOps/CMakeLists.txt
View File

@ -13,6 +13,10 @@ add_mlir_dialect_library(MLIRAffineOps
LLVMSupport
)
add_dependencies(MLIRAffineOps
MLIRAffineOpsIncGen
MLIREDSC
MLIRIR
MLIRLoopLikeInterfaceIncGen
MLIRStandardOps
)

8
mlir/lib/Dialect/FxpMathOps/CMakeLists.txt
View File

@ -16,5 +16,9 @@ add_mlir_dialect_library(MLIRFxpMathOps
LLVMSupport
)
add_dependencies(MLIRFxpMathOps
MLIRFxpMathOpsIncGen
)
MLIRFxpMathOpsIncGen
MLIRQuantOps
MLIRIR
MLIRPass
MLIRSupport
MLIRStandardOps)

8
mlir/lib/Dialect/GPU/CMakeLists.txt
View File

@ -21,4 +21,10 @@ add_mlir_dialect_library(MLIRGPU
)
add_dependencies(MLIRGPU
MLIRGPUOpsIncGen
)
MLIREDSC
MLIRIR
MLIRLLVMIR
MLIRLoopOps
MLIRSupport
MLIRTransformUtils
LLVMSupport)

16
mlir/lib/Dialect/LLVMIR/CMakeLists.txt
View File

@ -11,10 +11,7 @@ add_mlir_dialect_library(MLIRLLVMIR
MLIRIR
MLIRSupport
)
add_dependencies(MLIRLLVMIR
MLIRLLVMOpsIncGen
MLIRLLVMConversionsIncGen
)
add_dependencies(MLIRLLVMIR MLIRLLVMOpsIncGen MLIRLLVMConversionsIncGen LLVMAsmParser LLVMCore LLVMSupport)
add_mlir_dialect_library(MLIRNVVMIR
IR/NVVMDialect.cpp
@ -29,11 +26,7 @@ add_mlir_dialect_library(MLIRNVVMIR
LLVMSupport
LLVMCore
)
add_dependencies(MLIRNVVMIR
MLIRNVVMOpsIncGen
MLIRNVVMConversionsIncGen
)
add_dependencies(MLIRNVVMIR MLIRNVVMOpsIncGen MLIRNVVMConversionsIncGen LLVMAsmParser LLVMCore LLVMSupport)
add_mlir_dialect_library(MLIRROCDLIR
@ -48,7 +41,4 @@ add_mlir_dialect_library(MLIRROCDLIR
LLVMSupport
MLIRIR
)
add_dependencies(MLIRROCDLIR
MLIRROCDLOpsIncGen
MLIRROCDLConversionsIncGen
)
add_dependencies(MLIRROCDLIR MLIRROCDLOpsIncGen MLIRROCDLConversionsIncGen LLVMAsmParser LLVMCore LLVMSupport)

26
mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt
View File

@ -1,15 +1,21 @@
add_mlir_dialect_library(MLIRLinalgAnalysis
DependenceAnalysis.cpp
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
DEPENDS
intrinsics_gen
LINK_LIBS
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}
)
add_dependencies(MLIRLinalgAnalysis ${LIBS})

24
mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt
View File

@ -1,13 +1,5 @@
add_mlir_dialect_library(MLIRLinalgEDSC
Builders.cpp
set(LIBS
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
DEPENDS
intrinsics_gen
LINK_LIBS
MLIREDSC
MLIRIR
MLIRAffineOps
@ -16,3 +8,17 @@ add_mlir_dialect_library(MLIRLinalgEDSC
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}
)
add_dependencies(MLIRLinalgEDSC ${LIBS})

11
mlir/lib/Dialect/Linalg/IR/CMakeLists.txt
View File

@ -1,10 +1,16 @@
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
@ -14,7 +20,10 @@ add_mlir_dialect_library(MLIRLinalgOps
MLIRSupport
LLVMSupport
)
add_dependencies(MLIRLinalgOps
${LIBS}
MLIRLinalgOpsIncGen
MLIRLinalgStructuredOpsIncGen
MLIRLinalgStructuredOpsInterfaceIncGen

32
mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
View File

@ -1,16 +1,5 @@
add_mlir_dialect_library(MLIRLinalgTransforms
Fusion.cpp
LinalgTransforms.cpp
LinalgToLoops.cpp
Promotion.cpp
Tiling.cpp
set(LIBS
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
DEPENDS
intrinsics_gen
LINK_LIBS
MLIRAffineOps
MLIRAnalysis
MLIREDSC
@ -27,6 +16,25 @@ add_mlir_dialect_library(MLIRLinalgTransforms
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
)

25
mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt
View File

@ -1,13 +1,4 @@
add_mlir_dialect_library(MLIRLinalgUtils
Utils.cpp
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
DEPENDS
intrinsics_gen
LINK_LIBS
set(LIBS
MLIRAffineOps
MLIREDSC
MLIRIR
@ -18,3 +9,17 @@ add_mlir_dialect_library(MLIRLinalgUtils
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})

4
mlir/lib/Dialect/LoopOps/CMakeLists.txt
View File

@ -13,8 +13,12 @@ add_mlir_dialect_library(MLIRLoopOps
LLVMSupport
)
add_dependencies(MLIRLoopOps
MLIREDSC
MLIRLoopLikeInterfaceIncGen
MLIRLoopOpsIncGen
MLIRStandardOps
LLVMSupport
)
add_subdirectory(Transforms)

7
mlir/lib/Dialect/QuantOps/CMakeLists.txt
View File

@ -21,5 +21,8 @@ add_mlir_dialect_library(MLIRQuantOps
LLVMSupport
)
add_dependencies(MLIRQuantOps
MLIRQuantOpsIncGen
)
MLIRIR
MLIRPass
MLIRQuantOpsIncGen
MLIRSupport
MLIRStandardOps)

1
mlir/lib/Dialect/SDBM/CMakeLists.txt
View File

@ -10,3 +10,4 @@ add_mlir_dialect_library(MLIRSDBM
MLIRSupport
LLVMSupport
)
add_dependencies(MLIRSDBM MLIRIR)

4
mlir/lib/Dialect/StandardOps/CMakeLists.txt
View File

@ -14,6 +14,10 @@ add_mlir_dialect_library(MLIRStandardOps
LLVMSupport
)
add_dependencies(MLIRStandardOps
MLIRCallOpInterfacesIncGen
MLIREDSC
MLIRIR
MLIRStandardOpsIncGen
LLVMSupport
)

1
mlir/lib/EDSC/CMakeLists.txt
View File

@ -27,3 +27,4 @@ add_llvm_library(MLIREDSCInterface
MLIRParser
LLVMSupport
)
add_dependencies(MLIREDSCInterface MLIRIR)

5
mlir/lib/IR/CMakeLists.txt
View File

@ -10,7 +10,4 @@ add_llvm_library(MLIRIR
LLVMSupport
${LLVM_PTHREAD_LIB}
)
add_dependencies(MLIRIR
MLIRCallOpInterfacesIncGen
MLIROpAsmInterfacesIncGen
)
add_dependencies(MLIRIR MLIRCallOpInterfacesIncGen MLIROpAsmInterfacesIncGen MLIRSupport LLVMSupport)

1
mlir/lib/Parser/CMakeLists.txt
View File

@ -11,3 +11,4 @@ add_llvm_library(MLIRParser
MLIRAnalysis
LLVMSupport
)
add_dependencies(MLIRParser MLIRIR MLIRAnalysis)

1
mlir/lib/Pass/CMakeLists.txt
View File

@ -12,3 +12,4 @@ add_llvm_library(MLIRPass
LLVMIRReader
LLVMSupport
)
add_dependencies(MLIRPass MLIRAnalysis MLIRIR LLVMSupport)

14
mlir/lib/Quantizer/CMakeLists.txt
View File

@ -18,6 +18,12 @@ add_llvm_library(MLIRQuantizerSupport
LLVMSupport
)
add_dependencies(MLIRQuantizerSupport
MLIRIR
MLIRQuantOps
MLIRSupport
MLIRStandardOps)
# Configurations.
add_llvm_library(MLIRQuantizerFxpMathConfig
Configurations/FxpMathConfig.cpp
@ -35,8 +41,8 @@ add_llvm_library(MLIRQuantizerFxpMathConfig
)
add_dependencies(MLIRQuantizerFxpMathConfig
MLIRFxpMathOpsIncGen
)
MLIRFxpMathOpsIncGen
MLIRQuantizerSupport)
# Transforms.
add_llvm_library(MLIRQuantizerTransforms
@ -56,3 +62,7 @@ add_llvm_library(MLIRQuantizerTransforms
MLIRTransformUtils
LLVMSupport
)
add_dependencies(MLIRQuantizerTransforms
MLIRQuantizerFxpMathConfig
MLIRQuantizerSupport
MLIRPass)

3
mlir/test/lib/IR/CMakeLists.txt
View File

@ -13,3 +13,6 @@ add_llvm_library(MLIRTestIR
)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../TestDialect)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/../TestDialect)
add_dependencies(MLIRTestIR
MLIRTestDialect
)