OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[mlir][ods] Make OpBuilder and OperationState optional 

The OpBuilder is required to start with OpBuilder and OperationState, so remove
the need for the user to specify it. To make it simpler to update callers,
retain the legacy behavior for now and skip injecting OpBuilder/OperationState
when params start with OpBuilder.

Related to bug 47442.

Differential Revision: https://reviews.llvm.org/D88050
This commit is contained in:
Jacques Pienaar 2020-09-22 10:04:21 -07:00
parent d7336ad5ff
commit 2a6db92ca9
4 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mlir/docs/OpDefinitions.md
View File

@ -572,10 +572,13 @@ convenience build methods with `OpBuilder`.
`OpBuilder` is a class that takes the parameter list and the optional `build()`
method body. They are separated because we need to generate op declaration and
definition into separate files. The parameter list should _include_ `Builder
*builder, OperationState &state`. If the `body` is not provided, _only_ the
builder declaration will be generated; this provides a way to define complicated
builders entirely in C++ files.
definition into separate files. The parameter list should not include `OpBuilder
&builder, OperationState &state` as they will be inserted automatically and the
placeholders `$_builder` and `$_state` used. For legacy/to be deprecated reason
if the `OpBuilder` parameter starts with `OpBuilder` param, then the parameter
is used. If the `body` is not provided, only the builder declaration will be
generated; this provides a way to define complicated builders entirely in C++
files.
For example, for the following op:
@ -595,8 +598,8 @@ def MyOp : ... {
...
let builders = [
OpBuilder<"OpBuilder &builder, OperationState &state, float val = 0.5f", [{
state.addAttribute("attr", builder.getF32FloatAttr(val));
OpBuilder<"float val = 0.5f", [{
$_state.addAttribute("attr", $_builder.getF32FloatAttr(val));
}]>
];
}

12
mlir/test/lib/Dialect/Test/TestOps.td
View File

@ -1062,14 +1062,14 @@ def MixedVResultOp3 : TEST_Op<"mixed_variadic_out3",
// result type. So need to provide a builder not requiring result types.
let builders = [
OpBuilder<
"OpBuilder &builder, OperationState &state, IntegerAttr count",
"IntegerAttr count",
[{
auto i32Type = builder.getIntegerType(32);
state.addTypes(i32Type); // $output1
auto i32Type = $_builder.getIntegerType(32);
$_state.addTypes(i32Type); // $output1
SmallVector<Type, 4> types(count.getInt(), i32Type);
state.addTypes(types); // $output2
state.addTypes(types); // $output3
state.addAttribute("count", count);
$_state.addTypes(types); // $output2
$_state.addTypes(types); // $output3
$_state.addAttribute("count", count);
}]>
];
}

4
mlir/test/mlir-tblgen/op-decl.td
View File

@ -80,7 +80,7 @@ def NS_AOp : NS_Op<"a_op", [IsolatedFromAbove, IsolatedFromAbove]> {
// CHECK: uint32_t attr1();
// CHECK: ::mlir::FloatAttr attr2Attr()
// CHECK: ::llvm::Optional< ::llvm::APFloat > attr2();
// CHECK: static void build(Value val);
// CHECK: static void build(::mlir::OpBuilder &odsBuilder, ::mlir::OperationState &odsState, Value val);
// CHECK: static void build(::mlir::OpBuilder &odsBuilder, ::mlir::OperationState &odsState, ::mlir::Type r, ::llvm::ArrayRef<::mlir::Type> s, ::mlir::Value a, ::mlir::ValueRange b, ::mlir::IntegerAttr attr1, /*optional*/::mlir::FloatAttr attr2, unsigned someRegionsCount)
// CHECK: static void build(::mlir::OpBuilder &odsBuilder, ::mlir::OperationState &odsState, ::mlir::Type r, ::llvm::ArrayRef<::mlir::Type> s, ::mlir::Value a, ::mlir::ValueRange b, uint32_t attr1, /*optional*/::mlir::FloatAttr attr2, unsigned someRegionsCount)
// CHECK: static void build(::mlir::OpBuilder &, ::mlir::OperationState &odsState, ::llvm::ArrayRef<::mlir::Type> resultTypes, ::mlir::ValueRange operands, ::llvm::ArrayRef<::mlir::NamedAttribute> attributes, unsigned numRegions)
@ -256,7 +256,7 @@ def NS_SkipDefaultBuildersOp : NS_Op<"skip_default_builders", []> {
// CHECK-LABEL: NS::SkipDefaultBuildersOp declarations
// CHECK: class SkipDefaultBuildersOp
// CHECK-NOT: static void build(::mlir::Builder
// CHECK: static void build(Value
// CHECK: static void build(::mlir::OpBuilder &odsBuilder, ::mlir::OperationState &odsState, Value
// Check leading underscore in op name
// ---

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

@ -47,6 +47,7 @@ static cl::opt<std::string> opExcFilter(
static const char *const tblgenNamePrefix = "tblgen_";
static const char *const generatedArgName = "odsArg";
static const char *const builder = "odsBuilder";
static const char *const builderOpState = "odsState";
// The logic to calculate the actual value range for a declared operand/result
@ -1177,16 +1178,34 @@ void OpEmitter::genBuilder() {
if (listInit) {
for (Init *init : listInit->getValues()) {
Record *builderDef = cast<DefInit>(init)->getDef();
StringRef params = builderDef->getValueAsString("params");
StringRef params = builderDef->getValueAsString("params").trim();
// TODO: Remove this and just generate the builder/state always.
bool skipParamGen = params.startswith("OpBuilder") ||
params.startswith("mlir::OpBuilder") ||
params.startswith("::mlir::OpBuilder");
StringRef body = builderDef->getValueAsString("body");
bool hasBody = !body.empty();
OpMethod::Property properties =
hasBody ? OpMethod::MP_Static : OpMethod::MP_StaticDeclaration;
std::string paramStr =
skipParamGen ? params.str()
: llvm::formatv("::mlir::OpBuilder &{0}, "
"::mlir::OperationState &{1}, {2}",
builder, builderOpState, params)
.str();
auto *method =
opClass.addMethodAndPrune("void", "build", properties, params);
if (hasBody)
method->body() << body;
opClass.addMethodAndPrune("void", "build", properties, paramStr);
if (hasBody) {
if (skipParamGen) {
method->body() << body;
} else {
FmtContext fctx;
fctx.withBuilder(builder);
fctx.addSubst("_state", builderOpState);
method->body() << tgfmt(body, &fctx);
}
}
}
}
if (op.skipDefaultBuilders()) {