This is an archive of the discontinued LLVM Phabricator instance.

Differential D78317

[MLIR] Complete refactoring of Affine dialect into sub-libraries.
ClosedPublic

Authored by stephenneuendorffer on Apr 16 2020, 11:23 AM.

Details

Reviewers
nicolasvasilache
herhut
aartbik
Commits
rGf0612957324b: [MLIR] Complete refactoring of Affine dialect into sub-libraries.
Summary

There were some unused CMakeFiles for Affine/IR and Affine/EDSC.
This change builds separate MLIRAffineOps and MLIRAffineEDSC libraries
using those CMakeFiles. This combination replaces the old MLIRAffine
library.

Diff Detail

Event Timeline

stephenneuendorffer created this revision.Apr 16 2020, 11:23 AM
Herald added a reviewer: nicolasvasilache. · View Herald TranscriptApr 16 2020, 11:23 AM
Herald added a reviewer: herhut. · View Herald Transcript
Herald added a reviewer: aartbik. · View Herald Transcript
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, frgossen, grosul1 and 15 others. · View Herald Transcript
Harbormaster failed remote builds in B53596: Diff 258108!Apr 16 2020, 11:42 AM
stephenneuendorffer updated this revision to Diff 258128.Apr 16 2020, 12:29 PM
stephenneuendorffer added a child revision: D78320: [MLIR][cmake] Remove redundant add_dependencies().
Harbormaster failed remote builds in B53610: Diff 258128!Apr 16 2020, 12:50 PM
This revision was not accepted when it landed; it landed in state Needs Review.Apr 16 2020, 1:58 PM
Closed by commit rGf0612957324b: [MLIR] Complete refactoring of Affine dialect into sub-libraries. (authored by stephenneuendorffer). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
mlir/
lib/
Analysis/
4 lines
Conversion/
AffineToStandard/
2 lines
LoopsToGPU/
2 lines
VectorToLoops/
1 line
Dialect/
Affine/
22 lines
EDSC/
7 lines
IR/
4 lines
Transforms/
2 lines
Utils/
2 lines
Linalg/
EDSC/
3 lines
Transforms/
2 lines
Utils/
2 lines
LoopOps/
Transforms/
2 lines
Vector/
2 lines
Transforms/
2 lines
Utils/
2 lines
test/
EDSC/
3 lines
lib/
Transforms/
2 lines

Diff 258108

mlir/lib/Analysis/CMakeLists.txt

