This is an archive of the discontinued LLVM Phabricator instance.

Differential D80076

[MLIR] Fix linkage for libMLIR.so
ClosedPublic

Authored by stephenneuendorffer on May 16 2020, 11:04 PM.

Details

Reviewers
rriddle
Commits
rG37ce8d6ade24: [MLIR] Fix linkage for libMLIR.so
Summary

Generally:

  1. don't use target_link_libraries() and add_mlir_library() on the same target, use LINK_LIBS PUBLIC instead.
  2. don't use LINK_LIBS to specify LLVM libraries. Use LINK_COMPONENTS instead
  3. no need to link against LLVMSupport. We pull it in by default.

Depends on D80075

Diff Detail

Event Timeline

stephenneuendorffer created this revision.May 16 2020, 11:04 PM
Herald added a reviewer: rriddle. · View Herald TranscriptMay 16 2020, 11:04 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, jurahul, Kayjukh and 14 others. · View Herald Transcript
Harbormaster completed remote builds in B56987: Diff 264476.May 16 2020, 11:57 PM
This revision was not accepted when it landed; it landed in state Needs Review.May 17 2020, 2:23 PM
Closed by commit rG37ce8d6ade24: [MLIR] Fix linkage for libMLIR.so (authored by stephenneuendorffer). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
mlir/
lib/
Conversion/
LinalgToStandard/
5 lines
Dialect/
StandardOps/
Transforms/
2 lines
ExecutionEngine/
1 line
IR/
1 line
Support/
6 lines

Diff 264514

mlir/lib/Conversion/LinalgToStandard/CMakeLists.txt

add_mlir_conversion_library(MLIRLinalgToStandard add_mlir_conversion_library(MLIRLinalgToStandard
LinalgToStandard.cpp LinalgToStandard.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LinalgToStandard ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LinalgToStandard
DEPENDS DEPENDS
MLIRConversionPassIncGen MLIRConversionPassIncGen
LINK_COMPONENTS
Core
LINK_LIBS PUBLIC LINK_LIBS PUBLIC
MLIREDSC MLIREDSC
MLIRIR MLIRIR
MLIRLinalgOps MLIRLinalgOps
MLIRPass MLIRPass
MLIRSCF MLIRSCF
MLIRTransforms MLIRTransforms
LLVMCore
LLVMSupport
) )

mlir/lib/Dialect/StandardOps/Transforms/CMakeLists.txt

add_mlir_dialect_library(MLIRStandardOpsTransforms add_mlir_dialect_library(MLIRStandardOpsTransforms
ExpandAtomic.cpp ExpandAtomic.cpp
FuncConversions.cpp FuncConversions.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/StandardOps/Transforms ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/StandardOps/Transforms
DEPENDS DEPENDS
MLIRStandardTransformsIncGen MLIRStandardTransformsIncGen
LINK_LIBS PUBLIC LINK_LIBS PUBLIC
MLIRIR MLIRIR
MLIRPass MLIRPass
MLIRStandardOps MLIRStandardOps
MLIRSupport
MLIRTransforms MLIRTransforms
LLVMSupport
) )

mlir/lib/ExecutionEngine/CMakeLists.txt

Show First 20 Lines • Show All 49 Lines • ▼ Show 20 Linesadd_mlir_library(MLIRJitRunner
DEPENDS DEPENDS
intrinsics_gen intrinsics_gen
LINK_COMPONENTS LINK_COMPONENTS
Core Core
OrcJIT OrcJIT
JITLink JITLink
Support
LINK_LIBS PUBLIC LINK_LIBS PUBLIC
MLIRExecutionEngine MLIRExecutionEngine
MLIRIR MLIRIR
MLIRParser MLIRParser
MLIRStandardOps MLIRStandardOps
MLIRTargetLLVMIR MLIRTargetLLVMIR
MLIRTransforms MLIRTransforms
Show All 30 Lines

mlir/lib/IR/CMakeLists.txt

Show All 30 Linesadd_mlir_library(MLIRIR
DEPENDS DEPENDS
MLIRCallInterfacesIncGen MLIRCallInterfacesIncGen
MLIROpAsmInterfacesIncGen MLIROpAsmInterfacesIncGen
MLIRSymbolInterfacesIncGen MLIRSymbolInterfacesIncGen
LINK_LIBS PUBLIC LINK_LIBS PUBLIC
MLIRSupport MLIRSupport
LLVMSupport
) )

mlir/lib/Support/CMakeLists.txt

set(LLVM_OPTIONAL_SOURCES set(LLVM_OPTIONAL_SOURCES
FileUtilities.cpp FileUtilities.cpp
MlirOptMain.cpp MlirOptMain.cpp
StorageUniquer.cpp StorageUniquer.cpp
ToolUtilities.cpp ToolUtilities.cpp
) )
add_mlir_library(MLIRSupport add_mlir_library(MLIRSupport
FileUtilities.cpp FileUtilities.cpp
StorageUniquer.cpp StorageUniquer.cpp
ToolUtilities.cpp ToolUtilities.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Support ${MLIR_MAIN_INCLUDE_DIR}/mlir/Support
LINK_COMPONENTS
Support
LINK_LIBS PUBLIC LINK_LIBS PUBLIC
${LLVM_PTHREAD_LIB}) ${LLVM_PTHREAD_LIB})
add_mlir_library(MLIROptLib add_mlir_library(MLIROptLib
MlirOptMain.cpp MlirOptMain.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Support ${MLIR_MAIN_INCLUDE_DIR}/mlir/Support
LINK_COMPONENTS
Support
LINK_LIBS PUBLIC LINK_LIBS PUBLIC
MLIRPass MLIRPass
MLIRParser MLIRParser
MLIRSupport MLIRSupport
) )