[SPIRV] Avoid invlid SIPR-V (microsoft#7107)

1. Array with the block decoration are not suppose to have an array stride. 2. The CullPrimitive output should be an array of bools.

Author: s-perron

tools/clang/lib/SPIRV/DeclResultIdMapper.cpp

@@ -392,10 +392,16 @@ bool isBooleanStageIOVar(const NamedDecl *decl, QualType type,
  // [[vk::builtin(...)]] makes the decl a built-in stage variable.
  // IsFrontFace (if used as PSIn) is the only known boolean built-in stage
  // variable.
- const bool isBooleanBuiltin =
- (decl->getAttr<VKBuiltInAttr>() != nullptr) ||
- (semanticKind == hlsl::Semantic::Kind::IsFrontFace &&
- sigPointKind == hlsl::SigPoint::Kind::PSIn);
+ bool isBooleanBuiltin = false;
+
+ if ((decl->getAttr<VKBuiltInAttr>() != nullptr))
+ isBooleanBuiltin = true;
+ else if (semanticKind == hlsl::Semantic::Kind::IsFrontFace &&
+ sigPointKind == hlsl::SigPoint::Kind::PSIn) {
+ isBooleanBuiltin = true;
+ } else if (semanticKind == hlsl::Semantic::Kind::CullPrimitive) {
+ isBooleanBuiltin = true;
+ }
 
  // TODO: support boolean matrix stage I/O variable if needed.
  QualType elemType = {};
@@ -1816,24 +1822,24 @@ void DeclResultIdMapper::createCounterVar(
  }
 
  const SpirvType *counterType = spvContext.getACSBufferCounterType();
+ llvm::Optional<uint32_t> noArrayStride;
  QualType declType = decl->getType();
  if (declType->isArrayType()) {
  // Vulkan does not support multi-dimentional arrays of resource, so we
  // assume the array is a single dimensional array.
  assert(!declType->getArrayElementTypeNoTypeQual()->isArrayType());
- uint32_t arrayStride = 4;
+
  if (const auto *constArrayType =
  astContext.getAsConstantArrayType(declType)) {
  counterType = spvContext.getArrayType(
- counterType, constArrayType->getSize().getZExtValue(), arrayStride);
+ counterType, constArrayType->getSize().getZExtValue(), noArrayStride);
  } else {
  assert(declType->isIncompleteArrayType());
- counterType = spvContext.getRuntimeArrayType(counterType, arrayStride);
+ counterType = spvContext.getRuntimeArrayType(counterType, noArrayStride);
  }
  } else if (isResourceDescriptorHeap(decl->getType()) ||
  isSamplerDescriptorHeap(decl->getType())) {
- counterType =
- spvContext.getRuntimeArrayType(counterType, /* arrayStride= */ 4);
+ counterType = spvContext.getRuntimeArrayType(counterType, noArrayStride);
  }
 
  // {RW|Append|Consume}StructuredBuffer are all in Uniform storage class.

tools/clang/lib/SPIRV/SpirvEmitter.cpp

@@ -8095,7 +8095,8 @@ void SpirvEmitter::assignToMSOutAttribute(
  // All other attribute writes are handled below.
  auto *varInstr = declIdMapper.getStageVarInstruction(decl);
  QualType valueType = value->getAstResultType();
- if (valueType->isBooleanType()) {
+ if (valueType->isBooleanType() &&
+ semanticInfo.getKind() != hlsl::Semantic::Kind::CullPrimitive) {
  // Externally visible variables are changed to uint, so we need to cast the
  // value to uint.
  value = castToInt(value, valueType, astContext.UnsignedIntTy, loc);

tools/clang/test/CodeGenSPIRV/meshshading.ext.cullprimative.hlsl

@@ -9,7 +9,7 @@ struct MeshletPrimitiveOut
 // specification says that externally visible variables cannot be bool.
 // CHECK: OpDecorate [[var:%[0-9]+]] BuiltIn CullPrimitiveEXT
 // CHECK: OpDecorate [[var]] PerPrimitiveEXT
-// CHECK: [[var]] = OpVariable %_ptr_Output__arr_uint_uint_2 Output
+// CHECK: [[var]] = OpVariable %_ptr_Output__arr_bool_uint_2 Output
 
 struct VertOut
 {
@@ -28,7 +28,7 @@ void main(uint svGroupIndex : SV_GROUPINDEX,
 
 // Make sure that the references to m_cullPrimitive use uints.
 // CHECK: [[idx:%[0-9]+]] = OpLoad %uint %gl_LocalInvocationIndex
-// CHECK: [[ac:%[0-9]+]] = OpAccessChain %_ptr_Output_uint [[var]] [[idx]]
-// CHECK: OpStore [[ac]] %uint_0
+// CHECK: [[ac:%[0-9]+]] = OpAccessChain %_ptr_Output_bool [[var]] [[idx]]
+// CHECK: OpStore [[ac]] %false
  primitives[svGroupIndex].m_cullPrimitive = false;
 }

tools/clang/test/CodeGenSPIRV/sm6_6.descriptorheap.acbuffer.hlsl

@@ -9,6 +9,9 @@
 // CHECK: OpDecorate [[resource_heap_abuffer]] Binding 0
 // CHECK: OpDecorate [[resource_heap_abuffer_counter:%[_a-zA-Z0-9]+]] DescriptorSet 0
 // CHECK: OpDecorate [[resource_heap_abuffer_counter]] Binding 1
+// CHECK-NOT: OpDecorate %_runtimearr_type_ACSBuffer_counter ArrayStride
+// CHECK: OpDecorate %type_ACSBuffer_counter BufferBlock
+// CHECK-NOT: OpDecorate %_runtimearr_type_ACSBuffer_counter ArrayStride
 
 
 // CHECK-DAG: [[ra_uint_t:%[_a-zA-Z0-9]+]] = OpTypeRuntimeArray %uint

tools/clang/test/CodeGenSPIRV/type.rwstructured-buffer.array.counter.hlsl

@@ -7,8 +7,12 @@ struct PSInput
 
 // CHECK: OpDecorate %g_rwbuffer DescriptorSet 2
 // CHECK: OpDecorate %g_rwbuffer Binding 0
+// CHECK-NOT: OpDecorate %_arr_type_ACSBuffer_counter_uint_5 ArrayStride
 // CHECK: OpDecorate %counter_var_g_rwbuffer DescriptorSet 2
 // CHECK: OpDecorate %counter_var_g_rwbuffer Binding 1
+// CHECK-NOT: OpDecorate %_arr_type_ACSBuffer_counter_uint_5 ArrayStride
+// CHECK: OpDecorate %type_ACSBuffer_counter BufferBlock
+// CHECK-NOT: OpDecorate %_runtimearr_type_ACSBuffer_counter ArrayStride
 
 // CHECK: %g_rwbuffer = OpVariable %_ptr_Uniform__arr_type_RWStructuredBuffer_uint_uint_5 Uniform
 // CHECK: %counter_var_g_rwbuffer = OpVariable %_ptr_Uniform__arr_type_ACSBuffer_counter_uint_5 Uniform

tools/clang/test/CodeGenSPIRV/type.rwstructured-buffer.array.unbounded.counter.hlsl

@@ -7,8 +7,12 @@ struct PSInput
 
 // CHECK: OpDecorate %g_rwbuffer DescriptorSet 2
 // CHECK: OpDecorate %g_rwbuffer Binding 0
+// CHECK-NOT: OpDecorate %_runtimearr_type_ACSBuffer_counter ArrayStride
 // CHECK: OpDecorate %counter_var_g_rwbuffer DescriptorSet 2
 // CHECK: OpDecorate %counter_var_g_rwbuffer Binding 1
+// CHECK-NOT: OpDecorate %_runtimearr_type_ACSBuffer_counter ArrayStride
+// CHECK: OpDecorate %type_ACSBuffer_counter BufferBlock
+// CHECK-NOT: OpDecorate %_runtimearr_type_ACSBuffer_counter ArrayStride
 
 // CHECK: %g_rwbuffer = OpVariable %_ptr_Uniform__runtimearr_type_RWStructuredBuffer_uint Uniform
 // CHECK: %counter_var_g_rwbuffer = OpVariable %_ptr_Uniform__runtimearr_type_ACSBuffer_counter Uniform