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

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.

Differential Revision: https://reviews.llvm.org/D78317
This commit is contained in:
Stephen Neuendorffer 2020-04-16 11:11:13 -07:00
parent 1fae85a853
commit f061295732
18 changed files with 26 additions and 40 deletions

View File

@ -24,7 +24,7 @@ add_mlir_library(MLIRAnalysis
target_link_libraries(MLIRAnalysis
PUBLIC
MLIRAffine
MLIRAffineOps
MLIRCallInterfaces
MLIRControlFlowInterfaces
MLIRInferTypeOpInterface
@ -44,7 +44,7 @@ add_mlir_library(MLIRLoopAnalysis
target_link_libraries(MLIRLoopAnalysis
PUBLIC
MLIRAffine
MLIRAffineOps
MLIRCallInterfaces
MLIRControlFlowInterfaces
MLIRInferTypeOpInterface

View File

@ -10,7 +10,7 @@ add_mlir_conversion_library(MLIRAffineToStandard
target_link_libraries(
MLIRAffineToStandard
PUBLIC
MLIRAffine
MLIRAffineOps
MLIRLoopOps
MLIRPass
MLIRStandardOps

View File

@ -10,7 +10,7 @@ add_mlir_conversion_library(MLIRLoopsToGPU
)
target_link_libraries(MLIRLoopsToGPU
PUBLIC
MLIRAffine
MLIRAffineOps
MLIRAffineToStandard
MLIRGPU
MLIRIR

View File

@ -6,6 +6,7 @@ add_mlir_conversion_library(MLIRVectorToLoops
)
set(LIBS
MLIREDSC
MLIRAffineEDSC
MLIRLLVMIR
MLIRTransforms
LLVMCore

View File

@ -1,22 +1,4 @@
add_mlir_dialect_library(MLIRAffine
IR/AffineOps.cpp
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(IR)
add_subdirectory(EDSC)
add_subdirectory(Transforms)
add_subdirectory(Utils)

View File

@ -1,5 +1,5 @@
add_mlir_dialect_library(MLIRAffine
EDSC/Builders.cpp
add_mlir_dialect_library(MLIRAffineEDSC
Builders.cpp
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Affine
@ -7,8 +7,9 @@ add_mlir_dialect_library(MLIRAffine
DEPENDS
MLIRAffineOpsIncGen
)
target_link_libraries(MLIRAffine
target_link_libraries(MLIRAffineEDSC
PUBLIC
MLIRAffineOps
MLIREDSC
MLIRIR
MLIRLoopLikeInterface

View File

@ -1,4 +1,4 @@
add_mlir_dialect_library(MLIRAffine
add_mlir_dialect_library(MLIRAffineOps
AffineOps.cpp
AffineValueMap.cpp
@ -8,7 +8,7 @@ add_mlir_dialect_library(MLIRAffine
DEPENDS
MLIRAffineOpsIncGen
)
target_link_libraries(MLIRAffine
target_link_libraries(MLIRAffineOps
PUBLIC
MLIREDSC
MLIRIR

View File

@ -17,7 +17,7 @@ add_mlir_dialect_library(MLIRAffineTransforms
)
target_link_libraries(MLIRAffineTransforms
PUBLIC
MLIRAffine
MLIRAffineOps
MLIREDSC
MLIRIR
MLIRPass

View File

@ -7,6 +7,6 @@ add_mlir_dialect_library(MLIRAffineUtils
)
target_link_libraries(MLIRAffineUtils
PUBLIC
MLIRAffine
MLIRAffineOps
MLIRTransformUtils
)

View File

@ -12,7 +12,8 @@ target_link_libraries(MLIRLinalgEDSC
PUBLIC
MLIREDSC
MLIRIR
MLIRAffine
MLIRAffineOps
MLIRAffineEDSC
MLIRLinalgOps
MLIRLoopOps
MLIRStandardOps

View File

@ -15,7 +15,7 @@ add_mlir_dialect_library(MLIRLinalgTransforms
)
target_link_libraries(MLIRLinalgTransforms
PUBLIC
MLIRAffine
MLIRAffineOps
MLIRAnalysis
MLIREDSC
MLIRIR

View File

@ -9,7 +9,7 @@ add_mlir_dialect_library(MLIRLinalgUtils
target_link_libraries(MLIRLinalgUtils
PUBLIC
MLIRAffine
MLIRAffineOps
MLIREDSC
MLIRIR
MLIRLinalgOps

View File

@ -11,7 +11,7 @@ add_mlir_dialect_library(MLIRLoopOpsTransforms
)
target_link_libraries(MLIRLoopOpsTransforms
PUBLIC
MLIRAffine
MLIRAffineOps
MLIRIR
MLIRPass
MLIRLoopOps

View File

@ -16,7 +16,7 @@ target_link_libraries(MLIRVector
MLIREDSC
MLIRIR
MLIRStandardOps
MLIRAffine
MLIRAffineOps
MLIRLoopOps
MLIRLoopAnalysis
MLIRSideEffects

View File

@ -28,7 +28,7 @@ add_mlir_library(MLIRTransforms
target_link_libraries(MLIRTransforms
PUBLIC
MLIRAffine
MLIRAffineOps
MLIRAnalysis
MLIRLoopLikeInterface
MLIRLoopOps

View File

@ -16,7 +16,7 @@ add_mlir_library(MLIRTransformUtils
target_link_libraries(MLIRTransformUtils
PUBLIC
MLIRAffine
MLIRAffineOps
MLIRAnalysis
MLIRLoopAnalysis
MLIRLoopOps

View File

@ -6,7 +6,8 @@ llvm_update_compile_flags(mlir-edsc-builder-api-test)
target_link_libraries(mlir-edsc-builder-api-test
PRIVATE
MLIRAffine
MLIRAffineOps
MLIRAffineEDSC
MLIREDSC
MLIRIR
MLIRLinalgEDSC

View File

@ -37,7 +37,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/../DeclarativeTransforms)
target_link_libraries(MLIRTestTransforms
PUBLIC
MLIRAffine
MLIRAffineOps
MLIRAnalysis
MLIREDSC
MLIRGPU