Rename add_mlir_tablegen_target to add_mlir_dialect_tablegen_target

Author: Technius

mlir/cmake/modules/AddMLIR.cmake

@@ -174,8 +174,7 @@ function(add_mlir_dialect dialect dialect_namespace)
   mlir_tablegen(${dialect}Types.cpp.inc -gen-typedef-defs -typedefs-dialect=${dialect_namespace})
   mlir_tablegen(${dialect}Dialect.h.inc -gen-dialect-decls -dialect=${dialect_namespace})
   mlir_tablegen(${dialect}Dialect.cpp.inc -gen-dialect-defs -dialect=${dialect_namespace})
-  add_public_tablegen_target(MLIR${dialect}IncGen)
-  add_dependencies(mlir-headers MLIR${dialect}IncGen)
+  add_mlir_dialect_tablegen_target(MLIR${dialect}IncGen)
 endfunction()
 
 # Declare sharded dialect operation declarations and definitions
@@ -190,7 +189,7 @@ function(add_sharded_ops ops_target shard_count)
     tablegen(MLIR_SRC_SHARDER ${SHARDED_SRC} -op-shard-index=${index})
     set(TABLEGEN_OUTPUT ${TABLEGEN_OUTPUT} ${CMAKE_CURRENT_BINARY_DIR}/${SHARDED_SRC})
   endforeach()
-  add_public_tablegen_target(MLIR${ops_target}ShardGen)
+  add_mlir_dialect_tablegen_target(MLIR${ops_target}ShardGen)
   set(SHARDED_SRCS ${SHARDED_SRCS} PARENT_SCOPE)
 endfunction()
 
@@ -199,16 +198,23 @@ function(add_mlir_interface interface)
   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)
+  add_mlir_generic_tablegen_target(MLIR${interface}IncGen)
 endfunction()
 
-# Add a tablegen target that generates headers in the include directory
-macro(add_mlir_tablegen_target target)
+# Add a dialect-specific tablegen target that generates headers in the include directory
+macro(add_mlir_dialect_tablegen_target target)
   add_public_tablegen_target(${target})
   add_dependencies(mlir-headers ${target})
 endmacro()
 
+# Add a dialect-independent tablegen target that generates headers in the include directory
+# Generally this is used for files outside of the Dialects/ folder, and also for interfaces
+# that are meant to be implemented by other/multiple dialects.
+macro(add_mlir_generic_tablegen_target target)
+  add_public_tablegen_target(${target})
+  add_dependencies(mlir-generic-headers ${target})
+endmacro()
+
 # Generate Documentation
 function(add_mlir_doc doc_filename output_file output_directory command)
   set(LLVM_TARGET_DEFINITIONS ${doc_filename}.td)

mlir/include/mlir/Dialect/AMDGPU/IR/CMakeLists.txt

@@ -4,9 +4,9 @@ add_mlir_doc(AMDGPU AMDGPU Dialects/ -gen-dialect-doc)
 set(LLVM_TARGET_DEFINITIONS AMDGPU.td)
 mlir_tablegen(AMDGPUEnums.h.inc -gen-enum-decls)
 mlir_tablegen(AMDGPUEnums.cpp.inc -gen-enum-defs)
-add_mlir_tablegen_target(MLIRAMDGPUEnumsGen)
+add_mlir_dialect_tablegen_target(MLIRAMDGPUEnumsGen)
 
 set(LLVM_TARGET_DEFINITIONS AMDGPU.td)
 mlir_tablegen(AMDGPUAttributes.h.inc -gen-attrdef-decls -attrdefs-dialect=amdgpu)
 mlir_tablegen(AMDGPUAttributes.cpp.inc -gen-attrdef-defs -attrdefs-dialect=amdgpu)
-add_mlir_tablegen_target(MLIRAMDGPUAttributesIncGen)
+add_mlir_dialect_tablegen_target(MLIRAMDGPUAttributesIncGen)

mlir/include/mlir/Dialect/AMDGPU/Transforms/CMakeLists.txt

@@ -1,5 +1,5 @@
 set(LLVM_TARGET_DEFINITIONS Passes.td)
 mlir_tablegen(Passes.h.inc -gen-pass-decls -name AMDGPU)
-add_mlir_tablegen_target(MLIRAMDGPUTransformsIncGen)
+add_mlir_dialect_tablegen_target(MLIRAMDGPUTransformsIncGen)
 
 add_mlir_doc(Passes AMDGPUPasses ./ -gen-pass-doc)

mlir/include/mlir/Dialect/Affine/CMakeLists.txt

@@ -3,6 +3,6 @@ add_subdirectory(TransformOps)
 
 set(LLVM_TARGET_DEFINITIONS Passes.td)
 mlir_tablegen(Passes.h.inc -gen-pass-decls -name Affine)
-add_mlir_tablegen_target(MLIRAffinePassIncGen)
+add_mlir_dialect_tablegen_target(MLIRAffinePassIncGen)
 
 add_mlir_doc(Passes AffinePasses ./ -gen-pass-doc)

mlir/include/mlir/Dialect/Affine/TransformOps/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(LLVM_TARGET_DEFINITIONS AffineTransformOps.td)
 mlir_tablegen(AffineTransformOps.h.inc -gen-op-decls)
 mlir_tablegen(AffineTransformOps.cpp.inc -gen-op-defs)
