This is an archive of the discontinued LLVM Phabricator instance.

Differential D109494

[mlir] Replace `include_directories`
ClosedPublic

Authored by marbre on Sep 9 2021, 2:57 AM.

Details

Reviewers
rriddle
stephenneuendorffer
ftynse
Commits
rG6593cd3fe989: [mlir] Replace `include_directories`
Summary

Switches to adding target specific, private includes instead of adding
global includes.

Diff Detail

Event Timeline

marbre created this revision.Sep 9 2021, 2:57 AM
Herald added a reviewer: ftynse. · View Herald TranscriptSep 9 2021, 2:57 AM
Herald added subscribers: wenzhicui, wrengr, Chia-hungDuan and 19 others. · View Herald Transcript
marbre requested review of this revision.Sep 9 2021, 2:57 AM
Herald added a project: Restricted Project. · View Herald TranscriptSep 9 2021, 2:57 AM
Herald added a subscriber: nicolasvasilache. · View Herald Transcript
Harbormaster completed remote builds in B123173: Diff 371527.Sep 9 2021, 3:38 AM
ftynse accepted this revision.Sep 9 2021, 5:24 AM
This revision is now accepted and ready to land.Sep 9 2021, 5:24 AM
Closed by commit rG6593cd3fe989: [mlir] Replace `include_directories` (authored by marbre). · Explain WhySep 10 2021, 12:06 AM
This revision was automatically updated to reflect the committed changes.
marbre added a commit: rG6593cd3fe989: [mlir] Replace `include_directories`.

Revision Contents

PathSize
mlir/
test/
lib/
Analysis/
7 lines
Conversion/
StandardToLLVM/
7 lines
Dialect/
DLTI/
7 lines
StandardOps/
7 lines
IR/
8 lines
Transforms/
7 lines
unittests/
TableGen/
7 lines

Diff 371527

mlir/test/lib/Analysis/CMakeLists.txt

Show All 13 Linesadd_mlir_library(MLIRTestAnalysis
LINK_LIBS PUBLIC LINK_LIBS PUBLIC
MLIRAffine MLIRAffine
MLIRAnalysis MLIRAnalysis
MLIRMemRef MLIRMemRef
MLIRPass MLIRPass
MLIRTestDialect MLIRTestDialect
) )
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../Dialect/Test) target_include_directories(MLIRTestAnalysis
include_directories(${CMAKE_CURRENT_BINARY_DIR}/../Dialect/Test) PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../Dialect/Test
${CMAKE_CURRENT_BINARY_DIR}/../Dialect/Test
)

mlir/test/lib/Conversion/StandardToLLVM/CMakeLists.txt

# Exclude tests from libMLIR.so # Exclude tests from libMLIR.so
add_mlir_library(MLIRTestStandardToLLVM add_mlir_library(MLIRTestStandardToLLVM
TestConvertCallOp.cpp TestConvertCallOp.cpp
EXCLUDE_FROM_LIBMLIR EXCLUDE_FROM_LIBMLIR
LINK_LIBS PUBLIC LINK_LIBS PUBLIC
MLIRLLVMCommonConversion MLIRLLVMCommonConversion
MLIRLLVMIR MLIRLLVMIR
MLIRLLVMIRTransforms MLIRLLVMIRTransforms
MLIRPass MLIRPass
MLIRStandardToLLVM MLIRStandardToLLVM
MLIRTestDialect MLIRTestDialect
) )
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../Dialect/Test) target_include_directories(MLIRTestStandardToLLVM
include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../Dialect/Test) PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../../Dialect/Test
${CMAKE_CURRENT_BINARY_DIR}/../../Dialect/Test
)

mlir/test/lib/Dialect/DLTI/CMakeLists.txt

# Exclude tests from libMLIR.so # Exclude tests from libMLIR.so
add_mlir_library(MLIRDLTITestPasses add_mlir_library(MLIRDLTITestPasses
TestDataLayoutQuery.cpp TestDataLayoutQuery.cpp
EXCLUDE_FROM_LIBMLIR EXCLUDE_FROM_LIBMLIR
LINK_LIBS PUBLIC LINK_LIBS PUBLIC
MLIRDLTI MLIRDLTI
MLIRPass MLIRPass
MLIRTestDialect MLIRTestDialect
) )
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../Test) target_include_directories(MLIRDLTITestPasses
include_directories(${CMAKE_CURRENT_BINARY_DIR}/../Test) PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../Test
${CMAKE_CURRENT_BINARY_DIR}/../Test
)

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

