-
Notifications
You must be signed in to change notification settings - Fork 31
Add WaveActiveBitAnd tests #974
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
b23c6ed
add waveactivebitand tests
bob80905 1495bb2
iteration
bob80905 a7cfbbd
unify bindings
bob80905 836bcb4
address Finn and Deric
bob80905 8f70fb5
rename files
bob80905 22d1e2f
convergence rename
bob80905 a7b646f
Merge branch 'add_waveactivebitand_tests' of https://github.com/bob80…
bob80905 dd564d2
Merge branch 'main' into add_waveactivebitand_tests
bob80905 8921cc6
revert back to storing 3vec results into 4 vec element resources
bob80905 8983556
revert back to 3 vec
bob80905 e9d810f
address Justin's feedback on BitOr, and clean ups
bob80905 71edb79
variable rename for tid
bob80905 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,173 @@ | ||
| #--- source.hlsl | ||
| StructuredBuffer<uint> In : register(t0); | ||
|
|
||
| RWStructuredBuffer<uint> Out1 : register(u1); // branch A | ||
| RWStructuredBuffer<uint> Out2 : register(u2); // branch B | ||
| RWStructuredBuffer<uint> Out3 : register(u3); // reconverged | ||
| RWStructuredBuffer<uint> Out4 : register(u4); // loop | ||
| RWStructuredBuffer<uint> Out5 : register(u5); // divergent loop | ||
|
|
||
| [numthreads(4,1,1)] | ||
| void main(uint3 TID : SV_GroupThreadID) { | ||
| uint V = In[TID.x]; | ||
|
|
||
| // divergent branch | ||
| if (TID.x < 2) | ||
| Out1[TID.x] = WaveActiveBitAnd(V); | ||
| else | ||
| Out2[TID.x] = WaveActiveBitAnd(V); | ||
|
|
||
| // reconverged wave op | ||
| Out3[TID.x] = WaveActiveBitAnd(V); | ||
|
|
||
| // loop case | ||
| uint R = V; | ||
| for (uint i = 0; i < 2; i++) | ||
| R = WaveActiveBitAnd(R); | ||
|
|
||
| Out4[TID.x] = R; | ||
|
|
||
| // divergent loop: each thread iterates TID.x times | ||
| // thread 0: 0 iters, thread 1: 1 iter, thread 2: 2 iters, thread 3: 3 iters | ||
| uint R2 = V; | ||
| for (uint j = 0; j < TID.x; j++) | ||
| R2 = WaveActiveBitAnd(R2); | ||
|
|
||
| Out5[TID.x] = R2; | ||
| } | ||
|
|
||
| #--- pipeline.yaml | ||
|
|
||
| --- | ||
| Shaders: | ||
| - Stage: Compute | ||
| Entry: main | ||
| DispatchSize: [1, 1, 1] | ||
|
|
||
| Buffers: | ||
|
|
||
| - Name: In | ||
| Format: UInt32 | ||
| Stride: 4 | ||
| Data: [ 0xFFF0, 0xFF0F, 0xF0FF, 0x0FFF ] | ||
| - Name: Out1 | ||
| Format: UInt32 | ||
| Stride: 4 | ||
| FillSize: 16 | ||
| - Name: Out2 | ||
| Format: UInt32 | ||
| Stride: 4 | ||
| FillSize: 16 | ||
| - Name: Out3 | ||
| Format: UInt32 | ||
| Stride: 4 | ||
| FillSize: 16 | ||
| - Name: Out4 | ||
| Format: UInt32 | ||
| Stride: 4 | ||
| FillSize: 16 | ||
| - Name: Out5 | ||
| Format: UInt32 | ||
| Stride: 4 | ||
| FillSize: 16 | ||
| - Name: ExpectedOut1 | ||
| Format: UInt32 | ||
| Stride: 4 | ||
| Data: [ 0xFF00, 0xFF00, 0x0, 0x0 ] | ||
| - Name: ExpectedOut2 | ||
| Format: UInt32 | ||
| Stride: 4 | ||
| Data: [ 0x0, 0x0, 0xFF, 0xFF ] | ||
| - Name: ExpectedOut3 | ||
| Format: UInt32 | ||
| Stride: 4 | ||
| Data: [ 0x0, 0x0, 0x0, 0x0 ] | ||
| - Name: ExpectedOut4 | ||
| Format: UInt32 | ||
| Stride: 4 | ||
| Data: [ 0x0, 0x0, 0x0, 0x0 ] | ||
| - Name: ExpectedOut5 | ||
| Format: UInt32 | ||
| Stride: 4 | ||
| Data: [ 0xFFF0, 0xF, 0xF, 0xF ] | ||
|
|
||
|
|
||
| Results: | ||
| - Result: ExpectedOut1 | ||
| Rule: BufferExact | ||
| Actual: Out1 | ||
| Expected: ExpectedOut1 | ||
| - Result: ExpectedOut2 | ||
| Rule: BufferExact | ||
| Actual: Out2 | ||
| Expected: ExpectedOut2 | ||
| - Result: ExpectedOut3 | ||
| Rule: BufferExact | ||
| Actual: Out3 | ||
| Expected: ExpectedOut3 | ||
| - Result: ExpectedOut4 | ||
| Rule: BufferExact | ||
| Actual: Out4 | ||
| Expected: ExpectedOut4 | ||
| - Result: ExpectedOut5 | ||
| Rule: BufferExact | ||
| Actual: Out5 | ||
| Expected: ExpectedOut5 | ||
|
|
||
|
|
||
| DescriptorSets: | ||
| - Resources: | ||
| - Name: In | ||
| Kind: StructuredBuffer | ||
| DirectXBinding: | ||
| Register: 0 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 0 | ||
| - Name: Out1 | ||
| Kind: RWStructuredBuffer | ||
| DirectXBinding: | ||
| Register: 1 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 1 | ||
| - Name: Out2 | ||
| Kind: RWStructuredBuffer | ||
| DirectXBinding: | ||
| Register: 2 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 2 | ||
| - Name: Out3 | ||
| Kind: RWStructuredBuffer | ||
| DirectXBinding: | ||
| Register: 3 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 3 | ||
| - Name: Out4 | ||
| Kind: RWStructuredBuffer | ||
| DirectXBinding: | ||
| Register: 4 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 4 | ||
| - Name: Out5 | ||
| Kind: RWStructuredBuffer | ||
| DirectXBinding: | ||
| Register: 5 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 5 | ||
| ... | ||
| #--- end | ||
|
|
||
| # Bug: https://github.com/llvm/offload-test-suite/issues/977 | ||
| # XFAIL: Vulkan && Clang | ||
|
|
||
| # Not implemented: https://github.com/llvm/llvm-project/issues/99166 | ||
| # UNSUPPORTED: Clang | ||
|
|
||
| # RUN: split-file %s %t | ||
| # RUN: %dxc_target -T cs_6_5 -Fo %t.o %t/source.hlsl | ||
| # RUN: %offloader %t/pipeline.yaml %t.o |
|
Icohedron marked this conversation as resolved.
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You can rename this file to |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,174 @@ | ||
| #--- source.hlsl | ||
| StructuredBuffer<uint4> In : register(t0); | ||
|
|
||
| RWStructuredBuffer<uint> Out1 : register(u1); | ||
| RWStructuredBuffer<uint2> Out2 : register(u2); | ||
| RWStructuredBuffer<uint3> Out3 : register(u3); | ||
| RWStructuredBuffer<uint4> Out4 : register(u4); | ||
| RWStructuredBuffer<uint4> Out5 : register(u5); | ||
|
|
||
| [numthreads(4,1,1)] | ||
| void main(uint3 TID : SV_GroupThreadID) { | ||
| uint4 V = In[TID.x]; | ||
|
|
||
| Out1[TID.x] = WaveActiveBitAnd(V.x); | ||
|
|
||
| Out2[TID.x] = WaveActiveBitAnd(V.xy); | ||
|
|
||
| uint3 R3 = WaveActiveBitAnd(V.xyz); | ||
| Out3[TID.x].xyz = R3; | ||
|
|
||
| Out4[TID.x] = WaveActiveBitAnd(V); | ||
|
|
||
| // constant folding uint4 | ||
| Out5[TID.x] = WaveActiveBitAnd(uint4(1,2,3,4)); | ||
| } | ||
|
|
||
| #--- pipeline.yaml | ||
|
|
||
| --- | ||
| Shaders: | ||
| - Stage: Compute | ||
| Entry: main | ||
| DispatchSize: [1, 1, 1] | ||
|
|
||
| Buffers: | ||
| - Name: In | ||
| Format: UInt32 | ||
| Stride: 16 | ||
| Data: [ | ||
| 0xF, 0x13, 0x17, 0x1B, | ||
| 0xD, 0x15, 0x1D, 0x19, | ||
| 0xB, 0x11, 0x1F, 0x1B, | ||
| 0x9, 0x17, 0xF, 0x1F | ||
| ] | ||
|
|
||
| - Name: Out1 | ||
| Format: UInt32 | ||
| Stride: 4 | ||
| FillSize: 16 | ||
| - Name: Out2 | ||
| Format: UInt32 | ||
| Stride: 8 | ||
| FillSize: 32 | ||
| - Name: Out3 | ||
| Format: UInt32 | ||
| Stride: 12 | ||
| FillSize: 48 | ||
| - Name: Out4 | ||
| Format: UInt32 | ||
| Stride: 16 | ||
| FillSize: 64 | ||
|
|
||
| - Name: Out5 | ||
| Format: UInt32 | ||
| Stride: 16 | ||
| FillSize: 64 | ||
| - Name: ExpectedOut1 | ||
| Format: UInt32 | ||
| Stride: 4 | ||
| Data: [ 0x9, 0x9, 0x9, 0x9 ] | ||
| - Name: ExpectedOut2 | ||
| Format: UInt32 | ||
| Stride: 8 | ||
| Data: [ 0x9, 0x11, 0x9, 0x11, | ||
| 0x9, 0x11, 0x9, 0x11 | ||
| ] | ||
| - Name: ExpectedOut3 | ||
| Format: UInt32 | ||
| Stride: 12 | ||
| Data: [ 0x9, 0x11, 0x5, | ||
| 0x9, 0x11, 0x5, | ||
| 0x9, 0x11, 0x5, | ||
| 0x9, 0x11, 0x5 | ||
| ] | ||
| - Name: ExpectedOut4 | ||
| Format: UInt32 | ||
| Stride: 16 | ||
| Data: [ 0x9, 0x11, 0x5, 0x19, | ||
| 0x9, 0x11, 0x5, 0x19, | ||
| 0x9, 0x11, 0x5, 0x19, | ||
| 0x9, 0x11, 0x5, 0x19 | ||
| ] | ||
| - Name: ExpectedOut5 | ||
| Format: UInt32 | ||
| Stride: 16 | ||
| Data: [ 0x1, 0x2, 0x3, 0x4, | ||
| 0x1, 0x2, 0x3, 0x4, | ||
| 0x1, 0x2, 0x3, 0x4, | ||
| 0x1, 0x2, 0x3, 0x4 | ||
| ] | ||
|
|
||
| Results: | ||
| - Result: ExpectedOut1 | ||
| Rule: BufferExact | ||
| Actual: Out1 | ||
| Expected: ExpectedOut1 | ||
| - Result: ExpectedOut2 | ||
| Rule: BufferExact | ||
| Actual: Out2 | ||
| Expected: ExpectedOut2 | ||
| - Result: ExpectedOut3 | ||
| Rule: BufferExact | ||
| Actual: Out3 | ||
| Expected: ExpectedOut3 | ||
| - Result: ExpectedOut4 | ||
| Rule: BufferExact | ||
| Actual: Out4 | ||
| Expected: ExpectedOut4 | ||
| - Result: ExpectedOut5 | ||
| Rule: BufferExact | ||
| Actual: Out5 | ||
| Expected: ExpectedOut5 | ||
|
|
||
| DescriptorSets: | ||
| - Resources: | ||
| - Name: In | ||
| Kind: StructuredBuffer | ||
| DirectXBinding: | ||
| Register: 0 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 0 | ||
| - Name: Out1 | ||
| Kind: RWStructuredBuffer | ||
| DirectXBinding: | ||
| Register: 1 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 1 | ||
| - Name: Out2 | ||
| Kind: RWStructuredBuffer | ||
| DirectXBinding: | ||
| Register: 2 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 2 | ||
| - Name: Out3 | ||
| Kind: RWStructuredBuffer | ||
| DirectXBinding: | ||
| Register: 3 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 3 | ||
| - Name: Out4 | ||
| Kind: RWStructuredBuffer | ||
| DirectXBinding: | ||
| Register: 4 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 4 | ||
| - Name: Out5 | ||
| Kind: RWStructuredBuffer | ||
| DirectXBinding: | ||
| Register: 5 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 5 | ||
|
|
||
| ... | ||
| #--- end | ||
|
|
||
| # RUN: split-file %s %t | ||
| # RUN: %dxc_target -T cs_6_5 -fvk-use-dx-layout -Fo %t.o %t/source.hlsl | ||
| # RUN: %offloader %t/pipeline.yaml %t.o |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.