maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[mlir][tblgen] Consistently use `$_ctxt` instead of `$_ctx` 

With the exceptions of AttrOrTypeParameter and DerivedAttr, all of MLIR consistently uses $_ctxt as the substitute variable for the MLIRContext in TableGen C++ code.
Usually this does not matter unless one where to reuse some code in multiple fields but it is still needlessly inconsistent and prone to error.

This patch fixes that by consistently using _$ctxt everywhere.

Differential Revision: https://reviews.llvm.org/D129153
This commit is contained in:
Markus Böck 2022-07-05 20:04:50 +02:00
parent 0bb1bf1b17
commit f2beca908d
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mlir/docs/AttributesAndTypes.md
View File

@ -673,10 +673,10 @@ Which will look like:
```
For optional `Attribute` or `Type` parameters, the current MLIR context is
available through `$_ctx`. E.g.
available through `$_ctxt`. E.g.
```tablegen
DefaultValuedParameter<"IntegerType", "IntegerType::get($_ctx, 32)">
DefaultValuedParameter<"IntegerType", "IntegerType::get($_ctxt, 32)">
```
##### Assembly Format Directives

2
mlir/include/mlir/IR/AttrTypeBase.td
View File

@ -319,7 +319,7 @@ class AttrOrTypeParameter<string type, string desc, string accessorType = ""> {
// will be set to the default value. Parameters equal to their default values
// are elided when printing. Equality is checked using the `comparator` field,
// which by default is the C++ equality operator. The current MLIR context is
// made available through `$_ctx`, e.g., for constructing default values for
// made available through `$_ctxt`, e.g., for constructing default values for
// attributes and types.
string defaultValue = ?;
}

2
mlir/include/mlir/IR/OpBase.td
View File

@ -1513,7 +1513,7 @@ class DerivedAttr<code ret, code b, code convert = ""> :
// Special placeholders can be used to refer to entities during conversion:
//
// * `$_builder` will be replaced by a mlir::Builder instance.
// * `$_ctx` will be replaced by the MLIRContext* instance.
// * `$_ctxt` will be replaced by the MLIRContext* instance.
// * `$_self` will be replaced with the derived attribute (value produces
// `returnType`).
let convertFromStorage = convert;

2
mlir/test/lib/Dialect/Test/TestTypeDefs.td
View File

@ -312,7 +312,7 @@ def TestTypeAPFloat : Test_Type<"TestTypeAPFloat"> {
def TestTypeDefaultValuedType : Test_Type<"TestTypeDefaultValuedType"> {
let parameters = (ins
DefaultValuedParameter<"mlir::IntegerType",
"mlir::IntegerType::get($_ctx, 32)">:$type
"mlir::IntegerType::get($_ctxt, 32)">:$type
);
let mnemonic = "default_valued_type";
let assemblyFormat = "`<` (`(` $type^ `)`)? `>`";

4
mlir/tools/mlir-tblgen/AttrOrTypeFormatGen.cpp
View File

@ -249,7 +249,7 @@ private:
void DefFormat::genParser(MethodBody &os) {
FmtContext ctx;
ctx.addSubst("_parser", "odsParser");
ctx.addSubst("_ctx", "odsParser.getContext()");
ctx.addSubst("_ctxt", "odsParser.getContext()");
ctx.withBuilder("odsBuilder");
if (isa<AttrDef>(def))
ctx.addSubst("_type", "odsType");
@ -672,7 +672,7 @@ void DefFormat::genOptionalGroupParser(OptionalElement *el, FmtContext &ctx,
void DefFormat::genPrinter(MethodBody &os) {
FmtContext ctx;
ctx.addSubst("_printer", "odsPrinter");
ctx.addSubst("_ctx", "getContext()");
ctx.addSubst("_ctxt", "getContext()");
ctx.withBuilder("odsBuilder");
os.indent();
os << "::mlir::Builder odsBuilder(getContext());\n";

2
mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp
View File

@ -1071,7 +1071,7 @@ void OpEmitter::genAttrGetters() {
body << " {" << name << "AttrName(),\n"
<< tgfmt(tmpl, &fctx.withSelf(name + "()")
.withBuilder("odsBuilder")
.addSubst("_ctx", "ctx"))
.addSubst("_ctxt", "ctx"))
<< "}";
},
",\n");