Skip to content

Commit e75bc5c

Browse files
joker-ephjoker-eph
committed
Revert "Separate the Registration from Loading dialects in the Context"
This reverts commit d14cf45. The build is broken with GCC-5.
1 parent c996d49 commit e75bc5c

File tree

95 files changed

+239
-761
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+239
-761
lines changed

‎mlir/examples/standalone/standalone-opt/standalone-opt.cpp

+3-10
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,9 @@
2424
int main(int argc, char **argv) {
2525
mlir::registerAllDialects();
2626
mlir::registerAllPasses();
27-
// TODO: Register standalone passes here.
2827

29-
mlir::DialectRegistry registry;
30-
registry.insert<mlir::standalone::StandaloneDialect>();
31-
registry.insert<mlir::StandardOpsDialect>();
32-
// Add the following to include *all* MLIR Core dialects, or selectively
33-
// include what you need like above. You only need to register dialects that
34-
// will be *parsed* by the tool, not the one generated
35-
// registerAllDialects(registry);
28+
mlir::registerDialect<mlir::standalone::StandaloneDialect>();
29+
// TODO: Register standalone passes here.
3630

37-
return failed(
38-
mlir::MlirOptMain(argc, argv, "Standalone optimizer driver\n", registry));
31+
return failed(mlir::MlirOptMain(argc, argv, "Standalone optimizer driver\n"));
3932
}

‎mlir/examples/standalone/test/Standalone/standalone-opt.mlir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// RUN: standalone-opt --show-dialects | FileCheck %s
2-
// CHECK: Available Dialects:
2+
// CHECK: Registered Dialects:
33
// CHECK: standalone

‎mlir/examples/toy/Ch2/toyc.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,10 @@ std::unique_ptr<toy::ModuleAST> parseInputFile(llvm::StringRef filename) {
6868
}
6969

