-
Notifications
You must be signed in to change notification settings - Fork 854
[SM6.10] Implement LinAlg groupshared Builtins #8254
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 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
e520d0a
[SM6.10] Implement groupshared Builtins
V-FEXrt 28f9487
Address comments
V-FEXrt 6ff022c
Rework based on feedback
V-FEXrt 36b93d5
Cleanup comments
V-FEXrt def194e
Address comments
V-FEXrt 8fd6c3e
Address comments
V-FEXrt 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
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
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
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
19 changes: 19 additions & 0 deletions
19
tools/clang/test/CodeGenDXIL/hlsl/linalg/builtins/matrixaccumulatetomemory/nominal.hlsl
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,19 @@ | ||
| // REQUIRES: dxil-1-10 | ||
| // RUN: %dxc -T cs_6_10 -HV 202x -E main %s | FileCheck %s | ||
|
|
||
| groupshared float SharedArr[64]; | ||
|
|
||
| void fn(groupshared float Arr[64]) { | ||
| __builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat; | ||
| __builtin_LinAlg_MatrixAccumulateToMemory(mat, Arr, 0, 0, 0); | ||
|
V-FEXrt marked this conversation as resolved.
Outdated
|
||
| } | ||
|
|
||
| // CHECK: @{{.*}} = external addrspace(3) global [64 x float] | ||
|
|
||
| [numthreads(4,1,1)] | ||
| void main() { | ||
| // CHECK-LABEL: define void @main() | ||
|
|
||
| // CHECK: call void @dx.op.linAlgMatrixAccumulateToMemory.mC4M5N4U1S2.f32(i32 -2147483620, %dx.types.LinAlgMatrixC4M5N4U1S2 {{.*}}, [64 x float] addrspace(3)* nonnull @{{.*}}, i32 0, i32 0, i32 0) ; LinAlgMatrixAccumulateToMemory(matrix,memory,offset,stride,layout) | ||
| fn(SharedArr); | ||
|
V-FEXrt marked this conversation as resolved.
Outdated
|
||
| } | ||
19 changes: 19 additions & 0 deletions
19
tools/clang/test/CodeGenDXIL/hlsl/linalg/builtins/matrixloadfrommemory/nominal.hlsl
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,19 @@ | ||
| // REQUIRES: dxil-1-10 | ||
| // RUN: %dxc -T cs_6_10 -HV 202x -E main %s | FileCheck %s | ||
|
|
||
| groupshared float SharedArr[64]; | ||
|
|
||
| void fn(groupshared float Arr[64]) { | ||
| __builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat; | ||
| __builtin_LinAlg_MatrixLoadFromMemory(mat, Arr, 0, 0, 0); | ||
| } | ||
|
|
||
| // CHECK: @{{.*}} = external addrspace(3) global [64 x float] | ||
|
|
||
| [numthreads(4,1,1)] | ||
| void main() { | ||
| // CHECK-LABEL: define void @main() | ||
|
|
||
| // CHECK: call %dx.types.LinAlgMatrixC4M5N4U1S2 @dx.op.linAlgMatrixLoadFromMemory.mC4M5N4U1S2.f32(i32 -2147483633, [64 x float] addrspace(3)* nonnull @{{.*}}, i32 0, i32 0, i32 0) ; LinAlgMatrixLoadFromMemory(memory,offset,stride,layout) | ||
| fn(SharedArr); | ||
| } |
19 changes: 19 additions & 0 deletions
19
tools/clang/test/CodeGenDXIL/hlsl/linalg/builtins/matrixstoretomemory/nominal.hlsl
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,19 @@ | ||
| // REQUIRES: dxil-1-10 | ||
| // RUN: %dxc -T cs_6_10 -HV 202x -E main %s | FileCheck %s | ||
|
|
||
| groupshared float SharedArr[64]; | ||
|
|
||
| void fn(groupshared float Arr[64]) { | ||
| __builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat; | ||
| __builtin_LinAlg_MatrixStoreToMemory(mat, Arr, 0, 0, 0); | ||
| } | ||
|
|
||
| // CHECK: @{{.*}} = external addrspace(3) global [64 x float] | ||
|
|
||
| [numthreads(4,1,1)] | ||
| void main() { | ||
| // CHECK-LABEL: define void @main() | ||
|
|
||
| // CHECK: call void @dx.op.linAlgMatrixStoreToMemory.mC4M5N4U1S2.f32(i32 -2147483627, %dx.types.LinAlgMatrixC4M5N4U1S2 {{.*}}, [64 x float] addrspace(3)* nonnull @{{.*}}, i32 0, i32 0, i32 0) ; LinAlgMatrixStoreToMemory(matrix,memory,offset,stride,layout) | ||
| fn(SharedArr); | ||
| } |
24 changes: 24 additions & 0 deletions
24
tools/clang/test/SemaHLSL/hlsl/linalg/builtins/matrixaccumulatetomemory/ast.hlsl
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,24 @@ | ||
| // REQUIRES: dxil-1-10 | ||
| // RUN: %dxc -T lib_6_10 -E main %s -ast-dump-implicit | FileCheck %s | ||
|
|
||
| // CHECK: FunctionDecl {{.*}} implicit used __builtin_LinAlg_MatrixAccumulateToMemory 'void (__builtin_LinAlgMatrix {{.*}}, float const __attribute__((address_space(3))) (&)[64], unsigned int, unsigned int, unsigned int)' extern | ||
| // CHECK-NEXT: ParmVarDecl {{.*}} matrix '__builtin_LinAlgMatrix {{.*}}' | ||
| // CHECK-NEXT: ParmVarDecl {{.*}} memory 'float const __attribute__((address_space(3))) (&)[64]' | ||
| // CHECK-NEXT: ParmVarDecl {{.*}} offset 'unsigned int' | ||
| // CHECK-NEXT: ParmVarDecl {{.*}} stride 'unsigned int' | ||
| // CHECK-NEXT: ParmVarDecl {{.*}} layout 'unsigned int' | ||
| // CHECK-NEXT: HLSLIntrinsicAttr {{.*}} Implicit "op" "" 420 | ||
| // CHECK-NEXT: AvailabilityAttr {{.*}} Implicit 6.10 0 0 "" | ||
|
|
||
| groupshared float SharedArr[64]; | ||
|
|
||
| void fn(groupshared float Arr[64]) { | ||
| __builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat; | ||
| __builtin_LinAlg_MatrixAccumulateToMemory(mat, Arr, 0, 0, 0); | ||
| } | ||
|
|
||
| [shader("compute")] | ||
| [numthreads(1,1,1)] | ||
| void main() { | ||
| fn(SharedArr); | ||
| } |
15 changes: 15 additions & 0 deletions
15
...ng/test/SemaHLSL/hlsl/linalg/builtins/matrixaccumulatetomemory/unavailable_pre_sm610.hlsl
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,15 @@ | ||
| // RUN: %dxc -T cs_6_9 -HV 202x -E main %s -verify | ||
|
|
||
| groupshared float SharedArr[64]; | ||
|
|
||
| void fn(groupshared float Arr[64], float F) { | ||
| __builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat; | ||
|
|
||
| // expected-error@+1{{intrinsic __builtin_LinAlg_MatrixAccumulateToMemory potentially used by ''main'' requires shader model 6.10 or greater}} | ||
| __builtin_LinAlg_MatrixAccumulateToMemory(mat, Arr, 0, 0, 0); | ||
| } | ||
|
|
||
| [numthreads(4,1,1)] | ||
| void main() { | ||
| fn(SharedArr, 6.0); | ||
| } |
24 changes: 24 additions & 0 deletions
24
tools/clang/test/SemaHLSL/hlsl/linalg/builtins/matrixloadfrommemory/ast.hlsl
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,24 @@ | ||
| // REQUIRES: dxil-1-10 | ||
| // RUN: %dxc -T lib_6_10 -E main %s -ast-dump-implicit | FileCheck %s | ||
|
|
||
| // CHECK: FunctionDecl {{.*}} implicit used __builtin_LinAlg_MatrixLoadFromMemory 'void (__builtin_LinAlgMatrix {{.*}}, float const __attribute__((address_space(3))) (&)[64], unsigned int, unsigned int, unsigned int)' extern | ||
| // CHECK-NEXT: ParmVarDecl {{.*}} ret '__builtin_LinAlgMatrix {{.*}}' | ||
| // CHECK-NEXT: ParmVarDecl {{.*}} memory 'float const __attribute__((address_space(3))) (&)[64]' | ||
| // CHECK-NEXT: ParmVarDecl {{.*}} offset 'unsigned int' | ||
| // CHECK-NEXT: ParmVarDecl {{.*}} stride 'unsigned int' | ||
| // CHECK-NEXT: ParmVarDecl {{.*}} layout 'unsigned int' | ||
| // CHECK-NEXT: HLSLIntrinsicAttr {{.*}} Implicit "op" "" 411 | ||
| // CHECK-NEXT: AvailabilityAttr {{.*}} Implicit 6.10 0 0 "" | ||
|
|
||
| groupshared float SharedArr[64]; | ||
|
|
||
| void fn(groupshared float Arr[64]) { | ||
| __builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat; | ||
| __builtin_LinAlg_MatrixLoadFromMemory(mat, Arr, 0, 0, 0); | ||
| } | ||
|
|
||
| [shader("compute")] | ||
| [numthreads(1,1,1)] | ||
| void main() { | ||
| fn(SharedArr); | ||
| } |
15 changes: 15 additions & 0 deletions
15
.../clang/test/SemaHLSL/hlsl/linalg/builtins/matrixloadfrommemory/unavailable_pre_sm610.hlsl
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,15 @@ | ||
| // RUN: %dxc -T cs_6_9 -HV 202x -E main %s -verify | ||
|
|
||
| groupshared float SharedArr[64]; | ||
|
|
||
| void fn(groupshared float Arr[64], float F) { | ||
| __builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat; | ||
|
|
||
| // expected-error@+1{{intrinsic __builtin_LinAlg_MatrixLoadFromMemory potentially used by ''main'' requires shader model 6.10 or greater}} | ||
| __builtin_LinAlg_MatrixLoadFromMemory(mat, Arr, 0, 0, 0); | ||
| } | ||
|
|
||
| [numthreads(4,1,1)] | ||
| void main() { | ||
| fn(SharedArr, 6.0); | ||
| } |
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.
Since this function no longer has any functional changes, this is now a pure refactor. In fact, there are no other changes in this file that are not a result of generated code changes.
That's fine, but I thought it might be good to call that out. Think of this as just a review note.