[Mlir-commits] [mlir] [MLIR][Interface]: Verify index map ranks before composing loop bounds (PR #173434)
Stefan Weigl-Bosker
llvmlistbot at llvm.org
Sat Dec 27 08:52:58 PST 2025
https://github.com/sweiglbosker updated https://github.com/llvm/llvm-project/pull/173434
>From 8d84f9f67b45d8ce499708f315aef867b3bad5c2 Mon Sep 17 00:00:00 2001
From: Stefan Weigl-Bosker <stefan at s00.xyz>
Date: Tue, 23 Dec 2025 19:04:52 -0500
Subject: [PATCH 1/3] [MLIR][Interface]: Verify index map ranks before
composing loop bounds
---
.../lib/Interfaces/IndexingMapOpInterface.cpp | 26 +++++++-------
mlir/test/Dialect/Linalg/invalid.mlir | 35 +++++++++++++++++++
2 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/mlir/lib/Interfaces/IndexingMapOpInterface.cpp b/mlir/lib/Interfaces/IndexingMapOpInterface.cpp
index f3c12aed8df84..463276011acdb 100644
--- a/mlir/lib/Interfaces/IndexingMapOpInterface.cpp
+++ b/mlir/lib/Interfaces/IndexingMapOpInterface.cpp
@@ -32,35 +32,35 @@ LogicalResult mlir::IndexingMapOpInterface::verifyImpl() {
<< "(" << str << ")";
}
- SmallVector<int64_t> endLoopRangeValues = getStaticLoopRanges();
+ SmallVector<int64_t> allShapesSizes;
- // Set this flag if this op has user defined maps. This is required to guard
- // the below error condition which assume default indexing maps.
for (OpOperand &opOperand : getOperation()->getOpOperands()) {
AffineMap indexingMap = getMatchingIndexingMap(&opOperand);
+ SmallVector<int64_t> shape = getStaticOperandShape(&opOperand);
+ int64_t rank = shape.size();
// Symbols disallowed.
if (indexingMap.getNumSymbols() != 0)
return getOperation()->emitOpError("unexpected symbols in indexing_map #")
<< opOperand.getOperandNumber();
- // Domain must be consistent.
- if (indexingMap.getNumDims() != endLoopRangeValues.size())
- return getOperation()->emitOpError("expected indexing_map #")
- << opOperand.getOperandNumber() << " to have "
- << endLoopRangeValues.size()
- << " dim(s) to match the number of loops";
-
- SmallVector<int64_t> shape = getStaticOperandShape(&opOperand);
- int64_t rank = shape.size();
-
+ // Result rank must match operand rank.
if (indexingMap.getNumResults() != rank)
return getOperation()->emitOpError("expected operand rank (")
<< rank << ") to match the result rank of indexing_map #"
<< opOperand.getOperandNumber() << " ("
<< indexingMap.getNumResults() << ")";
+
+ llvm::append_range(allShapesSizes, shape);
}
+ SmallVector<int64_t> endLoopRangeValues = invertedMap.compose(allShapesSizes);
+
+ if (invertedMap.getNumResults() != endLoopRangeValues.size())
+ return getOperation()->emitOpError("expected each indexing_map to have ")
+ << endLoopRangeValues.size()
+ << " dim(s) to match the number of loops";
+
// Check if given shapes match to inferred shapes.
SmallVector<int64_t> startLoopRangeValues(endLoopRangeValues.size(), 0);
// Verify only static cases since we can't get exact dimension sizes and
diff --git a/mlir/test/Dialect/Linalg/invalid.mlir b/mlir/test/Dialect/Linalg/invalid.mlir
index 1f554e6c45da7..af9112b7c1f74 100644
--- a/mlir/test/Dialect/Linalg/invalid.mlir
+++ b/mlir/test/Dialect/Linalg/invalid.mlir
@@ -165,6 +165,41 @@ func.func @generic_singular_maps(%arg0: memref<?xf32, affine_map<(i)[off]->(off
}
}
+// -----
+
+func.func @generic_index_rank0(%arg0: tensor<f32>) -> tensor<f32> {
+// expected-error @+1 {{op expected operand rank (0) to match the result rank of indexing_map #0 (1)}}
+ %0 = linalg.generic {
+ indexing_maps = [
+ affine_map<(d0) -> (d0)>,
+ affine_map<(d0) -> (d0)>
+ ],
+ iterator_types = ["parallel"]}
+ ins(%arg0 : tensor<f32>)
+ outs(%arg0 : tensor<f32>) {
+ ^bb(%0: f32, %1: f32):
+ linalg.yield %1 : f32
+ } -> tensor<f32>
+ return %0 : tensor<f32>
+}
+
+// -----
+
+func.func @generic_index_domain_error(%arg0: tensor<4xf32>) -> tensor<4xf32> {
+// expected-error @+1 {{op expected operand rank (1) to match the result rank of indexing_map #1 (2)}}
+ %0 = linalg.generic {
+ indexing_maps = [
+ affine_map<(d0) -> (d0)>,
+ affine_map<(d0, d1) -> (d0, d1)>],
+ iterator_types = ["parallel", "parallel"]}
+ ins(%arg0 : tensor<4xf32>)
+ outs(%arg0 : tensor<4xf32>) {
+ ^bb(%0: f32):
+ linalg.yield %0 : f32
+ } -> tensor<4xf32>
+ return %0 : tensor<4xf32>
+}
+
////////////////////////////////////////////////////////////////////////////////
///////////////////////////// Region tests /////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
>From 54c5f040b03b842d7cebe699ba0a0b817aef5506 Mon Sep 17 00:00:00 2001
From: Stefan Weigl-Bosker <stefan at s00.xyz>
Date: Fri, 26 Dec 2025 21:04:07 -0500
Subject: [PATCH 2/3] Check there are no symbols before inverting map
---
.../lib/Interfaces/IndexingMapOpInterface.cpp | 22 +++++++++----------
mlir/test/Dialect/Linalg/invalid.mlir | 18 +++++++++++++++
2 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/mlir/lib/Interfaces/IndexingMapOpInterface.cpp b/mlir/lib/Interfaces/IndexingMapOpInterface.cpp
index 463276011acdb..9df8832c9e39e 100644
--- a/mlir/lib/Interfaces/IndexingMapOpInterface.cpp
+++ b/mlir/lib/Interfaces/IndexingMapOpInterface.cpp
@@ -23,15 +23,6 @@ LogicalResult mlir::IndexingMapOpInterface::verifyImpl() {
<< ") to be equal to the number of input/output operands ("
<< getOperation()->getNumOperands() << ")";
- AffineMap invertedMap = getShapesToLoopsMap();
- if (!invertedMap) {
- std::string str;
- llvm::raw_string_ostream os(str);
- getLoopsToShapesMap().print(os);
- return this->emitOpError("invalid indexing maps are non-invertible: ")
- << "(" << str << ")";
- }
-
SmallVector<int64_t> allShapesSizes;
for (OpOperand &opOperand : getOperation()->getOpOperands()) {
@@ -41,12 +32,12 @@ LogicalResult mlir::IndexingMapOpInterface::verifyImpl() {
// Symbols disallowed.
if (indexingMap.getNumSymbols() != 0)
- return getOperation()->emitOpError("unexpected symbols in indexing_map #")
+ return this->emitOpError("unexpected symbols in indexing_map #")
<< opOperand.getOperandNumber();
// Result rank must match operand rank.
if (indexingMap.getNumResults() != rank)
- return getOperation()->emitOpError("expected operand rank (")
+ return this->emitOpError("expected operand rank (")
<< rank << ") to match the result rank of indexing_map #"
<< opOperand.getOperandNumber() << " ("
<< indexingMap.getNumResults() << ")";
@@ -54,6 +45,15 @@ LogicalResult mlir::IndexingMapOpInterface::verifyImpl() {
llvm::append_range(allShapesSizes, shape);
}
+ AffineMap invertedMap = getShapesToLoopsMap();
+ if (!invertedMap) {
+ std::string str;
+ llvm::raw_string_ostream os(str);
+ getLoopsToShapesMap().print(os);
+ return this->emitOpError("invalid indexing maps are non-invertible: ")
+ << "(" << str << ")";
+ }
+
SmallVector<int64_t> endLoopRangeValues = invertedMap.compose(allShapesSizes);
if (invertedMap.getNumResults() != endLoopRangeValues.size())
diff --git a/mlir/test/Dialect/Linalg/invalid.mlir b/mlir/test/Dialect/Linalg/invalid.mlir
index af9112b7c1f74..2406764b65919 100644
--- a/mlir/test/Dialect/Linalg/invalid.mlir
+++ b/mlir/test/Dialect/Linalg/invalid.mlir
@@ -200,6 +200,24 @@ func.func @generic_index_domain_error(%arg0: tensor<4xf32>) -> tensor<4xf32> {
return %0 : tensor<4xf32>
}
+// -----
+
+
+#map_with_symbol = affine_map<(d0)[s0] -> (d0 + s0)>
+
+func.func @generic_indexing_map_with_symbol(%arg0: tensor<8xf32>) -> tensor<8xf32> {
+ // expected-error @+1 {{unexpected symbols in indexing_map #0}}
+ %0 = linalg.generic {
+ indexing_maps = [#map_with_symbol, #map_with_symbol],
+ iterator_types = ["parallel"]
+ } ins(%arg0 : tensor<8xf32>)
+ outs(%arg0 : tensor<8xf32>) {
+ ^bb0(%in: f32, %out: f32):
+ linalg.yield %in : f32
+ } -> tensor<8xf32>
+ return %0 : tensor<8xf32>
+}
+
////////////////////////////////////////////////////////////////////////////////
///////////////////////////// Region tests /////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
>From 7071ef437edcc765705397861f30421469db4ec9 Mon Sep 17 00:00:00 2001
From: Stefan Weigl-Bosker <stefan at s00.xyz>
Date: Sat, 27 Dec 2025 11:52:39 -0500
Subject: [PATCH 3/3] fixes
---
mlir/lib/Interfaces/IndexingMapOpInterface.cpp | 5 +++--
mlir/test/Dialect/Linalg/invalid.mlir | 1 -
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/mlir/lib/Interfaces/IndexingMapOpInterface.cpp b/mlir/lib/Interfaces/IndexingMapOpInterface.cpp
index 9df8832c9e39e..1e2a6aa28d409 100644
--- a/mlir/lib/Interfaces/IndexingMapOpInterface.cpp
+++ b/mlir/lib/Interfaces/IndexingMapOpInterface.cpp
@@ -37,8 +37,9 @@ LogicalResult mlir::IndexingMapOpInterface::verifyImpl() {
// Result rank must match operand rank.
if (indexingMap.getNumResults() != rank)
- return this->emitOpError("expected operand rank (")
- << rank << ") to match the result rank of indexing_map #"
+ return this->emitOpError("expected operand #")
+ << opOperand.getOperandNumber() << " rank (" << rank
+ << ") to match the result rank of indexing_map #"
<< opOperand.getOperandNumber() << " ("
<< indexingMap.getNumResults() << ")";
diff --git a/mlir/test/Dialect/Linalg/invalid.mlir b/mlir/test/Dialect/Linalg/invalid.mlir
index 2406764b65919..8a22bdd4cb952 100644
--- a/mlir/test/Dialect/Linalg/invalid.mlir
+++ b/mlir/test/Dialect/Linalg/invalid.mlir
@@ -202,7 +202,6 @@ func.func @generic_index_domain_error(%arg0: tensor<4xf32>) -> tensor<4xf32> {
// -----
-
#map_with_symbol = affine_map<(d0)[s0] -> (d0 + s0)>
func.func @generic_indexing_map_with_symbol(%arg0: tensor<8xf32>) -> tensor<8xf32> {
More information about the Mlir-commits
mailing list