This is an archive of the discontinued LLVM Phabricator instance.

Differential D79389

[MLIR] Normalize usage of intrinsics_gen
ClosedPublic

Authored by stephenneuendorffer on May 4 2020, 8:02 PM.

Details

Reviewers
nicolasvasilache
herhut
aartbik
ftynse
rriddle
Commits
rG146192ade440: [MLIR] Normalize usage of intrinsics_gen
Summary

Portions of MLIR which depend on LLVMIR generally need to depend on
intrinsics_gen, to ensure that tablegen'd header files from LLVM are built
first. Without this, we get errors, typically about llvm/IR/Attributes.inc
not being found.

Note that previously the Linalg Dialect depended on intrinsics_gen, but it
doesn't need to, since it doesn't use LLVMIR.

Diff Detail

Event Timeline

stephenneuendorffer created this revision.May 4 2020, 8:02 PM
Herald added a reviewer: nicolasvasilache. · View Herald TranscriptMay 4 2020, 8:02 PM
Herald added a reviewer: herhut. · View Herald Transcript
Herald added a reviewer: aartbik. · View Herald Transcript
Herald added a reviewer: ftynse. · View Herald Transcript
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, Kayjukh, frgossen and 14 others. · View Herald Transcript
stephenneuendorffer added a reviewer: rriddle.May 4 2020, 8:06 PM
rriddle accepted this revision.May 4 2020, 8:31 PM
This revision is now accepted and ready to land.May 4 2020, 8:31 PM
stephenneuendorffer added a comment.May 4 2020, 8:49 PM

Thanks for the quick review, River!

Closed by commit rG146192ade440: [MLIR] Normalize usage of intrinsics_gen (authored by stephenneuendorffer). · Explain WhyMay 4 2020, 8:59 PM
This revision was automatically updated to reflect the committed changes.
Harbormaster completed remote builds in B55731: Diff 261994.May 4 2020, 9:32 PM

Revision Contents

PathSize
mlir/
lib/
Conversion/
GPUToCUDA/
1 line
LinalgToLLVM/
3 lines
StandardToLLVM/
3 lines
VectorToLLVM/
3 lines
Dialect/
LLVMIR/
4 lines
Linalg/
Analysis/
3 lines
EDSC/
3 lines
IR/
1 line
Transforms/
1 line
Utils/
2 lines
ExecutionEngine/
3 lines
Support/
3 lines

Diff 262000

mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt

Show All 14 Lines list(APPEND SOURCES "ConvertKernelFuncToCubin.cpp")
) )
endif() endif()
add_mlir_conversion_library(MLIRGPUtoCUDATransforms add_mlir_conversion_library(MLIRGPUtoCUDATransforms
${SOURCES} ${SOURCES}
DEPENDS DEPENDS
MLIRConversionPassIncGen MLIRConversionPassIncGen
intrinsics_gen
) )
target_link_libraries(MLIRGPUtoCUDATransforms target_link_libraries(MLIRGPUtoCUDATransforms
PUBLIC PUBLIC
${NVPTX_LIBS} ${NVPTX_LIBS}
LLVMCore LLVMCore
LLVMMC LLVMMC
LLVMSupport LLVMSupport
MLIRGPU MLIRGPU
MLIRIR MLIRIR
MLIRLLVMIR MLIRLLVMIR
MLIRNVVMIR MLIRNVVMIR
MLIRPass MLIRPass
MLIRSupport MLIRSupport
MLIRTargetNVVMIR MLIRTargetNVVMIR
) )

mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt

