[Mlir-commits] [mlir] 777e97c - [MLIR] Fixes for BUILD_SHARED_LIBS=on

[Stephen Neuendorffer]

Author: Stephen Neuendorffer
Date: 2020-02-29T10:47:28-08:00
New Revision: 777e97cc1a8c1fe44245bdcb4fd9386ae2b3cc9d

URL: https://github.com/llvm/llvm-project/commit/777e97cc1a8c1fe44245bdcb4fd9386ae2b3cc9d
DIFF: https://github.com/llvm/llvm-project/commit/777e97cc1a8c1fe44245bdcb4fd9386ae2b3cc9d.diff

LOG: [MLIR] Fixes for BUILD_SHARED_LIBS=on

Differential Revision: https://reviews.llvm.org/D75308

Added: 
    

Modified: 
    mlir/examples/toy/Ch5/CMakeLists.txt
    mlir/examples/toy/Ch6/CMakeLists.txt
    mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
    mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt
    mlir/lib/Dialect/CMakeLists.txt
    mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt
    mlir/lib/Dialect/VectorOps/CMakeLists.txt
    mlir/test/SDBM/CMakeLists.txt
    mlir/test/lib/TestDialect/CMakeLists.txt
    mlir/tools/mlir-cpu-runner/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/mlir/examples/toy/Ch5/CMakeLists.txt b/mlir/examples/toy/Ch5/CMakeLists.txt
index 6b9ded359f66..c5f5def5bf00 100644
--- a/mlir/examples/toy/Ch5/CMakeLists.txt
+++ b/mlir/examples/toy/Ch5/CMakeLists.txt
@@ -35,4 +35,5 @@ target_link_libraries(toyc-ch5
     MLIRIR
     MLIRParser
     MLIRPass
+    MLIRSupport
     MLIRTransforms)

diff  --git a/mlir/examples/toy/Ch6/CMakeLists.txt b/mlir/examples/toy/Ch6/CMakeLists.txt
index 767f2e31750b..bfd8f8294fbb 100644
--- a/mlir/examples/toy/Ch6/CMakeLists.txt
+++ b/mlir/examples/toy/Ch6/CMakeLists.txt
@@ -41,6 +41,7 @@ target_link_libraries(toyc-ch6
     MLIRLLVMIR
     MLIRParser
     MLIRPass
+    MLIRSupport
     MLIRTargetLLVMIR
     MLIRTransforms
     LLVMOrcJIT

diff  --git a/mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt b/mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
index 4c682b471015..44e6dda2d5a3 100644
--- a/mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt
@@ -12,13 +12,19 @@ endif()
 
 add_mlir_conversion_library(MLIRGPUtoCUDATransforms
   ${SOURCES}
+
   LINK_LIBS
   LLVMNVPTXCodeGen
   LLVMNVPTXDesc
   LLVMNVPTXInfo
+  LLVMCore
+  LLVMMC
+  LLVMSupport
   MLIRGPU
+  MLIRIR
   MLIRLLVMIR
   MLIRNVVMIR
   MLIRPass
+  MLIRSupport
   MLIRTargetNVVMIR
   )

diff  --git a/mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt b/mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt
index 69c1c4e8b06d..4ef9ab789106 100644
--- a/mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUToVulkan/CMakeLists.txt
@@ -13,4 +13,5 @@ target_link_libraries(MLIRGPUtoVulkanTransforms
   MLIRSupport
   MLIRTransforms
   MLIRTranslation
+  LLVMSupport
   )

diff  --git a/mlir/lib/Dialect/CMakeLists.txt b/mlir/lib/Dialect/CMakeLists.txt
index 180ab07c21d7..2d3ae3d71bb6 100644
--- a/mlir/lib/Dialect/CMakeLists.txt
+++ b/mlir/lib/Dialect/CMakeLists.txt
@@ -7,7 +7,7 @@ add_subdirectory(LoopOps)
 add_subdirectory(OpenMP)
 add_subdirectory(QuantOps)
 add_subdirectory(SDBM)
-add_subdirectory(Shape)
+#add_subdirectory(Shape)
 add_subdirectory(SPIRV)
 add_subdirectory(StandardOps)
 add_subdirectory(VectorOps)

diff  --git a/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt b/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt
index eb2aaf6930f2..ec2512b712ec 100644
--- a/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt
@@ -5,9 +5,13 @@ add_mlir_dialect_library(MLIRLoopOpsTransforms
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LoopOps
-  )
 
-target_link_libraries(MLIRLoopOpsTransforms
+  LINK_LIBS
+  MLIRAffineOps
+  MLIRIR
   MLIRPass
   MLIRLoopOps
+  MLIRStandardOps
+  MLIRSupport
+  LLVMSupport
   )

diff  --git a/mlir/lib/Dialect/VectorOps/CMakeLists.txt b/mlir/lib/Dialect/VectorOps/CMakeLists.txt
index 86910d0c3a6c..622ccb9e5791 100644
--- a/mlir/lib/Dialect/VectorOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/VectorOps/CMakeLists.txt
@@ -12,6 +12,7 @@ add_mlir_dialect_library(MLIRVectorOps
   MLIRVectorTransformPatternsIncGen
 
   LINK_LIBS
+  MLIREDSC
   MLIRIR
   MLIRStandardOps
   MLIRAffineOps

diff  --git a/mlir/test/SDBM/CMakeLists.txt b/mlir/test/SDBM/CMakeLists.txt
index 028a6b33536e..c7ab71e89eec 100644
--- a/mlir/test/SDBM/CMakeLists.txt
+++ b/mlir/test/SDBM/CMakeLists.txt
@@ -8,6 +8,7 @@ target_link_libraries(mlir-sdbm-api-test
   PRIVATE
   MLIRIR
   MLIRSDBM
+  MLIRSupport
   LLVMCore
   LLVMSupport
 )

diff  --git a/mlir/test/lib/TestDialect/CMakeLists.txt b/mlir/test/lib/TestDialect/CMakeLists.txt
index d79d48128661..4dc1f2443454 100644
--- a/mlir/test/lib/TestDialect/CMakeLists.txt
+++ b/mlir/test/lib/TestDialect/CMakeLists.txt
@@ -25,6 +25,7 @@ add_llvm_library(MLIRTestDialect
   MLIRIR
   MLIRLinalgTransforms
   MLIRPass
+  MLIRStandardOps
   MLIRTransforms
   MLIRTransformUtils
   LLVMSupport

diff  --git a/mlir/tools/mlir-cpu-runner/CMakeLists.txt b/mlir/tools/mlir-cpu-runner/CMakeLists.txt
index ee56acd78316..98d842a7faa1 100644
--- a/mlir/tools/mlir-cpu-runner/CMakeLists.txt
+++ b/mlir/tools/mlir-cpu-runner/CMakeLists.txt
@@ -16,4 +16,7 @@ target_link_libraries(mlir-cpu-runner PRIVATE
   MLIRSupport
   LLVMCore
   LLVMSupport
-)
+  LLVMX86CodeGen
+  LLVMX86Desc
+  LLVMX86Info
+  )