[Mlir-commits] [mlir] [mlir][spirv] Verify matching of entry block arguments and function signature (PR #133167)

[llvmlistbot at llvm.org]

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

>From 607690491073d7197fb90f3a4d29f703ce461426 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        | 19 +++++++++++++++++
 .../SPIRV/IR/function-decorations.mlir        | 21 +++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp b/mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp
index da9855b02860d..04198ad2f4c45 100644
--- a/mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp
+++ b/mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp
@@ -1021,6 +1021,25 @@ 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";
+
+    ArrayRef<Type> fnInputTypes = getArgumentTypes();
+    for (unsigned i = 0, e = numArguments; i != e; ++i) {
+      Type argType = entryBlock.getArgument(i).getType();
+      if (fnInputTypes[i] != argType) {
+        return emitOpError("type of entry block argument #")
+               << i << '(' << argType
+               << ") must match the type of the corresponding argument in "
+               << "function signature(" << fnInputTypes[i] << ')';
+      }
+    }
+  }
 
   auto walkResult = walk([fnType](Operation *op) -> WalkResult {
     if (auto retOp = dyn_cast<spirv::ReturnOp>(op)) {
diff --git a/mlir/test/Dialect/SPIRV/IR/function-decorations.mlir b/mlir/test/Dialect/SPIRV/IR/function-decorations.mlir
index 07e187e6a7d68..dca66774bb54e 100644
--- a/mlir/test/Dialect/SPIRV/IR/function-decorations.mlir
+++ b/mlir/test/Dialect/SPIRV/IR/function-decorations.mlir
@@ -73,3 +73,24 @@ spirv.func @no_decoration_name_attr(%arg0 : !spirv.ptr<i32, PhysicalStorageBuffe
 spirv.func @no_decoration_name_attr(%arg0 : !spirv.ptr<i32, PhysicalStorageBuffer> { spirv.decoration = #spirv.decoration<Restrict>, random_attr = #spirv.decoration<Aliased> }) "None" {
   spirv.Return
 }
+
+// -----
+
+// expected-error @+2 {{'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
+  }
+}
+
+// -----
+
+// expected-error @+2 {{'spirv.func' op type of entry block argument #0('f64') must match the type of the corresponding argument in function signature('f32')}}
+module {
+  spirv.func @f(f32) "None" {
+    ^bb0(%arg0: f64):
+    %c0 = arith.constant 0 : index
+    spirv.Return
+  }
+}