Show All 18 Linesadd_mlir_library(MLIRAnalysis
Verifier.cpp Verifier.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis ${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis
) )
target_link_libraries(MLIRAnalysis target_link_libraries(MLIRAnalysis
PUBLIC PUBLIC
MLIRAffine MLIRAffineOps
MLIRCallInterfaces MLIRCallInterfaces
MLIRControlFlowInterfaces MLIRControlFlowInterfaces
MLIRInferTypeOpInterface MLIRInferTypeOpInterface
MLIRLoopOps MLIRLoopOps
) )
add_mlir_library(MLIRLoopAnalysis add_mlir_library(MLIRLoopAnalysis
AffineAnalysis.cpp AffineAnalysis.cpp
AffineStructures.cpp AffineStructures.cpp
LoopAnalysis.cpp LoopAnalysis.cpp
NestedMatcher.cpp NestedMatcher.cpp
Utils.cpp Utils.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis ${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis
) )
target_link_libraries(MLIRLoopAnalysis target_link_libraries(MLIRLoopAnalysis
PUBLIC PUBLIC
MLIRAffine MLIRAffineOps
MLIRCallInterfaces MLIRCallInterfaces
MLIRControlFlowInterfaces MLIRControlFlowInterfaces
MLIRInferTypeOpInterface MLIRInferTypeOpInterface
MLIRLoopOps) MLIRLoopOps)

mlir/lib/Conversion/AffineToStandard/CMakeLists.txt

add_mlir_conversion_library(MLIRAffineToStandard add_mlir_conversion_library(MLIRAffineToStandard
AffineToStandard.cpp AffineToStandard.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/AffineToStandard ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/AffineToStandard
DEPENDS DEPENDS
MLIRConversionPassIncGen MLIRConversionPassIncGen
) )
target_link_libraries( target_link_libraries(
MLIRAffineToStandard MLIRAffineToStandard
PUBLIC PUBLIC
MLIRAffine MLIRAffineOps
MLIRLoopOps MLIRLoopOps
MLIRPass MLIRPass
MLIRStandardOps MLIRStandardOps
MLIRTransforms MLIRTransforms
MLIRIR MLIRIR
LLVMCore LLVMCore
LLVMSupport LLVMSupport
) )

mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt

add_mlir_conversion_library(MLIRLoopsToGPU add_mlir_conversion_library(MLIRLoopsToGPU
LoopsToGPU.cpp LoopsToGPU.cpp
LoopsToGPUPass.cpp LoopsToGPUPass.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LoopsToGPU ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LoopsToGPU
DEPENDS DEPENDS
MLIRConversionPassIncGen MLIRConversionPassIncGen
) )
target_link_libraries(MLIRLoopsToGPU target_link_libraries(MLIRLoopsToGPU
PUBLIC PUBLIC
MLIRAffine MLIRAffineOps
MLIRAffineToStandard MLIRAffineToStandard
MLIRGPU MLIRGPU
MLIRIR MLIRIR
MLIRLinalgOps MLIRLinalgOps
MLIRPass MLIRPass
MLIRStandardOps MLIRStandardOps
MLIRSupport MLIRSupport
MLIRTransforms MLIRTransforms
LLVMSupport LLVMSupport
) )

mlir/lib/Conversion/VectorToLoops/CMakeLists.txt

add_mlir_conversion_library(MLIRVectorToLoops add_mlir_conversion_library(MLIRVectorToLoops
ConvertVectorToLoops.cpp ConvertVectorToLoops.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/VectorToLoops ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/VectorToLoops
) )
set(LIBS set(LIBS
MLIREDSC MLIREDSC
MLIRAffineEDSC
MLIRLLVMIR MLIRLLVMIR
MLIRTransforms MLIRTransforms
LLVMCore LLVMCore
LLVMSupport LLVMSupport
) )
add_dependencies(MLIRVectorToLoops ${LIBS}) add_dependencies(MLIRVectorToLoops ${LIBS})
target_link_libraries(MLIRVectorToLoops target_link_libraries(MLIRVectorToLoops
PUBLIC PUBLIC
${LIBS}) ${LIBS})

mlir/lib/Dialect/Affine/CMakeLists.txt

add_mlir_dialect_library(MLIRAffine add_subdirectory(IR)
IR/AffineOps.cpp add_subdirectory(EDSC)
IR/AffineValueMap.cpp
EDSC/Builders.cpp
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Affine
DEPENDS
MLIRAffineOpsIncGen
)
target_link_libraries(MLIRAffine
PUBLIC
MLIREDSC
MLIRIR
MLIRLoopLikeInterface
MLIRSideEffects
MLIRStandardOps
)
add_subdirectory(Transforms) add_subdirectory(Transforms)
add_subdirectory(Utils) add_subdirectory(Utils)

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

add_mlir_dialect_library(MLIRAffine add_mlir_dialect_library(MLIRAffineEDSC
EDSC/Builders.cpp Builders.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Affine ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Affine
DEPENDS DEPENDS
MLIRAffineOpsIncGen MLIRAffineOpsIncGen
) )
target_link_libraries(MLIRAffine target_link_libraries(MLIRAffineEDSC
PUBLIC PUBLIC
MLIRAffineOps
MLIREDSC MLIREDSC
MLIRIR MLIRIR
MLIRLoopLikeInterface MLIRLoopLikeInterface
MLIRSideEffects MLIRSideEffects
MLIRStandardOps MLIRStandardOps
) )

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

add_mlir_dialect_library(MLIRAffine add_mlir_dialect_library(MLIRAffineOps
AffineOps.cpp AffineOps.cpp
AffineValueMap.cpp AffineValueMap.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Affine ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Affine
DEPENDS DEPENDS
MLIRAffineOpsIncGen MLIRAffineOpsIncGen
) )
target_link_libraries(MLIRAffine target_link_libraries(MLIRAffineOps
PUBLIC PUBLIC
MLIREDSC MLIREDSC
MLIRIR MLIRIR
MLIRLoopLikeInterface MLIRLoopLikeInterface
MLIRSideEffects MLIRSideEffects
MLIRStandardOps MLIRStandardOps
) )

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

Show All 11 Linesadd_mlir_dialect_library(MLIRAffineTransforms
DEPENDS DEPENDS
MLIRAffineOpsIncGen MLIRAffineOpsIncGen
MLIRAffinePassIncGen MLIRAffinePassIncGen
MLIRLoopLikeInterfaceIncGen MLIRLoopLikeInterfaceIncGen
) )
target_link_libraries(MLIRAffineTransforms target_link_libraries(MLIRAffineTransforms
PUBLIC PUBLIC
MLIRAffine MLIRAffineOps
MLIREDSC MLIREDSC
MLIRIR MLIRIR
MLIRPass MLIRPass
MLIRSideEffects MLIRSideEffects
MLIRStandardOps MLIRStandardOps
MLIRTransformUtils MLIRTransformUtils
MLIRVector MLIRVector
MLIRVectorToLLVM MLIRVectorToLLVM
) )

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

