[Mlir-commits] [mlir] [MLIR][Linalg] Prevent PackOp canonicalization crash on zero tile factor (PR #185624)

[Ayush Kumar Gaur]

https://github.com/Ayush3941 updated https://github.com/llvm/llvm-project/pull/185624

>From 4d3cf95f9c95b9883ff1900dee45d8379f436b55 Mon Sep 17 00:00:00 2001
From: Ayush3941 <ayushkgaur1 at gmail.com>
Date: Tue, 10 Mar 2026 07:35:14 -0400
Subject: [PATCH 1/4] [MLIR][Linalg] Guard PackOp padding check against zero
 tile factor

---
 mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp      |  3 +++
 .../pack-zero-tile-after-sccp-invalid.mlir    | 23 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 mlir/test/Dialect/Linalg/pack-zero-tile-after-sccp-invalid.mlir

diff --git a/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp b/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp
index ad2909f656eea..da84c2cc1d16e 100644
--- a/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp
+++ b/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp
@@ -5806,6 +5806,9 @@ static bool paddingIsNotNeeded(PackOp op) {
   if (llvm::any_of(op.getInnerDimsPos(),
                    [&](int64_t pos) { return srcType.isDynamicDim(pos); }))
     return false;
+  if (llvm::any_of(op.getStaticInnerTiles(),
+                   [](int64_t tile) { return tile == 0; }))
+    return false;
   if (ShapedType::isDynamicShape(op.getStaticInnerTiles()))
     return false;
   return !PackOp::requirePaddingValue(
diff --git a/mlir/test/Dialect/Linalg/pack-zero-tile-after-sccp-invalid.mlir b/mlir/test/Dialect/Linalg/pack-zero-tile-after-sccp-invalid.mlir
new file mode 100644
index 0000000000000..2f443379cb83c
--- /dev/null
+++ b/mlir/test/Dialect/Linalg/pack-zero-tile-after-sccp-invalid.mlir
@@ -0,0 +1,23 @@
+// RUN: mlir-opt %s -split-input-file -verify-diagnostics
+
+func.func @get_tile_size() -> index {
+  %c0 = arith.constant 0 : index
+  return %c0 : index
+}
+
+func.func private @use(%A: tensor<?x16x?x1xi32>)
+
+func.func @pack(%A: tensor<7x16xi32>) {
+  %c1 = arith.constant 1 : index
+  %pad_val = arith.constant 123 : i32
+  %tile_size = func.call @get_tile_size() : () -> index
+  %empty = tensor.empty(%c1, %tile_size) : tensor<?x16x?x1xi32>
+  // expected-error @below {{invalid zero tile factor}}
+  %pack = linalg.pack %A
+    padding_value(%pad_val : i32)
+    inner_dims_pos = [0, 1]
+    inner_tiles = [%tile_size, 1]
+    into %empty : tensor<7x16xi32> -> tensor<?x16x?x1xi32>
+  func.call @use(%pack) : (tensor<?x16x?x1xi32>) -> ()
+  return
+}
\ No newline at end of file

>From 973b124c0711a6c8893ce464767c53fc362400f1 Mon Sep 17 00:00:00 2001
From: Ayush3941 <ayushkgaur1 at gmail.com>
Date: Tue, 10 Mar 2026 07:44:02 -0400
Subject: [PATCH 2/4] [MLIR][Linalg] Guard PackOp padding check against zero
 tile factor

---
 mlir/test/Dialect/Linalg/pack-zero-tile-after-sccp-invalid.mlir | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mlir/test/Dialect/Linalg/pack-zero-tile-after-sccp-invalid.mlir b/mlir/test/Dialect/Linalg/pack-zero-tile-after-sccp-invalid.mlir
index 2f443379cb83c..9913cd7663743 100644
--- a/mlir/test/Dialect/Linalg/pack-zero-tile-after-sccp-invalid.mlir
+++ b/mlir/test/Dialect/Linalg/pack-zero-tile-after-sccp-invalid.mlir
@@ -20,4 +20,4 @@ func.func @pack(%A: tensor<7x16xi32>) {
     into %empty : tensor<7x16xi32> -> tensor<?x16x?x1xi32>
   func.call @use(%pack) : (tensor<?x16x?x1xi32>) -> ()
   return
-}
\ No newline at end of file
+}

>From d817f150d88b66b6ca705e012a1aacff1ddae16a Mon Sep 17 00:00:00 2001
From: Ayush3941 <ayushkgaur1 at gmail.com>
Date: Tue, 10 Mar 2026 08:02:23 -0400
Subject: [PATCH 3/4] [MLIR][Linalg] Guard PackOp padding check against zero
 tile factor fixed test

---
 .../Dialect/Linalg/pack-zero-tile-after-sccp-invalid.mlir     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mlir/test/Dialect/Linalg/pack-zero-tile-after-sccp-invalid.mlir b/mlir/test/Dialect/Linalg/pack-zero-tile-after-sccp-invalid.mlir
index 9913cd7663743..ba35357d1d5fe 100644
--- a/mlir/test/Dialect/Linalg/pack-zero-tile-after-sccp-invalid.mlir
+++ b/mlir/test/Dialect/Linalg/pack-zero-tile-after-sccp-invalid.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-opt %s -split-input-file -verify-diagnostics
+// RUN: mlir-opt %s --inline --sccp --canonicalize -split-input-file -verify-diagnostics
 
 func.func @get_tile_size() -> index {
   %c0 = arith.constant 0 : index
@@ -20,4 +20,4 @@ func.func @pack(%A: tensor<7x16xi32>) {
     into %empty : tensor<7x16xi32> -> tensor<?x16x?x1xi32>
   func.call @use(%pack) : (tensor<?x16x?x1xi32>) -> ()
   return
-}
+}
\ No newline at end of file

>From d0b015d4de071dd88922706ebe8017166ed5bad1 Mon Sep 17 00:00:00 2001
From: Ayush3941 <ayushkgaur1 at gmail.com>
Date: Tue, 10 Mar 2026 08:04:05 -0400
Subject: [PATCH 4/4] [MLIR][Linalg] Guard PackOp padding check against zero
 tile factor fixed test

---
 mlir/test/Dialect/Linalg/pack-zero-tile-after-sccp-invalid.mlir | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mlir/test/Dialect/Linalg/pack-zero-tile-after-sccp-invalid.mlir b/mlir/test/Dialect/Linalg/pack-zero-tile-after-sccp-invalid.mlir
index ba35357d1d5fe..48cbc4ed2d606 100644
--- a/mlir/test/Dialect/Linalg/pack-zero-tile-after-sccp-invalid.mlir
+++ b/mlir/test/Dialect/Linalg/pack-zero-tile-after-sccp-invalid.mlir
@@ -20,4 +20,4 @@ func.func @pack(%A: tensor<7x16xi32>) {
     into %empty : tensor<7x16xi32> -> tensor<?x16x?x1xi32>
   func.call @use(%pack) : (tensor<?x16x?x1xi32>) -> ()
   return
-}
\ No newline at end of file
+}