[Mlir-commits] [mlir] [mlir][tosa] Fix a crash in `PadOp::fold` (PR #114921)
Longsheng Mou
llvmlistbot at llvm.org
Mon Nov 4 19:47:15 PST 2024
https://github.com/CoTinker created https://github.com/llvm/llvm-project/pull/114921
This PR fixes a crash when padding of `tosa.pad` is not dense elements. Fixes #114762.
>From 106e367a7f834370e78ce1905d8b15142c0e16f3 Mon Sep 17 00:00:00 2001
From: Longsheng Mou <longshengmou at gmail.com>
Date: Tue, 5 Nov 2024 11:42:46 +0800
Subject: [PATCH 1/2] [mlir][tosa] Fix a crash when padding of `tosa.pad` is
not dense elements
This PR fixes a crash when padding of `tosa.pad` is not dense elements.
---
mlir/lib/Dialect/Tosa/IR/TosaCanonicalizations.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/mlir/lib/Dialect/Tosa/IR/TosaCanonicalizations.cpp b/mlir/lib/Dialect/Tosa/IR/TosaCanonicalizations.cpp
index dbd573f96a79f8..39d0ee122b1630 100644
--- a/mlir/lib/Dialect/Tosa/IR/TosaCanonicalizations.cpp
+++ b/mlir/lib/Dialect/Tosa/IR/TosaCanonicalizations.cpp
@@ -878,8 +878,9 @@ OpFoldResult ReshapeOp::fold(FoldAdaptor adaptor) {
OpFoldResult PadOp::fold(FoldAdaptor adaptor) {
// If the pad is all zeros we can fold this operation away.
if (adaptor.getPadding() && getInput1().getType() == getType()) {
- auto densePad = llvm::cast<DenseElementsAttr>(adaptor.getPadding());
- if (densePad.isSplat() && densePad.getSplatValue<APInt>().isZero()) {
+ auto densePad = llvm::dyn_cast<DenseElementsAttr>(adaptor.getPadding());
+ if (densePad && densePad.isSplat() &&
+ densePad.getSplatValue<APInt>().isZero()) {
return getInput1();
}
}
>From 36316b2657d6c90667fbeaec7f39e0a2e908a8ed Mon Sep 17 00:00:00 2001
From: Longsheng Mou <longshengmou at gmail.com>
Date: Tue, 5 Nov 2024 11:45:27 +0800
Subject: [PATCH 2/2] Add tests
---
mlir/test/Dialect/Tosa/canonicalize.mlir | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/mlir/test/Dialect/Tosa/canonicalize.mlir b/mlir/test/Dialect/Tosa/canonicalize.mlir
index 3bcf58015831ba..67cd01f62f0bdf 100644
--- a/mlir/test/Dialect/Tosa/canonicalize.mlir
+++ b/mlir/test/Dialect/Tosa/canonicalize.mlir
@@ -217,6 +217,17 @@ func.func @pad_noop(%arg0: tensor<?x?xf32>) -> tensor<?x?xf32> {
// -----
+// CHECK-LABEL: @pad_noop_padding_mismatch_nofold
+func.func @pad_noop_padding_mismatch_nofold(%arg0: tensor<?x?xf32>) -> tensor<?x?xf32> {
+ // CHECK: %[[PAD:.+]] = tosa.pad
+ // CHECK: return %[[PAD]]
+ %0 = "tosa.const"() { value = dense_resource<__elided__> : tensor<2x2xi32>} : () -> tensor<2x2xi32>
+ %1 = tosa.pad %arg0, %0 : (tensor<?x?xf32>, tensor<2x2xi32>) -> tensor<?x?xf32>
+ return %1 : tensor<?x?xf32>
+}
+
+// -----
+
// CHECK-LABEL: @pad_noop_type_mismatch_nofold
func.func @pad_noop_type_mismatch_nofold(%arg0: tensor<10xf32>) -> tensor<?xf32> {
// CHECK: %[[PAD:.+]] = tosa.pad
More information about the Mlir-commits
mailing list