[Mlir-commits] [mlir] [mlir] Add test for invalid entry block (PR #133167)

[llvmlistbot at llvm.org]

https://github.com/hiraditya updated https://github.com/llvm/llvm-project/pull/133167

>From 04758b23f520ebc3cda826c440f86744144b20ff Mon Sep 17 00:00:00 2001
From: AdityaK <hiraditya at msn.com>
Date: Mon, 31 Mar 2025 18:37:06 +0000
Subject: [PATCH] Verify entry block in SPIRV dialect

---
 mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp     |  8 ++++++++
 mlir/test/Dialect/SPIRV/IR/func-entry.mlir | 12 ++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 mlir/test/Dialect/SPIRV/IR/func-entry.mlir

diff --git a/mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp b/mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp
index da9855b02860d..6bd1b0ab897b0 100644
--- a/mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp
+++ b/mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp
@@ -1021,6 +1021,14 @@ LogicalResult spirv::FuncOp::verifyType() {
 
 LogicalResult spirv::FuncOp::verifyBody() {
   FunctionType fnType = getFunctionType();
+  if (!isExternal()) {
+    Block &entryBlock = front();
+
+    unsigned numArguments = this->getNumArguments();
+    if (entryBlock.getNumArguments() != numArguments)
+      return emitOpError("entry block must have ")
+            << numArguments << " arguments to match function signature";
+  }
 
   auto walkResult = walk([fnType](Operation *op) -> WalkResult {
     if (auto retOp = dyn_cast<spirv::ReturnOp>(op)) {
diff --git a/mlir/test/Dialect/SPIRV/IR/func-entry.mlir b/mlir/test/Dialect/SPIRV/IR/func-entry.mlir
new file mode 100644
index 0000000000000..b2eec2d4ac20e
--- /dev/null
+++ b/mlir/test/Dialect/SPIRV/IR/func-entry.mlir
@@ -0,0 +1,12 @@
+// Bug: https://github.com/llvm/llvm-project/issues/132894
+
+// RUN: not mlir-opt %s 2>&1 | FileCheck %s
+
+// CHECK: error: 'spirv.func' op entry block must have 1 arguments to match function signature
+module {
+  spirv.func @f(f32) "None" {
+    %c0 = arith.constant 0 : index
+    spirv.Return
+  }
+}
+