Skip to content

[mlir][ODS] Fix default inferReturnTypes generation for variadic operands #131483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[mlir][ODS] Fix default inferReturnTypes generation for variadic operands #131483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e92fe4
[mlir][ODS] Fix default inferReturnTypes generation for variadic oper…
Groverkss Mar 16, 2025
dab5535
Remove TODO, already mentioned in docs
Groverkss Mar 19, 2025
1beaad3
Add test for variandic + one norm input
Groverkss Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions mlir/test/mlir-tblgen/op-result.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,8 @@ def OpL1 : NS_Op<"op_with_all_types_constraint",

// CHECK-LABEL: LogicalResult OpL1::inferReturnTypes
// CHECK-NOT: }
// CHECK: if (operands.size() <= 0)
// CHECK-NEXT: return ::mlir::failure();
// CHECK: ::mlir::Type odsInferredType0 = operands[0].getType();
// CHECK: OpL1::Adaptor adaptor
// CHECK: ::mlir::Type odsInferredType0 = adaptor.getA().getType();
// CHECK: inferredReturnTypes[0] = odsInferredType0;

def OpL2 : NS_Op<"op_with_all_types_constraint",
Expand All @@ -149,11 +148,9 @@ def OpL2 : NS_Op<"op_with_all_types_constraint",

// CHECK-LABEL: LogicalResult OpL2::inferReturnTypes
// CHECK-NOT: }
// CHECK: if (operands.size() <= 2)
// CHECK-NEXT: return ::mlir::failure();
// CHECK-NOT: if (operands.size() <= 0)
// CHECK: ::mlir::Type odsInferredType0 = operands[2].getType();
// CHECK: ::mlir::Type odsInferredType1 = operands[0].getType();
// CHECK: OpL2::Adaptor adaptor
// CHECK: ::mlir::Type odsInferredType0 = adaptor.getC().getType();
// CHECK: ::mlir::Type odsInferredType1 = adaptor.getA().getType();
// CHECK: inferredReturnTypes[0] = odsInferredType0;
// CHECK: inferredReturnTypes[1] = odsInferredType1;

Expand All @@ -177,9 +174,8 @@ def OpL4 : NS_Op<"two_inference_edges", [
}

// CHECK-LABEL: LogicalResult OpL4::inferReturnTypes
// CHECK: if (operands.size() <= 0)
// CHECK-NEXT: return ::mlir::failure();
// CHECK: odsInferredType0 = fromInput(operands[0].getType())
// CHECK: OpL4::Adaptor adaptor
// CHECK: odsInferredType0 = fromInput(adaptor.getInput().getType())
// CHECK: odsInferredType1 = infer0(odsInferredType0)
// CHECK: odsInferredType2 = infer1(odsInferredType1)
// CHECK: inferredReturnTypes[0] = odsInferredType0
Expand Down Expand Up @@ -207,6 +203,18 @@ def OpL6 : NS_Op<"op_with_same_and_constraint_results",
// CHECK: inferredReturnTypes[1] = odsInferredType1;
// CHECK: inferredReturnTypes[2] = odsInferredType2;

def OpL7 : NS_Op<"one_variadic_and_one_normal_operand_with_infer_result_op",
[TypesMatchWith<"", "input2", "output1", "infer0($_self)">]> {
let arguments = (ins Variadic<AnyTensor>:$input1, AnyTensor:$input2);
let results = (outs AnyTensor:$output1);
}

// CHECK-LABEL: LogicalResult OpL7::inferReturnTypes
// CHECK-NOT: }
// CHECK: OpL7::Adaptor adaptor
// CHECK: odsInferredType0 = infer0(adaptor.getInput2().getType())
// CHECK: inferredReturnTypes[0] = odsInferredType0

def OpM : NS_Op<"mix_diff_size_variadic_and_normal_results_op", [AttrSizedResultSegments]> {
let results = (outs Variadic<AnyTensor>:$output1, AnyTensor:$output2, Optional<AnyTensor>:$output3);
}
Expand Down
42 changes: 14 additions & 28 deletions mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2641,8 +2641,7 @@ void OpEmitter::genSeparateArgParamBuilder() {

// Avoid emitting "resultTypes.size() >= 0u" which is always true.
if (!hasVariadicResult || numNonVariadicResults != 0)
body << " "
<< "assert(resultTypes.size() "
body << " " << "assert(resultTypes.size() "
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably can remove the second << here and merge the strings, not sure its doing much here (if it were handling indentation other story)

<< (hasVariadicResult ? ">=" : "==") << " "
<< numNonVariadicResults
<< "u && \"mismatched number of results\");\n";
Expand Down Expand Up @@ -3751,29 +3750,15 @@ void OpEmitter::genTypeInterfaceMethods() {
fctx.addSubst("_ctxt", "context");
body << " ::mlir::Builder odsBuilder(context);\n";

// Preprocessing stage to verify all accesses to operands are valid.
int maxAccessedIndex = -1;
for (int i = 0, e = op.getNumResults(); i != e; ++i) {
const InferredResultType &infer = op.getInferredResultType(i);
if (!infer.isArg())
continue;
Operator::OperandOrAttribute arg =
op.getArgToOperandOrAttribute(infer.getIndex());
if (arg.kind() == Operator::OperandOrAttribute::Kind::Operand) {
maxAccessedIndex =
std::max(maxAccessedIndex, arg.operandOrAttributeIndex());
}
}
if (maxAccessedIndex != -1) {
body << " if (operands.size() <= " << Twine(maxAccessedIndex) << ")\n";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this check now handled in the adaptor? (I don't recall if there is a test for this upstream)

body << " return ::mlir::failure();\n";
}
// Emit an adaptor to access right ranges for ods operands.
body << " " << op.getCppClassName()
<< "::Adaptor adaptor(operands, attributes, properties, regions);\n";

// Process the type inference graph in topological order, starting from types
// that are always fully-inferred: operands and results with constructible
// types. The type inference graph here will always be a DAG, so this gives
// us the correct order for generating the types. -1 is a placeholder to
// indicate the type for a result has not been generated.
// Process the type inference graph in topological order, starting from
// types that are always fully-inferred: operands and results with
// constructible types. The type inference graph here will always be a
// DAG, so this gives us the correct order for generating the types. -1 is
// a placeholder to indicate the type for a result has not been generated.
SmallVector<int> constructedIndices(op.getNumResults(), -1);
int inferredTypeIdx = 0;
for (int numResults = op.getNumResults(); inferredTypeIdx != numResults;) {
Expand All @@ -3788,10 +3773,11 @@ void OpEmitter::genTypeInterfaceMethods() {
Operator::OperandOrAttribute arg =
op.getArgToOperandOrAttribute(infer.getIndex());
if (arg.kind() == Operator::OperandOrAttribute::Kind::Operand) {
typeStr = ("operands[" + Twine(arg.operandOrAttributeIndex()) +
"].getType()")
.str();

std::string getter =
"adaptor." +
op.getGetterName(
op.getOperand(arg.operandOrAttributeIndex()).name);
typeStr = (getter + "().getType()");
// If this is an attribute, index into the attribute dictionary.
} else {
auto *attr =
Expand Down