[clang] [flang] [mlir] [mlir][ODS] Include headers required by generated dialect declarations and definitions (PR #239215)

Markus Böck via cfe-commits cfe-commits at lists.llvm.org
Thu Nov 5 04:47:29 PST 2026


https://github.com/zero9178 created https://github.com/llvm/llvm-project/pull/239215

Generated dialect declarations and definitions use C++ constructs that are not declared by any header they include. They therefore relied on the surrounding source file to include these headers first.

The dialect declarations now include the header declaring the dialect base class, and the headers declaring `StringAttr` and `Operation` if the dialect has discardable attributes. The dialect definitions include `MLIRContext.h` if they load dependent dialects.

Similar to #236155 and #238735 but for the dialect generator.

>From ad3a846c2f3f702b6a19fdfd0249499b149b6f85 Mon Sep 17 00:00:00 2001
From: Markus Boeck <mboeck at nvidia.com>
Date: Thu, 5 Nov 2026 12:45:43 +0000
Subject: [PATCH] [mlir][ODS] Include headers required by generated dialect
 declarations and definitions

Generated dialect declarations and definitions use C++ constructs that are
not declared by any header they include. They therefore relied on the
surrounding source file to include these headers first.

The dialect declarations now include the header declaring the dialect base
class, and the headers declaring `StringAttr` and `Operation` if the
dialect has discardable attributes. The dialect definitions include
`MLIRContext.h` if they load dependent dialects.

Similar to #236155 and #238735 but for the dialect generator.

Co-authored-by: Claude <noreply at anthropic.com>
---
 .../include/clang/CIR/Dialect/IR/CIRDialect.h |  1 -
 .../flang/Optimizer/Dialect/CUF/CUFDialect.h  |  1 -
 .../flang/Optimizer/Dialect/MIF/MIFDialect.h  |  1 -
 .../flang/Optimizer/HLFIR/HLFIRDialect.h      |  1 -
 mlir/examples/toy/Ch2/include/toy/Dialect.h   |  1 -
 mlir/examples/toy/Ch3/include/toy/Dialect.h   |  1 -
 mlir/examples/toy/Ch4/include/toy/Dialect.h   |  1 -
 mlir/examples/toy/Ch5/include/toy/Dialect.h   |  1 -
 mlir/examples/toy/Ch6/include/toy/Dialect.h   |  1 -
 mlir/examples/toy/Ch7/include/toy/Dialect.h   |  1 -
 .../Dialect/AMDGPU/IR/AMDGPUDialectDecl.h     |  2 -
 .../mlir/Dialect/Affine/IR/AffineDialect.h    |  2 -
 .../mlir/Dialect/Arith/IR/ArithDialect.h      |  2 -
 .../mlir/Dialect/ArmNeon/ArmNeonDialect.h     |  1 -
 mlir/include/mlir/Dialect/ArmSME/IR/ArmSME.h  |  1 -
 .../mlir/Dialect/ArmSVE/IR/ArmSVEDialect.h    |  1 -
 mlir/include/mlir/Dialect/Async/IR/Async.h    |  1 -
 .../Bufferization/IR/BufferizationDialect.h   |  2 -
 .../mlir/Dialect/ControlFlow/IR/ControlFlow.h |  1 -
 mlir/include/mlir/Dialect/DLTI/DLTI.h         |  1 -
 mlir/include/mlir/Dialect/EmitC/IR/EmitC.h    |  1 -
 .../mlir/Dialect/Func/IR/FuncDialect.h        |  2 -
 .../mlir/Dialect/GPU/IR/GPUDialectDecl.h      |  2 -
 .../mlir/Dialect/Index/IR/IndexDialect.h      |  2 -
 .../mlir/Dialect/LLVMIR/LLVMDialectDecl.h     |  1 -
 .../mlir/Dialect/LLVMIR/NVVMDialectDecl.h     |  2 -
 .../mlir/Dialect/LLVMIR/ROCDLDialectDecl.h    |  3 --
 .../include/mlir/Dialect/LLVMIR/VCIXDialect.h |  1 -
 .../include/mlir/Dialect/LLVMIR/XeVMDialect.h |  1 -
 .../mlir/Dialect/Linalg/IR/LinalgDialect.h    |  2 -
 .../mlir/Dialect/MLProgram/IR/MLProgram.h     |  1 -
 mlir/include/mlir/Dialect/MPI/IR/MPI.h        |  1 -
 mlir/include/mlir/Dialect/Math/IR/Math.h      |  1 -
 .../mlir/Dialect/MemRef/IR/MemRefDialect.h    |  2 -
 .../mlir/Dialect/NVGPU/IR/NVGPUDialectDecl.h  |  2 -
 mlir/include/mlir/Dialect/OpenACC/OpenACC.h   |  1 -
 .../mlir/Dialect/OpenMP/OpenMPDialect.h       |  1 -
 mlir/include/mlir/Dialect/PDL/IR/PDL.h        |  2 -
 mlir/include/mlir/Dialect/Ptr/IR/PtrDialect.h |  2 -
 mlir/include/mlir/Dialect/Quant/IR/Quant.h    |  1 -
 mlir/include/mlir/Dialect/SCF/IR/SCFDialect.h |  2 -
 mlir/include/mlir/Dialect/SMT/IR/SMTDialect.h |  1 -
 .../mlir/Dialect/SPIRV/IR/SPIRVDialect.h      |  2 +-
 mlir/include/mlir/Dialect/Shape/IR/Shape.h    |  1 -
 .../mlir/Dialect/Shard/IR/ShardDialect.h      |  2 -
 .../Dialect/SparseTensor/IR/SparseTensor.h    |  1 -
 .../mlir/Dialect/Tensor/IR/TensorDialect.h    |  2 -
 mlir/include/mlir/Dialect/UB/IR/UBOps.h       |  1 -
 .../mlir/Dialect/Vector/IR/VectorDialect.h    |  2 -
 .../include/mlir/Dialect/WasmSSA/IR/WasmSSA.h |  2 -
 mlir/include/mlir/Dialect/X86/X86Dialect.h    |  1 -
 mlir/include/mlir/Dialect/XeGPU/IR/XeGPU.h    |  1 -
 mlir/include/mlir/IR/BuiltinDialect.h         |  1 -
 mlir/lib/Dialect/LLVMIR/IR/ROCDLDialect.cpp   |  1 -
 mlir/lib/Dialect/LLVMIR/IR/VCIXDialect.cpp    |  1 -
 mlir/test/lib/Dialect/Test/TestDialect.h      |  1 -
 mlir/test/mlir-tblgen/cpp-includes-dialect.td | 40 +++++++++++++++++++
 mlir/tools/mlir-tblgen/DialectGen.cpp         | 20 ++++++++++
 58 files changed, 61 insertions(+), 76 deletions(-)
 create mode 100644 mlir/test/mlir-tblgen/cpp-includes-dialect.td

diff --git a/clang/include/clang/CIR/Dialect/IR/CIRDialect.h b/clang/include/clang/CIR/Dialect/IR/CIRDialect.h
index d9018e93628b69..37131e6752e511 100644
--- a/clang/include/clang/CIR/Dialect/IR/CIRDialect.h
+++ b/clang/include/clang/CIR/Dialect/IR/CIRDialect.h
@@ -16,7 +16,6 @@
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/BuiltinTypes.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/Interfaces/CallInterfaces.h"
 #include "mlir/Interfaces/ControlFlowInterfaces.h"
diff --git a/flang/include/flang/Optimizer/Dialect/CUF/CUFDialect.h b/flang/include/flang/Optimizer/Dialect/CUF/CUFDialect.h
index 786d224a5299e9..55f8049fc87cfa 100644
--- a/flang/include/flang/Optimizer/Dialect/CUF/CUFDialect.h
+++ b/flang/include/flang/Optimizer/Dialect/CUF/CUFDialect.h
@@ -14,7 +14,6 @@
 #define FORTRAN_OPTIMIZER_DIALECT_CUF_CUFDIALECT_H
 
 #include "mlir/Bytecode/BytecodeOpInterface.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/IR/SymbolTable.h"
 #include "mlir/Interfaces/CallInterfaces.h"
 #include "mlir/Interfaces/LoopLikeInterface.h"
diff --git a/flang/include/flang/Optimizer/Dialect/MIF/MIFDialect.h b/flang/include/flang/Optimizer/Dialect/MIF/MIFDialect.h
index d8dddab0815e60..798d5abd7d04d5 100644
--- a/flang/include/flang/Optimizer/Dialect/MIF/MIFDialect.h
+++ b/flang/include/flang/Optimizer/Dialect/MIF/MIFDialect.h
@@ -10,7 +10,6 @@
 #define FORTRAN_OPTIMIZER_DIALECT_MIF_MIFDIALECT_H
 
 #include "mlir/Bytecode/BytecodeOpInterface.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/IR/OpImplementation.h"
 #include "mlir/Interfaces/InferTypeOpInterface.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
diff --git a/flang/include/flang/Optimizer/HLFIR/HLFIRDialect.h b/flang/include/flang/Optimizer/HLFIR/HLFIRDialect.h
index c5eafe51723ee5..84506bc16a56d3 100644
--- a/flang/include/flang/Optimizer/HLFIR/HLFIRDialect.h
+++ b/flang/include/flang/Optimizer/HLFIR/HLFIRDialect.h
@@ -15,7 +15,6 @@
 #define FORTRAN_OPTIMIZER_HLFIR_HLFIRDIALECT_H
 
 #include "flang/Optimizer/Dialect/FIRType.h"
-#include "mlir/IR/Dialect.h"
 
 namespace hlfir {
 /// Is this a type that can be used for an HLFIR variable ?
diff --git a/mlir/examples/toy/Ch2/include/toy/Dialect.h b/mlir/examples/toy/Ch2/include/toy/Dialect.h
index fae84ff79ad925..a053702306b7d5 100644
--- a/mlir/examples/toy/Ch2/include/toy/Dialect.h
+++ b/mlir/examples/toy/Ch2/include/toy/Dialect.h
@@ -14,7 +14,6 @@
 #ifndef MLIR_TUTORIAL_TOY_DIALECT_H_
 #define MLIR_TUTORIAL_TOY_DIALECT_H_
 
-#include "mlir/IR/Dialect.h"
 #include "mlir/IR/SymbolTable.h"
 #include "mlir/Interfaces/CallInterfaces.h"
 #include "mlir/Interfaces/FunctionInterfaces.h"
diff --git a/mlir/examples/toy/Ch3/include/toy/Dialect.h b/mlir/examples/toy/Ch3/include/toy/Dialect.h
index fae84ff79ad925..a053702306b7d5 100644
--- a/mlir/examples/toy/Ch3/include/toy/Dialect.h
+++ b/mlir/examples/toy/Ch3/include/toy/Dialect.h
@@ -14,7 +14,6 @@
 #ifndef MLIR_TUTORIAL_TOY_DIALECT_H_
 #define MLIR_TUTORIAL_TOY_DIALECT_H_
 
-#include "mlir/IR/Dialect.h"
 #include "mlir/IR/SymbolTable.h"
 #include "mlir/Interfaces/CallInterfaces.h"
 #include "mlir/Interfaces/FunctionInterfaces.h"
diff --git a/mlir/examples/toy/Ch4/include/toy/Dialect.h b/mlir/examples/toy/Ch4/include/toy/Dialect.h
index a511a20ec5c49a..f474ffbbd445e5 100644
--- a/mlir/examples/toy/Ch4/include/toy/Dialect.h
+++ b/mlir/examples/toy/Ch4/include/toy/Dialect.h
@@ -15,7 +15,6 @@
 #define MLIR_TUTORIAL_TOY_DIALECT_H_
 
 #include "mlir/IR/BuiltinTypes.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/IR/SymbolTable.h"
 #include "mlir/Interfaces/CallInterfaces.h"
 #include "mlir/Interfaces/CastInterfaces.h"
diff --git a/mlir/examples/toy/Ch5/include/toy/Dialect.h b/mlir/examples/toy/Ch5/include/toy/Dialect.h
index a511a20ec5c49a..f474ffbbd445e5 100644
--- a/mlir/examples/toy/Ch5/include/toy/Dialect.h
+++ b/mlir/examples/toy/Ch5/include/toy/Dialect.h
@@ -15,7 +15,6 @@
 #define MLIR_TUTORIAL_TOY_DIALECT_H_
 
 #include "mlir/IR/BuiltinTypes.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/IR/SymbolTable.h"
 #include "mlir/Interfaces/CallInterfaces.h"
 #include "mlir/Interfaces/CastInterfaces.h"
diff --git a/mlir/examples/toy/Ch6/include/toy/Dialect.h b/mlir/examples/toy/Ch6/include/toy/Dialect.h
index a511a20ec5c49a..f474ffbbd445e5 100644
--- a/mlir/examples/toy/Ch6/include/toy/Dialect.h
+++ b/mlir/examples/toy/Ch6/include/toy/Dialect.h
@@ -15,7 +15,6 @@
 #define MLIR_TUTORIAL_TOY_DIALECT_H_
 
 #include "mlir/IR/BuiltinTypes.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/IR/SymbolTable.h"
 #include "mlir/Interfaces/CallInterfaces.h"
 #include "mlir/Interfaces/CastInterfaces.h"
diff --git a/mlir/examples/toy/Ch7/include/toy/Dialect.h b/mlir/examples/toy/Ch7/include/toy/Dialect.h
index b8d9916c94d8fa..071d5b9c2c107d 100644
--- a/mlir/examples/toy/Ch7/include/toy/Dialect.h
+++ b/mlir/examples/toy/Ch7/include/toy/Dialect.h
@@ -15,7 +15,6 @@
 #define MLIR_TUTORIAL_TOY_DIALECT_H_
 
 #include "mlir/IR/BuiltinTypes.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/IR/SymbolTable.h"
 #include "mlir/Interfaces/CallInterfaces.h"
 #include "mlir/Interfaces/CastInterfaces.h"
diff --git a/mlir/include/mlir/Dialect/AMDGPU/IR/AMDGPUDialectDecl.h b/mlir/include/mlir/Dialect/AMDGPU/IR/AMDGPUDialectDecl.h
index f676ecfad0b747..9e7494c416e4c3 100644
--- a/mlir/include/mlir/Dialect/AMDGPU/IR/AMDGPUDialectDecl.h
+++ b/mlir/include/mlir/Dialect/AMDGPU/IR/AMDGPUDialectDecl.h
@@ -9,8 +9,6 @@
 #ifndef MLIR_DIALECT_AMDGPU_IR_AMDGPUDIALECTDECL_H
 #define MLIR_DIALECT_AMDGPU_IR_AMDGPUDIALECTDECL_H
 
-#include "mlir/IR/Dialect.h"
-
 #include "mlir/Dialect/AMDGPU/IR/AMDGPUDialect.h.inc"
 
 #endif // MLIR_DIALECT_AMDGPU_IR_AMDGPUDIALECTDECL_H
diff --git a/mlir/include/mlir/Dialect/Affine/IR/AffineDialect.h b/mlir/include/mlir/Dialect/Affine/IR/AffineDialect.h
index 5069a09b6962b2..5c818bfd5c2299 100644
--- a/mlir/include/mlir/Dialect/Affine/IR/AffineDialect.h
+++ b/mlir/include/mlir/Dialect/Affine/IR/AffineDialect.h
@@ -9,8 +9,6 @@
 #ifndef MLIR_DIALECT_AFFINE_IR_AFFINEDIALECT_H
 #define MLIR_DIALECT_AFFINE_IR_AFFINEDIALECT_H
 
-#include "mlir/IR/Dialect.h"
-
 #include "mlir/Dialect/Affine/IR/AffineOpsDialect.h.inc"
 
 #endif // MLIR_DIALECT_AFFINE_IR_AFFINEDIALECT_H
diff --git a/mlir/include/mlir/Dialect/Arith/IR/ArithDialect.h b/mlir/include/mlir/Dialect/Arith/IR/ArithDialect.h
index d54c196e1eb47a..e06f8925f69cb2 100644
--- a/mlir/include/mlir/Dialect/Arith/IR/ArithDialect.h
+++ b/mlir/include/mlir/Dialect/Arith/IR/ArithDialect.h
@@ -9,8 +9,6 @@
 #ifndef MLIR_DIALECT_ARITH_IR_ARITHDIALECT_H_
 #define MLIR_DIALECT_ARITH_IR_ARITHDIALECT_H_
 
-#include "mlir/IR/Dialect.h"
-
 #include "mlir/Dialect/Arith/IR/ArithOpsDialect.h.inc"
 
 #endif // MLIR_DIALECT_ARITH_IR_ARITHDIALECT_H_
diff --git a/mlir/include/mlir/Dialect/ArmNeon/ArmNeonDialect.h b/mlir/include/mlir/Dialect/ArmNeon/ArmNeonDialect.h
index 49d34c8851b603..1157dc5c54b369 100644
--- a/mlir/include/mlir/Dialect/ArmNeon/ArmNeonDialect.h
+++ b/mlir/include/mlir/Dialect/ArmNeon/ArmNeonDialect.h
@@ -15,7 +15,6 @@
 
 #include "mlir/Bytecode/BytecodeOpInterface.h"
 #include "mlir/IR/BuiltinTypes.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
 
 #include "mlir/Dialect/ArmNeon/ArmNeonDialect.h.inc"
diff --git a/mlir/include/mlir/Dialect/ArmSME/IR/ArmSME.h b/mlir/include/mlir/Dialect/ArmSME/IR/ArmSME.h
index 9c6452841c04d0..dc657d5c855732 100644
--- a/mlir/include/mlir/Dialect/ArmSME/IR/ArmSME.h
+++ b/mlir/include/mlir/Dialect/ArmSME/IR/ArmSME.h
@@ -20,7 +20,6 @@
 #include "mlir/Dialect/SCF/IR/SCF.h"
 #include "mlir/Dialect/Vector/IR/VectorOps.h"
 #include "mlir/IR/BuiltinTypes.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
 
 #define GET_ATTRDEF_CLASSES
diff --git a/mlir/include/mlir/Dialect/ArmSVE/IR/ArmSVEDialect.h b/mlir/include/mlir/Dialect/ArmSVE/IR/ArmSVEDialect.h
index 830a04d2bbfbfb..fedb3d785708c0 100644
--- a/mlir/include/mlir/Dialect/ArmSVE/IR/ArmSVEDialect.h
+++ b/mlir/include/mlir/Dialect/ArmSVE/IR/ArmSVEDialect.h
@@ -14,7 +14,6 @@
 #define MLIR_DIALECT_ARMSVE_ARMSVEDIALECT_H
 
 #include "mlir/IR/BuiltinTypes.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
 
 #include "mlir/Dialect/ArmSVE/IR/ArmSVEDialect.h.inc"
diff --git a/mlir/include/mlir/Dialect/Async/IR/Async.h b/mlir/include/mlir/Dialect/Async/IR/Async.h
index ba6a5aafeffdb9..70462a6df8bcad 100644
--- a/mlir/include/mlir/Dialect/Async/IR/Async.h
+++ b/mlir/include/mlir/Dialect/Async/IR/Async.h
@@ -17,7 +17,6 @@
 #include "mlir/Dialect/Async/IR/AsyncTypes.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinTypes.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/IR/SymbolTable.h"
 #include "mlir/Interfaces/CallInterfaces.h"
diff --git a/mlir/include/mlir/Dialect/Bufferization/IR/BufferizationDialect.h b/mlir/include/mlir/Dialect/Bufferization/IR/BufferizationDialect.h
index ebc70aa9962b9a..6d8fc4a5f9dfa9 100644
--- a/mlir/include/mlir/Dialect/Bufferization/IR/BufferizationDialect.h
+++ b/mlir/include/mlir/Dialect/Bufferization/IR/BufferizationDialect.h
@@ -9,8 +9,6 @@
 #ifndef MLIR_DIALECT_BUFFERIZATION_IR_BUFFERIZATIONDIALECT_H
 #define MLIR_DIALECT_BUFFERIZATION_IR_BUFFERIZATIONDIALECT_H
 
-#include "mlir/IR/Dialect.h"
-
 #include "mlir/Dialect/Bufferization/IR/BufferizationOpsDialect.h.inc"
 
 #endif // MLIR_DIALECT_BUFFERIZATION_IR_BUFFERIZATIONDIALECT_H
diff --git a/mlir/include/mlir/Dialect/ControlFlow/IR/ControlFlow.h b/mlir/include/mlir/Dialect/ControlFlow/IR/ControlFlow.h
index 0ae076120018f2..54ea73bf6fe66c 100644
--- a/mlir/include/mlir/Dialect/ControlFlow/IR/ControlFlow.h
+++ b/mlir/include/mlir/Dialect/ControlFlow/IR/ControlFlow.h
@@ -14,7 +14,6 @@
 #define MLIR_DIALECT_CONTROLFLOW_IR_CONTROLFLOW_H
 
 #include "mlir/Bytecode/BytecodeOpInterface.h"
-#include "mlir/IR/Dialect.h"
 
 #include "mlir/Dialect/ControlFlow/IR/ControlFlowOpsDialect.h.inc"
 
diff --git a/mlir/include/mlir/Dialect/DLTI/DLTI.h b/mlir/include/mlir/Dialect/DLTI/DLTI.h
index 41e42cd940ce0c..2aad7db6a4990f 100644
--- a/mlir/include/mlir/Dialect/DLTI/DLTI.h
+++ b/mlir/include/mlir/Dialect/DLTI/DLTI.h
@@ -14,7 +14,6 @@
 #define MLIR_DIALECT_DLTI_DLTI_H
 
 #include "mlir/IR/Attributes.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/Interfaces/DataLayoutInterfaces.h"
 
 namespace mlir {
diff --git a/mlir/include/mlir/Dialect/EmitC/IR/EmitC.h b/mlir/include/mlir/Dialect/EmitC/IR/EmitC.h
index 0a8de6bb9d0634..62c6c9d7230aa7 100644
--- a/mlir/include/mlir/Dialect/EmitC/IR/EmitC.h
+++ b/mlir/include/mlir/Dialect/EmitC/IR/EmitC.h
@@ -17,7 +17,6 @@
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/BuiltinTypes.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/Interfaces/CastInterfaces.h"
 #include "mlir/Interfaces/ControlFlowInterfaces.h"
 #include "mlir/Interfaces/FunctionInterfaces.h"
diff --git a/mlir/include/mlir/Dialect/Func/IR/FuncDialect.h b/mlir/include/mlir/Dialect/Func/IR/FuncDialect.h
index 9a8c12713505b1..640e0397b90241 100644
--- a/mlir/include/mlir/Dialect/Func/IR/FuncDialect.h
+++ b/mlir/include/mlir/Dialect/Func/IR/FuncDialect.h
@@ -9,8 +9,6 @@
 #ifndef MLIR_DIALECT_FUNC_IR_FUNCDIALECT_H
 #define MLIR_DIALECT_FUNC_IR_FUNCDIALECT_H
 
-#include "mlir/IR/Dialect.h"
-
 #include "mlir/Dialect/Func/IR/FuncOpsDialect.h.inc"
 
 #endif // MLIR_DIALECT_FUNC_IR_FUNCDIALECT_H
diff --git a/mlir/include/mlir/Dialect/GPU/IR/GPUDialectDecl.h b/mlir/include/mlir/Dialect/GPU/IR/GPUDialectDecl.h
index 1d9e79685c9f53..ae46ffcf5db022 100644
--- a/mlir/include/mlir/Dialect/GPU/IR/GPUDialectDecl.h
+++ b/mlir/include/mlir/Dialect/GPU/IR/GPUDialectDecl.h
@@ -11,8 +11,6 @@
 
 #include "mlir/IR/BuiltinAttributes.h"
 #include "mlir/IR/BuiltinTypes.h"
-#include "mlir/IR/Dialect.h"
-#include "mlir/IR/Operation.h"
 
 // Pull in enum definitions used by the generated dialect declaration.
 #include "mlir/Dialect/GPU/IR/GPUOpsEnums.h.inc"
diff --git a/mlir/include/mlir/Dialect/Index/IR/IndexDialect.h b/mlir/include/mlir/Dialect/Index/IR/IndexDialect.h
index fb8aebfb240b21..9fb7e4c826046c 100644
--- a/mlir/include/mlir/Dialect/Index/IR/IndexDialect.h
+++ b/mlir/include/mlir/Dialect/Index/IR/IndexDialect.h
@@ -9,8 +9,6 @@
 #ifndef MLIR_DIALECT_INDEX_IR_INDEXDIALECT_H
 #define MLIR_DIALECT_INDEX_IR_INDEXDIALECT_H
 
-#include "mlir/IR/Dialect.h"
-
 //===----------------------------------------------------------------------===//
 // ODS-Generated Declarations
 //===----------------------------------------------------------------------===//
diff --git a/mlir/include/mlir/Dialect/LLVMIR/LLVMDialectDecl.h b/mlir/include/mlir/Dialect/LLVMIR/LLVMDialectDecl.h
index d845d7dfb96d3a..57d95b56c4cfc7 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/LLVMDialectDecl.h
+++ b/mlir/include/mlir/Dialect/LLVMIR/LLVMDialectDecl.h
@@ -10,7 +10,6 @@
 #define MLIR_DIALECT_LLVMIR_LLVMDIALECTDECL_H_
 
 #include "mlir/Dialect/LLVMIR/LLVMAttrs.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/Support/ThreadLocalCache.h"
 #include "llvm/ADT/DenseSet.h"
 
diff --git a/mlir/include/mlir/Dialect/LLVMIR/NVVMDialectDecl.h b/mlir/include/mlir/Dialect/LLVMIR/NVVMDialectDecl.h
index d6f22a14ae1b4e..ef935d8d1e8cf8 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/NVVMDialectDecl.h
+++ b/mlir/include/mlir/Dialect/LLVMIR/NVVMDialectDecl.h
@@ -9,8 +9,6 @@
 #ifndef MLIR_DIALECT_LLVMIR_NVVMDIALECTDECL_H
 #define MLIR_DIALECT_LLVMIR_NVVMDIALECTDECL_H
 
-#include "mlir/IR/Dialect.h"
-
 #include "mlir/Dialect/LLVMIR/NVVMOpsDialect.h.inc"
 
 #endif // MLIR_DIALECT_LLVMIR_NVVMDIALECTDECL_H
diff --git a/mlir/include/mlir/Dialect/LLVMIR/ROCDLDialectDecl.h b/mlir/include/mlir/Dialect/LLVMIR/ROCDLDialectDecl.h
index ba2bfa2d26cb61..4b8e015032e5e4 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/ROCDLDialectDecl.h
+++ b/mlir/include/mlir/Dialect/LLVMIR/ROCDLDialectDecl.h
@@ -9,9 +9,6 @@
 #ifndef MLIR_DIALECT_LLVMIR_ROCDLDIALECTDECL_H
 #define MLIR_DIALECT_LLVMIR_ROCDLDIALECTDECL_H
 
-#include "mlir/IR/Dialect.h"
-#include "mlir/IR/Operation.h"
-
 #include "mlir/Dialect/LLVMIR/ROCDLOpsDialect.h.inc"
 
 #endif // MLIR_DIALECT_LLVMIR_ROCDLDIALECTDECL_H
diff --git a/mlir/include/mlir/Dialect/LLVMIR/VCIXDialect.h b/mlir/include/mlir/Dialect/LLVMIR/VCIXDialect.h
index ccfff0e12b569e..7849582fbfa512 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/VCIXDialect.h
+++ b/mlir/include/mlir/Dialect/LLVMIR/VCIXDialect.h
@@ -23,7 +23,6 @@
 #define MLIR_DIALECT_LLVMIR_VCIXDIALECT_H_
 
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
 
 ///// Ops /////
diff --git a/mlir/include/mlir/Dialect/LLVMIR/XeVMDialect.h b/mlir/include/mlir/Dialect/LLVMIR/XeVMDialect.h
index 379fbef1dba4ae..36bac2d5ca29bc 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/XeVMDialect.h
+++ b/mlir/include/mlir/Dialect/LLVMIR/XeVMDialect.h
@@ -10,7 +10,6 @@
 #define MLIR_DIALECT_LLVMIR_XEVMDIALECT_H_
 
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/Target/LLVMIR/ModuleTranslation.h"
 
 #include "mlir/Dialect/LLVMIR/XeVMOpsEnums.h.inc"
diff --git a/mlir/include/mlir/Dialect/Linalg/IR/LinalgDialect.h b/mlir/include/mlir/Dialect/Linalg/IR/LinalgDialect.h
index cf8ccad5fa3d70..d3d677d6f6b495 100644
--- a/mlir/include/mlir/Dialect/Linalg/IR/LinalgDialect.h
+++ b/mlir/include/mlir/Dialect/Linalg/IR/LinalgDialect.h
@@ -9,8 +9,6 @@
 #ifndef MLIR_DIALECT_LINALG_IR_LINALGDIALECT_H
 #define MLIR_DIALECT_LINALG_IR_LINALGDIALECT_H
 
-#include "mlir/IR/Dialect.h"
-
 #include "llvm/ADT/STLFunctionalExtras.h"
 #include "llvm/ADT/StringMap.h"
 
diff --git a/mlir/include/mlir/Dialect/MLProgram/IR/MLProgram.h b/mlir/include/mlir/Dialect/MLProgram/IR/MLProgram.h
index 70c227274f90de..3fe8b9a44138e5 100644
--- a/mlir/include/mlir/Dialect/MLProgram/IR/MLProgram.h
+++ b/mlir/include/mlir/Dialect/MLProgram/IR/MLProgram.h
@@ -10,7 +10,6 @@
 
 #include "mlir/Dialect/MLProgram/IR/MLProgramAttributes.h"
 #include "mlir/Dialect/MLProgram/IR/MLProgramTypes.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/IR/RegionKindInterface.h"
 #include "mlir/IR/SymbolTable.h"
 #include "mlir/Interfaces/CallInterfaces.h"
diff --git a/mlir/include/mlir/Dialect/MPI/IR/MPI.h b/mlir/include/mlir/Dialect/MPI/IR/MPI.h
index 4797eb8b0a490b..b7a02bf289601a 100644
--- a/mlir/include/mlir/Dialect/MPI/IR/MPI.h
+++ b/mlir/include/mlir/Dialect/MPI/IR/MPI.h
@@ -8,7 +8,6 @@
 #ifndef MLIR_DIALECT_MPI_IR_MPI_H_
 #define MLIR_DIALECT_MPI_IR_MPI_H_
 
-#include "mlir/IR/Dialect.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
 
 //===----------------------------------------------------------------------===//
diff --git a/mlir/include/mlir/Dialect/Math/IR/Math.h b/mlir/include/mlir/Dialect/Math/IR/Math.h
index 76bc1258b62e77..4d2dc414a5a449 100644
--- a/mlir/include/mlir/Dialect/Math/IR/Math.h
+++ b/mlir/include/mlir/Dialect/Math/IR/Math.h
@@ -11,7 +11,6 @@
 
 #include "mlir/Dialect/Arith/IR/ArithOpInterfaces.h"
 #include "mlir/IR/BuiltinTypes.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/Interfaces/InferTypeOpInterface.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
 #include "mlir/Interfaces/VectorInterfaces.h"
diff --git a/mlir/include/mlir/Dialect/MemRef/IR/MemRefDialect.h b/mlir/include/mlir/Dialect/MemRef/IR/MemRefDialect.h
index 79c37b214c224d..1cb8fd10492765 100644
--- a/mlir/include/mlir/Dialect/MemRef/IR/MemRefDialect.h
+++ b/mlir/include/mlir/Dialect/MemRef/IR/MemRefDialect.h
@@ -9,8 +9,6 @@
 #ifndef MLIR_DIALECT_MEMREF_IR_MEMREFDIALECT_H_
 #define MLIR_DIALECT_MEMREF_IR_MEMREFDIALECT_H_
 
-#include "mlir/IR/Dialect.h"
-
 #include "mlir/Dialect/MemRef/IR/MemRefOpsDialect.h.inc"
 
 #endif // MLIR_DIALECT_MEMREF_IR_MEMREFDIALECT_H_
diff --git a/mlir/include/mlir/Dialect/NVGPU/IR/NVGPUDialectDecl.h b/mlir/include/mlir/Dialect/NVGPU/IR/NVGPUDialectDecl.h
index a5987e44884970..bed2741ea94a13 100644
--- a/mlir/include/mlir/Dialect/NVGPU/IR/NVGPUDialectDecl.h
+++ b/mlir/include/mlir/Dialect/NVGPU/IR/NVGPUDialectDecl.h
@@ -9,8 +9,6 @@
 #ifndef MLIR_DIALECT_NVGPU_IR_NVGPUDIALECTDECL_H
 #define MLIR_DIALECT_NVGPU_IR_NVGPUDIALECTDECL_H
 
-#include "mlir/IR/Dialect.h"
-
 namespace mlir {
 class MemRefType;
 } // namespace mlir
diff --git a/mlir/include/mlir/Dialect/OpenACC/OpenACC.h b/mlir/include/mlir/Dialect/OpenACC/OpenACC.h
index 919941885b7bce..301350e8cf300b 100644
--- a/mlir/include/mlir/Dialect/OpenACC/OpenACC.h
+++ b/mlir/include/mlir/Dialect/OpenACC/OpenACC.h
@@ -15,7 +15,6 @@
 
 #include "mlir/Dialect/OpenACC/OpenACCVariableInfo.h"
 #include "mlir/IR/BuiltinTypes.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/IR/SymbolTable.h"
diff --git a/mlir/include/mlir/Dialect/OpenMP/OpenMPDialect.h b/mlir/include/mlir/Dialect/OpenMP/OpenMPDialect.h
index 7658d6eafdfd7d..a674a52b2434c1 100644
--- a/mlir/include/mlir/Dialect/OpenMP/OpenMPDialect.h
+++ b/mlir/include/mlir/Dialect/OpenMP/OpenMPDialect.h
@@ -18,7 +18,6 @@
 #include "mlir/Dialect/OpenACCMPCommon/Interfaces/OpenACCMPOpsInterfaces.h"
 #include "mlir/Dialect/OpenMP/OpenMPInterfaces.h"
 #include "mlir/Dialect/OpenMP/Utils/Utils.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/IR/SymbolTable.h"
 #include "mlir/Interfaces/ControlFlowInterfaces.h"
diff --git a/mlir/include/mlir/Dialect/PDL/IR/PDL.h b/mlir/include/mlir/Dialect/PDL/IR/PDL.h
index bbc52301360d7a..2d4a2df12602b7 100644
--- a/mlir/include/mlir/Dialect/PDL/IR/PDL.h
+++ b/mlir/include/mlir/Dialect/PDL/IR/PDL.h
@@ -13,8 +13,6 @@
 #ifndef MLIR_DIALECT_PDL_IR_PDL_H_
 #define MLIR_DIALECT_PDL_IR_PDL_H_
 
-#include "mlir/IR/Dialect.h"
-
 //===----------------------------------------------------------------------===//
 // PDL Dialect
 //===----------------------------------------------------------------------===//
diff --git a/mlir/include/mlir/Dialect/Ptr/IR/PtrDialect.h b/mlir/include/mlir/Dialect/Ptr/IR/PtrDialect.h
index 92f877c20dbf07..86da16cc1d8d47 100644
--- a/mlir/include/mlir/Dialect/Ptr/IR/PtrDialect.h
+++ b/mlir/include/mlir/Dialect/Ptr/IR/PtrDialect.h
@@ -13,8 +13,6 @@
 #ifndef MLIR_DIALECT_PTR_IR_PTRDIALECT_H
 #define MLIR_DIALECT_PTR_IR_PTRDIALECT_H
 
-#include "mlir/IR/Dialect.h"
-
 #include "mlir/Dialect/Ptr/IR/PtrOpsDialect.h.inc"
 
 #endif // MLIR_DIALECT_PTR_IR_PTRDIALECT_H
diff --git a/mlir/include/mlir/Dialect/Quant/IR/Quant.h b/mlir/include/mlir/Dialect/Quant/IR/Quant.h
index d72433883cb018..3b4655ebed64f9 100644
--- a/mlir/include/mlir/Dialect/Quant/IR/Quant.h
+++ b/mlir/include/mlir/Dialect/Quant/IR/Quant.h
@@ -12,7 +12,6 @@
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinTypes.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/IR/Types.h"
 #include "mlir/Interfaces/InferTypeOpInterface.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
diff --git a/mlir/include/mlir/Dialect/SCF/IR/SCFDialect.h b/mlir/include/mlir/Dialect/SCF/IR/SCFDialect.h
index fd6fe64dccd4e5..459780067cd719 100644
--- a/mlir/include/mlir/Dialect/SCF/IR/SCFDialect.h
+++ b/mlir/include/mlir/Dialect/SCF/IR/SCFDialect.h
@@ -9,8 +9,6 @@
 #ifndef MLIR_DIALECT_SCF_IR_SCFDIALECT_H
 #define MLIR_DIALECT_SCF_IR_SCFDIALECT_H
 
-#include "mlir/IR/Dialect.h"
-
 #include "mlir/Dialect/SCF/IR/SCFOpsDialect.h.inc"
 
 #endif // MLIR_DIALECT_SCF_IR_SCFDIALECT_H
diff --git a/mlir/include/mlir/Dialect/SMT/IR/SMTDialect.h b/mlir/include/mlir/Dialect/SMT/IR/SMTDialect.h
index 2c44ca802a2d51..037323385a9611 100644
--- a/mlir/include/mlir/Dialect/SMT/IR/SMTDialect.h
+++ b/mlir/include/mlir/Dialect/SMT/IR/SMTDialect.h
@@ -10,7 +10,6 @@
 #define MLIR_DIALECT_SMT_IR_SMTDIALECT_H
 
 #include "mlir/IR/BuiltinOps.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/Support/LLVM.h"
 
 // Pull in the dialect definition.
diff --git a/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVDialect.h b/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVDialect.h
index b3503fc732bb81..45e128045ad2e2 100644
--- a/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVDialect.h
+++ b/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVDialect.h
@@ -13,7 +13,7 @@
 #ifndef MLIR_DIALECT_SPIRV_IR_SPIRVDIALECT_H_
 #define MLIR_DIALECT_SPIRV_IR_SPIRVDIALECT_H_
 
-#include "mlir/IR/Dialect.h"
+#include <cstdint>
 
 namespace mlir {
 namespace spirv {
diff --git a/mlir/include/mlir/Dialect/Shape/IR/Shape.h b/mlir/include/mlir/Dialect/Shape/IR/Shape.h
index d46d2550175911..4dd8d5c745aca0 100644
--- a/mlir/include/mlir/Dialect/Shape/IR/Shape.h
+++ b/mlir/include/mlir/Dialect/Shape/IR/Shape.h
@@ -15,7 +15,6 @@
 #define MLIR_DIALECT_SHAPE_IR_SHAPE_H
 
 #include "mlir/IR/BuiltinOps.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/IR/SymbolTable.h"
 #include "mlir/Interfaces/CallInterfaces.h"
 #include "mlir/Interfaces/CastInterfaces.h"
diff --git a/mlir/include/mlir/Dialect/Shard/IR/ShardDialect.h b/mlir/include/mlir/Dialect/Shard/IR/ShardDialect.h
index 4113a668d4b76b..f39bc0ac651965 100644
--- a/mlir/include/mlir/Dialect/Shard/IR/ShardDialect.h
+++ b/mlir/include/mlir/Dialect/Shard/IR/ShardDialect.h
@@ -9,8 +9,6 @@
 #ifndef MLIR_DIALECT_SHARD_IR_SHARDDIALECT_H
 #define MLIR_DIALECT_SHARD_IR_SHARDDIALECT_H
 
-#include "mlir/IR/Dialect.h"
-
 #include "mlir/Dialect/Shard/IR/ShardDialect.h.inc"
 
 #endif // MLIR_DIALECT_SHARD_IR_SHARDDIALECT_H
diff --git a/mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensor.h b/mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensor.h
index 2013a43ffb58e8..2ad9555b496ca4 100644
--- a/mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensor.h
+++ b/mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensor.h
@@ -12,7 +12,6 @@
 #include "mlir/Dialect/SparseTensor/IR/Enums.h"
 #include "mlir/Dialect/SparseTensor/IR/SparseTensorInterfaces.h"
 #include "mlir/IR/BuiltinTypes.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/TensorEncoding.h"
 #include "mlir/Interfaces/ControlFlowInterfaces.h"
diff --git a/mlir/include/mlir/Dialect/Tensor/IR/TensorDialect.h b/mlir/include/mlir/Dialect/Tensor/IR/TensorDialect.h
index b59ec94415289e..965474ffa9b188 100644
--- a/mlir/include/mlir/Dialect/Tensor/IR/TensorDialect.h
+++ b/mlir/include/mlir/Dialect/Tensor/IR/TensorDialect.h
@@ -9,8 +9,6 @@
 #ifndef MLIR_DIALECT_TENSOR_IR_TENSORDIALECT_H_
 #define MLIR_DIALECT_TENSOR_IR_TENSORDIALECT_H_
 
-#include "mlir/IR/Dialect.h"
-
 #include "mlir/Dialect/Tensor/IR/TensorOpsDialect.h.inc"
 
 #endif // MLIR_DIALECT_TENSOR_IR_TENSORDIALECT_H_
diff --git a/mlir/include/mlir/Dialect/UB/IR/UBOps.h b/mlir/include/mlir/Dialect/UB/IR/UBOps.h
index 4b96dd21587b75..309ba0c0cd1261 100644
--- a/mlir/include/mlir/Dialect/UB/IR/UBOps.h
+++ b/mlir/include/mlir/Dialect/UB/IR/UBOps.h
@@ -9,7 +9,6 @@
 #ifndef MLIR_DIALECT_UB_IR_OPS_H
 #define MLIR_DIALECT_UB_IR_OPS_H
 
-#include "mlir/IR/Dialect.h"
 #include "mlir/IR/OpImplementation.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
 
diff --git a/mlir/include/mlir/Dialect/Vector/IR/VectorDialect.h b/mlir/include/mlir/Dialect/Vector/IR/VectorDialect.h
index da89c34e691707..70396434ffc683 100644
--- a/mlir/include/mlir/Dialect/Vector/IR/VectorDialect.h
+++ b/mlir/include/mlir/Dialect/Vector/IR/VectorDialect.h
@@ -9,8 +9,6 @@
 #ifndef MLIR_DIALECT_VECTOR_IR_VECTORDIALECT_H
 #define MLIR_DIALECT_VECTOR_IR_VECTORDIALECT_H
 
-#include "mlir/IR/Dialect.h"
-
 #include "mlir/Dialect/Vector/IR/VectorDialect.h.inc"
 
 #endif // MLIR_DIALECT_VECTOR_IR_VECTORDIALECT_H
diff --git a/mlir/include/mlir/Dialect/WasmSSA/IR/WasmSSA.h b/mlir/include/mlir/Dialect/WasmSSA/IR/WasmSSA.h
index e66c602ade1641..ae5ff3c8c5b817 100644
--- a/mlir/include/mlir/Dialect/WasmSSA/IR/WasmSSA.h
+++ b/mlir/include/mlir/Dialect/WasmSSA/IR/WasmSSA.h
@@ -9,8 +9,6 @@
 #ifndef MLIR_DIALECT_WasmSSA_IR_WasmSSA_H_
 #define MLIR_DIALECT_WasmSSA_IR_WasmSSA_H_
 
-#include "mlir/IR/Dialect.h"
-
 //===----------------------------------------------------------------------===//
 // WebAssemblyDialect
 //===----------------------------------------------------------------------===//
diff --git a/mlir/include/mlir/Dialect/X86/X86Dialect.h b/mlir/include/mlir/Dialect/X86/X86Dialect.h
index e4ea6334ac372f..8720972d78c956 100644
--- a/mlir/include/mlir/Dialect/X86/X86Dialect.h
+++ b/mlir/include/mlir/Dialect/X86/X86Dialect.h
@@ -16,7 +16,6 @@
 #include "mlir/Conversion/LLVMCommon/Pattern.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
 #include "mlir/IR/BuiltinTypes.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/Interfaces/InferTypeOpInterface.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
diff --git a/mlir/include/mlir/Dialect/XeGPU/IR/XeGPU.h b/mlir/include/mlir/Dialect/XeGPU/IR/XeGPU.h
index 0f41fc48cf1351..351524849e61e6 100644
--- a/mlir/include/mlir/Dialect/XeGPU/IR/XeGPU.h
+++ b/mlir/include/mlir/Dialect/XeGPU/IR/XeGPU.h
@@ -14,7 +14,6 @@
 #include "mlir/Dialect/Utils/IndexingUtils.h"
 #include "mlir/Dialect/Vector/IR/VectorOps.h"
 #include "mlir/IR/BuiltinTypes.h"
-#include "mlir/IR/Dialect.h"
 #include "mlir/IR/TypeUtilities.h"
 #include "mlir/IR/Value.h"
 #include "mlir/Interfaces/ShapedOpInterfaces.h"
diff --git a/mlir/include/mlir/IR/BuiltinDialect.h b/mlir/include/mlir/IR/BuiltinDialect.h
index b7c7a271b07fcf..3f4573d229117f 100644
--- a/mlir/include/mlir/IR/BuiltinDialect.h
+++ b/mlir/include/mlir/IR/BuiltinDialect.h
@@ -15,7 +15,6 @@
 #define MLIR_IR_BUILTINDIALECT_H_
 
 #include "mlir/Bytecode/BytecodeImplementation.h"
-#include "mlir/IR/Dialect.h"
 
 //===----------------------------------------------------------------------===//
 // BuiltinDialectVersion
diff --git a/mlir/lib/Dialect/LLVMIR/IR/ROCDLDialect.cpp b/mlir/lib/Dialect/LLVMIR/IR/ROCDLDialect.cpp
index c0b30863134ef2..856f75ea8db97c 100644
--- a/mlir/lib/Dialect/LLVMIR/IR/ROCDLDialect.cpp
+++ b/mlir/lib/Dialect/LLVMIR/IR/ROCDLDialect.cpp
@@ -23,7 +23,6 @@
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/DialectImplementation.h"
-#include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/Operation.h"
 #include "mlir/Transforms/InliningUtils.h"
 #include "llvm/ADT/StringExtras.h"
diff --git a/mlir/lib/Dialect/LLVMIR/IR/VCIXDialect.cpp b/mlir/lib/Dialect/LLVMIR/IR/VCIXDialect.cpp
index fe7cc553a475e8..5138960ea96ca7 100644
--- a/mlir/lib/Dialect/LLVMIR/IR/VCIXDialect.cpp
+++ b/mlir/lib/Dialect/LLVMIR/IR/VCIXDialect.cpp
@@ -14,7 +14,6 @@
 
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
 #include "mlir/IR/DialectImplementation.h"
-#include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/Operation.h"
 #include "llvm/ADT/TypeSwitch.h"
 
diff --git a/mlir/test/lib/Dialect/Test/TestDialect.h b/mlir/test/lib/Dialect/Test/TestDialect.h
index bcf3b55d33cb91..d37272f17e547c 100644
--- a/mlir/test/lib/Dialect/Test/TestDialect.h
+++ b/mlir/test/lib/Dialect/Test/TestDialect.h
@@ -29,7 +29,6 @@
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/DialectResourceBlobManager.h"
-#include "mlir/IR/ExtensibleDialect.h"
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/OpImplementation.h"
 #include "mlir/IR/RegionKindInterface.h"
diff --git a/mlir/test/mlir-tblgen/cpp-includes-dialect.td b/mlir/test/mlir-tblgen/cpp-includes-dialect.td
new file mode 100644
index 00000000000000..73fccc4c890b00
--- /dev/null
+++ b/mlir/test/mlir-tblgen/cpp-includes-dialect.td
@@ -0,0 +1,40 @@
+// RUN: mlir-tblgen -gen-dialect-decls -dialect=test -I %S/../../include %s | FileCheck %s --check-prefix=DECL
+// RUN: mlir-tblgen -gen-dialect-defs -dialect=test -I %S/../../include %s | FileCheck %s --check-prefix=DEF
+// RUN: mlir-tblgen -gen-dialect-decls -dialect=ext -I %S/../../include %s | FileCheck %s --check-prefix=EXT-DECL
+// RUN: mlir-tblgen -gen-dialect-defs -dialect=ext -I %S/../../include %s | FileCheck %s --check-prefix=EXT-DEF
+
+include "mlir/IR/DialectBase.td"
+
+// Dialect declarations include the header declaring the dialect base class.
+// The discardable attribute helpers additionally need the headers declaring
+// `StringAttr` and `Operation`. The dialect definitions include the context
+// header when loading dependent dialects.
+
+def Test_Dialect : Dialect {
+  let name = "test";
+  let cppNamespace = "::test";
+  let dependentDialects = ["::test::OtherDialect"];
+  let discardableAttrs = (ins "::mlir::UnitAttr":$discardable);
+}
+
+// DECL: #include "mlir/IR/BuiltinAttributes.h"
+// DECL-NEXT: #include "mlir/IR/Dialect.h"
+// DECL-NEXT: #include "mlir/IR/Operation.h"
+// DECL-EMPTY:
+// DECL-NOT: #include
+
+// DEF: #include "mlir/IR/MLIRContext.h"
+// DEF-EMPTY:
+// DEF-NOT: #include
+
+def Ext_Dialect : Dialect {
+  let name = "ext";
+  let cppNamespace = "::ext";
+  let isExtensible = 1;
+}
+
+// EXT-DECL: #include "mlir/IR/ExtensibleDialect.h"
+// EXT-DECL-EMPTY:
+// EXT-DECL-NOT: #include
+
+// EXT-DEF-NOT: #include
diff --git a/mlir/tools/mlir-tblgen/DialectGen.cpp b/mlir/tools/mlir-tblgen/DialectGen.cpp
index d6977b1f225794..a1633174cbdfa7 100644
--- a/mlir/tools/mlir-tblgen/DialectGen.cpp
+++ b/mlir/tools/mlir-tblgen/DialectGen.cpp
@@ -283,6 +283,22 @@ static void emitDialectDecl(Dialect &dialect, raw_ostream &os) {
        << "::" << dialect.getCppClassName() << ")\n";
 }
 
+/// Emit the `#include` directives for the headers declaring the C++ constructs
+/// used by the declaration of `dialect`.
+static void emitDialectDeclIncludes(const Dialect &dialect, raw_ostream &os) {
+  SmallVector<StringRef> includes;
+  // `::mlir::Dialect` or `::mlir::ExtensibleDialect`.
+  includes.push_back(dialect.isExtensible() ? "mlir/IR/ExtensibleDialect.h"
+                                            : "mlir/IR/Dialect.h");
+  if (dialect.getDiscardableAttributes()->getNumArgs() != 0) {
+    // `::mlir::StringAttr` and `::mlir::Operation`, used by the discardable
+    // attribute helpers.
+    includes.push_back("mlir/IR/BuiltinAttributes.h");
+    includes.push_back("mlir/IR/Operation.h");
+  }
+  tblgen::emitIncludes(os, includes);
+}
+
 static bool emitDialectDecls(const RecordKeeper &records, raw_ostream &os) {
   emitSourceFileHeader("Dialect Declarations", os, records);
 
@@ -294,6 +310,7 @@ static bool emitDialectDecls(const RecordKeeper &records, raw_ostream &os) {
   std::optional<Dialect> dialect = findDialectToGenerate(dialects);
   if (!dialect)
     return true;
+  emitDialectDeclIncludes(*dialect, os);
   emitDialectDecl(*dialect, os);
   return false;
 }
@@ -386,6 +403,9 @@ static bool emitDialectDefs(const RecordKeeper &records, raw_ostream &os) {
   std::optional<Dialect> dialect = findDialectToGenerate(dialects);
   if (!dialect)
     return true;
+  // `::mlir::MLIRContext::loadDialect`, used to load the dependent dialects.
+  if (!dialect->getDependentDialects().empty())
+    tblgen::emitIncludes(os, StringRef("mlir/IR/MLIRContext.h"));
   emitDialectDef(*dialect, records, os);
   return false;
 }



More information about the cfe-commits mailing list