[SPIRV] Cleanup string matching in SPIRV generator

docs/ReleaseNotes.md

@@ -30,6 +30,8 @@ line upon naming the release. Refer to previous for appropriate section names.
 - SPIR-V: Fixed an invalid `OpSelect` being generated when optimizing for
   SPIR-V 1.3 and earlier
   [#8603](https://github.com/microsoft/DirectXShaderCompiler/issues/8603).
+- SPIR-V: Fixed user-defined types whose names match built-in resource types
+  being incorrectly lowered as resources.
 
 #### HLSL Language
 

tools/clang/include/clang/AST/HlslTypes.h

@@ -520,6 +520,14 @@ bool IsHLSLRayQueryType(clang::QualType type);
 bool GetHLSLNodeIORecordType(const clang::ParmVarDecl *parmDecl,
                              NodeFlags &nodeKind);
 
+/// Returns the DXIL ResourceKind for this type, or ResourceKind::Invalid if
+/// not an HLSL resource type.
+DXIL::ResourceKind GetHLSLResourceKind(clang::QualType type);
+
+/// Returns the DXIL ResourceClass for this type, or ResourceClass::Invalid if
+/// not an HLSL resource type.
+DXIL::ResourceClass GetHLSLResourceClass(clang::QualType type);
+
 bool IsArrayConstantStringType(const clang::QualType type);
 bool IsPointerStringType(const clang::QualType type);
 bool IsStringType(const clang::QualType type);

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

@@ -1205,6 +1205,16 @@ def HLSLHitObject : InheritableAttr {
   let Documentation = [Undocumented];
 }
 
+// Vulkan SubpassInput / SubpassInputMS Attribute
+// Marks the built-in SubpassInput<T> and SubpassInputMS<T,S> record types as
+// distinct from any user-defined type with the same unqualified name.
+def HLSLVkSubpassInput : InheritableAttr {
+  let Spellings = []; // No spellings!
+  let Args = [BoolArgument<"IsMultiSampled">];
+  let Subjects = SubjectList<[CXXRecord]>;
+  let Documentation = [Undocumented];
+}
+
 // HLSL Dynamic Resource Attribute
 // Marks the builtin `.Resource` / `.Sampler` placeholder record types used
 // for descriptor heap indexing (ResourceDescriptorHeap[i] /

tools/clang/lib/AST/HlslTypes.cpp

@@ -615,6 +615,18 @@ bool IsHLSLStructuredBufferType(clang::QualType type) {
   return false;
 }
 
+DXIL::ResourceKind GetHLSLResourceKind(clang::QualType type) {
+  if (const HLSLResourceAttr *Attr = getAttr<HLSLResourceAttr>(type))
+    return Attr->getResKind();
+  return DXIL::ResourceKind::Invalid;
+}
+
+DXIL::ResourceClass GetHLSLResourceClass(clang::QualType type) {
+  if (const HLSLResourceAttr *Attr = getAttr<HLSLResourceAttr>(type))
+    return Attr->getResClass();
+  return DXIL::ResourceClass::Invalid;
+}
+
 bool IsHLSLSubobjectType(clang::QualType type) {
   DXIL::SubobjectKind kind;
   DXIL::HitGroupType hgType;