[llvm] [SPIR-V] Remove metadata-driven kernel arg Volatile decoration (PR #215790)

Arseniy Obolenskiy via llvm-commits llvm-commits at lists.llvm.org
Wed Aug 19 13:55:53 PDT 2026


https://github.com/aobolensk updated https://github.com/llvm/llvm-project/pull/215790

>From 8c4eb3b679a71dede8d9195bc27df485618ad07f Mon Sep 17 00:00:00 2001
From: Arseniy Obolenskiy <arseniy.obolenskiy at amd.com>
Date: Wed, 12 Aug 2026 14:41:53 +0200
Subject: [PATCH 1/2] [SPIR-V] Recognize volatile inside combined OpenCL kernel
 type qualifiers

---
 llvm/lib/Target/SPIRV/SPIRVCallLowering.cpp   |  6 ++-
 .../SPIRV/spirv_param_decorations_quals.ll    | 37 ++++++++++++++++---
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/llvm/lib/Target/SPIRV/SPIRVCallLowering.cpp b/llvm/lib/Target/SPIRV/SPIRVCallLowering.cpp
index b2b9c318cdd7e..1452df8c03350 100644
--- a/llvm/lib/Target/SPIRV/SPIRVCallLowering.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVCallLowering.cpp
@@ -134,7 +134,11 @@ getArgAccessQual(const Function &F, unsigned ArgIdx) {
 static std::vector<SPIRV::Decoration::Decoration>
 getKernelArgTypeQual(const Function &F, unsigned ArgIdx) {
   MDString *ArgAttribute = getOCLKernelArgTypeQual(F, ArgIdx);
-  if (ArgAttribute && ArgAttribute->getString() == "volatile")
+  if (!ArgAttribute)
+    return {};
+  SmallVector<StringRef, 3> Tokens;
+  ArgAttribute->getString().split(Tokens, ' ', -1, /*KeepEmpty=*/false);
+  if (llvm::is_contained(Tokens, "volatile"))
     return {SPIRV::Decoration::Volatile};
   return {};
 }
diff --git a/llvm/test/CodeGen/SPIRV/spirv_param_decorations_quals.ll b/llvm/test/CodeGen/SPIRV/spirv_param_decorations_quals.ll
index ca9a200e70097..8e48888908033 100644
--- a/llvm/test/CodeGen/SPIRV/spirv_param_decorations_quals.ll
+++ b/llvm/test/CodeGen/SPIRV/spirv_param_decorations_quals.ll
@@ -1,18 +1,45 @@
 ; RUN: llc -O0 -mtriple=spirv32-unknown-unknown %s -o - | FileCheck %s --check-prefix=CHECK-SPIRV
 ; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv32-unknown-unknown %s -o - -filetype=obj | spirv-val %}
 
+; CHECK-SPIRV-DAG: OpDecorate %[[#PId:]] Volatile
+; CHECK-SPIRV-DAG: OpDecorate %[[#PId]] FuncParamAttr NoAlias
+; CHECK-SPIRV-DAG: OpDecorate %[[#PId]] FuncParamAttr NoWrite
+; CHECK-SPIRV-DAG: OpDecorate %[[#PId2:]] Volatile
+; CHECK-SPIRV-DAG: OpDecorate %[[#PId3:]] Volatile
+; CHECK-SPIRV-DAG: OpDecorate %[[#PId4:]] Volatile
+
 define spir_kernel void @k(ptr addrspace(1) %a) !kernel_arg_type_qual !7 !spirv.ParameterDecorations !10 {
+; CHECK-SPIRV: %[[#PId]] = OpFunctionParameter %[[#]]
 entry:
   ret void
 }
 
-; CHECK-SPIRV: OpDecorate %[[#PId:]] Volatile
-; CHECK-SPIRV: OpDecorate %[[#PId]] FuncParamAttr NoAlias
-; CHECK-SPIRV: OpDecorate %[[#PId]] FuncParamAttr NoWrite
-; CHECK-SPIRV: %[[#PId]] = OpFunctionParameter %[[#]]
-
 !7 = !{!"volatile"}
 !8 = !{i32 38, i32 4} ; FuncParamAttr NoAlias
 !11 = !{i32 38, i32 6} ; FuncParamAttr NoWrite
 !9 = !{!8, !11}
 !10 = !{!9}
+
+define spir_kernel void @k_const_volatile(ptr addrspace(1) %a) !kernel_arg_type_qual !20 {
+; CHECK-SPIRV: %[[#PId2]] = OpFunctionParameter %[[#]]
+entry:
+  ret void
+}
+
+!20 = !{!"const volatile"}
+
+define spir_kernel void @k_restrict_volatile(ptr addrspace(1) %a) !kernel_arg_type_qual !21 {
+; CHECK-SPIRV: %[[#PId3]] = OpFunctionParameter %[[#]]
+entry:
+  ret void
+}
+
+!21 = !{!"restrict volatile"}
+
+define spir_kernel void @k_restrict_const_volatile(ptr addrspace(1) %a) !kernel_arg_type_qual !22 {
+; CHECK-SPIRV: %[[#PId4]] = OpFunctionParameter %[[#]]
+entry:
+  ret void
+}
+
+!22 = !{!"restrict const volatile"}

>From 249a754d522b33913f7f60f328f77e9290f3329b Mon Sep 17 00:00:00 2001
From: Arseniy Obolenskiy <arseniy.obolenskiy at amd.com>
Date: Wed, 19 Aug 2026 22:53:20 +0200
Subject: [PATCH 2/2] Address comment

---
 llvm/lib/Target/SPIRV/SPIRVCallLowering.cpp   | 19 --------
 llvm/lib/Target/SPIRV/SPIRVMetadata.cpp       |  7 ---
 llvm/lib/Target/SPIRV/SPIRVMetadata.h         |  1 -
 .../SPIRV/spirv_param_decorations_quals.ll    | 45 -------------------
 4 files changed, 72 deletions(-)
 delete mode 100644 llvm/test/CodeGen/SPIRV/spirv_param_decorations_quals.ll

diff --git a/llvm/lib/Target/SPIRV/SPIRVCallLowering.cpp b/llvm/lib/Target/SPIRV/SPIRVCallLowering.cpp
index 1452df8c03350..0fe4451d50ad7 100644
--- a/llvm/lib/Target/SPIRV/SPIRVCallLowering.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVCallLowering.cpp
@@ -131,18 +131,6 @@ getArgAccessQual(const Function &F, unsigned ArgIdx) {
   return SPIRV::AccessQualifier::ReadWrite;
 }
 
-static std::vector<SPIRV::Decoration::Decoration>
-getKernelArgTypeQual(const Function &F, unsigned ArgIdx) {
-  MDString *ArgAttribute = getOCLKernelArgTypeQual(F, ArgIdx);
-  if (!ArgAttribute)
-    return {};
-  SmallVector<StringRef, 3> Tokens;
-  ArgAttribute->getString().split(Tokens, ' ', -1, /*KeepEmpty=*/false);
-  if (llvm::is_contained(Tokens, "volatile"))
-    return {SPIRV::Decoration::Volatile};
-  return {};
-}
-
 static SPIRVTypeInst getArgSPIRVType(const Function &F, unsigned ArgIdx,
                                      SPIRVGlobalRegistry *GR,
                                      MachineIRBuilder &MIRBuilder,
@@ -337,13 +325,6 @@ bool SPIRVCallLowering::lowerFormalArguments(MachineIRBuilder &MIRBuilder,
         }
       }
 
-      if (F.getCallingConv() == CallingConv::SPIR_KERNEL) {
-        std::vector<SPIRV::Decoration::Decoration> ArgTypeQualDecs =
-            getKernelArgTypeQual(F, i);
-        for (SPIRV::Decoration::Decoration Decoration : ArgTypeQualDecs)
-          buildOpDecorate(VRegs[i][0], MIRBuilder, Decoration, {});
-      }
-
       MDNode *Node = F.getMetadata("spirv.ParameterDecorations");
       if (Node && i < Node->getNumOperands() &&
           isa<MDNode>(Node->getOperand(i))) {
diff --git a/llvm/lib/Target/SPIRV/SPIRVMetadata.cpp b/llvm/lib/Target/SPIRV/SPIRVMetadata.cpp
index ea05118981e71..948eb51ce0eca 100644
--- a/llvm/lib/Target/SPIRV/SPIRVMetadata.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVMetadata.cpp
@@ -75,11 +75,4 @@ MDString *getOCLKernelArgAccessQual(const Function &F, unsigned ArgIdx) {
   return getOCLKernelArgAttribute(F, ArgIdx, "kernel_arg_access_qual");
 }
 
-MDString *getOCLKernelArgTypeQual(const Function &F, unsigned ArgIdx) {
-  assert(
-      F.getCallingConv() == CallingConv::SPIR_KERNEL &&
-      "Kernel attributes are attached/belong only to OpenCL kernel functions");
-  return getOCLKernelArgAttribute(F, ArgIdx, "kernel_arg_type_qual");
-}
-
 } // namespace llvm
diff --git a/llvm/lib/Target/SPIRV/SPIRVMetadata.h b/llvm/lib/Target/SPIRV/SPIRVMetadata.h
index b159b16f33606..dddf59f740d8f 100644
--- a/llvm/lib/Target/SPIRV/SPIRVMetadata.h
+++ b/llvm/lib/Target/SPIRV/SPIRVMetadata.h
@@ -24,7 +24,6 @@ namespace llvm {
 //
 
 MDString *getOCLKernelArgAccessQual(const Function &F, unsigned ArgIdx);
-MDString *getOCLKernelArgTypeQual(const Function &F, unsigned ArgIdx);
 
 } // namespace llvm
 #endif // LLVM_LIB_TARGET_SPIRV_SPIRVMETADATA_H
diff --git a/llvm/test/CodeGen/SPIRV/spirv_param_decorations_quals.ll b/llvm/test/CodeGen/SPIRV/spirv_param_decorations_quals.ll
deleted file mode 100644
index 8e48888908033..0000000000000
--- a/llvm/test/CodeGen/SPIRV/spirv_param_decorations_quals.ll
+++ /dev/null
@@ -1,45 +0,0 @@
-; RUN: llc -O0 -mtriple=spirv32-unknown-unknown %s -o - | FileCheck %s --check-prefix=CHECK-SPIRV
-; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv32-unknown-unknown %s -o - -filetype=obj | spirv-val %}
-
-; CHECK-SPIRV-DAG: OpDecorate %[[#PId:]] Volatile
-; CHECK-SPIRV-DAG: OpDecorate %[[#PId]] FuncParamAttr NoAlias
-; CHECK-SPIRV-DAG: OpDecorate %[[#PId]] FuncParamAttr NoWrite
-; CHECK-SPIRV-DAG: OpDecorate %[[#PId2:]] Volatile
-; CHECK-SPIRV-DAG: OpDecorate %[[#PId3:]] Volatile
-; CHECK-SPIRV-DAG: OpDecorate %[[#PId4:]] Volatile
-
-define spir_kernel void @k(ptr addrspace(1) %a) !kernel_arg_type_qual !7 !spirv.ParameterDecorations !10 {
-; CHECK-SPIRV: %[[#PId]] = OpFunctionParameter %[[#]]
-entry:
-  ret void
-}
-
-!7 = !{!"volatile"}
-!8 = !{i32 38, i32 4} ; FuncParamAttr NoAlias
-!11 = !{i32 38, i32 6} ; FuncParamAttr NoWrite
-!9 = !{!8, !11}
-!10 = !{!9}
-
-define spir_kernel void @k_const_volatile(ptr addrspace(1) %a) !kernel_arg_type_qual !20 {
-; CHECK-SPIRV: %[[#PId2]] = OpFunctionParameter %[[#]]
-entry:
-  ret void
-}
-
-!20 = !{!"const volatile"}
-
-define spir_kernel void @k_restrict_volatile(ptr addrspace(1) %a) !kernel_arg_type_qual !21 {
-; CHECK-SPIRV: %[[#PId3]] = OpFunctionParameter %[[#]]
-entry:
-  ret void
-}
-
-!21 = !{!"restrict volatile"}
-
-define spir_kernel void @k_restrict_const_volatile(ptr addrspace(1) %a) !kernel_arg_type_qual !22 {
-; CHECK-SPIRV: %[[#PId4]] = OpFunctionParameter %[[#]]
-entry:
-  ret void
-}
-
-!22 = !{!"restrict const volatile"}



More information about the llvm-commits mailing list