add_mlir_conversion_library(MLIRLinalgToLLVM add_mlir_conversion_library(MLIRLinalgToLLVM
LinalgToLLVM.cpp LinalgToLLVM.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LinalgToLLVM ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LinalgToLLVM
DEPENDS DEPENDS
MLIRConversionPassIncGen MLIRConversionPassIncGen
intrinsics_gen
) )
target_link_libraries(MLIRLinalgToLLVM target_link_libraries(MLIRLinalgToLLVM
PUBLIC PUBLIC
MLIRAffineToStandard MLIRAffineToStandard
MLIREDSC MLIREDSC
MLIRIR MLIRIR
MLIRLinalgOps MLIRLinalgOps
MLIRLLVMIR MLIRLLVMIR
MLIRLoopToStandard MLIRLoopToStandard
MLIRStandardToLLVM MLIRStandardToLLVM
MLIRVectorToLLVM MLIRVectorToLLVM
MLIRVectorToLoops MLIRVectorToLoops
MLIRTransforms MLIRTransforms
LLVMCore LLVMCore
LLVMSupport LLVMSupport
) )

mlir/lib/Conversion/StandardToLLVM/CMakeLists.txt

add_mlir_conversion_library(MLIRStandardToLLVM add_mlir_conversion_library(MLIRStandardToLLVM
StandardToLLVM.cpp StandardToLLVM.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/StandardToLLVM ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/StandardToLLVM
DEPENDS DEPENDS
MLIRConversionPassIncGen MLIRConversionPassIncGen
intrinsics_gen
) )
target_link_libraries( target_link_libraries(
MLIRStandardToLLVM MLIRStandardToLLVM
PUBLIC PUBLIC
MLIRLLVMIR MLIRLLVMIR
MLIRTransforms MLIRTransforms
LLVMCore LLVMCore
LLVMSupport LLVMSupport
) )

mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt

add_mlir_conversion_library(MLIRVectorToLLVM add_mlir_conversion_library(MLIRVectorToLLVM
ConvertVectorToLLVM.cpp ConvertVectorToLLVM.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/VectorToLLVM ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/VectorToLLVM
DEPENDS DEPENDS
MLIRConversionPassIncGen MLIRConversionPassIncGen
intrinsics_gen
) )
target_link_libraries(MLIRVectorToLLVM target_link_libraries(MLIRVectorToLLVM
PUBLIC PUBLIC
MLIRLLVMIR MLIRLLVMIR
MLIRStandardToLLVM MLIRStandardToLLVM
MLIRVector MLIRVector
MLIRTransforms MLIRTransforms
LLVMCore LLVMCore
LLVMSupport LLVMSupport
) )

mlir/lib/Dialect/LLVMIR/CMakeLists.txt

