-
Notifications
You must be signed in to change notification settings - Fork 18
Add WaveReadLaneAt tests
#349
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
bob80905
merged 18 commits into
llvm:main
from
bob80905:add_wavereadlaneat_tests_from_Finn
Aug 18, 2025
Merged
Changes from 17 commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
226de62
add int test
2cd0add
add uint test
531d263
add basic floats
38aa248
add basic 16 bit support
8cec995
add 64 bit tests
97cae79
fix typo
92e8261
add basic user defined tests
f5bea7c
add tests for index behaviour
1a45fbc
add float edge cases
d58096c
fix vulkan bindings
c2e6465
move float edge case tests
c75f352
move matrix to own test
0ca5519
update TID arg type
bob80905 faec51b
address other failures
bob80905 6656f7a
attempt to fix test errors / xfail failing tests
bob80905 e8c76ca
split 64 bit test into float and int
bob80905 a42b2dd
xfail Metal
bob80905 2605a10
add Bool test
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,145 @@ | ||
| #--- source.hlsl | ||
|
|
||
| StructuredBuffer<int16_t4> InInt : register(t0); | ||
| RWStructuredBuffer<int16_t4> OutInt : register(u1); | ||
|
|
||
| StructuredBuffer<uint16_t4> InUInt : register(t2); | ||
| RWStructuredBuffer<uint16_t4> OutUInt : register(u3); | ||
|
|
||
| StructuredBuffer<float16_t4> InFloat : register(t4); | ||
| RWStructuredBuffer<float16_t4> OutFloat : register(u5); | ||
|
|
||
| [numthreads(4,1,1)] | ||
| void main(uint32_t3 TID : SV_GroupThreadID) { | ||
| uint OutIdx = TID.x * 3; | ||
|
|
||
| // Int | ||
| OutInt[OutIdx] = WaveReadLaneAt(InInt[TID.x], TID.x); | ||
| uint16_t4 ThreadInInt = {InInt[TID.x].xyz, InInt[TID.x].w}; | ||
| OutInt[OutIdx + 1] = WaveReadLaneAt(ThreadInInt, TID.x);; | ||
| OutInt[OutIdx + 2].xy = WaveReadLaneAt(InInt[TID.x].xy, TID.x); | ||
|
|
||
| // UInt | ||
| OutUInt[OutIdx] = WaveReadLaneAt(InUInt[TID.x], TID.x); | ||
| int16_t4 ThreadInUInt = {InUInt[TID.x].xyz, InUInt[TID.x].w}; | ||
| OutUInt[OutIdx + 1] = WaveReadLaneAt(ThreadInUInt, TID.x);; | ||
| OutUInt[OutIdx + 2].xy = WaveReadLaneAt(InUInt[TID.x].xy, TID.x); | ||
|
|
||
| // Float | ||
| OutFloat[OutIdx] = WaveReadLaneAt(InFloat[TID.x], TID.x); | ||
| float16_t4 ThreadInFloat = {InFloat[TID.x].xyz, InFloat[TID.x].w}; | ||
| OutFloat[OutIdx + 1] = WaveReadLaneAt(ThreadInFloat, TID.x);; | ||
| OutFloat[OutIdx + 2].xy = WaveReadLaneAt(InFloat[TID.x].xy, TID.x); | ||
| } | ||
|
|
||
| //--- pipeline.yaml | ||
|
|
||
| --- | ||
| Shaders: | ||
| - Stage: Compute | ||
| Entry: main | ||
| DispatchSize: [4, 1, 1] | ||
| Buffers: | ||
| - Name: InInt | ||
| Format: Int16 | ||
| Stride: 8 | ||
| Data: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 ] | ||
| - Name: OutInt | ||
| Format: Int16 | ||
| Stride: 8 | ||
| ZeroInitSize: 72 | ||
| - Name: ExpectedOutInt # The result we expect | ||
| Format: Int16 | ||
| Stride: 8 | ||
| Data: [ 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 0, 0, 4, 5, 6, 7, 4, 5, 6, 7, 4, 5, 0, 0, 8, 9, 10, 11, 8, 9, 10, 11, 8, 9, 0, 0 ] | ||
| - Name: InUInt | ||
| Format: UInt16 | ||
| Stride: 8 | ||
| Data: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 ] | ||
| - Name: OutUInt | ||
| Format: UInt16 | ||
| Stride: 8 | ||
| ZeroInitSize: 72 | ||
| - Name: ExpectedOutUInt # The result we expect | ||
| Format: UInt16 | ||
| Stride: 8 | ||
| Data: [ 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 0, 0, 4, 5, 6, 7, 4, 5, 6, 7, 4, 5, 0, 0, 8, 9, 10, 11, 8, 9, 10, 11, 8, 9, 0, 0 ] | ||
| - Name: InFloat | ||
| Format: Float16 | ||
| Stride: 8 | ||
| Data: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 ] | ||
| - Name: OutFloat | ||
| Format: Float16 | ||
| Stride: 8 | ||
| ZeroInitSize: 72 | ||
| - Name: ExpectedOutFloat # The result we expect | ||
| Format: Float16 | ||
| Stride: 8 | ||
| Data: [ 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 0, 0, 4, 5, 6, 7, 4, 5, 6, 7, 4, 5, 0, 0, 8, 9, 10, 11, 8, 9, 10, 11, 8, 9, 0, 0 ] | ||
| Results: | ||
| - Result: TestInt | ||
| Rule: BufferExact | ||
| Actual: OutInt | ||
| Expected: ExpectedOutInt | ||
| - Result: TestUInt | ||
| Rule: BufferExact | ||
| Actual: OutUInt | ||
| Expected: ExpectedOutUInt | ||
| - Result: TestFloat | ||
| Rule: BufferExact | ||
| Actual: OutFloat | ||
| Expected: ExpectedOutFloat | ||
| DescriptorSets: | ||
| - Resources: | ||
| - Name: InInt | ||
| Kind: StructuredBuffer | ||
| DirectXBinding: | ||
| Register: 0 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 0 | ||
| - Name: OutInt | ||
| Kind: RWStructuredBuffer | ||
| DirectXBinding: | ||
| Register: 1 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 1 | ||
| - Name: InUInt | ||
| Kind: StructuredBuffer | ||
| DirectXBinding: | ||
| Register: 2 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 2 | ||
| - Name: OutUInt | ||
| Kind: RWStructuredBuffer | ||
| DirectXBinding: | ||
| Register: 3 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 3 | ||
| - Name: InFloat | ||
| Kind: StructuredBuffer | ||
| DirectXBinding: | ||
| Register: 4 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 4 | ||
| - Name: OutFloat | ||
| Kind: RWStructuredBuffer | ||
| DirectXBinding: | ||
| Register: 5 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 5 | ||
| ... | ||
| #--- end | ||
| # Tracked by https://github.com/llvm/offload-test-suite/issues/351 | ||
| # XFAIL: Metal | ||
|
|
||
| # REQUIRES: Half, Int16 | ||
|
|
||
| # RUN: split-file %s %t | ||
| # RUN: %dxc_target -enable-16bit-types -T cs_6_5 -Fo %t.o %t/source.hlsl | ||
| # RUN: %offloader %t/pipeline.yaml %t.o |
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,181 @@ | ||
| #--- source.hlsl | ||
|
|
||
| StructuredBuffer<int4> InInt : register(t0); | ||
| RWStructuredBuffer<int4> OutInt : register(u1); | ||
|
|
||
| StructuredBuffer<uint4> InUInt : register(t2); | ||
| RWStructuredBuffer<uint4> OutUInt : register(u3); | ||
|
|
||
| StructuredBuffer<float4> InFloat : register(t4); | ||
| RWStructuredBuffer<float4> OutFloat : register(u5); | ||
|
|
||
| // Checks for edge-case floats | ||
| StructuredBuffer<float> InEdgeFloat : register(t6); | ||
| RWStructuredBuffer<float> OutEdgeFloat : register(u7); | ||
|
|
||
| [numthreads(4,1,1)] | ||
| void main(uint3 TID : SV_GroupThreadID) { | ||
| uint OutIdx = TID.x * 3; | ||
|
|
||
| // Int | ||
| OutInt[OutIdx] = WaveReadLaneAt(InInt[TID.x], TID.x); | ||
| uint4 ThreadInInt = {InInt[TID.x].xyz, InInt[TID.x].w}; | ||
| OutInt[OutIdx + 1] = WaveReadLaneAt(ThreadInInt, TID.x); | ||
| OutInt[OutIdx + 2].xy = WaveReadLaneAt(InInt[TID.x].xy, TID.x); | ||
|
|
||
| // UInt | ||
| OutUInt[OutIdx] = WaveReadLaneAt(InUInt[TID.x], TID.x); | ||
| uint4 ThreadInUInt = {InUInt[TID.x].xyz, InUInt[TID.x].w}; | ||
| OutUInt[OutIdx + 1] = WaveReadLaneAt(ThreadInUInt, TID.x); | ||
| OutUInt[OutIdx + 2].xy = WaveReadLaneAt(InUInt[TID.x].xy, TID.x); | ||
|
|
||
| // Float | ||
| OutFloat[OutIdx] = WaveReadLaneAt(InFloat[TID.x], TID.x); | ||
| uint4 ThreadInFloat = {InFloat[TID.x].xyz, InFloat[TID.x].w}; | ||
| OutFloat[OutIdx + 1] = WaveReadLaneAt(ThreadInFloat, TID.x); | ||
| OutFloat[OutIdx + 2].xy = WaveReadLaneAt(InFloat[TID.x].xy, TID.x); | ||
|
|
||
| // Edge-Cases | ||
| OutEdgeFloat[TID.x] = WaveReadLaneAt(InEdgeFloat[TID.x], TID.x); | ||
| } | ||
|
|
||
| //--- pipeline.yaml | ||
|
|
||
| --- | ||
| Shaders: | ||
| - Stage: Compute | ||
| Entry: main | ||
| DispatchSize: [4, 1, 1] | ||
| Buffers: | ||
| - Name: InInt | ||
| Format: Int32 | ||
| Stride: 16 | ||
| Data: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 ] | ||
| - Name: OutInt | ||
| Format: Int32 | ||
| Stride: 16 | ||
| ZeroInitSize: 144 | ||
| - Name: ExpectedOutInt # The result we expect | ||
| Format: Int32 | ||
| Stride: 16 | ||
| Data: [ 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 0, 0, 4, 5, 6, 7, 4, 5, 6, 7, 4, 5, 0, 0, 8, 9, 10, 11, 8, 9, 10, 11, 8, 9, 0, 0 ] | ||
| - Name: InUInt | ||
| Format: UInt32 | ||
| Stride: 16 | ||
| Data: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 ] | ||
| - Name: OutUInt | ||
| Format: UInt32 | ||
| Stride: 16 | ||
| ZeroInitSize: 144 | ||
| - Name: ExpectedOutUInt # The result we expect | ||
| Format: UInt32 | ||
| Stride: 16 | ||
| Data: [ 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 0, 0, 4, 5, 6, 7, 4, 5, 6, 7, 4, 5, 0, 0, 8, 9, 10, 11, 8, 9, 10, 11, 8, 9, 0, 0 ] | ||
| - Name: InFloat | ||
| Format: Float32 | ||
| Stride: 16 | ||
| Data: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 ] | ||
| - Name: OutFloat | ||
| Format: Float32 | ||
| Stride: 16 | ||
| ZeroInitSize: 144 | ||
| - Name: ExpectedOutFloat # The result we expect | ||
| Format: Float32 | ||
| Stride: 16 | ||
| Data: [ 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 0, 0, 4, 5, 6, 7, 4, 5, 6, 7, 4, 5, 0, 0, 8, 9, 10, 11, 8, 9, 10, 11, 8, 9, 0, 0 ] | ||
| - Name: InEdgeFloat | ||
| Format: Float32 | ||
| Stride: 4 | ||
| Data: [inf, -inf, nan, 0 ] | ||
| - Name: OutEdgeFloat | ||
| Format: Float32 | ||
| Stride: 4 | ||
| ZeroInitSize: 16 | ||
| - Name: ExpectedOutEdgeFloat # The result we expect | ||
| Format: Float32 | ||
| Stride: 4 | ||
| Data: [ inf, -inf, nan, 0] | ||
| Results: | ||
| - Result: TestInt | ||
| Rule: BufferExact | ||
| Actual: OutInt | ||
| Expected: ExpectedOutInt | ||
| - Result: TestUInt | ||
| Rule: BufferExact | ||
| Actual: OutUInt | ||
| Expected: ExpectedOutUInt | ||
| - Result: TestFloat | ||
| Rule: BufferExact | ||
| Actual: OutFloat | ||
| Expected: ExpectedOutFloat | ||
| - Result: TestEdgeFloat | ||
| Rule: BufferExact | ||
| Actual: OutEdgeFloat | ||
| Expected: ExpectedOutEdgeFloat | ||
| DescriptorSets: | ||
| - Resources: | ||
| - Name: InInt | ||
| Kind: StructuredBuffer | ||
| DirectXBinding: | ||
| Register: 0 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 0 | ||
| - Name: OutInt | ||
| Kind: RWStructuredBuffer | ||
| DirectXBinding: | ||
| Register: 1 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 1 | ||
| - Name: InUInt | ||
| Kind: StructuredBuffer | ||
| DirectXBinding: | ||
| Register: 2 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 2 | ||
| - Name: OutUInt | ||
| Kind: RWStructuredBuffer | ||
| DirectXBinding: | ||
| Register: 3 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 3 | ||
| - Name: InFloat | ||
| Kind: StructuredBuffer | ||
| DirectXBinding: | ||
| Register: 4 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 4 | ||
| - Name: OutFloat | ||
| Kind: RWStructuredBuffer | ||
| DirectXBinding: | ||
| Register: 5 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 5 | ||
| - Name: InEdgeFloat | ||
| Kind: StructuredBuffer | ||
| DirectXBinding: | ||
| Register: 6 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 6 | ||
| - Name: OutEdgeFloat | ||
| Kind: RWStructuredBuffer | ||
| DirectXBinding: | ||
| Register: 7 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 7 | ||
| ... | ||
| #--- end | ||
| # Tracked by https://github.com/llvm/offload-test-suite/issues/351 | ||
| # XFAIL: Metal | ||
|
|
||
|
|
||
| # RUN: split-file %s %t | ||
| # RUN: %dxc_target -T cs_6_5 -Gis -Fo %t.o %t/source.hlsl | ||
| # RUN: %offloader %t/pipeline.yaml %t.o | ||
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,66 @@ | ||
| #--- source.hlsl | ||
|
|
||
| StructuredBuffer<float64_t4> InFloat : register(t4); | ||
| RWStructuredBuffer<float64_t4> OutFloat : register(u5); | ||
|
|
||
|
|
||
| [numthreads(4,1,1)] | ||
| void main(uint32_t3 TID : SV_GroupThreadID) { | ||
| uint OutIdx = TID.x * 3; | ||
|
|
||
| // Float | ||
| OutFloat[OutIdx] = WaveReadLaneAt(InFloat[TID.x], TID.x); | ||
| float64_t4 ThreadInFloat = {InFloat[TID.x].xyz, InFloat[TID.x].w}; | ||
| OutFloat[OutIdx + 1] = WaveReadLaneAt(ThreadInFloat, TID.x);; | ||
| OutFloat[OutIdx + 2].xy = WaveReadLaneAt(InFloat[TID.x].xy, TID.x); | ||
| } | ||
|
|
||
| //--- pipeline.yaml | ||
|
|
||
| --- | ||
| Shaders: | ||
| - Stage: Compute | ||
| Entry: main | ||
| DispatchSize: [4, 1, 1] | ||
| Buffers: | ||
| - Name: InFloat | ||
| Format: Float64 | ||
| Stride: 16 | ||
| Data: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 ] | ||
| - Name: OutFloat | ||
| Format: Float64 | ||
| Stride: 16 | ||
| ZeroInitSize: 288 | ||
| - Name: ExpectedOutFloat # The result we expect | ||
| Format: Float64 | ||
| Stride: 16 | ||
| Data: [ 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 0, 0, 4, 5, 6, 7, 4, 5, 6, 7, 4, 5, 0, 0, 8, 9, 10, 11, 8, 9, 10, 11, 8, 9, 0, 0 ] | ||
| Results: | ||
| - Result: TestFloat | ||
| Rule: BufferExact | ||
| Actual: OutFloat | ||
| Expected: ExpectedOutFloat | ||
| DescriptorSets: | ||
| - Resources: | ||
| - Name: InFloat | ||
| Kind: StructuredBuffer | ||
| DirectXBinding: | ||
| Register: 4 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 4 | ||
| - Name: OutFloat | ||
| Kind: RWStructuredBuffer | ||
| DirectXBinding: | ||
| Register: 5 | ||
| Space: 0 | ||
| VulkanBinding: | ||
| Binding: 5 | ||
| ... | ||
| #--- end | ||
|
|
||
| # REQUIRES: Double | ||
|
|
||
| # 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 |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should there be bool tests for
WaveReadLaneAt? I see that it supports bool in the HLSL headers