Skip to content

Commit cb244b8

Browse files
tcorringhamTim Corringham
andauthored
Update WaveActiveBallot.Wave32.test and WaveActiveBallot.Wave64.test (#697)
The Output buffer stride for WaveActiveBallot.Wave32.test and WaveActiveBallot.Wave64.test was set to 4, but the buffer holds uint4 elements so requires a stride of 16 (4 * 4). With the amended stride these now pass on AMD DXIL so the XFAIL has been removed. Fixes #688 Co-authored-by: Tim Corringham <tcorring@amd.com>
1 parent 66988cc commit cb244b8

File tree

2 files changed

+9
-15
lines changed

2 files changed

+9
-15
lines changed

test/WaveOps/WaveActiveBallot.Wave32.test

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ RWStructuredBuffer<uint4> Out : register(u1);
44
[WaveSize(32)]
55
[numthreads(32, 1, 1)]
66
void main(uint3 threadID : SV_DispatchThreadID) {
7-
// We expect the first resulting uint's bitmask to be
7+
// We expect the first resulting uint's bitmask to be
88
// 0xBFFFFFFF
99
Out[0] = WaveActiveBallot(threadID.x != 30);
1010

11-
// We expect the first resulting uint's bitmask to be
12-
// 0x0000FFFF
11+
// We expect the first resulting uint's bitmask to be
12+
// 0x0000FFFF
1313
Out[1] = WaveActiveBallot(threadID.x < 16);
1414

1515
// We expect the resulting uint4 to be 4 0x00000000's
@@ -23,7 +23,7 @@ Shaders:
2323
- Stage: Compute
2424
Entry: main
2525
DispatchSize: [1, 1, 1]
26-
Buffers:
26+
Buffers:
2727
- Name: Out
2828
Format: UInt32
2929
Stride: 16
@@ -38,7 +38,7 @@ Results:
3838
Actual: Out
3939
Expected: ExpectedOut
4040
DescriptorSets:
41-
- Resources:
41+
- Resources:
4242
- Name: Out
4343
Kind: RWStructuredBuffer
4444
DirectXBinding:
@@ -51,9 +51,6 @@ DescriptorSets:
5151

5252
# REQUIRES: WaveSize_32
5353

54-
# Bug: https://github.com/llvm/offload-test-suite/issues/688
55-
# XFAIL: AMD && DirectX
56-
5754
# RUN: split-file %s %t
5855
# RUN: %dxc_target -T cs_6_6 -Fo %t.o %t/source.hlsl
5956
# RUN: %offloader %t/pipeline.yaml %t.o

test/WaveOps/WaveActiveBallot.Wave64.test

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ RWStructuredBuffer<uint4> Out : register(u1);
44
[WaveSize(64)]
55
[numthreads(64, 1, 1)]
66
void main(uint3 threadID : SV_DispatchThreadID) {
7-
// We expect the first and second resulting uint's bitmask to be
7+
// We expect the first and second resulting uint's bitmask to be
88
// 0xBFFFFFFF
99
Out[0] = WaveActiveBallot(threadID.x != 30 && threadID.x != 62);
1010

11-
// We expect the first resulting uint's bitmask to be
11+
// We expect the first resulting uint's bitmask to be
1212
// 0x0000FFFF, and the second to be 0xFFFF0000
1313
Out[1] = WaveActiveBallot(threadID.x < 16 || threadID.x > 47 );
1414

@@ -23,7 +23,7 @@ Shaders:
2323
- Stage: Compute
2424
Entry: main
2525
DispatchSize: [1, 1, 1]
26-
Buffers:
26+
Buffers:
2727
- Name: Out
2828
Format: UInt32
2929
Stride: 16
@@ -38,7 +38,7 @@ Results:
3838
Actual: Out
3939
Expected: ExpectedOut
4040
DescriptorSets:
41-
- Resources:
41+
- Resources:
4242
- Name: Out
4343
Kind: RWStructuredBuffer
4444
DirectXBinding:
@@ -51,9 +51,6 @@ DescriptorSets:
5151

5252
# REQUIRES: WaveSize_64
5353

54-
# Bug: https://github.com/llvm/offload-test-suite/issues/688
55-
# XFAIL: AMD && DirectX
56-
5754
# RUN: split-file %s %t
5855
# RUN: %dxc_target -T cs_6_6 -Fo %t.o %t/source.hlsl
5956
# RUN: %offloader %t/pipeline.yaml %t.o

0 commit comments

Comments
 (0)