reuse spirv.Decorations metadata

Author: Keenuts

clang/lib/CodeGen/CGHLSLRuntime.cpp

@@ -559,9 +559,11 @@ void CGHLSLRuntime::handleGlobalVarDefinition(const VarDecl *VD,
   if (auto Attr = VD->getAttr<HLSLVkExtBuiltinInputAttr>()) {
     LLVMContext &Ctx = GV->getContext();
     IRBuilder<> B(GV->getContext());
-    MDNode *Val = MDNode::get(
-        Ctx, {ConstantAsMetadata::get(B.getInt32(Attr->getBuiltIn()))});
-    GV->addMetadata("spv.builtin", *Val);
+    MDNode *Operands = MDNode::get(
+        Ctx, {ConstantAsMetadata::get(B.getInt32(11)),
+              ConstantAsMetadata::get(B.getInt32(Attr->getBuiltIn()))});
+    MDNode *Decoration = MDNode::get(Ctx, {Operands});
+    GV->addMetadata("spirv.Decorations", *Decoration);
   }
 }
 

clang/test/CodeGenHLSL/vk-input-builtin.hlsl

@@ -3,12 +3,13 @@
 
 [[vk::ext_builtin_input(/* WorkgroupId */ 26)]]
 static const uint3 groupid;
-// CHECK: @_ZL7groupid = local_unnamed_addr addrspace(7) externally_initialized constant <3 x i32> undef, align 16, !spv.builtin [[META0:![0-9]+]]
+// CHECK: @_ZL7groupid = local_unnamed_addr addrspace(7) externally_initialized constant <3 x i32> undef, align 16, !spirv.Decorations [[META0:![0-9]+]]
 
 RWStructuredBuffer<int> output : register(u1, space0);
 
 [numthreads(1, 1, 1)]
 void main() {
   output[0] = groupid;
 }
-// CHECK: [[META0]] = !{i32 26}
+// CHECK: [[META0]] = !{[[META1:![0-9]+]]}
+// CHECK: [[META1]] = !{i32 11, i32 26}

llvm/test/CodeGen/SPIRV/hlsl-intrinsics/vk-ext-builtin-input.ll

@@ -0,0 +1,26 @@
+; RUN: llc -O0 -verify-machineinstrs -mtriple=spirv-vulkan-unknown %s -o - | FileCheck %s
+
+; FIXME(138268): Alignment decoration is emitted.
+; NO-RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv-vulkan-unknown %s -o - -filetype=obj | spirv-val %}
+
+; CHECK-DAG:        OpDecorate %[[#WorkgroupId:]] BuiltIn WorkgroupId
+
+; CHECK-DAG:             %[[#uint:]] = OpTypeInt 32 0
+; CHECK-DAG:           %[[#uint_0:]] = OpConstant %[[#uint]] 0
+; CHECK-DAG:           %[[#v3uint:]] = OpTypeVector %[[#uint]] 3
+; CHECK-DAG:   %[[#ptr_Input_uint:]] = OpTypePointer Input %[[#uint]]
+; CHECK-DAG: %[[#ptr_Input_v3uint:]] = OpTypePointer Input %[[#v3uint]]
+; CHECK-DAG:      %[[#WorkgroupId:]] = OpVariable %[[#ptr_Input_v3uint]] Input
+@var = local_unnamed_addr addrspace(7) externally_initialized constant <3 x i32> undef, align 16, !spirv.Decorations !0
+
+define i32 @foo() {
+entry:
+; CHECK: %[[#ptr:]] = OpAccessChain %[[#ptr_Input_uint]] %[[#WorkgroupId]] %[[#uint_0]]
+; CHECK: %[[#res:]] = OpLoad %[[#uint]] %[[#ptr]] Aligned 16
+; CHECK:              OpReturnValue %[[#res]]
+  %0 = load i32, ptr addrspace(7) @var, align 16
+  ret i32 %0
+}
+
+!0 = !{!1}
+!1 = !{i32 11, i32 26}