Add numthreads to disassembly output (#4484)

* add metadata on numthreads for CS, AS, and MS

* add associated hlsl test file

* move test hlsl file to correct location

* update check values

* tested each shader type separately, added breaks in switch statement

* add some extra numthread checking to each separate type of shader in other existing tests

Author: bob80905

tools/clang/test/HLSLFileCheck/disassembler/amplificationtest.hlsl

@@ -0,0 +1,17 @@
+// RUN: %dxc /T as_6_6 /E ASMain %s | FileCheck %s
+// CHECK: Amplification Shader
+// CHECK: Numthreads: (2,4,1)
+ 
+
+struct payloadStruct
+{ 
+    uint myArbitraryData; 
+}; 
+ 
+[numthreads(2,4,1)] 
+void ASMain (in uint3 groupID : SV_GroupID)    
+{ 
+    payloadStruct p; 
+    p.myArbitraryData = 3; 
+    DispatchMesh(1,1,1,p);
+}

tools/clang/test/HLSLFileCheck/disassembler/computetest.hlsl

@@ -0,0 +1,20 @@
+// RUN: %dxc /T cs_6_0 /E main %s | FileCheck %s
+// CHECK: Compute Shader
+// CHECK: Numthreads: (2,2,1)
+
+[NumThreads(2,2,1)]
+void  main() {
+  int x = 2;
+}
+
+[NumThreads(2,4,1)]
+void  ASMain() {
+  int x = 2;
+}
+
+[NumThreads(2,3,1)]
+void  MSMain() {
+  int x = 2;
+}
+
+

tools/clang/test/HLSLFileCheck/disassembler/meshtest.hlsl

@@ -0,0 +1,10 @@
+// RUN: %dxc /T ms_6_6 /E MSMain %s | FileCheck %s
+// CHECK: Mesh Shader
+// CHECK: Numthreads: (2,3,1)
+
+
+[NumThreads(2,3,1)]
+[OutputTopology("triangle")] 
+void  MSMain() {
+  int x = 2;
+}

tools/clang/test/HLSLFileCheck/hlsl/intrinsics/atomic/atomic.hlsl

@@ -3,6 +3,8 @@
 // RUN: %dxc -E main -DTYPE=uint64_t -T cs_6_6 %s | FileCheck %s
 // RUN: %dxc -E main -DTYPE=int64_t -T cs_6_6 %s | FileCheck %s
 
+// CHECK: Compute Shader
+// CHECK: Numthreads: (8,8,1)
 // CHECK: atomicrmw add
 // CHECK: atomicrmw add
 // CHECK: cmpxchg

tools/clang/test/HLSLFileCheck/shader_targets/mesh/amplification.hlsl

@@ -1,6 +1,8 @@
 // RUN: %dxc -E main -T as_6_5 %s | FileCheck %s
 // RUN: %dxc -E main -T as_6_5 %s | %D3DReflect %s | FileCheck -check-prefix=REFL %s
 
+// CHECK: Amplification Shader
+// CHECK: Numthreads: (32,1,1)
 // CHECK: dx.op.dispatchMesh.struct.Payload
 
 #define NUM_THREADS 32

tools/clang/test/HLSLFileCheck/shader_targets/mesh/mesh.hlsl

@@ -1,6 +1,8 @@
 // RUN: %dxc -E main -T ms_6_5 %s | FileCheck %s
 // RUN: %dxc -E main -T ms_6_5 %s | %D3DReflect %s | FileCheck -check-prefix=REFL %s
 
+// CHECK: Mesh Shader
+// CHECK: Numthreads: (32,1,1)
 // CHECK: dx.op.getMeshPayload.struct.MeshPayload(i32 170)
 // CHECK: dx.op.setMeshOutputCounts(i32 168, i32 32, i32 16)
 // CHECK: dx.op.emitIndices(i32 169,

tools/clang/tools/dxcompiler/dxcdisassembler.cpp

@@ -1294,6 +1294,7 @@ void PrintPipelineStateValidationRuntimeInfo(const char *pBuffer,
 
   const unsigned offset = sizeof(unsigned);
   const PSVRuntimeInfo0 *pInfo = (const PSVRuntimeInfo0 *)(pBuffer + offset);
+  const PSVRuntimeInfo2 *pInfo2 = (const PSVRuntimeInfo2 *)(pBuffer + offset);
 
   switch (shaderKind) {
   case DXIL::ShaderKind::Hull: {
@@ -1508,6 +1509,17 @@ void PrintPipelineStateValidationRuntimeInfo(const char *pBuffer,
        << "\n";
     break;
   case DXIL::ShaderKind::Compute:
+    OS << comment << " Compute Shader\n";
+    OS << comment << " Numthreads: (" << pInfo2->NumThreadsX << "," << pInfo2->NumThreadsY << "," << pInfo2->NumThreadsZ << ")\n";
+    break;
+  case DXIL::ShaderKind::Amplification:
+    OS << comment << " Amplification Shader\n"; 
+    OS << comment << " Numthreads: (" << pInfo2->NumThreadsX << "," << pInfo2->NumThreadsY << "," << pInfo2->NumThreadsZ << ")\n";
+    break;
+  case DXIL::ShaderKind::Mesh:
+    OS << comment << " Mesh Shader\n"; 
+    OS << comment << " Numthreads: (" << pInfo2->NumThreadsX << "," << pInfo2->NumThreadsY << "," << pInfo2->NumThreadsZ << ")\n";
+    break;
   case DXIL::ShaderKind::Library:
   case DXIL::ShaderKind::Invalid:
     // Nothing to print for these shader kinds.