[mlir][tosa]-Edit the verifier of tosa constShapeOp #126962
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add verification for rank 1 for the elements' attribute of the tosa const_shape operation.
|
@llvm/pr-subscribers-mlir Author: Amir Bishara (amirBish) ChangesAdd verification for rank 1 for the elements' attribute of the tosa const_shape operation. Full diff: https://github.com/llvm/llvm-project/pull/126962.diff 2 Files Affected:
diff --git a/mlir/lib/Dialect/Tosa/IR/TosaOps.cpp b/mlir/lib/Dialect/Tosa/IR/TosaOps.cpp
index 4928be38476a9..e782838ad97f9 100644
--- a/mlir/lib/Dialect/Tosa/IR/TosaOps.cpp
+++ b/mlir/lib/Dialect/Tosa/IR/TosaOps.cpp
@@ -2618,6 +2618,10 @@ OpTrait::tosa::verifyTosaShapeOperatorWithSameRanks(Operation *op) {
//===----------------------------------------------------------------------===//
LogicalResult tosa::ConstShapeOp::verify() {
+ // check one dimensional rank
+ auto valuesRank = getValue().getType().getRank();
+ if (valuesRank != 1)
+ return emitOpError("expect elements in attribute value with rank 1");
// check that number of elements in value attr equal to rank of result shape
auto count = getValue().getNumElements();
auto rank = (cast<tosa::shapeType>(getResult().getType())).getRank();
diff --git a/mlir/test/Dialect/Tosa/invalid.mlir b/mlir/test/Dialect/Tosa/invalid.mlir
index 913191be86f85..ff874af5c5f07 100644
--- a/mlir/test/Dialect/Tosa/invalid.mlir
+++ b/mlir/test/Dialect/Tosa/invalid.mlir
@@ -1087,6 +1087,14 @@ func.func @test_const_shape_value() -> !tosa.shape<5> {
// -----
+func.func @test_const_shape_value() -> !tosa.shape<4> {
+ // expected-error@+1 {{'tosa.const_shape' op expect elements in attribute value with rank 1}}
+ %cst = tosa.const_shape {value = dense<[[1, 2], [3, 4]]> : tensor<2x2xindex>} : () -> !tosa.shape<4>
+ return %cst : !tosa.shape<4>
+}
+
+// -----
+
func.func @test_sub_with_unequal_operand_ranks(%arg0: tensor<1x21x3xf32>, %arg1: tensor<1x13x21x3xf32>) -> tensor<1x13x21x3xf32> {
// expected-error@+1 {{'tosa.sub' op operands don't have matching ranks}}
%0 = tosa.sub %arg0, %arg1 : (tensor<1x21x3xf32>, tensor<1x13x21x3xf32>) -> tensor<1x13x21x3xf32>
|
|
@llvm/pr-subscribers-mlir-tosa Author: Amir Bishara (amirBish) ChangesAdd verification for rank 1 for the elements' attribute of the tosa const_shape operation. Full diff: https://github.com/llvm/llvm-project/pull/126962.diff 2 Files Affected:
diff --git a/mlir/lib/Dialect/Tosa/IR/TosaOps.cpp b/mlir/lib/Dialect/Tosa/IR/TosaOps.cpp
index 4928be38476a9..e782838ad97f9 100644
--- a/mlir/lib/Dialect/Tosa/IR/TosaOps.cpp
+++ b/mlir/lib/Dialect/Tosa/IR/TosaOps.cpp
@@ -2618,6 +2618,10 @@ OpTrait::tosa::verifyTosaShapeOperatorWithSameRanks(Operation *op) {
//===----------------------------------------------------------------------===//
LogicalResult tosa::ConstShapeOp::verify() {
+ // check one dimensional rank
+ auto valuesRank = getValue().getType().getRank();
+ if (valuesRank != 1)
+ return emitOpError("expect elements in attribute value with rank 1");
// check that number of elements in value attr equal to rank of result shape
auto count = getValue().getNumElements();
auto rank = (cast<tosa::shapeType>(getResult().getType())).getRank();
diff --git a/mlir/test/Dialect/Tosa/invalid.mlir b/mlir/test/Dialect/Tosa/invalid.mlir
index 913191be86f85..ff874af5c5f07 100644
--- a/mlir/test/Dialect/Tosa/invalid.mlir
+++ b/mlir/test/Dialect/Tosa/invalid.mlir
@@ -1087,6 +1087,14 @@ func.func @test_const_shape_value() -> !tosa.shape<5> {
// -----
+func.func @test_const_shape_value() -> !tosa.shape<4> {
+ // expected-error@+1 {{'tosa.const_shape' op expect elements in attribute value with rank 1}}
+ %cst = tosa.const_shape {value = dense<[[1, 2], [3, 4]]> : tensor<2x2xindex>} : () -> !tosa.shape<4>
+ return %cst : !tosa.shape<4>
+}
+
+// -----
+
func.func @test_sub_with_unequal_operand_ranks(%arg0: tensor<1x21x3xf32>, %arg1: tensor<1x13x21x3xf32>) -> tensor<1x13x21x3xf32> {
// expected-error@+1 {{'tosa.sub' op operands don't have matching ranks}}
%0 = tosa.sub %arg0, %arg1 : (tensor<1x21x3xf32>, tensor<1x13x21x3xf32>) -> tensor<1x13x21x3xf32>
|
|
@Jerry-Ge this change is regarding this thread https://discourse.llvm.org/t/questions-regarding-tosa-shape-type/84431 |
Tai78641
reviewed
Feb 12, 2025
| // check one dimensional rank | ||
| auto valuesRank = getValue().getType().getRank(); | ||
| if (valuesRank != 1) | ||
| return emitOpError("expect elements in attribute value with rank 1"); |
There was a problem hiding this comment.
this is great! thank you. I was just about to work on similar checks.
if you don't mind, would you please add an additional check that
the getValue().getType() has element type which is an index type?
There was a problem hiding this comment.
It's already being validated with the type of value being declared in the td file.
take a look at mlir/include/mlir/Dialect/Tosa/IR/TosaShapeOps.td line 70:
let arguments = (ins IndexElementsAttr : $value);
|
LGTM |
flovent
pushed a commit
to flovent/llvm-project
that referenced
this pull request
Feb 13, 2025
Add verification for rank 1 for the elements' attribute of the tosa const_shape operation.
joaosaffran
pushed a commit
to joaosaffran/llvm-project
that referenced
this pull request
Feb 14, 2025
Add verification for rank 1 for the elements' attribute of the tosa const_shape operation.
sivan-shani
pushed a commit
to sivan-shani/llvm-project
that referenced
this pull request
Feb 24, 2025
Add verification for rank 1 for the elements' attribute of the tosa const_shape operation.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add verification for rank 1 for the elements' attribute of the tosa const_shape operation.