[SPIR-V] Enable vk::ext_extension and vk::ext_capability for variables (microsoft#6052)

`ext_extension` and `ext_capability` can only be added to functions at
the moment. This PR enables adding them to variable declarations, so
that using the variable results in the extensions and capabilities being
added to the module. This is useful for the builtin variable syntax
proposed in microsoft/hlsl-specs#129.

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Author: cassiebeckley

tools/clang/include/clang/Basic/Attr.td

@@ -1294,7 +1294,7 @@ def VKBinding : InheritableAttr {
 
 def VKCapabilityExt : InheritableAttr {
   let Spellings = [CXX11<"vk", "ext_capability">];
-  let Subjects = SubjectList<[Function], ErrorDiag>;
+  let Subjects = SubjectList<[Function, Var], ErrorDiag>;
   let Args = [IntArgument<"capability">];
   let LangOpts = [SPIRV];
   let Documentation = [Undocumented];
@@ -1334,7 +1334,7 @@ def VKDecorateStringExt : InheritableAttr {
 
 def VKExtensionExt : InheritableAttr {
   let Spellings = [CXX11<"vk", "ext_extension">];
-  let Subjects = SubjectList<[Function], ErrorDiag>;
+  let Subjects = SubjectList<[Function, Var], ErrorDiag>;
   let Args = [StringArgument<"name">];
   let LangOpts = [SPIRV];
   let Documentation = [Undocumented];

tools/clang/lib/SPIRV/DeclResultIdMapper.cpp

@@ -956,6 +956,12 @@ DeclResultIdMapper::getDeclSpirvInfo(const ValueDecl *decl) const {
 SpirvInstruction *DeclResultIdMapper::getDeclEvalInfo(const ValueDecl *decl,
                                                       SourceLocation loc,
                                                       SourceRange range) {
+  if (decl->hasAttr<VKExtensionExtAttr>() ||
+      decl->hasAttr<VKCapabilityExtAttr>()) {
+    theEmitter.createSpirvIntrInstExt(decl->getAttrs(), QualType(),
+                                      /* spvArgs */ {}, /* isInst */ false,
+                                      loc);
+  }
   if (hlsl::IsHLSLDynamicResourceType(decl->getType()) ||
       hlsl::IsHLSLDynamicSamplerType(decl->getType())) {
     emitError("HLSL object %0 not yet supported with -spirv",

tools/clang/lib/SPIRV/SpirvEmitter.cpp

@@ -14011,19 +14011,20 @@ SpirvEmitter::processRayQueryIntrinsics(const CXXMemberCallExpr *expr,
   return retVal;
 }
 
-SpirvInstruction *SpirvEmitter::createSpirvIntrInstExt(
-    llvm::ArrayRef<const Attr *> attrs, QualType retType,
-    const llvm::SmallVectorImpl<SpirvInstruction *> &spvArgs, bool isInstr,
-    SourceLocation loc) {
-  llvm::SmallVector<uint32_t, 2> capbilities;
+SpirvInstruction *
+SpirvEmitter::createSpirvIntrInstExt(llvm::ArrayRef<const Attr *> attrs,
+                                     QualType retType,
+                                     llvm::ArrayRef<SpirvInstruction *> spvArgs,
+                                     bool isInstr, SourceLocation loc) {
+  llvm::SmallVector<uint32_t, 2> capabilities;
   llvm::SmallVector<llvm::StringRef, 2> extensions;
   llvm::StringRef instSet = "";
   // For [[vk::ext_type_def]], we use dummy OpNop with no semantic meaning,
   // with possible extension and capabilities.
   uint32_t op = static_cast<unsigned>(spv::Op::OpNop);
   for (auto &attr : attrs) {
     if (auto capAttr = dyn_cast<VKCapabilityExtAttr>(attr)) {
-      capbilities.push_back(capAttr->getCapability());
+      capabilities.push_back(capAttr->getCapability());
     } else if (auto extAttr = dyn_cast<VKExtensionExtAttr>(attr)) {
       extensions.push_back(extAttr->getName());
     }
@@ -14036,7 +14037,7 @@ SpirvInstruction *SpirvEmitter::createSpirvIntrInstExt(
   }
 
   SpirvInstruction *retVal = spvBuilder.createSpirvIntrInstExt(
-      op, retType, spvArgs, extensions, instSet, capbilities, loc);
+      op, retType, spvArgs, extensions, instSet, capabilities, loc);
   if (!retVal)
     return nullptr;
 

tools/clang/lib/SPIRV/SpirvEmitter.h

@@ -104,6 +104,13 @@ class SpirvEmitter : public ASTConsumer {
                : (var->getAttr<HLSLGroupSharedAttr>() != nullptr);
   }
 
+  /// Create SpirvIntrinsicInstruction for arbitrary SPIR-V instructions
+  /// specified by [[vk::ext_instruction(..)]] or [[vk::ext_type_def(..)]]
+  SpirvInstruction *
+  createSpirvIntrInstExt(llvm::ArrayRef<const Attr *> attrs, QualType retType,
+                         llvm::ArrayRef<SpirvInstruction *> spvArgs,
+                         bool isInstr, SourceLocation loc);
+
 private:
   void doFunctionDecl(const FunctionDecl *decl);
   void doVarDecl(const VarDecl *decl);
@@ -685,13 +692,6 @@ class SpirvEmitter : public ASTConsumer {
   /// Process ray query intrinsics
   SpirvInstruction *processRayQueryIntrinsics(const CXXMemberCallExpr *expr,
                                               hlsl::IntrinsicOp opcode);
-
-  /// Create SpirvIntrinsicInstruction for arbitrary SPIR-V instructions
-  /// specified by [[vk::ext_instruction(..)]] or [[vk::ext_type_def(..)]]
-  SpirvInstruction *createSpirvIntrInstExt(
-      llvm::ArrayRef<const Attr *> attrs, QualType retType,
-      const llvm::SmallVectorImpl<SpirvInstruction *> &spvArgs, bool isInstr,
-      SourceLocation loc);
   /// Process spirv intrinsic instruction
   SpirvInstruction *processSpvIntrinsicCallExpr(const CallExpr *expr);
 

tools/clang/test/CodeGenSPIRV_Lit/spv.inline.capability.hlsl

@@ -0,0 +1,10 @@
+// RUN: %dxc -T ps_6_0 -E main -fcgl -Vd %s -spirv | FileCheck %s
+
+// CHECK: OpCapability SampleMaskPostDepthCoverage
+
+[[vk::ext_capability(/* SampleMaskPostDepthCoverageCapability */ 4447)]]
+int val;
+
+void main() {
+  int local = val;
+}

tools/clang/test/CodeGenSPIRV_Lit/spv.inline.extension.hlsl

@@ -0,0 +1,11 @@
+// RUN: %dxc -T ps_6_0 -E main -fcgl %s -spirv | FileCheck %s
+
+// CHECK: OpExtension "another_extension"
+// CHECK: OpExtension "some_extension"
+
+[[vk::ext_extension("some_extension"), vk::ext_extension("another_extension")]]
+int val;
+
+void main() {
+  int local = val;
+}

tools/clang/test/CodeGenSPIRV_Lit/spv.inline.extension.unused.hlsl

@@ -0,0 +1,11 @@
+// RUN: %dxc -T ps_6_0 -E main -fcgl %s -spirv | FileCheck %s
+
+// CHECK-NOT: OpExtension "some_extension"
+// CHECK-NOT: OpCapability SampleMaskPostDepthCoverage
+
+[[vk::ext_extension("some_extension")]]
+[[vk::ext_capability(/* SampleMaskPostDepthCoverageCapability */ 4447)]]
+int val;
+
+void main() {
+}