[Mlir-commits] [mlir] [mlir][vector] Fix crash in `vector.insert` canonicalization (PR #97801)
llvmlistbot at llvm.org
llvmlistbot at llvm.org
Fri Jul 5 02:24:53 PDT 2024
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-mlir-vector
Author: Matthias Springer (matthias-springer)
<details>
<summary>Changes</summary>
The `InsertOpConstantFolder` assumed that whenever the destination can be folded to a constant attribute, that attribute must be a `DenseElementsAttr`. That is is not necessarily the case.
---
Full diff: https://github.com/llvm/llvm-project/pull/97801.diff
2 Files Affected:
- (modified) mlir/lib/Dialect/Vector/IR/VectorOps.cpp (+4-3)
- (modified) mlir/test/Dialect/Vector/canonicalize.mlir (+11)
``````````diff
diff --git a/mlir/lib/Dialect/Vector/IR/VectorOps.cpp b/mlir/lib/Dialect/Vector/IR/VectorOps.cpp
index 53a6648de014c..7967aa1582fd8 100644
--- a/mlir/lib/Dialect/Vector/IR/VectorOps.cpp
+++ b/mlir/lib/Dialect/Vector/IR/VectorOps.cpp
@@ -2851,6 +2851,9 @@ class InsertOpConstantFolder final : public OpRewritePattern<InsertOp> {
Attribute vectorDestCst;
if (!matchPattern(destVector, m_Constant(&vectorDestCst)))
return failure();
+ auto denseDest = llvm::dyn_cast<DenseElementsAttr>(vectorDestCst);
+ if (!denseDest)
+ return failure();
VectorType destTy = destVector.getType();
if (destTy.isScalable())
@@ -2860,9 +2863,7 @@ class InsertOpConstantFolder final : public OpRewritePattern<InsertOp> {
if (destTy.getNumElements() > vectorSizeFoldThreshold &&
!destVector.hasOneUse())
return failure();
-
- auto denseDest = llvm::cast<DenseElementsAttr>(vectorDestCst);
-
+
Value sourceValue = op.getSource();
Attribute sourceCst;
if (!matchPattern(sourceValue, m_Constant(&sourceCst)))
diff --git a/mlir/test/Dialect/Vector/canonicalize.mlir b/mlir/test/Dialect/Vector/canonicalize.mlir
index 1a674d715ca61..9f16dfb5093d0 100644
--- a/mlir/test/Dialect/Vector/canonicalize.mlir
+++ b/mlir/test/Dialect/Vector/canonicalize.mlir
@@ -2729,3 +2729,14 @@ func.func @fold_vector_step_to_constant() -> vector<4xindex> {
%0 = vector.step : vector<4xindex>
return %0 : vector<4xindex>
}
+
+// -----
+
+// CHECK-LABEL: func @vector_insert_regression(
+// CHECK: llvm.mlir.undef
+// CHECK: vector.insert
+func.func @vector_insert_regression(%arg0: i8) -> vector<4xi8> {
+ %0 = llvm.mlir.undef : vector<4xi8>
+ %1 = vector.insert %arg0, %0 [0] : i8 into vector<4xi8>
+ return %1 : vector<4xi8>
+}
``````````
</details>
https://github.com/llvm/llvm-project/pull/97801
More information about the Mlir-commits
mailing list