-add_mlir_tablegen_target(MLIRAffineTransformOpsIncGen)
+add_mlir_dialect_tablegen_target(MLIRAffineTransformOpsIncGen)
 
 add_mlir_doc(AffineTransformOps AffineLoopTransformOps Dialects/ -gen-op-doc)

mlir/include/mlir/Dialect/Arith/Transforms/CMakeLists.txt

@@ -1,5 +1,5 @@
 set(LLVM_TARGET_DEFINITIONS Passes.td)
 mlir_tablegen(Passes.h.inc -gen-pass-decls -name Arith)
-add_mlir_tablegen_target(MLIRArithTransformsIncGen)
+add_mlir_dialect_tablegen_target(MLIRArithTransformsIncGen)
 
 add_mlir_doc(Passes ArithPasses ./ -gen-pass-doc)

mlir/include/mlir/Dialect/ArmNeon/CMakeLists.txt

@@ -3,6 +3,6 @@ add_mlir_doc(ArmNeon ArmNeon Dialects/ -gen-dialect-doc -dialect=arm_neon)
 
 set(LLVM_TARGET_DEFINITIONS ArmNeon.td)
 mlir_tablegen(ArmNeonConversions.inc -gen-llvmir-conversions)
-add_mlir_tablegen_target(MLIRArmNeonConversionsIncGen)
+add_mlir_dialect_tablegen_target(MLIRArmNeonConversionsIncGen)
 
 add_subdirectory(TransformOps)

mlir/include/mlir/Dialect/ArmNeon/TransformOps/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(LLVM_TARGET_DEFINITIONS ArmNeonVectorTransformOps.td)
 mlir_tablegen(ArmNeonVectorTransformOps.h.inc -gen-op-decls)
 mlir_tablegen(ArmNeonVectorTransformOps.cpp.inc -gen-op-defs)
-add_mlir_tablegen_target(MLIRArmNeonVectorTransformOpsIncGen)
+add_mlir_dialect_tablegen_target(MLIRArmNeonVectorTransformOpsIncGen)
 
 add_mlir_doc(ArmNeonVectorTransformOps ArmNeonVectorTransformOps Dialects/ -gen-op-doc)

mlir/include/mlir/Dialect/ArmSME/IR/CMakeLists.txt

@@ -8,25 +8,25 @@ mlir_tablegen(ArmSMEEnums.h.inc -gen-enum-decls)
 mlir_tablegen(ArmSMEEnums.cpp.inc -gen-enum-defs)
 mlir_tablegen(ArmSMEAttrDefs.h.inc -gen-attrdef-decls -attrdefs-dialect=arm_sme)
 mlir_tablegen(ArmSMEAttrDefs.cpp.inc -gen-attrdef-defs -attrdefs-dialect=arm_sme)
-add_mlir_tablegen_target(MLIRArmSMEOpsIncGen)
+add_mlir_dialect_tablegen_target(MLIRArmSMEOpsIncGen)
 
 # Generate LLVM IR Conversions
 set(LLVM_TARGET_DEFINITIONS ArmSMEOps.td)
 mlir_tablegen(ArmSMEOpsConversions.inc -gen-llvmir-conversions)
-add_mlir_tablegen_target(MLIRArmSMEConversionsIncGen)
+add_mlir_dialect_tablegen_target(MLIRArmSMEConversionsIncGen)
 
 # Generate op interface declarations and definitions
 set(LLVM_TARGET_DEFINITIONS ArmSMEOps.td)
 mlir_tablegen(ArmSMEOpInterfaces.h.inc -gen-op-interface-decls)
 mlir_tablegen(ArmSMEOpInterfaces.cpp.inc -gen-op-interface-defs)
-add_mlir_tablegen_target(MLIRArmSMEOpInterfaces)
+add_mlir_dialect_tablegen_target(MLIRArmSMEOpInterfaces)
 
 # Generate declarations and definitions of ArmSME intrinsic Ops
 set(LLVM_TARGET_DEFINITIONS ArmSMEIntrinsicOps.td)
 mlir_tablegen(ArmSMEIntrinsicOps.h.inc -gen-op-decls)
 mlir_tablegen(ArmSMEIntrinsicOps.cpp.inc -gen-op-defs)
 mlir_tablegen(ArmSMEIntrinsicConversions.inc -gen-llvmir-conversions)
-add_mlir_tablegen_target(MLIRArmSMEIntrinsicOpsIncGen)
+add_mlir_dialect_tablegen_target(MLIRArmSMEIntrinsicOpsIncGen)
 
 # Generate the docs
 add_mlir_doc(ArmSMEOps ArmSMEOps Dialects/ -gen-op-doc)

mlir/include/mlir/Dialect/ArmSME/Transforms/CMakeLists.txt

@@ -2,6 +2,6 @@ set(LLVM_TARGET_DEFINITIONS Passes.td)
 mlir_tablegen(Passes.h.inc -gen-pass-decls -name ArmSME)
 mlir_tablegen(PassesEnums.h.inc -gen-enum-decls)
 mlir_tablegen(PassesEnums.cpp.inc -gen-enum-defs)
-add_mlir_tablegen_target(MLIRArmSMETransformsIncGen)
+add_mlir_dialect_tablegen_target(MLIRArmSMETransformsIncGen)
 
 add_mlir_doc(Passes ArmSMEPasses ./ -gen-pass-doc)