[mlir][affine] Verify map of affineMaxMinOp has at least one result
#108699
Conversation
This file contains hidden or 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
This PR fixes a bug in `verifyAffineMinMaxOp` that allowed `map` of `affine.max` and `affine.min` to have an empty result.
|
@llvm/pr-subscribers-mlir Author: Longsheng Mou (CoTinker) ChangesThis PR fixes a bug in Full diff: https://github.com/llvm/llvm-project/pull/108699.diff 2 Files Affected:
diff --git a/mlir/lib/Dialect/Affine/IR/AffineOps.cpp b/mlir/lib/Dialect/Affine/IR/AffineOps.cpp
index 11b6b7cf5fd5a7..b89888e6aa83f7 100644
--- a/mlir/lib/Dialect/Affine/IR/AffineOps.cpp
+++ b/mlir/lib/Dialect/Affine/IR/AffineOps.cpp
@@ -3214,6 +3214,9 @@ static LogicalResult verifyAffineMinMaxOp(T op) {
op.getMap().getNumDims() + op.getMap().getNumSymbols())
return op.emitOpError(
"operand count and affine map dimension and symbol count must match");
+
+ if (op.getMap().getNumResults() == 0)
+ return op.emitOpError("affine map expect at least one result");
return success();
}
diff --git a/mlir/test/Dialect/Affine/invalid.mlir b/mlir/test/Dialect/Affine/invalid.mlir
index 60f13102f55156..869ea712bb3690 100644
--- a/mlir/test/Dialect/Affine/invalid.mlir
+++ b/mlir/test/Dialect/Affine/invalid.mlir
@@ -178,6 +178,22 @@ func.func @affine_min(%arg0 : index, %arg1 : index, %arg2 : index) {
// -----
+func.func @affine_min() {
+ // expected-error@+1 {{'affine.min' op affine map expect at least one result}}
+ %0 = affine.min affine_map<() -> ()> ()
+ return
+}
+
+// -----
+
+func.func @affine_min(%arg0 : index) {
+ // expected-error@+1 {{'affine.min' op affine map expect at least one result}}
+ %0 = affine.min affine_map<(d0) -> ()> (%arg0)
+ return
+}
+
+// -----
+
func.func @affine_max(%arg0 : index, %arg1 : index, %arg2 : index) {
// expected-error@+1 {{operand count and affine map dimension and symbol count must match}}
%0 = affine.max affine_map<(d0) -> (d0)> (%arg0, %arg1)
@@ -205,6 +221,22 @@ func.func @affine_max(%arg0 : index, %arg1 : index, %arg2 : index) {
// -----
+func.func @affine_max() {
+ // expected-error@+1 {{'affine.max' op affine map expect at least one result}}
+ %0 = affine.max affine_map<() -> ()> ()
+ return
+}
+
+// -----
+
+func.func @affine_max(%arg0 : index) {
+ // expected-error@+1 {{'affine.max' op affine map expect at least one result}}
+ %0 = affine.max affine_map<(d0) -> ()> (%arg0)
+ return
+}
+
+// -----
+
func.func @affine_parallel(%arg0 : index, %arg1 : index, %arg2 : index) {
// expected-error@+1 {{the number of region arguments (1) and the number of map groups for lower (2) and upper bound (2), and the number of steps (2) must all match}}
affine.parallel (%i) = (0, 0) to (100, 100) step (10, 10) {
|
|
@llvm/pr-subscribers-mlir-affine Author: Longsheng Mou (CoTinker) ChangesThis PR fixes a bug in Full diff: https://github.com/llvm/llvm-project/pull/108699.diff 2 Files Affected:
diff --git a/mlir/lib/Dialect/Affine/IR/AffineOps.cpp b/mlir/lib/Dialect/Affine/IR/AffineOps.cpp
index 11b6b7cf5fd5a7..b89888e6aa83f7 100644
--- a/mlir/lib/Dialect/Affine/IR/AffineOps.cpp
+++ b/mlir/lib/Dialect/Affine/IR/AffineOps.cpp
@@ -3214,6 +3214,9 @@ static LogicalResult verifyAffineMinMaxOp(T op) {
op.getMap().getNumDims() + op.getMap().getNumSymbols())
return op.emitOpError(
"operand count and affine map dimension and symbol count must match");
+
+ if (op.getMap().getNumResults() == 0)
+ return op.emitOpError("affine map expect at least one result");
return success();
}
diff --git a/mlir/test/Dialect/Affine/invalid.mlir b/mlir/test/Dialect/Affine/invalid.mlir
index 60f13102f55156..869ea712bb3690 100644
--- a/mlir/test/Dialect/Affine/invalid.mlir
+++ b/mlir/test/Dialect/Affine/invalid.mlir
@@ -178,6 +178,22 @@ func.func @affine_min(%arg0 : index, %arg1 : index, %arg2 : index) {
// -----
+func.func @affine_min() {
+ // expected-error@+1 {{'affine.min' op affine map expect at least one result}}
+ %0 = affine.min affine_map<() -> ()> ()
+ return
+}
+
+// -----
+
+func.func @affine_min(%arg0 : index) {
+ // expected-error@+1 {{'affine.min' op affine map expect at least one result}}
+ %0 = affine.min affine_map<(d0) -> ()> (%arg0)
+ return
+}
+
+// -----
+
func.func @affine_max(%arg0 : index, %arg1 : index, %arg2 : index) {
// expected-error@+1 {{operand count and affine map dimension and symbol count must match}}
%0 = affine.max affine_map<(d0) -> (d0)> (%arg0, %arg1)
@@ -205,6 +221,22 @@ func.func @affine_max(%arg0 : index, %arg1 : index, %arg2 : index) {
// -----
+func.func @affine_max() {
+ // expected-error@+1 {{'affine.max' op affine map expect at least one result}}
+ %0 = affine.max affine_map<() -> ()> ()
+ return
+}
+
+// -----
+
+func.func @affine_max(%arg0 : index) {
+ // expected-error@+1 {{'affine.max' op affine map expect at least one result}}
+ %0 = affine.max affine_map<(d0) -> ()> (%arg0)
+ return
+}
+
+// -----
+
func.func @affine_parallel(%arg0 : index, %arg1 : index, %arg2 : index) {
// expected-error@+1 {{the number of region arguments (1) and the number of map groups for lower (2) and upper bound (2), and the number of steps (2) must all match}}
affine.parallel (%i) = (0, 0) to (100, 100) step (10, 10) {
|
|
Thanks. |
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.
This PR fixes a bug in
verifyAffineMinMaxOpthat allowedmapofaffine.maxandaffine.minto have an empty result. Fixes #108368.