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

ODG: Always deference operand/result when using named arg/result. 

Considered adding more placeholders to designate types in the replacement pattern, but convinced for now sticking to simpler approach. This should at least enable specifying constraints across operands/results/attributes and we can start getting rid of the special cases.

PiperOrigin-RevId: 251564893
This commit is contained in:
Jacques Pienaar 2019-06-04 19:31:30 -07:00 committed by Mehdi Amini
parent f1b848e470
commit 7438dcb71f
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1023,9 +1023,9 @@ class TCopVTEtIs<int idx, Type type> : And<[
// Predicate to verify that a named argument or result's element type matches a
// given type.
class ArgOrResultElementTypeIs<string name, Type type> : And<[
SubstLeaves<"$_self", "$" # name # "->getType()", IsShapedTypePred>,
SubstLeaves<"$_self", "$" # name # ".getType()", IsShapedTypePred>,
SubstLeaves<"$_self", "$" # name #
"->getType().cast<ShapedType>().getElementType()",
".getType().cast<ShapedType>().getElementType()",
type.predicate>]>;
// Predicate to verify that the i'th operand and the j'th operand have the same

3
mlir/test/TestDialect/TestOps.td
View File

@ -91,8 +91,7 @@ def ArgAndResHaveFixedElementTypesOp :
Or<[And<[ArgOrResultElementTypeIs<"x", I32>,
ArgOrResultElementTypeIs<"y", F32>,
ArgOrResultElementTypeIs<"res", I16>]>,
// TODO(jpienaar): change back to attr.
ArgOrResultElementTypeIs<"x", I8>]>>]> {
ArgOrResultElementTypeIs<"attr", I8>]>>]> {
let arguments = (ins AnyVectorOrTensor:$x, AnyVectorOrTensor:$y, AnyAttr:$attr);
let results = (outs AnyVectorOrTensor:$res);
}

11
mlir/test/mlir-tblgen/types.mlir
View File

@ -89,12 +89,11 @@ func @fixed_element_types(%arg0: tensor<* x i32>, %arg1: tensor<* x f32>) {
// -----
// TODO(jpienaar): re-enable post supporting attributes again.
// DISABLED_CHECK-LABEL: @fixed_element_types
//func @fixed_element_types(%arg0: tensor<* x i32>, %arg1: tensor<* x f32>) {
// %0 = "test.arg_and_res_have_fixed_element_types"(%arg0, %arg1) {attr: splat<tensor<2xi8>, 1>}: (tensor<* x i32>, tensor<* x f32>) -> tensor<* x i32>
// return
//}
// CHECK-LABEL: @fixed_element_types
func @fixed_element_types(%arg0: tensor<* x i32>, %arg1: tensor<* x f32>) {
%0 = "test.arg_and_res_have_fixed_element_types"(%arg0, %arg1) {attr: splat<tensor<2xi8>, 1>}: (tensor<* x i32>, tensor<* x f32>) -> tensor<* x i32>
return
}
// -----

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

@ -985,7 +985,9 @@ void OpEmitter::genVerifier() {
auto &body = method.body();
// Populate substitutions for attributes and named operands and results.
// TODO(jpienaar): Add attributes back.
for (const auto &namedAttr : op.getAttributes())
verifyCtx.addSubst(namedAttr.name,
formatv("this->getAttr(\"{0}\")", namedAttr.name));
for (int i = 0, e = op.getNumOperands(); i < e; ++i) {
auto &value = op.getOperand(i);
// Skip from from first variadic operands for now. Else getOperand index
@ -993,8 +995,8 @@ void OpEmitter::genVerifier() {
if (value.isVariadic())
break;
if (!value.name.empty())
verifyCtx.addSubst(value.name,
formatv("this->getOperation()->getOperand({0})", i));
verifyCtx.addSubst(
value.name, formatv("(*this->getOperation()->getOperand({0}))", i));
}
for (int i = 0, e = op.getNumResults(); i < e; ++i) {
auto &value = op.getResult(i);
@ -1004,7 +1006,7 @@ void OpEmitter::genVerifier() {
break;
if (!value.name.empty())
verifyCtx.addSubst(value.name,
formatv("this->getOperation()->getResult({0})", i));
formatv("(*this->getOperation()->getResult({0}))", i));
}
// Verify the attributes have the correct type.