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

Add verification error message for ops that require at least one operand or result. 

PiperOrigin-RevId: 272153634
This commit is contained in:
Christian Sigg 2019-10-01 00:56:38 -07:00 committed by A. Unique TensorFlower
parent f479f816f9
commit 8503ffbe3a
3 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mlir/lib/IR/Operation.cpp
View File

@ -767,7 +767,7 @@ static LogicalResult verifyShapeMatch(Type type1, Type type2) {
}
LogicalResult OpTrait::impl::verifySameOperandsShape(Operation *op) {
if (op->getNumOperands() == 0)
if (failed(verifyAtLeastNOperands(op, 1)))
return failure();
auto type = op->getOperand(0)->getType();
@ -779,7 +779,8 @@ LogicalResult OpTrait::impl::verifySameOperandsShape(Operation *op) {
}
LogicalResult OpTrait::impl::verifySameOperandsAndResultShape(Operation *op) {
if (op->getNumOperands() == 0 || op->getNumResults() == 0)
if (failed(verifyAtLeastNOperands(op, 1)) ||
failed(verifyAtLeastNResults(op, 1)))
return failure();
auto type = op->getOperand(0)->getType();
@ -797,7 +798,7 @@ LogicalResult OpTrait::impl::verifySameOperandsAndResultShape(Operation *op) {
}
LogicalResult OpTrait::impl::verifySameOperandsElementType(Operation *op) {
if (op->getNumOperands() == 0)
if (failed(verifyAtLeastNOperands(op, 1)))
return failure();
auto type = op->getOperand(0)->getType().dyn_cast<ShapedType>();
@ -818,7 +819,8 @@ LogicalResult OpTrait::impl::verifySameOperandsElementType(Operation *op) {
LogicalResult
OpTrait::impl::verifySameOperandsAndResultElementType(Operation *op) {
if (op->getNumOperands() == 0 || op->getNumResults() == 0)
if (failed(verifyAtLeastNOperands(op, 1)) ||
failed(verifyAtLeastNResults(op, 1)))
return failure();
auto type = op->getResult(0)->getType().dyn_cast<ShapedType>();
@ -850,7 +852,8 @@ OpTrait::impl::verifySameOperandsAndResultElementType(Operation *op) {
}
LogicalResult OpTrait::impl::verifySameOperandsAndResultType(Operation *op) {
if (op->getNumOperands() == 0 || op->getNumResults() == 0)
if (failed(verifyAtLeastNOperands(op, 1)) ||
failed(verifyAtLeastNResults(op, 1)))
return failure();
auto type = op->getResult(0)->getType();

35
mlir/test/IR/traits.mlir
View File

@ -45,6 +45,20 @@ func @failedSameOperandAndResultElementType(%t10x10 : tensor<10x10xf32>, %t1: te
// -----
func @failedSameOperandAndResultElementType() {
// expected-error@+1 {{expected 1 or more operands}}
%0 = "test.same_operand_and_result_type"() : () -> tensor<1xf32>
}
// -----
func @failedSameOperandAndResultElementType(%t1: tensor<1xf32>) {
// expected-error@+1 {{expected 1 or more results}}
"test.same_operand_and_result_type"(%t1) : (tensor<1xf32>) -> ()
}
// -----
// CHECK: succeededSameOperandShape
func @succeededSameOperandShape(%t10x10 : tensor<10x10xf32>, %t1: tensor<1xf32>, %tr: tensor<*xf32>) {
%0 = "test.same_operand_shape"(%t1, %t1) : (tensor<1xf32>, tensor<1xf32>) -> (tensor<10x10xf32>)
@ -62,6 +76,13 @@ func @failedSameOperandShape(%t10x10 : tensor<10x10xf32>, %t1: tensor<1xf32>) {
// -----
func @failedSameOperandShape() {
// expected-error@+1 {{expected 1 or more operands}}
%0 = "test.same_operand_shape"() : () -> (tensor<1xf32>)
}
// -----
// CHECK: succeededSameOperandAndResultShape
func @succeededSameOperandAndResultShape(%t10x10 : tensor<10x10xf32>, %t1: tensor<1xf32>, %tr: tensor<*xf32>) {
%0 = "test.same_operand_and_result_shape"(%t1, %t1) : (tensor<1xf32>, tensor<1xf32>) -> tensor<1xf32>
@ -79,6 +100,20 @@ func @failedSameOperandAndResultShape(%t10x10 : tensor<10x10xf32>, %t1: tensor<1
// -----
func @failedSameOperandAndResultShape() {
// expected-error@+1 {{expected 1 or more operands}}
%0 = "test.same_operand_and_result_shape"() : () -> (tensor<1xf32>)
}
// -----
func @failedSameOperandAndResultShape(%t1: tensor<1xf32>) {
// expected-error@+1 {{expected 1 or more results}}
"test.same_operand_and_result_shape"(%t1) : (tensor<1xf32>) -> ()
}
// -----
func @hasParent() {
"some.op"() ({
// expected-error@+1 {{'test.child' op expects parent op 'test.parent'}}

10
mlir/test/lib/TestDialect/TestOps.td
View File

@ -219,19 +219,19 @@ def SameOperandElementTypeOp : TEST_Op<"same_operand_type",
def SameOperandAndResultElementTypeOp : TEST_Op<"same_operand_and_result_type",
[SameOperandsAndResultElementType]> {
let arguments = (ins AnyVectorOrTensor:$x, AnyVectorOrTensor:$y);
let results = (outs AnyVectorOrTensor:$res);
let arguments = (ins Variadic<AnyVectorOrTensor>:$args);
let results = (outs Variadic<AnyVectorOrTensor>:$res);
}
def SameOperandShapeOp : TEST_Op<"same_operand_shape", [SameOperandsShape]> {
let arguments = (ins AnyVectorOrTensor:$x, AnyVectorOrTensor:$y);
let arguments = (ins Variadic<AnyVectorOrTensor>:$args);
let results = (outs AnyVectorOrTensor:$res);
}
def SameOperandAndResultShapeOp : TEST_Op<"same_operand_and_result_shape",
[SameOperandsAndResultShape]> {
let arguments = (ins AnyVectorOrTensor:$x, AnyVectorOrTensor:$y);
let results = (outs AnyVectorOrTensor:$res);
let arguments = (ins Variadic<AnyVectorOrTensor>:$args);
let results = (outs Variadic<AnyVectorOrTensor>:$res);
}
def ArgAndResHaveFixedElementTypesOp :