This is an archive of the discontinued LLVM Phabricator instance.

Differential D79841

[MLIR] refactor cmake specification of tablegen'd interfaces.
ClosedPublic

Authored by stephenneuendorffer on May 13 2020, 12:11 AM.

Details

Reviewers
mehdi_amini
Commits
rGce3bbeb9159b: [MLIR] refactor cmake specification of tablegen'd interfaces.
Summary

Introduce add_mlir_interface to avoid lots of boilerplate

Diff Detail

Event Timeline

stephenneuendorffer created this revision.May 13 2020, 12:11 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 13 2020, 12:11 AM
Herald added subscribers: llvm-commits, Kayjukh, frgossen and 14 others. · View Herald Transcript
mehdi_amini accepted this revision.May 13 2020, 12:58 AM
This revision is now accepted and ready to land.May 13 2020, 12:58 AM
Harbormaster failed remote builds in B56556: Diff 263633!May 13 2020, 1:34 AM
stephenneuendorffer updated this revision to Diff 263777.May 13 2020, 10:36 AM
stephenneuendorffer added a child revision: D79889: [MLIR] Discourage people from copying the toy examples.
Closed by commit rGce3bbeb9159b: [MLIR] refactor cmake specification of tablegen'd interfaces. (authored by stephenneuendorffer). · Explain WhyMay 13 2020, 10:52 AM
This revision was automatically updated to reflect the committed changes.
Harbormaster failed remote builds in B56626: Diff 263777!May 13 2020, 11:25 AM
rriddle added inline comments.May 27 2020, 12:38 PM
mlir/cmake/modules/AddMLIR.cmake
17

This comment seems wrong.

18

nit: I would have named this add_mlir_op_interface just in case we somehow auto-gen dialect interfaces in the future.

Herald added a subscriber: jurahul. · View Herald TranscriptMay 27 2020, 12:38 PM
mehdi_amini added a comment.Jun 5 2020, 1:28 AM

@stephenneuendorffer ping on post-commit review comments?

Herald added a project: Restricted Project. · View Herald TranscriptJun 5 2020, 1:28 AM
Herald added a subscriber: msifontes. · View Herald Transcript

Revision Contents

PathSize
mlir/
cmake/
modules/
10 lines
include/
mlir/
Interfaces/
47 lines
lib/
Interfaces/
2 lines

Diff 263787

mlir/cmake/modules/AddMLIR.cmake

function(mlir_tablegen ofn) function(mlir_tablegen ofn)
tablegen(MLIR ${ARGV}) tablegen(MLIR ${ARGV})
set(TABLEGEN_OUTPUT ${TABLEGEN_OUTPUT} ${CMAKE_CURRENT_BINARY_DIR}/${ofn} set(TABLEGEN_OUTPUT ${TABLEGEN_OUTPUT} ${CMAKE_CURRENT_BINARY_DIR}/${ofn}
PARENT_SCOPE) PARENT_SCOPE)
endfunction() endfunction()
# Declare a dialect in the include directory # Declare a dialect in the include directory
function(add_mlir_dialect dialect dialect_namespace) function(add_mlir_dialect dialect dialect_namespace)
set(LLVM_TARGET_DEFINITIONS ${dialect}.td) set(LLVM_TARGET_DEFINITIONS ${dialect}.td)
mlir_tablegen(${dialect}.h.inc -gen-op-decls) mlir_tablegen(${dialect}.h.inc -gen-op-decls)
mlir_tablegen(${dialect}.cpp.inc -gen-op-defs) mlir_tablegen(${dialect}.cpp.inc -gen-op-defs)
mlir_tablegen(${dialect}Dialect.h.inc -gen-dialect-decls -dialect=${dialect_namespace}) mlir_tablegen(${dialect}Dialect.h.inc -gen-dialect-decls -dialect=${dialect_namespace})
add_public_tablegen_target(MLIR${dialect}IncGen) add_public_tablegen_target(MLIR${dialect}IncGen)
add_dependencies(mlir-headers MLIR${dialect}IncGen) add_dependencies(mlir-headers MLIR${dialect}IncGen)
endfunction() endfunction()
# Declare a dialect in the include directory
rriddleUnsubmitted
Not Done
ReplyInline Actions

This comment seems wrong.

rriddle: This comment seems wrong.
function(add_mlir_interface interface)
rriddleUnsubmitted
Not Done
ReplyInline Actions

nit: I would have named this add_mlir_op_interface just in case we somehow auto-gen dialect interfaces in the future.

