[SPIR-V] fix variable with inline SC added to CB (#7967)

Before this commit, non-static global variables with a inline SPIR-V
ext_storage_class attribute were added to the default constant buffer
global struct. This is an issue as the point of a custom storage class
is to create globals such as acceleration structures.

Fixes #7742

Author: Keenuts

tools/clang/lib/SPIRV/DeclResultIdMapper.cpp

@@ -330,6 +330,10 @@ bool shouldSkipInStructLayout(const Decl *decl) {
       return true;
     }
 
+    if (decl->hasAttr<VKStorageClassExtAttr>()) {
+      return true;
+    }
+
     // External visibility
     if (const auto *declDecl = dyn_cast<DeclaratorDecl>(decl))
       if (!declDecl->hasExternalFormalLinkage())
@@ -1183,14 +1187,15 @@ SpirvVariable *DeclResultIdMapper::createExternVar(const VarDecl *var) {
 SpirvVariable *DeclResultIdMapper::createExternVar(const VarDecl *var,
                                                    QualType type) {
   const bool isGroupShared = var->hasAttr<HLSLGroupSharedAttr>();
+  const bool hasInlineSpirvSC = var->hasAttr<VKStorageClassExtAttr>();
   const bool isACSBuffer =
       isAppendStructuredBuffer(type) || isConsumeStructuredBuffer(type);
   const bool isRWSBuffer = isRWStructuredBuffer(type);
   const auto storageClass = getStorageClassForExternVar(type, isGroupShared);
   const auto rule = getLayoutRuleForExternVar(type, spirvOptions);
   const auto loc = var->getLocation();
 
-  if (!isGroupShared && !isResourceType(type) &&
+  if (!isGroupShared && !isResourceType(type) && !hasInlineSpirvSC &&
       !isResourceOnlyStructure(type)) {
 
     // We currently cannot support global structures that contain both resources

tools/clang/test/CodeGenSPIRV/inline-spirv/spv.intrinsicStorageClass.hlsl

@@ -1,15 +1,18 @@
 // RUN: %dxc -T ps_6_0 -E main -spirv -Vd -fcgl  %s -spirv | FileCheck %s
 
-//CHECK: [[payloadTy:%[a-zA-Z0-9_]+]] = OpTypeStruct %v4float
-//CHECK-NEXT: [[payloadTyPtr:%[a-zA-Z0-9_]+]] = OpTypePointer RayPayloadKHR [[payloadTy]]
-//CHECK: [[crossTy:%[a-zA-Z0-9_]+]] = OpTypePointer CrossWorkgroup %int
-//CHECK: {{%[a-zA-Z0-9_]+}} = OpVariable [[payloadTyPtr]] RayPayloadKHR
-//CHECK: {{%[a-zA-Z0-9_]+}} = OpVariable [[crossTy]] CrossWorkgroup
-
+[[vk::ext_extension("SPV_KHR_ray_tracing")]]
+[[vk::ext_capability(/* RayTracingKHR */ 4479)]]
 [[vk::ext_storage_class(/*RayPayloadKHR*/5338)]]
 float4 payload;
+// CHECK-DAG: [[ptr_payload_v4:%[a-zA-Z0-9_]+]] = OpTypePointer RayPayloadKHR %v4float
+// CHECK-DAG: %payload = OpVariable [[ptr_payload_v4]] RayPayloadKHR
 
 int main() : SV_Target0 {
-  [[vk::ext_storage_class(/* CrossWorkgroup */ 5)]] int foo = 3;
+
+  [[vk::ext_storage_class(/* CrossWorkgroup */ 5)]]
+  int foo = 3;
+// CHECK-DAG:     [[ptr_cw_int:%[a-zA-Z0-9_]+]] = OpTypePointer CrossWorkgroup %int
+// CHECK-DAG:     %foo = OpVariable [[ptr_cw_int]] CrossWorkgroup
+
   return foo;
 }

tools/clang/test/CodeGenSPIRV/inline-spirv/spv.raytracing.hlsl

@@ -0,0 +1,18 @@
+// RUN: %dxc %s -T cs_6_8 -spirv -fspv-target-env=vulkan1.3 -E main -O0 | FileCheck %s
+
+// CHECK-DAG: OpCapability RuntimeDescriptorArray
+// CHECK-DAG: OpCapability RayQueryKHR
+
+using A = vk::SpirvOpaqueType</* OpTypeAccelerationStructureKHR */ 5341>;
+// CHECK: %[[name:[^ ]+]] = OpTypeAccelerationStructureKHR
+
+using RA [[vk::ext_capability(/* RuntimeDescriptorArray */ 5302)]] = vk::SpirvOpaqueType</* OpTypeRuntimeArray */ 29, A>;
+// CHECK: %[[rarr:[^ ]+]] = OpTypeRuntimeArray %[[name]]
+
+// CHECK: %[[ptr:[^ ]+]] = OpTypePointer UniformConstant %[[rarr]]
+// CHECK: %MyScene = OpVariable %[[ptr]] UniformConstant
+[[vk::ext_storage_class(0)]]
+RA MyScene;
+
+[numthreads(1, 1, 1)]
+void main() {}