add_subdirectory(Transforms) add_subdirectory(Transforms)
add_mlir_dialect_library(MLIRLLVMIR add_mlir_dialect_library(MLIRLLVMIR
IR/LLVMDialect.cpp IR/LLVMDialect.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
DEPENDS DEPENDS
MLIRLLVMOpsIncGen MLIRLLVMOpsIncGen
MLIRLLVMConversionsIncGen MLIRLLVMConversionsIncGen
intrinsics_gen
) )
target_link_libraries(MLIRLLVMIR target_link_libraries(MLIRLLVMIR
PUBLIC PUBLIC
LLVMAsmParser LLVMAsmParser
LLVMBitReader LLVMBitReader
LLVMBitWriter LLVMBitWriter
LLVMCore LLVMCore
LLVMSupport LLVMSupport
Show All 10 Linesadd_mlir_dialect_library(MLIRLLVMAVX512
IR/LLVMAVX512Dialect.cpp IR/LLVMAVX512Dialect.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
DEPENDS DEPENDS
MLIRLLVMAVX512IncGen MLIRLLVMAVX512IncGen
MLIRLLVMAVX512ConversionsIncGen MLIRLLVMAVX512ConversionsIncGen
intrinsics_gen
) )
target_link_libraries(MLIRLLVMAVX512 target_link_libraries(MLIRLLVMAVX512
PUBLIC PUBLIC
LLVMAsmParser LLVMAsmParser
MLIRIR MLIRIR
MLIRLLVMIR MLIRLLVMIR
MLIRSideEffects MLIRSideEffects
LLVMSupport LLVMSupport
LLVMCore LLVMCore
) )
add_mlir_dialect_library(MLIRNVVMIR add_mlir_dialect_library(MLIRNVVMIR
IR/NVVMDialect.cpp IR/NVVMDialect.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
DEPENDS DEPENDS
MLIRNVVMOpsIncGen MLIRNVVMOpsIncGen
MLIRNVVMConversionsIncGen MLIRNVVMConversionsIncGen
intrinsics_gen
) )
target_link_libraries(MLIRNVVMIR target_link_libraries(MLIRNVVMIR
PUBLIC PUBLIC
LLVMAsmParser LLVMAsmParser
MLIRIR MLIRIR
MLIRLLVMIR MLIRLLVMIR
MLIRSideEffects MLIRSideEffects
LLVMSupport LLVMSupport
LLVMCore LLVMCore
) )
add_mlir_dialect_library(MLIRROCDLIR add_mlir_dialect_library(MLIRROCDLIR
IR/ROCDLDialect.cpp IR/ROCDLDialect.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
DEPENDS DEPENDS
MLIRROCDLOpsIncGen MLIRROCDLOpsIncGen
MLIRROCDLConversionsIncGen MLIRROCDLConversionsIncGen
intrinsics_gen
) )
target_link_libraries(MLIRROCDLIR target_link_libraries(MLIRROCDLIR
PUBLIC PUBLIC
LLVMAsmParser LLVMAsmParser
LLVMCore LLVMCore
LLVMSupport LLVMSupport
MLIRIR MLIRIR
MLIRSideEffects MLIRSideEffects
MLIRVectorToLLVM MLIRVectorToLLVM
) )

mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt

add_mlir_dialect_library(MLIRLinalgAnalysis add_mlir_dialect_library(MLIRLinalgAnalysis
DependenceAnalysis.cpp DependenceAnalysis.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
DEPENDS
intrinsics_gen
) )
target_link_libraries(MLIRLinalgAnalysis target_link_libraries(MLIRLinalgAnalysis
PUBLIC PUBLIC
MLIRIR MLIRIR
MLIRLinalgOps MLIRLinalgOps
MLIRStandardOps MLIRStandardOps
LLVMSupport LLVMSupport
) )

mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt

add_mlir_dialect_library(MLIRLinalgEDSC add_mlir_dialect_library(MLIRLinalgEDSC
Builders.cpp Builders.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
DEPENDS
intrinsics_gen
) )
target_link_libraries(MLIRLinalgEDSC target_link_libraries(MLIRLinalgEDSC
PUBLIC PUBLIC
MLIREDSC MLIREDSC
MLIRIR MLIRIR
MLIRAffineOps MLIRAffineOps
MLIRAffineEDSC MLIRAffineEDSC
MLIRLinalgOps MLIRLinalgOps
MLIRLoopOps MLIRLoopOps
MLIRStandardOps MLIRStandardOps
LLVMSupport LLVMSupport
) )

mlir/lib/Dialect/Linalg/IR/CMakeLists.txt

add_mlir_dialect_library(MLIRLinalgOps add_mlir_dialect_library(MLIRLinalgOps
LinalgOps.cpp LinalgOps.cpp
LinalgTypes.cpp LinalgTypes.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
DEPENDS DEPENDS
intrinsics_gen
MLIRLinalgOpsIncGen MLIRLinalgOpsIncGen
MLIRLinalgStructuredOpsIncGen MLIRLinalgStructuredOpsIncGen
MLIRLinalgStructuredOpsInterfaceIncGen MLIRLinalgStructuredOpsInterfaceIncGen
) )
target_link_libraries(MLIRLinalgOps target_link_libraries(MLIRLinalgOps
PUBLIC PUBLIC
MLIRIR MLIRIR
MLIRSideEffects MLIRSideEffects
MLIRViewLikeInterface MLIRViewLikeInterface
MLIRStandardOps MLIRStandardOps
) )

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

add_mlir_dialect_library(MLIRLinalgTransforms add_mlir_dialect_library(MLIRLinalgTransforms
Fusion.cpp Fusion.cpp
Interchange.cpp Interchange.cpp
Loops.cpp Loops.cpp
Promotion.cpp Promotion.cpp
Tiling.cpp Tiling.cpp
Transforms.cpp Transforms.cpp
Vectorization.cpp Vectorization.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
DEPENDS DEPENDS
intrinsics_gen
MLIRLinalgPassIncGen MLIRLinalgPassIncGen
) )
target_link_libraries(MLIRLinalgTransforms target_link_libraries(MLIRLinalgTransforms
PUBLIC PUBLIC
MLIRAffineOps MLIRAffineOps
MLIRAnalysis MLIRAnalysis
MLIREDSC MLIREDSC
MLIRIR MLIRIR
Show All 11 Lines

mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt

add_mlir_dialect_library(MLIRLinalgUtils add_mlir_dialect_library(MLIRLinalgUtils
Utils.cpp Utils.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
DEPENDS
intrinsics_gen
) )
target_link_libraries(MLIRLinalgUtils target_link_libraries(MLIRLinalgUtils
PUBLIC PUBLIC
MLIRAffineOps MLIRAffineOps
MLIREDSC MLIREDSC
MLIRIR MLIRIR
MLIRLinalgOps MLIRLinalgOps
MLIRLoopOps MLIRLoopOps
MLIRPass MLIRPass
MLIRStandardOps MLIRStandardOps
MLIRTransformUtils MLIRTransformUtils
) )

mlir/lib/ExecutionEngine/CMakeLists.txt

set(LLVM_OPTIONAL_SOURCES set(LLVM_OPTIONAL_SOURCES
CRunnerUtils.cpp CRunnerUtils.cpp
ExecutionEngine.cpp ExecutionEngine.cpp
RunnerUtils.cpp RunnerUtils.cpp
OptUtils.cpp OptUtils.cpp
) )
llvm_map_components_to_libnames(outlibs "nativecodegen" "IPO") llvm_map_components_to_libnames(outlibs "nativecodegen" "IPO")
add_mlir_library(MLIRExecutionEngine add_mlir_library(MLIRExecutionEngine
ExecutionEngine.cpp ExecutionEngine.cpp
OptUtils.cpp OptUtils.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/ExecutionEngine ${MLIR_MAIN_INCLUDE_DIR}/mlir/ExecutionEngine
DEPENDS
intrinsics_gen
) )
target_link_libraries(MLIRExecutionEngine target_link_libraries(MLIRExecutionEngine
PUBLIC PUBLIC
MLIRLLVMIR MLIRLLVMIR
MLIRTargetLLVMIR MLIRTargetLLVMIR
LLVMExecutionEngine LLVMExecutionEngine
LLVMObject LLVMObject
LLVMOrcJIT LLVMOrcJIT
Show All 25 Lines

mlir/lib/Support/CMakeLists.txt

Show All 29 Linestarget_link_libraries(MLIROptLib
MLIRPass MLIRPass
MLIRParser MLIRParser
LLVMSupport LLVMSupport
MLIRSupport MLIRSupport
) )
add_llvm_library(MLIRJitRunner add_llvm_library(MLIRJitRunner
JitRunner.cpp JitRunner.cpp
DEPENDS
intrinsics_gen
) )
target_link_libraries(MLIRJitRunner target_link_libraries(MLIRJitRunner
PUBLIC PUBLIC
MLIRExecutionEngine MLIRExecutionEngine
MLIRIR MLIRIR
MLIRParser MLIRParser
MLIRStandardOps MLIRStandardOps
MLIRTargetLLVMIR MLIRTargetLLVMIR
MLIRTransforms MLIRTransforms
MLIRStandardToLLVM MLIRStandardToLLVM
MLIRSupport MLIRSupport
LLVMCore LLVMCore
LLVMSupport LLVMSupport
) )