add_mlir_dialect_library(MLIRAffineUtils add_mlir_dialect_library(MLIRAffineUtils
Utils.cpp Utils.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Affine ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Affine
) )
target_link_libraries(MLIRAffineUtils target_link_libraries(MLIRAffineUtils
PUBLIC PUBLIC
MLIRAffine MLIRAffineOps
MLIRTransformUtils MLIRTransformUtils
) )

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 DEPENDS
intrinsics_gen intrinsics_gen
) )
target_link_libraries(MLIRLinalgEDSC target_link_libraries(MLIRLinalgEDSC
PUBLIC PUBLIC
MLIREDSC MLIREDSC
MLIRIR MLIRIR
MLIRAffine MLIRAffineOps
MLIRAffineEDSC
MLIRLinalgOps MLIRLinalgOps
MLIRLoopOps MLIRLoopOps
MLIRStandardOps MLIRStandardOps
LLVMSupport LLVMSupport
) )

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

Show All 9 Linesadd_mlir_dialect_library(MLIRLinalgTransforms
DEPENDS DEPENDS
intrinsics_gen intrinsics_gen
MLIRLinalgPassIncGen MLIRLinalgPassIncGen
MLIRLinalgTransformPatternsIncGen MLIRLinalgTransformPatternsIncGen
) )
target_link_libraries(MLIRLinalgTransforms target_link_libraries(MLIRLinalgTransforms
PUBLIC PUBLIC
MLIRAffine MLIRAffineOps
MLIRAnalysis MLIRAnalysis
MLIREDSC MLIREDSC
MLIRIR MLIRIR
MLIRLinalgAnalysis MLIRLinalgAnalysis
MLIRLinalgEDSC MLIRLinalgEDSC
MLIRLinalgOps MLIRLinalgOps
MLIRLinalgUtils MLIRLinalgUtils
MLIRLoopOps MLIRLoopOps
MLIRPass MLIRPass
MLIRStandardOps MLIRStandardOps
MLIRStandardToLLVM MLIRStandardToLLVM
MLIRTransformUtils MLIRTransformUtils
MLIRVector MLIRVector
) )

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 DEPENDS
intrinsics_gen intrinsics_gen
) )
target_link_libraries(MLIRLinalgUtils target_link_libraries(MLIRLinalgUtils
PUBLIC PUBLIC
MLIRAffine MLIRAffineOps
MLIREDSC MLIREDSC
MLIRIR MLIRIR
MLIRLinalgOps MLIRLinalgOps
MLIRLoopOps MLIRLoopOps
MLIRPass MLIRPass
MLIRStandardOps MLIRStandardOps
MLIRTransformUtils MLIRTransformUtils
) )

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

add_mlir_dialect_library(MLIRLoopOpsTransforms add_mlir_dialect_library(MLIRLoopOpsTransforms
ParallelLoopFusion.cpp ParallelLoopFusion.cpp
ParallelLoopSpecialization.cpp ParallelLoopSpecialization.cpp
ParallelLoopTiling.cpp ParallelLoopTiling.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LoopOps ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LoopOps
DEPENDS DEPENDS
MLIRLoopPassIncGen MLIRLoopPassIncGen
) )
target_link_libraries(MLIRLoopOpsTransforms target_link_libraries(MLIRLoopOpsTransforms
PUBLIC PUBLIC
MLIRAffine MLIRAffineOps
MLIRIR MLIRIR
MLIRPass MLIRPass
MLIRLoopOps MLIRLoopOps
MLIRStandardOps MLIRStandardOps
MLIRSupport MLIRSupport
LLVMSupport LLVMSupport
) )

mlir/lib/Dialect/Vector/CMakeLists.txt

