code review feedback - use std::array, llvm_unreachanble, add test, fix typo

Author: hekota

clang/lib/CodeGen/CGHLSLRuntime.cpp

@@ -117,7 +117,7 @@ static int getTotalArraySize(ASTContext &AST, const clang::Type *Ty) {
 static CXXConstructorDecl *findResourceConstructorDecl(ASTContext &AST,
                                                        QualType ResTy,
                                                        bool ExplicitBinding) {
-  SmallVector<QualType> ExpParmTypes = {
+  std::array<QualType, 5> ExpParmTypes = {
       AST.UnsignedIntTy, AST.UnsignedIntTy, AST.UnsignedIntTy,
       AST.UnsignedIntTy, AST.getPointerType(AST.CharTy.withConst())};
   ExpParmTypes[ExplicitBinding ? 2 : 1] = AST.IntTy;
@@ -126,8 +126,8 @@ static CXXConstructorDecl *findResourceConstructorDecl(ASTContext &AST,
   for (auto *Ctor : ResDecl->ctors()) {
     if (Ctor->getNumParams() != ExpParmTypes.size())
       continue;
-    ParmVarDecl **ParmIt = Ctor->param_begin();
-    QualType *ExpTyIt = ExpParmTypes.begin();
+    auto *ParmIt = Ctor->param_begin();
+    auto ExpTyIt = ExpParmTypes.begin();
     for (; ParmIt != Ctor->param_end() && ExpTyIt != ExpParmTypes.end();
          ++ParmIt, ++ExpTyIt) {
       if ((*ParmIt)->getType() != *ExpTyIt)
@@ -807,9 +807,10 @@ std::optional<LValue> CGHLSLRuntime::emitResourceArraySubscriptExpr(
   if (!ArrayDecl || !ArrayDecl->hasGlobalStorage())
     return std::nullopt;
 
-  // FIXME: this is not yet implemented (llvm/llvm-project#145426)
-  assert(!ArraySubsExpr->getType()->isArrayType() &&
-         "indexing of array subsets it not supported yet");
+  if (ArraySubsExpr->getType()->isArrayType())
+    // FIXME: this is not yet implemented (llvm/llvm-project#145426)
+    llvm_unreachable(
+        "indexing of sub-arrays of multidimensional arrays not supported yet");
 
   // get the resource array type
   ASTContext &AST = ArrayDecl->getASTContext();

clang/test/CodeGenHLSL/resources/res-array-global.hlsl

@@ -7,6 +7,7 @@
 // CHECK: @[[BufB:.*]] = private unnamed_addr constant [2 x i8] c"B\00", align 1
 // CHECK: @[[BufC:.*]] = private unnamed_addr constant [2 x i8] c"C\00", align 1
 // CHECK: @[[BufD:.*]] = private unnamed_addr constant [2 x i8] c"D\00", align 1
+// CHECK: @[[BufE:.*]] = private unnamed_addr constant [2 x i8] c"E\00", align 1
 
 // different explicit binding for DXIL and SPIR-V
 [[vk::binding(12, 2)]]
@@ -22,6 +23,9 @@ RWBuffer<int> C[3] : register(u2);
 // implicit binding for both DXIL and SPIR-V in space/set 0 
 RWBuffer<double> D[10];
 
+// implicit binding for both DXIL and SPIR-V with specified space/set 0 
+RWBuffer<uint> E[15] : register(space2);
+
 RWStructuredBuffer<float> Out;
 
 [numthreads(4,1,1)]
@@ -31,6 +35,7 @@ void main() {
   // CHECK: %[[Tmp1:.*]] = alloca %"class.hlsl::RWBuffer
   // CHECK: %[[Tmp2:.*]] = alloca %"class.hlsl::RWBuffer
   // CHECK: %[[Tmp3:.*]] = alloca %"class.hlsl::RWBuffer
+  // CHECK: %[[Tmp4:.*]] = alloca %"class.hlsl::RWBuffer
 
   // NOTE:
   // Constructor call for explicit binding has "jjij" in the mangled name and the arguments are (register, space, range_size, index, name).
@@ -62,5 +67,9 @@ void main() {
   // for both DXIL and SPIR-V
   // DXIL: call void @_ZN4hlsl8RWBufferIdEC1EjijjPKc(ptr {{.*}} %[[Tmp3]], i32 noundef 0, i32 noundef 10, i32 noundef 7, i32 noundef 1, ptr noundef @[[BufD]])
   // SPV: call void @_ZN4hlsl8RWBufferIdEC1EjijjPKc(ptr {{.*}} %[[Tmp3]], i32 noundef 0, i32 noundef 10, i32 noundef 7, i32 noundef 0, ptr noundef @[[BufD]])
-  Out[0] = A[2][0] + (float)B[3][0] + (float)C[1][0] + (float)D[7][0];
+
+  // Make sure E[5][0] is translated to RWBuffer<uint> constructor call with implicit binding and specified space/set 2
+  // DXIL: call void @_ZN4hlsl8RWBufferIjEC1EjijjPKc(ptr {{.*}} %[[Tmp4]], i32 noundef 2, i32 noundef 15, i32 noundef 5, i32 noundef 2, ptr noundef @[[BufE]])
+  // SPV: call void @_ZN4hlsl8RWBufferIjEC1EjijjPKc(ptr {{.*}} %[[Tmp4]], i32 noundef 2, i32 noundef 15, i32 noundef 5, i32 noundef 1, ptr noundef @[[BufE]])
+  Out[0] = A[2][0] + (float)B[3][0] + (float)C[1][0] + (float)D[7][0] + (float)E[5][0];
 }

clang/test/CodeGenHLSL/resources/resource-bindings.hlsl

@@ -44,7 +44,7 @@ struct S {
 };
 RWStructuredBuffer<S> T3S0 : register(u3);
 
-// Resource array elements are initialized on access; make sure there is not call
+// Resource array elements are initialized on access; make sure there is no call
 // to initialize RWBuffer<double>.
 // CHECK-NOT: call target("dx.TypedBuffer", double, 1, 0, 0) @llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_f64_1_0_0t(
 RWBuffer<double> Array[10] : register(u4, space0);