7070
int dumpMLIR() {
71-
mlir::MLIRContext context(/*loadAllDialects=*/false);
72-
// Load our Dialect in this MLIR Context.
73-
context.getOrLoadDialect<mlir::toy::ToyDialect>();
71+
// Register our Dialect with MLIR.
72+
mlir::registerDialect<mlir::toy::ToyDialect>();
73+
74+
mlir::MLIRContext context;
7475

7576
// Handle '.toy' input to the compiler.
7677
if (inputType != InputType::MLIR &&

‎mlir/examples/toy/Ch3/toyc.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ int loadMLIR(llvm::SourceMgr &sourceMgr, mlir::MLIRContext &context,
102102
}
103103

104104
int dumpMLIR() {
105-
mlir::MLIRContext context(/*loadAllDialects=*/false);
106-
// Load our Dialect in this MLIR Context.
107-
context.getOrLoadDialect<mlir::toy::ToyDialect>();
105+
// Register our Dialect with MLIR.
106+
mlir::registerDialect<mlir::toy::ToyDialect>();
108107

108+
mlir::MLIRContext context;
109109
mlir::OwningModuleRef module;
110110
llvm::SourceMgr sourceMgr;
111111
mlir::SourceMgrDiagnosticHandler sourceMgrHandler(sourceMgr, &context);

‎mlir/examples/toy/Ch4/toyc.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ int loadMLIR(llvm::SourceMgr &sourceMgr, mlir::MLIRContext &context,
103103
}
104104

105105
int dumpMLIR() {
106-
mlir::MLIRContext context(/*loadAllDialects=*/false);
107-
// Load our Dialect in this MLIR Context.
108-
context.getOrLoadDialect<mlir::toy::ToyDialect>();
106+
// Register our Dialect with MLIR.
107+
mlir::registerDialect<mlir::toy::ToyDialect>();
109108

109+
mlir::MLIRContext context;
110110
mlir::OwningModuleRef module;
111111
llvm::SourceMgr sourceMgr;
112112
mlir::SourceMgrDiagnosticHandler sourceMgrHandler(sourceMgr, &context);

‎mlir/examples/toy/Ch5/mlir/LowerToAffineLoops.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,6 @@ struct TransposeOpLowering : public ConversionPattern {
256256
namespace {
257257
struct ToyToAffineLoweringPass
258258
: public PassWrapper<ToyToAffineLoweringPass, FunctionPass> {
259-
void getDependentDialects(DialectRegistry &registry) const override {
260-
registry.insert<AffineDialect, StandardOpsDialect>();
261-
}
262259
void runOnFunction() final;
263260
};
264261
} // end anonymous namespace.

‎mlir/examples/toy/Ch5/toyc.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ int loadMLIR(llvm::SourceMgr &sourceMgr, mlir::MLIRContext &context,
106106
}
107107

108108
int dumpMLIR() {
109-
mlir::MLIRContext context(/*loadAllDialects=*/false);
110-
// Load our Dialect in this MLIR Context.
111-
context.getOrLoadDialect<mlir::toy::ToyDialect>();
109+
// Register our Dialect with MLIR.
110+
mlir::registerDialect<mlir::toy::ToyDialect>();
112111

112+
mlir::MLIRContext context;
113113
mlir::OwningModuleRef module;
114114
llvm::SourceMgr sourceMgr;
115115
mlir::SourceMgrDiagnosticHandler sourceMgrHandler(sourceMgr, &context);

‎mlir/examples/toy/Ch6/mlir/LowerToAffineLoops.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,6 @@ struct TransposeOpLowering : public ConversionPattern {
255255
namespace {
256256
struct ToyToAffineLoweringPass
257257
: public PassWrapper<ToyToAffineLoweringPass, FunctionPass> {
258-
void getDependentDialects(DialectRegistry &registry) const override {
259-
registry.insert<AffineDialect, StandardOpsDialect>();
260-
}
261258
void runOnFunction() final;
262259
};
263260
} // end anonymous namespace.

‎mlir/examples/toy/Ch6/mlir/LowerToLLVM.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,6 @@ class PrintOpLowering : public ConversionPattern {
159159
namespace {
160160
struct ToyToLLVMLoweringPass
161161
: public PassWrapper<ToyToLLVMLoweringPass, OperationPass<ModuleOp>> {
162-
void getDependentDialects(DialectRegistry &registry) const override {
163-
registry.insert<LLVM::LLVMDialect, scf::SCFDialect>();
164-
}
165162
void runOnOperation() final;
166163
};
167164
} // end anonymous namespace

‎mlir/examples/toy/Ch6/toyc.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,10 @@ int main(int argc, char **argv) {
255255

256256
// If we aren't dumping the AST, then we are compiling with/to MLIR.
257257

258-
mlir::MLIRContext context(/*loadAllDialects=*/false);
259-
// Load our Dialect in this MLIR Context.
260-
context.getOrLoadDialect<mlir::toy::ToyDialect>();
258+
// Register our Dialect with MLIR.
259+
mlir::registerDialect<mlir::toy::ToyDialect>();
261260

261+
mlir::MLIRContext context;
262262
mlir::OwningModuleRef module;
263263
if (int error = loadAndProcessMLIR(context, module))
264264
return error;

‎mlir/examples/toy/Ch7/mlir/LowerToAffineLoops.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,6 @@ struct TransposeOpLowering : public ConversionPattern {
256256
namespace {
257257
struct ToyToAffineLoweringPass
258258
: public PassWrapper<ToyToAffineLoweringPass, FunctionPass> {
259-
void getDependentDialects(DialectRegistry &registry) const override {
260-
registry.insert<AffineDialect, StandardOpsDialect>();
261-
}
262259
void runOnFunction() final;
263260
};
264261
} // end anonymous namespace.

‎mlir/examples/toy/Ch7/mlir/LowerToLLVM.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,6 @@ class PrintOpLowering : public ConversionPattern {
159159
namespace {
160160
struct ToyToLLVMLoweringPass
161161
: public PassWrapper<ToyToLLVMLoweringPass, OperationPass<ModuleOp>> {
162-
void getDependentDialects(DialectRegistry &registry) const override {
163-
registry.insert<LLVM::LLVMDialect, scf::SCFDialect>();
164-
}
165162
void runOnOperation() final;
166163
};
167164
} // end anonymous namespace

‎mlir/examples/toy/Ch7/toyc.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,10 @@ int main(int argc, char **argv) {
256256

257257
// If we aren't dumping the AST, then we are compiling with/to MLIR.
258258

259-
mlir::MLIRContext context(/*loadAllDialects=*/false);
260-
// Load our Dialect in this MLIR Context.
261-
context.getOrLoadDialect<mlir::toy::ToyDialect>();
259+
// Register our Dialect with MLIR.
260+
mlir::registerDialect<mlir::toy::ToyDialect>();
262261

262+
mlir::MLIRContext context;
263263
mlir::OwningModuleRef module;
264264
if (int error = loadAndProcessMLIR(context, module))
265265
return error;

‎mlir/include/mlir-c/Registration.h

+4-6
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,14 @@
1010
#ifndef MLIR_C_REGISTRATION_H
1111
#define MLIR_C_REGISTRATION_H
1212

13-
#include "mlir-c/IR.h"
14-
1513
#ifdef __cplusplus
1614
extern "C" {
1715
#endif
1816

19-
/** Registers all dialects known to core MLIR with the provided Context.
20-
* This is needed before creating IR for these Dialects.
21-
*/
22-
void mlirRegisterAllDialects(MlirContext context);
17+
/** Registers all dialects known to core MLIR with the system. This must be
18+
* called before creating an MlirContext if it needs access to the registered
19+
* dialects. */
20+
void mlirRegisterAllDialects();
2321

2422
#ifdef __cplusplus
2523
}

‎mlir/include/mlir/Conversion/Passes.td

-26
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,6 @@ def ConvertAffineToStandard : Pass<"lower-affine"> {
6666
`affine.apply`.
6767
}];
6868
let constructor = "mlir::createLowerAffinePass()";
69-
let dependentDialects = [
70-
"scf::SCFDialect",
71-
"StandardOpsDialect",
72-
"vector::VectorDialect"
73-
];
7469
}
7570

7671
//===----------------------------------------------------------------------===//
@@ -81,7 +76,6 @@ def ConvertAVX512ToLLVM : Pass<"convert-avx512-to-llvm", "ModuleOp"> {
8176
let summary = "Convert the operations from the avx512 dialect into the LLVM "
8277
"dialect";
8378
let constructor = "mlir::createConvertAVX512ToLLVMPass()";
84-
let dependentDialects = ["LLVM::LLVMDialect", "LLVM::LLVMAVX512Dialect"];
8579
}
8680

8781
//===----------------------------------------------------------------------===//
@@ -104,7 +98,6 @@ def GpuToLLVMConversionPass : Pass<"gpu-to-llvm", "ModuleOp"> {
10498
def ConvertGpuOpsToNVVMOps : Pass<"convert-gpu-to-nvvm", "gpu::GPUModuleOp"> {
10599
let summary = "Generate NVVM operations for gpu operations";
106100
let constructor = "mlir::createLowerGpuOpsToNVVMOpsPass()";
107-
let dependentDialects = ["NVVM::NVVMDialect"];
108101
let options = [
109102
Option<"indexBitwidth", "index-bitwidth", "unsigned",
110103
/*default=kDeriveIndexBitwidthFromDataLayout*/"0",
@@ -119,7 +112,6 @@ def ConvertGpuOpsToNVVMOps : Pass<"convert-gpu-to-nvvm", "gpu::GPUModuleOp"> {
119112
def ConvertGpuOpsToROCDLOps : Pass<"convert-gpu-to-rocdl", "gpu::GPUModuleOp"> {
120113
let summary = "Generate ROCDL operations for gpu operations";
121114
let constructor = "mlir::createLowerGpuOpsToROCDLOpsPass()";
122-
let dependentDialects = ["ROCDL::ROCDLDialect"];
123115
let options = [
124116
Option<"indexBitwidth", "index-bitwidth", "unsigned",
125117
/*default=kDeriveIndexBitwidthFromDataLayout*/"0",
@@ -134,7 +126,6 @@ def ConvertGpuOpsToROCDLOps : Pass<"convert-gpu-to-rocdl", "gpu::GPUModuleOp"> {
134126
def ConvertGPUToSPIRV : Pass<"convert-gpu-to-spirv", "ModuleOp"> {
135127
let summary = "Convert GPU dialect to SPIR-V dialect";
136128
let constructor = "mlir::createConvertGPUToSPIRVPass()";
137-
let dependentDialects = ["spirv::SPIRVDialect"];
138129
}
139130

140131
//===----------------------------------------------------------------------===//
@@ -145,15 +136,13 @@ def ConvertGpuLaunchFuncToVulkanLaunchFunc
145136
: Pass<"convert-gpu-launch-to-vulkan-launch", "ModuleOp"> {
146137
let summary = "Convert gpu.launch_func to vulkanLaunch external call";
147138
let constructor = "mlir::createConvertGpuLaunchFuncToVulkanLaunchFuncPass()";
148-
let dependentDialects = ["spirv::SPIRVDialect"];
149139
}
150140

151141
def ConvertVulkanLaunchFuncToVulkanCalls
152142
: Pass<"launch-func-to-vulkan", "ModuleOp"> {
153143
let summary = "Convert vulkanLaunch external call to Vulkan runtime external "
154144
"calls";
155145
let constructor = "mlir::createConvertVulkanLaunchFuncToVulkanCallsPass()";
156-
let dependentDialects = ["LLVM::LLVMDialect"];
157146
}
158147

159148
//===----------------------------------------------------------------------===//
@@ -164,7 +153,6 @@ def ConvertLinalgToLLVM : Pass<"convert-linalg-to-llvm", "ModuleOp"> {
164153
let summary = "Convert the operations from the linalg dialect into the LLVM "
165154
"dialect";
166155
let constructor = "mlir::createConvertLinalgToLLVMPass()";
167-
let dependentDialects = ["scf::SCFDialect", "LLVM::LLVMDialect"];
168156
}
169157

170158
//===----------------------------------------------------------------------===//
@@ -175,7 +163,6 @@ def ConvertLinalgToStandard : Pass<"convert-linalg-to-std", "ModuleOp"> {
175163
let summary = "Convert the operations from the linalg dialect into the "
176164
"Standard dialect";
177165
let constructor = "mlir::createConvertLinalgToStandardPass()";
178-
let dependentDialects = ["StandardOpsDialect"];
179166
}
180167

181168
//===----------------------------------------------------------------------===//
@@ -185,7 +172,6 @@ def ConvertLinalgToStandard : Pass<"convert-linalg-to-std", "ModuleOp"> {
185172
def ConvertLinalgToSPIRV : Pass<"convert-linalg-to-spirv", "ModuleOp"> {
186173
let summary = "Convert Linalg ops to SPIR-V ops";
187174
let constructor = "mlir::createLinalgToSPIRVPass()";
188-
let dependentDialects = ["spirv::SPIRVDialect"];
189175
}
190176

191177
//===----------------------------------------------------------------------===//
@@ -196,7 +182,6 @@ def SCFToStandard : Pass<"convert-scf-to-std"> {
196182
let summary = "Convert SCF dialect to Standard dialect, replacing structured"
197183
" control flow with a CFG";
198184
let constructor = "mlir::createLowerToCFGPass()";
199-
let dependentDialects = ["StandardOpsDialect"];
200185
}
201186

202187
//===----------------------------------------------------------------------===//
@@ -206,7 +191,6 @@ def SCFToStandard : Pass<"convert-scf-to-std"> {
206191
def ConvertAffineForToGPU : FunctionPass<"convert-affine-for-to-gpu"> {
207192
let summary = "Convert top-level AffineFor Ops to GPU kernels";
208193
let constructor = "mlir::createAffineForToGPUPass()";
209-
let dependentDialects = ["gpu::GPUDialect"];
210194
let options = [
211195
Option<"numBlockDims", "gpu-block-dims", "unsigned", /*default=*/"1u",
212196
"Number of GPU block dimensions for mapping">,
@@ -218,7 +202,6 @@ def ConvertAffineForToGPU : FunctionPass<"convert-affine-for-to-gpu"> {
218202
def ConvertParallelLoopToGpu : Pass<"convert-parallel-loops-to-gpu"> {
219203
let summary = "Convert mapped scf.parallel ops to gpu launch operations";
220204
let constructor = "mlir::createParallelLoopToGpuPass()";
221-
let dependentDialects = ["AffineDialect", "gpu::GPUDialect"];
222205
}
223206

224207
//===----------------------------------------------------------------------===//
@@ -229,7 +212,6 @@ def ConvertShapeToStandard : Pass<"convert-shape-to-std", "ModuleOp"> {
229212
let summary = "Convert operations from the shape dialect into the standard "
230213
"dialect";
231214
let constructor = "mlir::createConvertShapeToStandardPass()";
232-
let dependentDialects = ["StandardOpsDialect"];
233215
}
234216

235217
//===----------------------------------------------------------------------===//
@@ -239,7 +221,6 @@ def ConvertShapeToStandard : Pass<"convert-shape-to-std", "ModuleOp"> {
239221
def ConvertShapeToSCF : FunctionPass<"convert-shape-to-scf"> {
240222
let summary = "Convert operations from the shape dialect to the SCF dialect";
241223
let constructor = "mlir::createConvertShapeToSCFPass()";
242-
let dependentDialects = ["scf::SCFDialect"];
243224
}
244225

245226
//===----------------------------------------------------------------------===//
@@ -249,7 +230,6 @@ def ConvertShapeToSCF : FunctionPass<"convert-shape-to-scf"> {
249230
def ConvertSPIRVToLLVM : Pass<"convert-spirv-to-llvm", "ModuleOp"> {
250231
let summary = "Convert SPIR-V dialect to LLVM dialect";
251232
let constructor = "mlir::createConvertSPIRVToLLVMPass()";
252-
let dependentDialects = ["LLVM::LLVMDialect"];
253233
}
254234

255235
//===----------------------------------------------------------------------===//
@@ -284,7 +264,6 @@ def ConvertStandardToLLVM : Pass<"convert-std-to-llvm", "ModuleOp"> {
284264
LLVM IR types.
285265
}];
286266
let constructor = "mlir::createLowerToLLVMPass()";
287-
let dependentDialects = ["LLVM::LLVMDialect"];
288267
let options = [
289268
Option<"useAlignedAlloc", "use-aligned-alloc", "bool", /*default=*/"false",
290269
"Use aligned_alloc in place of malloc for heap allocations">,
@@ -312,13 +291,11 @@ def ConvertStandardToLLVM : Pass<"convert-std-to-llvm", "ModuleOp"> {
312291
def LegalizeStandardForSPIRV : Pass<"legalize-std-for-spirv"> {
313292
let summary = "Legalize standard ops for SPIR-V lowering";
314293
let constructor = "mlir::createLegalizeStdOpsForSPIRVLoweringPass()";
315-
let dependentDialects = ["spirv::SPIRVDialect"];
316294
}
317295

318296
def ConvertStandardToSPIRV : Pass<"convert-std-to-spirv", "ModuleOp"> {
319297
let summary = "Convert Standard Ops to SPIR-V dialect";
320298
let constructor = "mlir::createConvertStandardToSPIRVPass()";
321-
let dependentDialects = ["spirv::SPIRVDialect"];
322299
}
323300

324301
//===----------------------------------------------------------------------===//
@@ -329,7 +306,6 @@ def ConvertVectorToSCF : FunctionPass<"convert-vector-to-scf"> {
329306
let summary = "Lower the operations from the vector dialect into the SCF "
330307
"dialect";
331308
let constructor = "mlir::createConvertVectorToSCFPass()";
332-
let dependentDialects = ["AffineDialect", "scf::SCFDialect"];
333309
let options = [
334310
Option<"fullUnroll", "full-unroll", "bool", /*default=*/"false",
335311
"Perform full unrolling when converting vector transfers to SCF">,
@@ -344,7 +320,6 @@ def ConvertVectorToLLVM : Pass<"convert-vector-to-llvm", "ModuleOp"> {
344320
let summary = "Lower the operations from the vector dialect into the LLVM "
345321
"dialect";
346322
let constructor = "mlir::createConvertVectorToLLVMPass()";
347-
let dependentDialects = ["LLVM::LLVMDialect"];
348323
let options = [
349324
Option<"reassociateFPReductions", "reassociate-fp-reductions",
350325
"bool", /*default=*/"false",
@@ -360,7 +335,6 @@ def ConvertVectorToROCDL : Pass<"convert-vector-to-rocdl", "ModuleOp"> {
360335
let summary = "Lower the operations from the vector dialect into the ROCDL "
361336
"dialect";
362337
let constructor = "mlir::createConvertVectorToROCDLPass()";
363-
let dependentDialects = ["ROCDL::ROCDLDialect"];
364338
}
365339

366340
#endif // MLIR_CONVERSION_PASSES

‎mlir/include/mlir/Dialect/Affine/Passes.td

-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ def AffineLoopUnrollAndJam : FunctionPass<"affine-loop-unroll-jam"> {
9494
def AffineVectorize : FunctionPass<"affine-super-vectorize"> {
9595
let summary = "Vectorize to a target independent n-D vector abstraction";
9696
let constructor = "mlir::createSuperVectorizePass()";
97-
let dependentDialects = ["vector::VectorDialect"];
9897
let options = [
9998
ListOption<"vectorSizes", "virtual-vector-size", "int64_t",
10099
"Specify an n-D virtual vector size for vectorization",

‎mlir/include/mlir/Dialect/LLVMIR/LLVMDialect.h

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#define MLIR_DIALECT_LLVMIR_LLVMDIALECT_H_
1616

1717
#include "mlir/Dialect/LLVMIR/LLVMTypes.h"
18-
#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
1918
#include "mlir/IR/Dialect.h"
2019
#include "mlir/IR/Function.h"
2120
#include "mlir/IR/OpDefinition.h"

‎mlir/include/mlir/Dialect/LLVMIR/LLVMOpBase.td

-5
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ include "mlir/IR/OpBase.td"
1919
def LLVM_Dialect : Dialect {
2020
let name = "llvm";
2121
let cppNamespace = "LLVM";
22-
23-
/// FIXME: at the moment this is a dependency of the translation to LLVM IR,
24-
/// not really one of this dialect per-se.
25-
let dependentDialects = ["omp::OpenMPDialect"];
26-
2722
let hasRegionArgAttrVerify = 1;
2823
let hasOperationAttrVerify = 1;
2924
let extraClassDeclaration = [{

‎mlir/include/mlir/Dialect/LLVMIR/NVVMDialect.h

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#ifndef MLIR_DIALECT_LLVMIR_NVVMDIALECT_H_
1515
#define MLIR_DIALECT_LLVMIR_NVVMDIALECT_H_
1616

17-
#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
1817
#include "mlir/IR/Dialect.h"
1918
#include "mlir/IR/OpDefinition.h"
2019
#include "mlir/Interfaces/SideEffectInterfaces.h"

0 commit comments

Comments
 (0)