# Exclude tests from libMLIR.so # Exclude tests from libMLIR.so
add_mlir_library(MLIRStandardOpsTestPasses add_mlir_library(MLIRStandardOpsTestPasses
TestDecomposeCallGraphTypes.cpp TestDecomposeCallGraphTypes.cpp
TestComposeSubView.cpp TestComposeSubView.cpp
EXCLUDE_FROM_LIBMLIR EXCLUDE_FROM_LIBMLIR
LINK_LIBS PUBLIC LINK_LIBS PUBLIC
MLIRAffine MLIRAffine
MLIRPass MLIRPass
MLIRStandardOpsTransforms MLIRStandardOpsTransforms
MLIRTestDialect MLIRTestDialect
MLIRTransformUtils MLIRTransformUtils
) )
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../Test) target_include_directories(MLIRStandardOpsTestPasses
include_directories(${CMAKE_CURRENT_BINARY_DIR}/../Test) PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../Test
${CMAKE_CURRENT_BINARY_DIR}/../Test
)

mlir/test/lib/IR/CMakeLists.txt

Show All 15 Linesadd_mlir_library(MLIRTestIR
TestVisitors.cpp TestVisitors.cpp
EXCLUDE_FROM_LIBMLIR EXCLUDE_FROM_LIBMLIR
LINK_LIBS PUBLIC LINK_LIBS PUBLIC
MLIRPass MLIRPass
MLIRTestDialect MLIRTestDialect
) )
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../Dialect/Test)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/../Dialect/Test) target_include_directories(MLIRTestIR
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../Dialect/Test
${CMAKE_CURRENT_BINARY_DIR}/../Dialect/Test
)

mlir/test/lib/Transforms/CMakeLists.txt

Show All 11 Linesadd_mlir_library(MLIRTestTransforms
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Transforms ${MLIR_MAIN_INCLUDE_DIR}/mlir/Transforms
LINK_LIBS PUBLIC LINK_LIBS PUBLIC
MLIRTestDialect MLIRTestDialect
MLIRTransforms MLIRTransforms
) )
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../Dialect/Test) target_include_directories(MLIRTestTransforms
include_directories(${CMAKE_CURRENT_BINARY_DIR}/../Dialect/Test) PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../Dialect/Test
${CMAKE_CURRENT_BINARY_DIR}/../Dialect/Test
)

mlir/unittests/TableGen/CMakeLists.txt

Show All 19 Linesadd_mlir_unittest(MLIRTableGenTests
PassGenTest.cpp PassGenTest.cpp
) )
add_dependencies(MLIRTableGenTests MLIRTableGenEnumsIncGen) add_dependencies(MLIRTableGenTests MLIRTableGenEnumsIncGen)
add_dependencies(MLIRTableGenTests MLIRTableGenStructAttrIncGen) add_dependencies(MLIRTableGenTests MLIRTableGenStructAttrIncGen)
add_dependencies(MLIRTableGenTests MLIRTableGenTestPassIncGen) add_dependencies(MLIRTableGenTests MLIRTableGenTestPassIncGen)
add_dependencies(MLIRTableGenTests MLIRTestDialect) add_dependencies(MLIRTableGenTests MLIRTestDialect)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../test/lib/Dialect/Test) target_include_directories(MLIRTableGenTests
include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../test/lib/Dialect/Test) PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../../test/lib/Dialect/Test
${CMAKE_CURRENT_BINARY_DIR}/../../test/lib/Dialect/Test
)
target_link_libraries(MLIRTableGenTests target_link_libraries(MLIRTableGenTests
PRIVATE MLIRTableGen MLIRIR PRIVATE MLIRTableGen MLIRIR
PUBLIC MLIRTestDialect PUBLIC MLIRTestDialect
) )