Refactor formatTypeName, add CB2 back to test

Author: hekota

llvm/lib/Analysis/DXILResource.cpp

@@ -257,37 +257,34 @@ ResourceTypeInfo::ResourceTypeInfo(TargetExtType *HandleTy,
 }
 
 static void formatTypeName(SmallString<64> &Dest, StringRef Name,
-                           bool IsWriteable, bool IsROV) {
-  Dest = IsWriteable ? (IsROV ? "RasterizerOrdered" : "RW") : "";
-  Dest += Name;
-}
-
-static void formatTypeName(SmallString<64> &Dest, StringRef Name,
-                           bool IsWriteable, bool IsROV, Type *ContainedType,
-                           bool IsSigned) {
+                           bool IsWriteable, bool IsROV,
+                           Type *ContainedType = nullptr,
+                           bool IsSigned = true) {
   raw_svector_ostream DestStream(Dest);
   if (IsWriteable)
     DestStream << (IsROV ? "RasterizerOrdered" : "RW");
   DestStream << Name;
 
-  if (ContainedType) {
-    StringRef ElementName;
-    ElementType ET = toDXILElementType(ContainedType, IsSigned);
-    if (ET != ElementType::Invalid) {
-      ElementName = getElementTypeNameForTemplate(ET);
-    } else if (StructType *ST = dyn_cast<StructType>(ContainedType)) {
-      if (!ST->hasName())
-        return;
-      ElementName = ST->getStructName();
-    } else {
-      llvm_unreachable("invalid element type for raw buffer");
-    }
+  if (!ContainedType)
+    return;
 
-    if (const FixedVectorType *VTy = dyn_cast<FixedVectorType>(ContainedType))
-      DestStream << "<" << ElementName << VTy->getNumElements() << ">";
-    else
-      DestStream << "<" << ElementName << ">";
+  StringRef ElementName;
+  ElementType ET = toDXILElementType(ContainedType, IsSigned);
+  if (ET != ElementType::Invalid) {
+    ElementName = getElementTypeNameForTemplate(ET);
+  } else {
+    assert(isa<StructType>(ContainedType) &&
+           "invalid element type for raw buffer");
+    StructType *ST = cast<StructType>(ContainedType);
+    if (!ST->hasName())
+      return;
+    ElementName = ST->getStructName();
   }
+
+  DestStream << "<" << ElementName;
+  if (const FixedVectorType *VTy = dyn_cast<FixedVectorType>(ContainedType))
+    DestStream << VTy->getNumElements();
+  DestStream << ">";
 }
 
 static StructType *getOrCreateElementStruct(Type *ElemType, StringRef Name) {

llvm/test/CodeGen/DirectX/Metadata/cbuffer_metadata.ll

@@ -11,6 +11,7 @@ target triple = "dxil-pc-shadermodel6.6-compute"
 
 %__cblayout_CB2 = type <{ float, double, float, half, i16, i64, i32 }>
 @CB2.cb = global target("dx.CBuffer", target("dx.Layout", %__cblayout_CB2, 36, 0, 8, 16, 20, 22, 24, 32)) poison
+@CB2.str = private unnamed_addr constant [4 x i8] c"CB2\00", align 1
 
 %__cblayout_MyConstants = type <{ double, <3 x float>, float, <3 x double>, half, <2 x double>, float, <3 x half>, <3 x half> }>
 @MyConstants.cb = global target("dx.CBuffer", target("dx.Layout", %__cblayout_MyConstants, 96, 0, 16, 28, 32, 56, 64, 80, 84, 90)) poison
@@ -21,7 +22,7 @@ target triple = "dxil-pc-shadermodel6.6-compute"
 ; PRINT-NEXT:; Name                                 Type  Format         Dim      ID      HLSL Bind  Count
 ; PRINT-NEXT:; ------------------------------ ---------- ------- ----------- ------- -------------- ------
 ; PRINT-NEXT:; CB1                               cbuffer      NA          NA     CB0            cb0     1
-; PRINT-NEXT:;                                   cbuffer      NA          NA     CB1            cb1     1
+; PRINT-NEXT:; CB2                               cbuffer      NA          NA     CB1            cb1     1
 ; PRINT-NEXT:; MyConstants                       cbuffer      NA          NA     CB2    cb5,space15     1
 
 define void @test() #0 {
@@ -45,7 +46,7 @@ define void @test() #0 {
   ;}
 
   %CB2.cb_h = call target("dx.CBuffer", target("dx.Layout", %__cblayout_CB2, 36, 0, 8, 16, 20, 22, 24, 32))
-            @llvm.dx.resource.handlefrombinding(i32 0, i32 1, i32 1, i32 0, i1 false, ptr null)
+            @llvm.dx.resource.handlefrombinding(i32 0, i32 1, i32 1, i32 0, i1 false, ptr @CB2.str)
   ; cbuffer CB3 : register(b5) {
   ;   double B0;
   ;   float3 B1;
@@ -66,13 +67,13 @@ define void @test() #0 {
 attributes #0 = { noinline nounwind "hlsl.shader"="compute" }
 
 ; CHECK: @CB1 = external constant %CBuffer.CB1
-; CHECK: @0 = external constant %CBuffer
+; CHECK: @CB2 = external constant %CBuffer.CB2
 ; CHECK: @MyConstants = external constant %CBuffer.MyConstants
 
 ; CHECK: !dx.resources = !{[[ResList:[!][0-9]+]]}
 
 ; CHECK: [[ResList]] = !{null, null, [[CBList:[!][0-9]+]], null}
 ; CHECK: [[CBList]] = !{![[CB1:[0-9]+]], ![[CB2:[0-9]+]], ![[MYCONSTANTS:[0-9]+]]}
 ; CHECK: ![[CB1]] = !{i32 0, ptr @CB1, !"CB1", i32 0, i32 0, i32 1, i32 24, null}
-; CHECK: ![[CB2]] = !{i32 1, ptr @0, !"", i32 0, i32 1, i32 1, i32 36, null}
+; CHECK: ![[CB2]] = !{i32 1, ptr @CB2, !"CB2", i32 0, i32 1, i32 1, i32 36, null}
 ; CHECK: ![[MYCONSTANTS]] = !{i32 2, ptr @MyConstants, !"MyConstants", i32 15, i32 5, i32 1, i32 96, null}