Revert "[MLIR] Move from using target_link_libraries to LINK_LIBS for…

… llvm libraries." This reverts commit 2f265e3.
llvm · Feb 28, 2020 · dc1056a · dc1056a
1 parent fed2acc
commit dc1056a
Show file tree

Hide file tree

Showing 59 changed files with 220 additions and 427 deletions.
diff --git a/mlir/examples/toy/Ch6/CMakeLists.txt b/mlir/examples/toy/Ch6/CMakeLists.txt
@@ -41,9 +41,4 @@ target_link_libraries(toyc-ch6
     MLIRPass
     MLIRTargetLLVMIR
     MLIRTransforms
-    LLVMOrcJIT
-    LLVMSupport
-    LLVMX86CodeGen
-    LLVMX86Desc
-    LLVMX86Info
     )
diff --git a/mlir/examples/toy/Ch7/CMakeLists.txt b/mlir/examples/toy/Ch7/CMakeLists.txt
@@ -38,12 +38,6 @@ target_link_libraries(toyc-ch7
     MLIRIR
     MLIRParser
     MLIRPass
-    MLIRSupport
     MLIRTargetLLVMIR
     MLIRTransforms
-    LLVMOrcJIT
-    LLVMSupport
-    LLVMX86CodeGen
-    LLVMX86Desc
-    LLVMX86Info
     )