rriddle: nit: I would have named this add_mlir_op_interface just in case we somehow auto-gen dialect…
set(LLVM_TARGET_DEFINITIONS ${interface}.td)
mlir_tablegen(${interface}.h.inc -gen-op-interface-decls)
mlir_tablegen(${interface}.cpp.inc -gen-op-interface-defs)
add_public_tablegen_target(MLIR${interface}IncGen)
add_dependencies(mlir-generic-headers MLIR${interface}IncGen)
endfunction()
# Generate Documentation # Generate Documentation
function(add_mlir_doc doc_filename command output_file output_directory) function(add_mlir_doc doc_filename command output_file output_directory)
set(LLVM_TARGET_DEFINITIONS ${doc_filename}.td) set(LLVM_TARGET_DEFINITIONS ${doc_filename}.td)
tablegen(MLIR ${output_file}.md ${command} "-I${MLIR_MAIN_INCLUDE_DIR}" "-I${MLIR_INCLUDE_DIR}") tablegen(MLIR ${output_file}.md ${command} "-I${MLIR_MAIN_INCLUDE_DIR}" "-I${MLIR_INCLUDE_DIR}")
set(GEN_DOC_FILE ${MLIR_BINARY_DIR}/docs/${output_directory}${output_file}.md) set(GEN_DOC_FILE ${MLIR_BINARY_DIR}/docs/${output_directory}${output_file}.md)
add_custom_command( add_custom_command(
OUTPUT ${GEN_DOC_FILE} OUTPUT ${GEN_DOC_FILE}
COMMAND ${CMAKE_COMMAND} -E copy COMMAND ${CMAKE_COMMAND} -E copy
▲ Show 20 Lines • Show All 164 Lines • Show Last 20 Lines

mlir/include/mlir/Interfaces/CMakeLists.txt

set(LLVM_TARGET_DEFINITIONS CallInterfaces.td) add_mlir_interface(CallInterfaces)
mlir_tablegen(CallInterfaces.h.inc -gen-op-interface-decls) add_mlir_interface(ControlFlowInterfaces)
mlir_tablegen(CallInterfaces.cpp.inc -gen-op-interface-defs) add_mlir_interface(DerivedAttributeOpInterface)
add_public_tablegen_target(MLIRCallInterfacesIncGen) add_mlir_interface(InferTypeOpInterface)
add_dependencies(mlir-generic-headers MLIRCallInterfacesIncGen) add_mlir_interface(LoopLikeInterface)
add_mlir_interface(SideEffectInterfaces)
add_mlir_interface(ViewLikeInterface)
set(LLVM_TARGET_DEFINITIONS ControlFlowInterfaces.td)
mlir_tablegen(ControlFlowInterfaces.h.inc -gen-op-interface-decls)
mlir_tablegen(ControlFlowInterfaces.cpp.inc -gen-op-interface-defs)
add_public_tablegen_target(MLIRControlFlowInterfacesIncGen)
add_dependencies(mlir-generic-headers MLIRControlFlowInterfacesIncGen)
set(LLVM_TARGET_DEFINITIONS DerivedAttributeOpInterface.td)
mlir_tablegen(DerivedAttributeOpInterface.h.inc -gen-op-interface-decls)
mlir_tablegen(DerivedAttributeOpInterface.cpp.inc -gen-op-interface-defs)
add_public_tablegen_target(MLIRDerivedAttributeOpInterfaceIncGen)
add_dependencies(mlir-generic-headers MLIRDerivedAttributeOpInterfaceIncGen)
set(LLVM_TARGET_DEFINITIONS InferTypeOpInterface.td)
mlir_tablegen(InferTypeOpInterface.h.inc -gen-op-interface-decls)
mlir_tablegen(InferTypeOpInterface.cpp.inc -gen-op-interface-defs)
add_public_tablegen_target(MLIRInferTypeOpInterfaceIncGen)
add_dependencies(mlir-generic-headers MLIRInferTypeOpInterfaceIncGen)
set(LLVM_TARGET_DEFINITIONS LoopLikeInterface.td)
mlir_tablegen(LoopLikeInterface.h.inc -gen-op-interface-decls)
mlir_tablegen(LoopLikeInterface.cpp.inc -gen-op-interface-defs)
add_public_tablegen_target(MLIRLoopLikeInterfaceIncGen)
add_dependencies(mlir-generic-headers MLIRLoopLikeInterfaceIncGen)
set(LLVM_TARGET_DEFINITIONS SideEffectInterfaces.td)
mlir_tablegen(SideEffectInterfaces.h.inc -gen-op-interface-decls)
mlir_tablegen(SideEffectInterfaces.cpp.inc -gen-op-interface-defs)
add_public_tablegen_target(MLIRSideEffectOpInterfacesIncGen)
add_dependencies(mlir-generic-headers MLIRSideEffectOpInterfacesIncGen)
set(LLVM_TARGET_DEFINITIONS ViewLikeInterface.td)
mlir_tablegen(ViewLikeInterface.h.inc -gen-op-interface-decls)
mlir_tablegen(ViewLikeInterface.cpp.inc -gen-op-interface-defs)
add_public_tablegen_target(MLIRViewLikeInterfaceIncGen)
add_dependencies(mlir-generic-headers MLIRViewLikeInterfaceIncGen)

mlir/lib/Interfaces/CMakeLists.txt

Show First 20 Lines • Show All 74 Lines • ▼ Show 20 Lines
add_mlir_library(MLIRSideEffects add_mlir_library(MLIRSideEffects
SideEffects.cpp SideEffects.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Interfaces ${MLIR_MAIN_INCLUDE_DIR}/mlir/Interfaces
DEPENDS DEPENDS
MLIRSideEffectOpInterfacesIncGen MLIRSideEffectInterfacesIncGen
LINK_LIBS PUBLIC LINK_LIBS PUBLIC
MLIRIR MLIRIR
) )
add_mlir_library(MLIRViewLikeInterface add_mlir_library(MLIRViewLikeInterface
ViewLikeInterface.cpp ViewLikeInterface.cpp
Show All 9 Lines