Skip to content

Commit 24b29c8

Browse files
inbelicinbelic
authored
Implement tests for countbits (#205)
Implement tests for `countbits` intrinsic with `uint16_t`, `int16_t`, `uint`, `uint32_t`, `int64_t` and `uint64_t`. Resolves #140
1 parent 3be7141 commit 24b29c8

File tree

3 files changed

+332
-0
lines changed

3 files changed

+332
-0
lines changed

‎test/Feature/HLSLLib/countbits.16.test

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
#--- source.hlsl
2+
3+
StructuredBuffer<int16_t4> InInt : register(t0);
4+
StructuredBuffer<uint16_t4> InUInt : register(t1);
5+
6+
// Explicitly using a size 3 buffer illustrates an error when using warp
7+
StructuredBuffer<int16_t3> InIntWarp : register(t4);
8+
StructuredBuffer<uint16_t3> InUIntWarp : register(t5);
9+
10+
RWStructuredBuffer<uint4> OutInt : register(u2);
11+
RWStructuredBuffer<uint4> OutUInt : register(u3);
12+
13+
[numthreads(1,1,1)]
14+
void main() {
15+
// Int
16+
OutInt[0] = countbits(InInt[0]);
17+
uint4 OutOne = {countbits(InIntWarp[0]), countbits(InUInt[0].w)};
18+
OutInt[1] = OutOne;
19+
OutInt[2].xy = countbits(InInt[0].xy);
20+
21+
// UInt
22+
OutUInt[0] = countbits(InUInt[0]);
23+
uint4 OutUOne = {countbits(InUIntWarp[0]), countbits(InUInt[0].w)};
24+
OutUInt[1] = OutUOne;
25+
OutUInt[2].xy = countbits(InUInt[0].xy);
26+
}
27+
28+
//--- pipeline.yaml
29+
30+
---
31+
Shaders:
32+
- Stage: Compute
33+
Entry: main
34+
DispatchSize: [1, 1, 1]
35+
Buffers:
36+
- Name: InInt
37+
Format: Int16
38+
Stride: 8
39+
Data: [0x2A, 0, 0x0f0f, -1]
40+
- Name: InUInt
41+
Format: UInt16
42+
Stride: 8
43+
Data: [0x2A, 0, 0x0f0f, 0xffff]
44+
- Name: InIntWarp
45+
Format: Int16
46+
Stride: 6
47+
Data: [0, 0x0f0f, -1]
48+
- Name: InUIntWarp
49+
Format: UInt16
50+
Stride: 6
51+
Data: [0, 0x0f0f, 0xffff]
52+
- Name: OutInt
53+
Format: UInt32
54+
Stride: 16
55+
ZeroInitSize: 48
56+
- Name: OutUInt
57+
Format: UInt32
58+
Stride: 16
59+
ZeroInitSize: 48
60+
- Name: ExpectedOut # The result we expect
61+
Format: UInt32
62+
Stride: 16
63+
Data: [3, 0, 8, 16, 3, 0, 8, 16, 3, 0, 0, 0]
64+
Results:
65+
- Result: Test1
66+
Rule: BufferExact
67+
Actual: OutInt
68+
Expected: ExpectedOut
69+
- Result: Test2
70+
Rule: BufferExact
71+
Actual: OutUInt
72+
Expected: ExpectedOut
73+
DescriptorSets:
74+
- Resources:
75+
- Name: InInt
76+
Kind: StructuredBuffer
77+
DirectXBinding:
78+
Register: 0
79+
Space: 0
80+
VulkanBinding:
81+
Binding: 0
82+
- Name: InUInt
83+
Kind: StructuredBuffer
84+
DirectXBinding:
85+
Register: 1
86+
Space: 0
87+
VulkanBinding:
88+
Binding: 1
89+
- Name: InIntWarp
90+
Kind: StructuredBuffer
91+
DirectXBinding:
92+
Register: 4
93+
Space: 0
94+
VulkanBinding:
95+
Binding: 4
96+
- Name: InUIntWarp
97+
Kind: StructuredBuffer
98+
DirectXBinding:
99+
Register: 5
100+
Space: 0
101+
VulkanBinding:
102+
Binding: 5
103+
- Name: OutInt
104+
Kind: RWStructuredBuffer
105+
DirectXBinding:
106+
Register: 2
107+
Space: 0
108+
VulkanBinding:
109+
Binding: 2
110+
- Name: OutUInt
111+
Kind: RWStructuredBuffer
112+
DirectXBinding:
113+
Register: 3
114+
Space: 0
115+
VulkanBinding:
116+
Binding: 3
117+
...
118+
#--- end
119+
120+
# REQUIRES: Int16
121+
122+
# Bug in DXC-Vulkan
123+
# https://github.com/microsoft/DirectXShaderCompiler/issues/7494
124+
# Bug in Clang-Vulkan
125+
# https://github.com/llvm/llvm-project/issues/142677
126+
# However, the behaviour is also inconsistent across GPUs when using directx
127+
# and requires an HLK test so we will mark everything as UNSUPPORTED.
128+
# For more context see here:
129+
# https://github.com/microsoft/DirectXShaderCompiler/issues/7499
130+
# UNSUPPORTED: DXC
131+
# UNSUPPORTED: Clang
132+
133+
# RUN: split-file %s %t
134+
# RUN: %dxc_target -enable-16bit-types -T cs_6_5 -Fo %t.o %t/source.hlsl
135+
# RUN: %offloader %t/pipeline.yaml %t.o

‎test/Feature/HLSLLib/countbits.32.test

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
#--- source.hlsl
2+
3+
StructuredBuffer<int4> InInt : register(t0);
4+
StructuredBuffer<uint4> InUInt : register(t1);
5+
RWStructuredBuffer<uint4> OutInt : register(u2);
6+
RWStructuredBuffer<uint4> OutUInt : register(u3);
7+
8+
[numthreads(1,1,1)]
9+
void main() {
10+
// Int
11+
OutInt[0] = countbits(InInt[0]);
12+
uint4 OutOne = {countbits(InInt[0].xyz), countbits(InInt[0].w)};
13+
OutInt[1] = OutOne;
14+
OutInt[2].xy = countbits(InInt[0].xy);
15+
16+
// UInt
17+
OutUInt[0] = countbits(InUInt[0]);
18+
uint4 OutUOne = {countbits(InUInt[0].xyz), countbits(InUInt[0].w)};
19+
OutUInt[1] = OutUOne;
20+
OutUInt[2].xy = countbits(InUInt[0].xy);
21+
}
22+
23+
//--- pipeline.yaml
24+
25+
---
26+
Shaders:
27+
- Stage: Compute
28+
Entry: main
29+
DispatchSize: [1, 1, 1]
30+
Buffers:
31+
- Name: InInt
32+
Format: Int32
33+
Stride: 16
34+
Data: [0x2A, 0, 0x0f0f0f0f, -1]
35+
- Name: InUInt
36+
Format: UInt32
37+
Stride: 16
38+
Data: [0x2A, 0, 0x0f0f0f0f, 0xffffffff]
39+
- Name: OutInt
40+
Format: UInt32
41+
Stride: 16
42+
ZeroInitSize: 48
43+
- Name: OutUInt
44+
Format: UInt32
45+
Stride: 16
46+
ZeroInitSize: 48
47+
- Name: ExpectedOut # The result we expect
48+
Format: UInt32
49+
Stride: 16
50+
Data: [3, 0, 16, 32, 3, 0, 16, 32, 3, 0, 0, 0]
51+
Results:
52+
- Result: Test1
53+
Rule: BufferExact
54+
Actual: OutInt
55+
Expected: ExpectedOut
56+
- Result: Test2
57+
Rule: BufferExact
58+
Actual: OutUInt
59+
Expected: ExpectedOut
60+
DescriptorSets:
61+
- Resources:
62+
- Name: InInt
63+
Kind: StructuredBuffer
64+
DirectXBinding:
65+
Register: 0
66+
Space: 0
67+
VulkanBinding:
68+
Binding: 0
69+
- Name: InUInt
70+
Kind: StructuredBuffer
71+
DirectXBinding:
72+
Register: 1
73+
Space: 0
74+
VulkanBinding:
75+
Binding: 1
76+
- Name: OutInt
77+
Kind: RWStructuredBuffer
78+
DirectXBinding:
79+
Register: 2
80+
Space: 0
81+
VulkanBinding:
82+
Binding: 2
83+
- Name: OutUInt
84+
Kind: RWStructuredBuffer
85+
DirectXBinding:
86+
Register: 3
87+
Space: 0
88+
VulkanBinding:
89+
Binding: 3
90+
...
91+
#--- end
92+
93+
# RUN: split-file %s %t
94+
# RUN: %dxc_target -T cs_6_5 -Fo %t.o %t/source.hlsl
95+
# RUN: %offloader %t/pipeline.yaml %t.o

‎test/Feature/HLSLLib/countbits.64.test

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
#--- source.hlsl
2+
3+
StructuredBuffer<int64_t4> InInt : register(t0);
4+
StructuredBuffer<uint64_t4> InUInt : register(t1);
5+
6+
RWStructuredBuffer<uint4> OutInt : register(u2);
7+
RWStructuredBuffer<uint4> OutUInt : register(u3);
8+
9+
[numthreads(1,1,1)]
10+
void main() {
11+
// Int
12+
OutInt[0] = countbits(InInt[0]);
13+
uint4 OutOne = {countbits(InInt[0].xyz), countbits(InInt[0].w)};
14+
OutInt[1] = OutOne;
15+
OutInt[2].xy = countbits(InInt[0].xy);
16+
17+
// UInt
18+
OutUInt[0] = countbits(InUInt[0]);
19+
uint4 OutUOne = {countbits(InUInt[0].xyz), countbits(InUInt[0].w)};
20+
OutUInt[1] = OutUOne;
21+
OutUInt[2].xy = countbits(InUInt[0].xy);
22+
}
23+
24+
//--- pipeline.yaml
25+
26+
---
27+
Shaders:
28+
- Stage: Compute
29+
Entry: main
30+
DispatchSize: [1, 1, 1]
31+
Buffers:
32+
- Name: InInt
33+
Format: Int64
34+
Stride: 32
35+
Data: [0x2A, 0, 0x0f0f0f0f0f0f0f0f, -1]
36+
- Name: InUInt
37+
Format: UInt64
38+
Stride: 32
39+
Data: [0x2A, 0, 0x0f0f0f0f0f0f0f0f, 0xffffffffffffffff]
40+
- Name: OutInt
41+
Format: UInt32
42+
Stride: 16
43+
ZeroInitSize: 48
44+
- Name: OutUInt
45+
Format: UInt32
46+
Stride: 16
47+
ZeroInitSize: 48
48+
- Name: ExpectedOut # The result we expect
49+
Format: UInt32
50+
Stride: 16
51+
Data: [3, 0, 32, 64, 3, 0, 32, 64, 3, 0, 0, 0]
52+
Results:
53+
- Result: Test1
54+
Rule: BufferExact
55+
Actual: OutInt
56+
Expected: ExpectedOut
57+
- Result: Test2
58+
Rule: BufferExact
59+
Actual: OutUInt
60+
Expected: ExpectedOut
61+
DescriptorSets:
62+
- Resources:
63+
- Name: InInt
64+
Kind: StructuredBuffer
65+
DirectXBinding:
66+
Register: 0
67+
Space: 0
68+
VulkanBinding:
69+
Binding: 0
70+
- Name: InUInt
71+
Kind: StructuredBuffer
72+
DirectXBinding:
73+
Register: 1
74+
Space: 0
75+
VulkanBinding:
76+
Binding: 1
77+
- Name: OutInt
78+
Kind: RWStructuredBuffer
79+
DirectXBinding:
80+
Register: 2
81+
Space: 0
82+
VulkanBinding:
83+
Binding: 2
84+
- Name: OutUInt
85+
Kind: RWStructuredBuffer
86+
DirectXBinding:
87+
Register: 3
88+
Space: 0
89+
VulkanBinding:
90+
Binding: 3
91+
...
92+
#--- end
93+
94+
# REQUIRES: Int64
95+
96+
# https://github.com/microsoft/DirectXShaderCompiler/issues/7494
97+
# https://github.com/llvm/llvm-project/issues/142677
98+
# UNSUPPORTED: Vulkan
99+
100+
# RUN: split-file %s %t
101+
# RUN: %dxc_target -T cs_6_5 -Fo %t.o %t/source.hlsl
102+
# RUN: %offloader %t/pipeline.yaml %t.o

0 commit comments

Comments
 (0)