Skip to content

Commit 6c99ecf

Browse files
python3kgaepython3kgae
authored
[Dump] Fix PSV dump issues. (#6881)
1. Number of SemanticIndex should match number of rows instead of number of columns. 2. Mesh shader could have ViewID mask for Primitive output. For #6817.
1 parent 6227e57 commit 6c99ecf

File tree

7 files changed

+35
-33
lines changed

7 files changed

+35
-33
lines changed

‎lib/DxilContainer/DxilPipelineStateValidation.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ void PSVSignatureElement::Print(raw_ostream &OS) const {
364364
OS << " SemanticName: " << GetSemanticName() << "\n";
365365
OS << " SemanticIndex: ";
366366
const uint32_t *SemanticIndexes = GetSemanticIndexes();
367-
for (unsigned i = 0; i < GetCols(); ++i) {
367+
for (unsigned i = 0; i < GetRows(); ++i) {
368368
OS << *(SemanticIndexes + i) << " ";
369369
}
370370
OS << "\n";
@@ -880,7 +880,7 @@ void DxilPipelineStateValidation::Print(raw_ostream &OS,
880880
ViewIDMask.Print(OS, "ViewID", OutputSetName.c_str());
881881
}
882882

883-
if (IsHS()) {
883+
if (IsHS() || IsMS()) {
884884
OS << "PCOutputs affected by ViewID as a bitmask:\n";
885885
uint8_t OutputVectors = m_pPSVRuntimeInfo1->SigPatchConstOrPrimVectors;
886886
const PSVComponentMask ViewIDMask(m_pViewIDPCOrPrimOutputMask,

‎tools/clang/test/DXC/dumpPSV_DS.hlsl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
// CHECK-NEXT: ResourceCount : 0
2121
// CHECK-NEXT: PSVSignatureElement:
2222
// CHECK-NEXT: SemanticName:
23-
// CHECK-NEXT: SemanticIndex: 0 0 1 2
23+
// CHECK-NEXT: SemanticIndex: 0
2424
// CHECK-NEXT: IsAllocated: 1
2525
// CHECK-NEXT: StartRow: 0
2626
// CHECK-NEXT: StartCol: 0
@@ -33,7 +33,7 @@
3333
// CHECK-NEXT: DynamicIndexMask: 0
3434
// CHECK-NEXT: PSVSignatureElement:
3535
// CHECK-NEXT: SemanticName: TEXCOORD
36-
// CHECK-NEXT: SemanticIndex: 0 0
36+
// CHECK-NEXT: SemanticIndex: 0
3737
// CHECK-NEXT: IsAllocated: 1
3838
// CHECK-NEXT: StartRow: 1
3939
// CHECK-NEXT: StartCol: 0
@@ -46,7 +46,7 @@
4646
// CHECK-NEXT: DynamicIndexMask: 0
4747
// CHECK-NEXT: PSVSignatureElement:
4848
// CHECK-NEXT: SemanticName: NORMAL
49-
// CHECK-NEXT: SemanticIndex: 0 0 1
49+
// CHECK-NEXT: SemanticIndex: 0
5050
// CHECK-NEXT: IsAllocated: 1
5151
// CHECK-NEXT: StartRow: 2
5252
// CHECK-NEXT: StartCol: 0
@@ -72,7 +72,7 @@
7272
// CHECK-NEXT: DynamicIndexMask: 0
7373
// CHECK-NEXT: PSVSignatureElement:
7474
// CHECK-NEXT: SemanticName:
75-
// CHECK-NEXT: SemanticIndex: 0 0 1 2
75+
// CHECK-NEXT: SemanticIndex: 0
7676
// CHECK-NEXT: IsAllocated: 1
7777
// CHECK-NEXT: StartRow: 0
7878
// CHECK-NEXT: StartCol: 0
@@ -85,7 +85,7 @@
8585
// CHECK-NEXT: DynamicIndexMask: 0
8686
// CHECK-NEXT: PSVSignatureElement:
8787
// CHECK-NEXT: SemanticName: TEXCOORD
88-
// CHECK-NEXT: SemanticIndex: 0 0
88+
// CHECK-NEXT: SemanticIndex: 0
8989
// CHECK-NEXT: IsAllocated: 1
9090
// CHECK-NEXT: StartRow: 1
9191
// CHECK-NEXT: StartCol: 0
@@ -98,7 +98,7 @@
9898
// CHECK-NEXT: DynamicIndexMask: 0
9999
// CHECK-NEXT: PSVSignatureElement:
100100
// CHECK-NEXT: SemanticName: NORMAL
101-
// CHECK-NEXT: SemanticIndex: 0 0 1
101+
// CHECK-NEXT: SemanticIndex: 0
102102
// CHECK-NEXT: IsAllocated: 1
103103
// CHECK-NEXT: StartRow: 2
104104
// CHECK-NEXT: StartCol: 0
@@ -124,7 +124,7 @@
124124
// CHECK-NEXT: DynamicIndexMask: 0
125125
// CHECK-NEXT: PSVSignatureElement:
126126
// CHECK-NEXT: SemanticName:
127-
// CHECK-NEXT: SemanticIndex: 0
127+
// CHECK-NEXT: SemanticIndex: 0 1 2
128128
// CHECK-NEXT: IsAllocated: 1
129129
// CHECK-NEXT: StartRow: 0
130130
// CHECK-NEXT: StartCol: 3

‎tools/clang/test/DXC/dumpPSV_GS.hlsl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
// CHECK-NEXT: ResFlags: None
3131
// CHECK-NEXT: PSVSignatureElement:
3232
// CHECK-NEXT: SemanticName: POSSIZE
33-
// CHECK-NEXT: SemanticIndex: 0 16 1
33+
// CHECK-NEXT: SemanticIndex: 0
3434
// CHECK-NEXT: IsAllocated: 1
3535
// CHECK-NEXT: StartRow: 0
3636
// CHECK-NEXT: StartCol: 0
@@ -43,7 +43,7 @@
4343
// CHECK-NEXT: DynamicIndexMask: 0
4444
// CHECK-NEXT: PSVSignatureElement:
4545
// CHECK-NEXT: SemanticName: COLOR
46-
// CHECK-NEXT: SemanticIndex: 0 16 1 0
46+
// CHECK-NEXT: SemanticIndex: 0
4747
// CHECK-NEXT: IsAllocated: 1
4848
// CHECK-NEXT: StartRow: 1
4949
// CHECK-NEXT: StartCol: 0
@@ -69,7 +69,7 @@
6969
// CHECK-NEXT: DynamicIndexMask: 0
7070
// CHECK-NEXT: PSVSignatureElement:
7171
// CHECK-NEXT: SemanticName: TEXCOORD
72-
// CHECK-NEXT: SemanticIndex: 0 16
72+
// CHECK-NEXT: SemanticIndex: 0
7373
// CHECK-NEXT: IsAllocated: 1
7474
// CHECK-NEXT: StartRow: 0
7575
// CHECK-NEXT: StartCol: 0
@@ -82,7 +82,7 @@
8282
// CHECK-NEXT: DynamicIndexMask: 0
8383
// CHECK-NEXT: PSVSignatureElement:
8484
// CHECK-NEXT: SemanticName: COLOR
85-
// CHECK-NEXT: SemanticIndex: 0 16 1 0
85+
// CHECK-NEXT: SemanticIndex: 0
8686
// CHECK-NEXT: IsAllocated: 1
8787
// CHECK-NEXT: StartRow: 1
8888
// CHECK-NEXT: StartCol: 0
@@ -95,7 +95,7 @@
9595
// CHECK-NEXT: DynamicIndexMask: 0
9696
// CHECK-NEXT: PSVSignatureElement:
9797
// CHECK-NEXT: SemanticName:
98-
// CHECK-NEXT: SemanticIndex: 0 16 1 0
98+
// CHECK-NEXT: SemanticIndex: 0
9999
// CHECK-NEXT: IsAllocated: 1
100100
// CHECK-NEXT: StartRow: 2
101101
// CHECK-NEXT: StartCol: 0

‎tools/clang/test/DXC/dumpPSV_HS.hlsl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// CHECK-NEXT: ResourceCount : 0
2424
// CHECK-NEXT: PSVSignatureElement:
2525
// CHECK-NEXT: SemanticName:
26-
// CHECK-NEXT: SemanticIndex: 0 0 1 2
26+
// CHECK-NEXT: SemanticIndex: 0
2727
// CHECK-NEXT: IsAllocated: 1
2828
// CHECK-NEXT: StartRow: 0
2929
// CHECK-NEXT: StartCol: 0
@@ -36,7 +36,7 @@
3636
// CHECK-NEXT: DynamicIndexMask: 0
3737
// CHECK-NEXT: PSVSignatureElement:
3838
// CHECK-NEXT: SemanticName: TEXCOORD
39-
// CHECK-NEXT: SemanticIndex: 0 0
39+
// CHECK-NEXT: SemanticIndex: 0
4040
// CHECK-NEXT: IsAllocated: 1
4141
// CHECK-NEXT: StartRow: 1
4242
// CHECK-NEXT: StartCol: 0
@@ -49,7 +49,7 @@
4949
// CHECK-NEXT: DynamicIndexMask: 0
5050
// CHECK-NEXT: PSVSignatureElement:
5151
// CHECK-NEXT: SemanticName: NORMAL
52-
// CHECK-NEXT: SemanticIndex: 0 0 1
52+
// CHECK-NEXT: SemanticIndex: 0
5353
// CHECK-NEXT: IsAllocated: 1
5454
// CHECK-NEXT: StartRow: 2
5555
// CHECK-NEXT: StartCol: 0
@@ -62,7 +62,7 @@
6262
// CHECK-NEXT: DynamicIndexMask: 0
6363
// CHECK-NEXT: PSVSignatureElement:
6464
// CHECK-NEXT: SemanticName:
65-
// CHECK-NEXT: SemanticIndex: 0 0 1 2
65+
// CHECK-NEXT: SemanticIndex: 0
6666
// CHECK-NEXT: IsAllocated: 1
6767
// CHECK-NEXT: StartRow: 0
6868
// CHECK-NEXT: StartCol: 0
@@ -75,7 +75,7 @@
7575
// CHECK-NEXT: DynamicIndexMask: 0
7676
// CHECK-NEXT: PSVSignatureElement:
7777
// CHECK-NEXT: SemanticName: TEXCOORD
78-
// CHECK-NEXT: SemanticIndex: 0 0
78+
// CHECK-NEXT: SemanticIndex: 0
7979
// CHECK-NEXT: IsAllocated: 1
8080
// CHECK-NEXT: StartRow: 1
8181
// CHECK-NEXT: StartCol: 0
@@ -88,7 +88,7 @@
8888
// CHECK-NEXT: DynamicIndexMask: 0
8989
// CHECK-NEXT: PSVSignatureElement:
9090
// CHECK-NEXT: SemanticName: NORMAL
91-
// CHECK-NEXT: SemanticIndex: 0 0 1
91+
// CHECK-NEXT: SemanticIndex: 0
9292
// CHECK-NEXT: IsAllocated: 1
9393
// CHECK-NEXT: StartRow: 2
9494
// CHECK-NEXT: StartCol: 0
@@ -101,7 +101,7 @@
101101
// CHECK-NEXT: DynamicIndexMask: 0
102102
// CHECK-NEXT: PSVSignatureElement:
103103
// CHECK-NEXT: SemanticName:
104-
// CHECK-NEXT: SemanticIndex: 0
104+
// CHECK-NEXT: SemanticIndex: 0 1 2
105105
// CHECK-NEXT: IsAllocated: 1
106106
// CHECK-NEXT: StartRow: 0
107107
// CHECK-NEXT: StartCol: 3

‎tools/clang/test/DXC/dumpPSV_MS.hlsl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
// CHECK-NEXT: ResourceCount : 0
2222
// CHECK-NEXT: PSVSignatureElement:
2323
// CHECK-NEXT: SemanticName:
24-
// CHECK-NEXT: SemanticIndex: 0 0 1 2
24+
// CHECK-NEXT: SemanticIndex: 0
2525
// CHECK-NEXT: IsAllocated: 1
2626
// CHECK-NEXT: StartRow: 0
2727
// CHECK-NEXT: StartCol: 0
@@ -34,7 +34,7 @@
3434
// CHECK-NEXT: DynamicIndexMask: 0
3535
// CHECK-NEXT: PSVSignatureElement:
3636
// CHECK-NEXT: SemanticName: COLOR
37-
// CHECK-NEXT: SemanticIndex: 0
37+
// CHECK-NEXT: SemanticIndex: 0 1 2 3
3838
// CHECK-NEXT: IsAllocated: 1
3939
// CHECK-NEXT: StartRow: 1
4040
// CHECK-NEXT: StartCol: 0
@@ -99,7 +99,7 @@
9999
// CHECK-NEXT: DynamicIndexMask: 0
100100
// CHECK-NEXT: PSVSignatureElement:
101101
// CHECK-NEXT: SemanticName: LAYER
102-
// CHECK-NEXT: SemanticIndex: 0
102+
// CHECK-NEXT: SemanticIndex: 0 1 2 3 4 5
103103
// CHECK-NEXT: IsAllocated: 1
104104
// CHECK-NEXT: StartRow: 1
105105
// CHECK-NEXT: StartCol: 0
@@ -125,6 +125,8 @@
125125
// CHECK-NEXT: DynamicIndexMask: 0
126126
// CHECK-NEXT: Outputs affected by ViewID as a bitmask for stream 0:
127127
// CHECK-NEXT: ViewID influencing Outputs[0] : 0 1 2 3 4 8 12 16
128+
// CHECK-NEXT: PCOutputs affected by ViewID as a bitmask:
129+
// CHECK-NEXT: ViewID influencing PCOutputs : None
128130
// CHECK-NEXT: Outputs affected by inputs as a table of bitmasks for stream 0:
129131
// CHECK-NEXT: Inputs contributing to computation of Outputs[0]: None
130132

‎tools/clang/test/DXC/dumpPSV_PS.hlsl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
// CHECK-NEXT: ResFlags: None
4343
// CHECK-NEXT: PSVSignatureElement:
4444
// CHECK-NEXT: SemanticName: NORMAL
45-
// CHECK-NEXT: SemanticIndex: 0 16 1
45+
// CHECK-NEXT: SemanticIndex: 0
4646
// CHECK-NEXT: IsAllocated: 1
4747
// CHECK-NEXT: StartRow: 0
4848
// CHECK-NEXT: StartCol: 0
@@ -55,7 +55,7 @@
5555
// CHECK-NEXT: DynamicIndexMask: 0
5656
// CHECK-NEXT: PSVSignatureElement:
5757
// CHECK-NEXT: SemanticName: TEXCOORD
58-
// CHECK-NEXT: SemanticIndex: 0 16
58+
// CHECK-NEXT: SemanticIndex: 0
5959
// CHECK-NEXT: IsAllocated: 1
6060
// CHECK-NEXT: StartRow: 1
6161
// CHECK-NEXT: StartCol: 0
@@ -68,7 +68,7 @@
6868
// CHECK-NEXT: DynamicIndexMask: 0
6969
// CHECK-NEXT: PSVSignatureElement:
7070
// CHECK-NEXT: SemanticName:
71-
// CHECK-NEXT: SemanticIndex: 0 16 1 0
71+
// CHECK-NEXT: SemanticIndex: 0
7272
// CHECK-NEXT: IsAllocated: 1
7373
// CHECK-NEXT: StartRow: 0
7474
// CHECK-NEXT: StartCol: 0

‎tools/clang/test/DXC/dumpPSV_VS.hlsl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
// CHECK-NEXT: ResFlags: None
2828
// CHECK-NEXT: PSVSignatureElement:
2929
// CHECK-NEXT: SemanticName: POSITION
30-
// CHECK-NEXT: SemanticIndex: 0 16 1
30+
// CHECK-NEXT: SemanticIndex: 0
3131
// CHECK-NEXT: IsAllocated: 1
3232
// CHECK-NEXT: StartRow: 0
3333
// CHECK-NEXT: StartCol: 0
@@ -40,7 +40,7 @@
4040
// CHECK-NEXT: DynamicIndexMask: 0
4141
// CHECK-NEXT: PSVSignatureElement:
4242
// CHECK-NEXT: SemanticName: NORMAL
43-
// CHECK-NEXT: SemanticIndex: 0 16 1
43+
// CHECK-NEXT: SemanticIndex: 0
4444
// CHECK-NEXT: IsAllocated: 1
4545
// CHECK-NEXT: StartRow: 1
4646
// CHECK-NEXT: StartCol: 0
@@ -53,7 +53,7 @@
5353
// CHECK-NEXT: DynamicIndexMask: 0
5454
// CHECK-NEXT: PSVSignatureElement:
5555
// CHECK-NEXT: SemanticName: TEXCOORD
56-
// CHECK-NEXT: SemanticIndex: 0 16
56+
// CHECK-NEXT: SemanticIndex: 0
5757
// CHECK-NEXT: IsAllocated: 1
5858
// CHECK-NEXT: StartRow: 2
5959
// CHECK-NEXT: StartCol: 0
@@ -66,7 +66,7 @@
6666
// CHECK-NEXT: DynamicIndexMask: 0
6767
// CHECK-NEXT: PSVSignatureElement:
6868
// CHECK-NEXT: SemanticName: NORMAL
69-
// CHECK-NEXT: SemanticIndex: 0 16 1
69+
// CHECK-NEXT: SemanticIndex: 0
7070
// CHECK-NEXT: IsAllocated: 1
7171
// CHECK-NEXT: StartRow: 0
7272
// CHECK-NEXT: StartCol: 0
@@ -79,7 +79,7 @@
7979
// CHECK-NEXT: DynamicIndexMask: 0
8080
// CHECK-NEXT: PSVSignatureElement:
8181
// CHECK-NEXT: SemanticName: TEXCOORD
82-
// CHECK-NEXT: SemanticIndex: 0 16
82+
// CHECK-NEXT: SemanticIndex: 0
8383
// CHECK-NEXT: IsAllocated: 1
8484
// CHECK-NEXT: StartRow: 1
8585
// CHECK-NEXT: StartCol: 0
@@ -92,7 +92,7 @@
9292
// CHECK-NEXT: DynamicIndexMask: 0
9393
// CHECK-NEXT: PSVSignatureElement:
9494
// CHECK-NEXT: SemanticName:
95-
// CHECK-NEXT: SemanticIndex: 0 16 1 0
95+
// CHECK-NEXT: SemanticIndex: 0
9696
// CHECK-NEXT: IsAllocated: 1
9797
// CHECK-NEXT: StartRow: 2
9898
// CHECK-NEXT: StartCol: 0

0 commit comments

Comments
 (0)