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

Revert "[MLIR][Shape] Allow `num_elements` to operate on extent tensors" 

This reverts commit 55ced04d6b.

Forgot to submit depend change first.
This commit is contained in:
Jacques Pienaar 2020-07-25 14:47:57 -07:00
parent 55ced04d6b
commit 7bfecd7739
5 changed files with 13 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mlir/include/mlir/Dialect/Shape/IR/ShapeOps.td
View File

@ -333,19 +333,19 @@ def Shape_NumElementsOp : Shape_Op<"num_elements", [NoSideEffect]> {
let summary = "Returns the number of elements for a given shape";
let description = [{
Returns the number of elements for a given shape which is the product of its
extents. If the argument is of type `shape` then the result will be of type
`size` and potential errors will be propagated. Otherwise, if the argument
is and extent tensor `tensor<?xindex>` then the result will be of type
`index`.
dimensions.
```mlir
%product = shape.mul %lhs, %rhs
```
}];
let arguments = (ins Shape_ShapeOrExtentTensorType:$shape);
let results = (outs Shape_SizeOrIndexType:$result);
let arguments = (ins Shape_ShapeType:$shape);
let results = (outs Shape_SizeType:$result);
let assemblyFormat = "$shape `:` type($shape) `->` type($result) attr-dict";
let assemblyFormat = "$shape attr-dict";
let hasFolder = 1;
let verifier = [{ return ::verifySizeOrIndexOp(*this); }];
}
def Shape_ReduceOp : Shape_Op<"reduce",

4
mlir/test/Dialect/Shape/canonicalize.mlir
View File

@ -217,7 +217,7 @@ func @num_elements() -> !shape.size {
// CHECK-NOT: shape.const_shape
%shape = shape.const_shape [4, 5, 6] : !shape.shape
// CHECK-NOT: shape.num_elements
%num_elements = shape.num_elements %shape : !shape.shape -> !shape.size
%num_elements = shape.num_elements %shape
// CHECK: %[[NUM:.*]] = shape.const_size 120
// CHECK-NEXT: return %[[NUM]] : !shape.size
return %num_elements : !shape.size
@ -229,7 +229,7 @@ func @num_elements() -> !shape.size {
// CHECK-LABEL: func @nonfoldable_num_elements
func @nonfoldable_num_elements(%shape : !shape.shape) -> !shape.size {
// CHECK-NOT: shape.const_{{.*}}
%num_elements = shape.num_elements %shape : !shape.shape -> !shape.size
%num_elements = shape.num_elements %shape
return %num_elements : !shape.size
}

16
mlir/test/Dialect/Shape/invalid.mlir
View File

@ -146,19 +146,3 @@ func @mul_error_possible(%lhs : !shape.size, %rhs : index) -> index {
return %result : index
}
// -----
func @num_elements_error_free(%arg : tensor<?xindex>) -> !shape.size {
// expected-error@+1 {{if none of the operands can hold error values then the result must be of type `index`}}
%result = shape.num_elements %arg : tensor<?xindex> -> !shape.size
return %result : !shape.size
}
// -----
func @num_elements_error_possible(%arg : !shape.shape) -> index {
// expected-error@+1 {{if at least one of the operands can hold error values then the result must be of type `size` to propagate them}}
%result = shape.num_elements %arg : !shape.shape -> index
return %result : index
}

11
mlir/test/Dialect/Shape/ops.mlir
View File

@ -195,14 +195,3 @@ func @any() {
return
}
func @num_elements_extent_tensor(%arg : tensor<?xindex>) -> index {
%result = shape.num_elements %arg : tensor<?xindex> -> index
return %result : index
}
func @num_elements_shape(%arg : !shape.shape) -> !shape.size {
%result = shape.num_elements %arg : !shape.shape -> !shape.size
return %result : !shape.size
}

6
mlir/test/Dialect/Shape/shape-to-shape.mlir
View File

@ -1,9 +1,9 @@
// RUN: mlir-opt -shape-to-shape-lowering -split-input-file %s | FileCheck %s
// CHECK-LABEL: func @num_elements_to_reduce
// CHECK-SAME: ([[ARG:%.*]]: !shape.shape) -> !shape.size
// CHECK-LABEL: func @num_elements_to_reduce(
// CHECK-SAME: [[ARG:%.*]]: !shape.shape) -> !shape.size {
func @num_elements_to_reduce(%shape : !shape.shape) -> !shape.size {
%num_elements = shape.num_elements %shape : !shape.shape -> !shape.size
%num_elements = shape.num_elements %shape
return %num_elements : !shape.size
}
// CHECK: [[C1:%.*]] = shape.const_size 1