Rearrange the getHLSLType code and map resource class to HLSL virtual register letter for mangling

Author: hekota

clang/lib/AST/ItaniumMangle.cpp

@@ -4495,18 +4495,19 @@ void CXXNameMangler::mangleType(const ArrayParameterType *T) {
 void CXXNameMangler::mangleType(const HLSLAttributedResourceType *T) {
   mangleType(T->getWrappedType());
   const HLSLAttributedResourceType::Attributes &Attrs = T->getAttrs();
+  // map resource class to HLSL virtual register letter
   switch (Attrs.ResourceClass) {
   case llvm::dxil::ResourceClass::UAV:
-    Out << 'U';
+    Out << 'u';
     break;
   case llvm::dxil::ResourceClass::SRV:
-    Out << 'T';
+    Out << 't';
     break;
   case llvm::dxil::ResourceClass::CBuffer:
-    Out << 'C';
+    Out << 'b';
     break;
   case llvm::dxil::ResourceClass::Sampler:
-    Out << 'S';
+    Out << 's';
     break;
   }
   mangleNumber(Attrs.IsROV);

clang/lib/AST/MicrosoftMangle.cpp

@@ -3758,18 +3758,19 @@ void MicrosoftCXXNameMangler::mangleType(const HLSLAttributedResourceType *T,
                                          Qualifiers, SourceRange Range) {
   mangleType(T->getWrappedType(), SourceRange(), QMM_Escape);
   const HLSLAttributedResourceType::Attributes &Attrs = T->getAttrs();
+  // map resource class to HLSL virtual register letter
   switch (Attrs.ResourceClass) {
   case llvm::dxil::ResourceClass::UAV:
-    Out << 'U';
+    Out << 'u';
     break;
   case llvm::dxil::ResourceClass::SRV:
-    Out << 'T';
+    Out << 't';
     break;
   case llvm::dxil::ResourceClass::CBuffer:
-    Out << 'C';
+    Out << 'b';
     break;
   case llvm::dxil::ResourceClass::Sampler:
-    Out << 'S';
+    Out << 's';
     break;
   }
   mangleNumber(Attrs.IsROV);

clang/lib/CodeGen/Targets/DirectX.cpp

@@ -38,31 +38,23 @@ llvm::Type *DirectXTargetCodeGenInfo::getHLSLType(CodeGenModule &CGM,
   switch (ResAttrs.ResourceClass) {
   case llvm::dxil::ResourceClass::UAV:
   case llvm::dxil::ResourceClass::SRV: {
-    // convert element type
+    // TypedBuffer and RawBuffer both need element type
     QualType ContainedTy = ResType->getContainedType();
-    llvm::Type *ElemType = nullptr;
-    if (!ContainedTy.isNull())
-      ElemType = CGM.getTypes().ConvertType(ContainedTy);
-
-    if (ResAttrs.RawBuffer) {
-      // RawBuffer needs element type
-      if (ContainedTy.isNull())
-        return nullptr;
-      return llvm::TargetExtType::get(Ctx, "dx.RawBuffer", {ElemType},
-                                      {/*IsWriteable*/ ResAttrs.ResourceClass ==
-                                           llvm::dxil::ResourceClass::UAV,
-                                       /*IsROV*/ ResAttrs.IsROV});
-    }
-
-    // TypedBuffer needs element type
     if (ContainedTy.isNull())
       return nullptr;
-    return llvm::TargetExtType::get(
-        Ctx, "dx.TypedBuffer", {ElemType},
-        {/*IsWriteable*/ ResAttrs.ResourceClass ==
-             llvm::dxil::ResourceClass::UAV,
-         /*IsROV*/ ResAttrs.IsROV,
-         /*IsSigned*/ ContainedTy->isSignedIntegerType()});
+
+    // convert element type
+    llvm::Type *ElemType = CGM.getTypes().ConvertType(ContainedTy);
+
+    const char* TypeName = ResAttrs.RawBuffer ? "dx.RawBuffer" : "dx.TypedBuffer";
+    SmallVector<unsigned, 3> Ints = {
+      /*IsWriteable*/ ResAttrs.ResourceClass == llvm::dxil::ResourceClass::UAV,
+      /*IsROV*/ ResAttrs.IsROV
+    };
+    if (!ResAttrs.RawBuffer)
+      Ints.push_back(/*IsSigned*/ ContainedTy->isSignedIntegerType());
+    
+    return llvm::TargetExtType::get(Ctx, TypeName, {ElemType}, Ints);
   }
   case llvm::dxil::ResourceClass::CBuffer:
     llvm_unreachable("dx.CBuffer handles are not implemented yet");

clang/test/CodeGenHLSL/builtins/hlsl_resource_t.hlsl

@@ -5,17 +5,17 @@ using handle_float_t = __hlsl_resource_t [[hlsl::resource_class(UAV)]] [[hlsl::c
 // CHECK: %"class.hlsl::RWBuffer" = type { target("dx.TypedBuffer", <4 x float>, 1, 0, 0)
 // CHECK: %"class.hlsl::StructuredBuffer" = type { target("dx.RawBuffer", %struct.MyStruct = type { <4 x float>, <2 x i32>, [8 x i8] }, 1, 0)
 
-// CHECK: define void @"?fa@@YAXU__hlsl_resource_t@@UA@A@M@Z"(ptr noundef byval(target("dx.TypedBuffer", float, 1, 0, 0)) align 4 %a)
-// CHECK: call void @"?foo1@@YAXU__hlsl_resource_t@@UA@A@M@Z"(ptr noundef byval(target("dx.TypedBuffer", float, 1, 0, 0)) align 4 %a)
-// CHECK: declare void @"?foo1@@YAXU__hlsl_resource_t@@UA@A@M@Z"(ptr noundef byval(target("dx.TypedBuffer", float, 1, 0, 0)) align 4)
+// CHECK: define void @"?fa@@YAXU__hlsl_resource_t@@uA@A@M@Z"(ptr noundef byval(target("dx.TypedBuffer", float, 1, 0, 0)) align 4 %a)
+// CHECK: call void @"?foo1@@YAXU__hlsl_resource_t@@uA@A@M@Z"(ptr noundef byval(target("dx.TypedBuffer", float, 1, 0, 0)) align 4 %a)
+// CHECK: declare void @"?foo1@@YAXU__hlsl_resource_t@@uA@A@M@Z"(ptr noundef byval(target("dx.TypedBuffer", float, 1, 0, 0)) align 4)
 
 void foo1(handle_float_t res);
 
 void fa(handle_float_t a) {
     foo1(a);
 }
 
-// CHECK: define void @"?fb@@YAXU__hlsl_resource_t@@UA@A@M@Z"(ptr noundef byval(target("dx.TypedBuffer", float, 1, 0, 0)) align 4 %a)
+// CHECK: define void @"?fb@@YAXU__hlsl_resource_t@@uA@A@M@Z"(ptr noundef byval(target("dx.TypedBuffer", float, 1, 0, 0)) align 4 %a)
 void fb(handle_float_t a) {
     handle_float_t b = a;
 }