Show All 10 Linesadd_mlir_dialect_library(MLIRVector
MLIRVectorOpsIncGen MLIRVectorOpsIncGen
MLIRVectorTransformPatternsIncGen MLIRVectorTransformPatternsIncGen
) )
target_link_libraries(MLIRVector target_link_libraries(MLIRVector
PUBLIC PUBLIC
MLIREDSC MLIREDSC
MLIRIR MLIRIR
MLIRStandardOps MLIRStandardOps
MLIRAffine MLIRAffineOps
MLIRLoopOps MLIRLoopOps
MLIRLoopAnalysis MLIRLoopAnalysis
MLIRSideEffects MLIRSideEffects
) )

mlir/lib/Transforms/CMakeLists.txt

Show All 22 Linesadd_mlir_library(MLIRTransforms
DEPENDS DEPENDS
MLIRStandardOpsIncGen MLIRStandardOpsIncGen
MLIRTransformsPassIncGen MLIRTransformsPassIncGen
) )
target_link_libraries(MLIRTransforms target_link_libraries(MLIRTransforms
PUBLIC PUBLIC
MLIRAffine MLIRAffineOps
MLIRAnalysis MLIRAnalysis
MLIRLoopLikeInterface MLIRLoopLikeInterface
MLIRLoopOps MLIRLoopOps
MLIRPass MLIRPass
MLIRTransformUtils MLIRTransformUtils
MLIRVector MLIRVector
) )

mlir/lib/Transforms/Utils/CMakeLists.txt

Show All 10 Linesadd_mlir_library(MLIRTransformUtils
${MLIR_MAIN_INCLUDE_DIR}/mlir/Transforms ${MLIR_MAIN_INCLUDE_DIR}/mlir/Transforms
DEPENDS DEPENDS
MLIRStandardOpsIncGen MLIRStandardOpsIncGen
) )
target_link_libraries(MLIRTransformUtils target_link_libraries(MLIRTransformUtils
PUBLIC PUBLIC
MLIRAffine MLIRAffineOps
MLIRAnalysis MLIRAnalysis
MLIRLoopAnalysis MLIRLoopAnalysis
MLIRLoopOps MLIRLoopOps
MLIRPass MLIRPass
MLIRStandardOps MLIRStandardOps
) )

mlir/test/EDSC/CMakeLists.txt

add_llvm_executable(mlir-edsc-builder-api-test add_llvm_executable(mlir-edsc-builder-api-test
builder-api-test.cpp builder-api-test.cpp
) )
llvm_update_compile_flags(mlir-edsc-builder-api-test) llvm_update_compile_flags(mlir-edsc-builder-api-test)
target_link_libraries(mlir-edsc-builder-api-test target_link_libraries(mlir-edsc-builder-api-test
PRIVATE PRIVATE
MLIRAffine MLIRAffineOps
MLIRAffineEDSC
MLIREDSC MLIREDSC
MLIRIR MLIRIR
MLIRLinalgEDSC MLIRLinalgEDSC
MLIRLinalgOps MLIRLinalgOps
MLIRLoopOps MLIRLoopOps
MLIRStandardOps MLIRStandardOps
MLIRTransforms MLIRTransforms
MLIRVector MLIRVector
LLVMCore LLVMCore
LLVMSupport LLVMSupport
) )
target_include_directories(mlir-edsc-builder-api-test PRIVATE ..) target_include_directories(mlir-edsc-builder-api-test PRIVATE ..)

mlir/test/lib/Transforms/CMakeLists.txt

Show All 31 Lines
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../Dialect/Test) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../Dialect/Test)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/../Dialect/Test) include_directories(${CMAKE_CURRENT_BINARY_DIR}/../Dialect/Test)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../DeclarativeTransforms) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../DeclarativeTransforms)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/../DeclarativeTransforms) include_directories(${CMAKE_CURRENT_BINARY_DIR}/../DeclarativeTransforms)
target_link_libraries(MLIRTestTransforms target_link_libraries(MLIRTestTransforms
PUBLIC PUBLIC
MLIRAffine MLIRAffineOps
MLIRAnalysis MLIRAnalysis
MLIREDSC MLIREDSC
MLIRGPU MLIRGPU
MLIRGPUtoCUDATransforms MLIRGPUtoCUDATransforms
MLIRLinalgOps MLIRLinalgOps
MLIRLinalgTransforms MLIRLinalgTransforms
MLIRLoopOps MLIRLoopOps
MLIRGPU MLIRGPU
MLIRPass MLIRPass
MLIRStandardToStandard MLIRStandardToStandard
MLIRTestDialect MLIRTestDialect
MLIRTransformUtils MLIRTransformUtils
MLIRVectorToLoops MLIRVectorToLoops
MLIRVector MLIRVector
) )