diff --git a/mlir/lib/Analysis/CMakeLists.txt b/mlir/lib/Analysis/CMakeLists.txt
@@ -22,13 +22,6 @@ add_llvm_library(MLIRAnalysis
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis
-
-  LINK_LIBS
-  MLIRAffineOps
-  MLIRIR
-  MLIRLoopOps
-  MLIRSupport
-  LLVMSupport
   )
 add_dependencies(MLIRAnalysis
   MLIRAffineOps
@@ -37,6 +30,8 @@ add_dependencies(MLIRAnalysis
   MLIRLoopOps
   )
 
+target_link_libraries(MLIRAnalysis MLIRAffineOps MLIRLoopOps)
+
 add_llvm_library(MLIRLoopAnalysis
   AffineAnalysis.cpp
   AffineStructures.cpp
@@ -46,18 +41,12 @@ add_llvm_library(MLIRLoopAnalysis
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis
-
-  LINK_LIBS
-  MLIRAffineOps
-  MLIRIR
-  MLIRLoopOps
-  MLIRStandardOps
-  MLIRSupport
-  LLVMSupport
   )
 add_dependencies(MLIRLoopAnalysis
   MLIRAffineOps
   MLIRCallOpInterfacesIncGen
   MLIRTypeInferOpInterfaceIncGen
   MLIRLoopOps
   )
+
+target_link_libraries(MLIRLoopAnalysis MLIRAffineOps MLIRLoopOps)
diff --git a/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt b/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
@@ -3,22 +3,24 @@ add_mlir_conversion_library(MLIRAffineToStandard
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/AffineToStandard
+)
+add_dependencies(
+  MLIRAffineToStandard
 
-  LINK_LIBS
   MLIRAffineOps
-  MLIRLoopOps
-  MLIRPass
   MLIRStandardOps
-  MLIRTransforms
   MLIRIR
   LLVMCore
   LLVMSupport
-  )
-add_dependencies(
+)
+target_link_libraries(
   MLIRAffineToStandard
 
   MLIRAffineOps
+  MLIRLoopOps
+  MLIRPass
   MLIRStandardOps
+  MLIRTransforms
   MLIRIR
   LLVMCore
   LLVMSupport

diff --git a/mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt b/mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
@@ -10,15 +10,11 @@ if (MLIR_CUDA_CONVERSIONS_ENABLED)
  list(APPEND SOURCES "ConvertKernelFuncToCubin.cpp")
 endif()
 
-add_mlir_conversion_library(MLIRGPUtoCUDATransforms
-  ${SOURCES}
-  LINK_LIBS
-  LLVMNVPTXCodeGen
-  LLVMNVPTXDesc
-  LLVMNVPTXInfo
+add_mlir_conversion_library(MLIRGPUtoCUDATransforms ${SOURCES})
+target_link_libraries(MLIRGPUtoCUDATransforms
   MLIRGPU
   MLIRLLVMIR
   MLIRNVVMIR
   MLIRPass
   MLIRTargetNVVMIR
-  )
+)
diff --git a/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt b/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt
@@ -4,21 +4,17 @@ add_public_tablegen_target(MLIRGPUToNVVMIncGen)
 
 add_mlir_conversion_library(MLIRGPUtoNVVMTransforms
   LowerGpuOpsToNVVMOps.cpp
+  )
+
+add_dependencies(MLIRGPUtoNVVMTransforms
+  MLIRGPUToNVVMIncGen)
 
-  LINK_LIBS
-  LLVMCore
+target_link_libraries(MLIRGPUtoNVVMTransforms
   LLVMSupport
   MLIRGPU
-  MLIRIR
   MLIRLLVMIR
   MLIRNVVMIR
   MLIRPass
-  MLIRStandardOps
   MLIRStandardToLLVM
-  MLIRSupport
-  MLIRTransforms
   MLIRTransformUtils
   )
-
-add_dependencies(MLIRGPUtoNVVMTransforms
-  MLIRGPUToNVVMIncGen)
diff --git a/mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt b/mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt
@@ -1,16 +1,11 @@
 add_mlir_conversion_library(MLIRGPUtoROCDLTransforms
   LowerGpuOpsToROCDLOps.cpp
-
-  LINK_LIBS
-  LLVMCore
+  )
+target_link_libraries(MLIRGPUtoROCDLTransforms
   LLVMSupport
   MLIRGPU
-  MLIRIR
   MLIRLLVMIR
   MLIRROCDLIR
   MLIRPass
   MLIRStandardToLLVM
-  MLIRStandardOps
-  MLIRTransforms
-  MLIRTransformUtils
   )
diff --git a/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
@@ -5,19 +5,18 @@ add_public_tablegen_target(MLIRGPUToSPIRVIncGen)
 add_mlir_conversion_library(MLIRGPUtoSPIRVTransforms
   ConvertGPUToSPIRV.cpp
   ConvertGPUToSPIRVPass.cpp
+  )
+
+add_dependencies(MLIRGPUtoSPIRVTransforms
+  MLIRGPUToSPIRVIncGen)
 
-  LINK_LIBS
+target_link_libraries(MLIRGPUtoSPIRVTransforms
   MLIRGPU
   MLIRIR
-  MLIRLoopOps
   MLIRPass
   MLIRSPIRV
   MLIRStandardOps
   MLIRStandardToSPIRVTransforms
   MLIRSupport
   MLIRTransforms
-  LLVMSupport
   )
-
-add_dependencies(MLIRGPUtoSPIRVTransforms
-  MLIRGPUToSPIRVIncGen)
diff --git a/mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt b/mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt
@@ -3,19 +3,20 @@ add_mlir_conversion_library(MLIRLinalgToLLVM
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LinalgToLLVM
-
-  LINK_LIBS
+)
+set(LIBS
   MLIRAffineToStandard
   MLIREDSC
   MLIRIR
   MLIRLinalgOps
   MLIRLLVMIR
   MLIRLoopToStandard
-  MLIRPass
-  MLIRStandardOps
   MLIRStandardToLLVM
   MLIRVectorToLLVM
   MLIRTransforms
   LLVMCore
   LLVMSupport
   )
+
+add_dependencies(MLIRLinalgToLLVM ${LIBS})
+target_link_libraries(MLIRLinalgToLLVM ${LIBS})
diff --git a/mlir/lib/Conversion/LinalgToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/LinalgToSPIRV/CMakeLists.txt
@@ -5,15 +5,13 @@ add_mlir_conversion_library(MLIRLinalgToSPIRVTransforms
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/IR
+  )
 
-  LINK_LIBS
+target_link_libraries(MLIRLinalgToSPIRVTransforms
   MLIRIR
   MLIRLinalgOps
   MLIRLinalgUtils
   MLIRPass
   MLIRSPIRV
   MLIRSupport
-  MLIRTransforms
-  MLIRTransformUtils
-  LLVMSupport
   )
diff --git a/mlir/lib/Conversion/LoopToStandard/CMakeLists.txt b/mlir/lib/Conversion/LoopToStandard/CMakeLists.txt
@@ -3,17 +3,16 @@ add_mlir_conversion_library(MLIRLoopToStandard
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LoopToStandard
+)
+add_dependencies(
+  MLIRLoopToStandard
 
-  LINK_LIBS
-  MLIRIR
   MLIRLoopOps
-  MLIRPass
-  MLIRStandardOps
   MLIRTransforms
   LLVMCore
   LLVMSupport
-  )
-add_dependencies(
+)
+target_link_libraries(
   MLIRLoopToStandard
 
   MLIRLoopOps

diff --git a/mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt b/mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt
@@ -4,12 +4,10 @@ set(LIBS
   MLIRGPU
   MLIRIR
   MLIRLinalgOps
-  MLIRLoopOps
   MLIRPass
   MLIRStandardOps
   MLIRSupport
   MLIRTransforms
-  MLIRTransformUtils
   LLVMSupport
 )
 
@@ -19,8 +17,6 @@ add_mlir_conversion_library(MLIRLoopsToGPU
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LoopsToGPU
-
-  LINK_LIBS
-  ${LIBS}
-  )
+)
 add_dependencies(MLIRLoopsToGPU ${LIBS})
+target_link_libraries(MLIRLoopsToGPU ${LIBS})
diff --git a/mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt b/mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt
@@ -3,17 +3,16 @@ add_mlir_conversion_library(MLIRStandardToLLVM
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/StandardToLLVM
+)
+add_dependencies(
+  MLIRStandardToLLVM
 
-  LINK_LIBS
-  MLIRIR
   MLIRLLVMIR
-  MLIRPass
-  MLIRStandardOps
   MLIRTransforms
   LLVMCore
   LLVMSupport
-  )
-add_dependencies(
+)
+target_link_libraries(
   MLIRStandardToLLVM
 
   MLIRLLVMIR

diff --git a/mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt
@@ -10,18 +10,17 @@ add_mlir_conversion_library(MLIRStandardToSPIRVTransforms
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/IR
+  )
+
+add_dependencies(MLIRStandardToSPIRVTransforms
+  MLIRStandardToSPIRVIncGen)
 
-  LINK_LIBS
+target_link_libraries(MLIRStandardToSPIRVTransforms
   MLIRIR
   MLIRPass
   MLIRSPIRV
   MLIRSupport
-  MLIRTransforms
   MLIRTransformUtils
   MLIRSPIRV
   MLIRStandardOps
-  LLVMSupport
   )
-
-add_dependencies(MLIRStandardToSPIRVTransforms
-  MLIRStandardToSPIRVIncGen)
diff --git a/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt b/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt
@@ -3,16 +3,15 @@ add_mlir_conversion_library(MLIRVectorToLLVM
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/VectorToLLVM
-
-  LINK_LIBS
-  MLIRIR
+)
+set(LIBS
   MLIRLLVMIR
-  MLIRPass
-  MLIRStandardOps
   MLIRStandardToLLVM
   MLIRVectorOps
   MLIRTransforms
-  MLIRTransformUtils
   LLVMCore
   LLVMSupport
-)
+  )
+
+add_dependencies(MLIRVectorToLLVM ${LIBS})
+target_link_libraries(MLIRVectorToLLVM ${LIBS})
diff --git a/mlir/lib/Conversion/VectorToLoops/CMakeLists.txt b/mlir/lib/Conversion/VectorToLoops/CMakeLists.txt
@@ -3,17 +3,14 @@ add_mlir_conversion_library(MLIRVectorToLoops
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/VectorToLoops
-
-  LINK_LIBS
-  MLIRAffineOps
+)
+set(LIBS
   MLIREDSC
-  MLIRIR
   MLIRLLVMIR
-  MLIRLoopOps
-  MLIRStandardOps
   MLIRTransforms
-  MLIRTransformUtils
-  MLIRVectorOps
   LLVMCore
   LLVMSupport
   )
+
+add_dependencies(MLIRVectorToLoops ${LIBS})
+target_link_libraries(MLIRVectorToLoops ${LIBS})
diff --git a/mlir/lib/Dialect/AffineOps/CMakeLists.txt b/mlir/lib/Dialect/AffineOps/CMakeLists.txt
@@ -5,18 +5,18 @@ add_mlir_dialect_library(MLIRAffineOps
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/AffineOps
+  )
+add_dependencies(MLIRAffineOps
 
-  LINK_LIBS
+  MLIRAffineOpsIncGen
   MLIREDSC
   MLIRIR
+  MLIRLoopLikeInterfaceIncGen
   MLIRStandardOps
-  LLVMSupport
   )
-add_dependencies(MLIRAffineOps
+target_link_libraries(MLIRAffineOps
 
-  MLIRAffineOpsIncGen
   MLIREDSC
   MLIRIR
-  MLIRLoopLikeInterfaceIncGen
   MLIRStandardOps
   )