Fixed int16_t type name in debug info (#3804)

Author: adam-yang

tools/clang/lib/AST/Type.cpp

@@ -2497,13 +2497,13 @@ StringRef BuiltinType::getName(const PrintingPolicy &Policy) const {
   case Char_S:            return "char";
   case Char_U:            return "char";
   case SChar:             return "signed char";
-  case Short:             return "short";
+  case Short:             return /* "short" */ "int16_t" /* HLSL Change */;
   case Int:               return "int";
   case Long:              return "long";
   case LongLong:          return "long long";
   case Int128:            return "__int128";
   case UChar:             return "unsigned char";
-  case UShort:            return "unsigned short";
+  case UShort:            return /* "unsigned short" */ "uint16_t" /* HLSL Change */;
   case UInt:              return "unsigned int";
   case ULong:             return "unsigned long";
   case ULongLong:         return "unsigned long long";

tools/clang/lib/CodeGen/CGDebugInfo.cpp

@@ -526,13 +526,15 @@ llvm::DIType *CGDebugInfo::CreateType(const BuiltinType *BT) {
     BTName = "long int";
     break;
   case BuiltinType::LongLong:
-    BTName = "long long int";
+    // BTName = "long long int"; // HLSL Change
+    BTName = "int64_t"; // HLSL Change
     break;
   case BuiltinType::ULong:
     BTName = "long unsigned int";
     break;
   case BuiltinType::ULongLong:
-    BTName = "long long unsigned int";
+    // BTName = "long long unsigned int"; // HLSL Change
+    BTName = "uint64_t"; // HLSL Change
     break;
   default:
     BTName = BT->getName(CGM.getLangOpts());

tools/clang/test/HLSLFileCheck/dxil/debug/int16_t.hlsl

@@ -0,0 +1,21 @@
+// RUN: %dxc -T cs_6_5 -enable-16bit-types /Zi /O0 %s | FileCheck %s -check-prefix=SHORT
+// RUN: %dxc -T cs_6_5 -enable-16bit-types /Zi /O0 %s | FileCheck %s
+
+// SHORT-NOT: !{{[0-9]+}} = !DIBasicType(name: "short"
+// SHORT-NOT: !{{[0-9]+}} = !DIBasicType(name: "unsigned short"
+
+// CHECK-DAG: !{{[0-9]+}} = !DIBasicType(name: "uint16_t"
+// CHECK-DAG: !{{[0-9]+}} = !DIBasicType(name: "int16_t"
+
+ByteAddressBuffer buf;
+RWByteAddressBuffer buf2;
+
+[numthreads(64, 1, 1)]
+void main(int3 tid : SV_DispatchThreadId) {
+  uint16_t3x3 mat = buf.Load<uint16_t3x3>(tid.x);
+  uint16_t3 v = buf.Load<uint16_t3>(tid.y);
+  uint16_t3 w = mul(mat, v);
+  int16_t3 ret = int16_t3(w.x, w.y, w.z);
+  buf2.Store<int16_t3>(tid.z, ret);
+}
+

tools/clang/test/HLSLFileCheck/dxil/debug/uint.hlsl

@@ -0,0 +1,18 @@
+// RUN: %dxc -T cs_6_0 /Zi /O0 %s | FileCheck %s -check-prefix=OLD_TYPE
+// RUN: %dxc -T cs_6_0 /Zi /O0 %s | FileCheck %s
+
+// OLD_TYPE-NOT: !{{[0-9]+}} = !DIBasicType({{.+}}long
+
+// CHECK-DAG: !{{[0-9]+}} = !DIDerivedType(tag: DW_TAG_typedef, name: "uint"
+// CHECK-DAG: !{{[0-9]+}} = !DIBasicType(name: "int"
+
+ByteAddressBuffer buf;
+RWByteAddressBuffer buf2;
+
+[numthreads(64, 1, 1)]
+void main(int3 tid : SV_DispatchThreadId) {
+  uint v = buf.Load<uint>(tid.y) * 2;
+  int w = (int)v / 2;
+  buf2.Store<int>(tid.z, w);
+}
+

tools/clang/test/HLSLFileCheck/dxil/debug/uint64_t.hlsl

@@ -0,0 +1,18 @@
+// RUN: %dxc -T cs_6_0 /Zi /O0 %s | FileCheck %s -check-prefix=OLD_TYPE
+// RUN: %dxc -T cs_6_0 /Zi /O0 %s | FileCheck %s
+
+// OLD_TYPE-NOT: !{{[0-9]+}} = !DIBasicType({{.+}}long long
+
+// CHECK-DAG: !{{[0-9]+}} = !DIBasicType(name: "uint64_t"
+// CHECK-DAG: !{{[0-9]+}} = !DIBasicType(name: "int64_t"
+
+ByteAddressBuffer buf;
+RWByteAddressBuffer buf2;
+
+[numthreads(64, 1, 1)]
+void main(int3 tid : SV_DispatchThreadId) {
+  uint64_t v = buf.Load<uint64_t>(tid.y) * 2;
+  int64_t w = (int64_t)v / 3;
+  buf2.Store<int64_t>(tid.z, w);
+}
+