update corresponding PSVInfo

Author: inbelic

llvm/lib/Target/DirectX/DXContainerGlobals.cpp

@@ -284,6 +284,13 @@ void DXContainerGlobals::addPipelineStateValidationInfo(
     PSV.BaseData.NumThreadsX = MMI.EntryPropertyVec[0].NumThreadsX;
     PSV.BaseData.NumThreadsY = MMI.EntryPropertyVec[0].NumThreadsY;
     PSV.BaseData.NumThreadsZ = MMI.EntryPropertyVec[0].NumThreadsZ;
+    if (MMI.EntryPropertyVec[0].WaveSizeMin) {
+      PSV.BaseData.MinimumWaveLaneCount = MMI.EntryPropertyVec[0].WaveSizeMin;
+      PSV.BaseData.MaximumWaveLaneCount =
+          MMI.EntryPropertyVec[0].WaveSizeMax
+              ? MMI.EntryPropertyVec[0].WaveSizeMax
+              : MMI.EntryPropertyVec[0].WaveSizeMin;
+    }
     break;
   default:
     break;

llvm/test/CodeGen/DirectX/wavesize-md-valid.ll

@@ -4,6 +4,11 @@
 ; RUN: opt -S --dxil-translate-metadata %t/max.ll | FileCheck %t/max.ll
 ; RUN: opt -S --dxil-translate-metadata %t/pref.ll | FileCheck %t/pref.ll
 
+; RUN: llc --filetype=obj %t/only.ll -o - | obj2yaml | FileCheck %t/only.ll --check-prefix=OBJ
+; RUN: llc --filetype=obj %t/min.ll -o - | obj2yaml | FileCheck %t/min.ll --check-prefix=OBJ
+; RUN: llc --filetype=obj %t/max.ll -o - | obj2yaml | FileCheck %t/max.ll --check-prefix=OBJ
+; RUN: llc --filetype=obj %t/pref.ll -o - | obj2yaml | FileCheck %t/pref.ll --check-prefix=OBJ
+
 ; Test that wave size/range metadata is correctly generated with the correct tag
 
 ;--- only.ll
@@ -13,6 +18,11 @@
 ; CHECK: ![[#PROPS]] = !{{{.*}}i32 11, ![[#WAVE_SIZE:]]{{.*}}}
 ; CHECK: ![[#WAVE_SIZE]] = !{i32 16}
 
+; OBJ: - Name:    PSV0
+; OBJ:   PSVInfo:
+; OBJ:     MinimumWaveLaneCount: 16
+; OBJ:     MaximumWaveLaneCount: 16
+
 target triple = "dxil-unknown-shadermodel6.6-compute"
 
 define void @main() #0 {
@@ -29,6 +39,11 @@ attributes #0 = { "hlsl.wavesize"="16,0,0" "hlsl.numthreads"="1,1,1" "hlsl.shade
 ; CHECK: ![[#PROPS]] = !{{{.*}}i32 23, ![[#WAVE_SIZE:]]{{.*}}}
 ; CHECK: ![[#WAVE_SIZE]] = !{i32 16, i32 0, i32 0}
 
+; OBJ: - Name:    PSV0
+; OBJ:   PSVInfo:
+; OBJ:     MinimumWaveLaneCount: 16
+; OBJ:     MaximumWaveLaneCount: 16
+
 target triple = "dxil-unknown-shadermodel6.8-compute"
 
 define void @main() #0 {
@@ -45,6 +60,11 @@ attributes #0 = { "hlsl.wavesize"="16,0,0" "hlsl.numthreads"="1,1,1" "hlsl.shade
 ; CHECK: ![[#PROPS]] = !{{{.*}}i32 23, ![[#WAVE_SIZE:]]{{.*}}}
 ; CHECK: ![[#WAVE_SIZE]] = !{i32 16, i32 32, i32 0}
 
+; OBJ: - Name:    PSV0
+; OBJ:   PSVInfo:
+; OBJ:     MinimumWaveLaneCount: 16
+; OBJ:     MaximumWaveLaneCount: 32
+
 target triple = "dxil-unknown-shadermodel6.8-compute"
 
 define void @main() #0 {
@@ -61,6 +81,11 @@ attributes #0 = { "hlsl.wavesize"="16,32,0" "hlsl.numthreads"="1,1,1" "hlsl.shad
 ; CHECK: ![[#PROPS]] = !{{{.*}}i32 23, ![[#WAVE_SIZE:]]{{.*}}}
 ; CHECK: ![[#WAVE_SIZE]] = !{i32 16, i32 64, i32 32}
 
+; OBJ: - Name:    PSV0
+; OBJ:   PSVInfo:
+; OBJ:     MinimumWaveLaneCount: 16
+; OBJ:     MaximumWaveLaneCount: 64
+
 target triple = "dxil-unknown-shadermodel6.8-compute"
 
 define void @main() #0 {