-
Notifications
You must be signed in to change notification settings - Fork 11k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SPIRV] Add OpAccessChain instruction support (#66253)
This commit adds 2 new instructions in the selector: - OpAccessChain - OpInBoundsAccessChain. The choice between the two relies on the `inbounds` marker. Those instruction are not used for OpenCL, to maintain the same behavior as previously. They are only added when building for logical SPIR-V, as it doesn't support the pointer equivalent. Because logical SPIR-V doesn't support pointer cast either, the assign_ptr_type intrinsic need to be generated so OpAccessChain gets lowered with the correct pointer type, instead of i8*. Fixes #66107 --------- Signed-off-by: Nathan Gauër <brioche@google.com>
- Loading branch information
Showing
4 changed files
with
96 additions
and
7 deletions.
There are no files selected for viewing
This file contains 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 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 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,20 @@ | ||
; RUN: llc -O0 -mtriple=spirv-unknown-unknown %s -o - | FileCheck %s | ||
|
||
; CHECK: [[uint:%[0-9]+]] = OpTypeInt 32 0 | ||
; CHECK: [[uint2:%[0-9]+]] = OpTypeVector [[uint]] 2 | ||
; CHECK: [[uint_1:%[0-9]+]] = OpConstant [[uint]] 1 | ||
; CHECK: [[ptr_uint:%[0-9]+]] = OpTypePointer Function [[uint]] | ||
; CHECK: [[ptr_uint2:%[0-9]+]] = OpTypePointer Function [[uint2]] | ||
|
||
define void @main() #1 { | ||
entry: | ||
%0 = alloca <2 x i32>, align 4 | ||
; CHECK: [[var:%[0-9]+]] = OpVariable [[ptr_uint2]] Function | ||
|
||
%1 = getelementptr <2 x i32>, ptr %0, i32 0, i32 1 | ||
; CHECK: {{%[0-9]+}} = OpAccessChain [[ptr_uint]] [[var]] [[uint_1]] | ||
|
||
ret void | ||
} | ||
|
||
attributes #1 = { "hlsl.numthreads"="4,8,16" "hlsl.shader"="compute" } |
This file contains 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,59 @@ | ||
; RUN: llc -O0 -mtriple=spirv-unknown-unknown %s -o - | FileCheck %s | ||
|
||
; CHECK: [[uint:%[0-9]+]] = OpTypeInt 32 0 | ||
|
||
%A = type { | ||
i32, | ||
i32 | ||
} | ||
; CHECK: [[A:%[0-9]+]] = OpTypeStruct [[uint]] [[uint]] | ||
|
||
%B = type { | ||
%A, | ||
i32, | ||
%A | ||
} | ||
; CHECK: [[B:%[0-9]+]] = OpTypeStruct [[A]] [[uint]] [[A]] | ||
|
||
; CHECK: [[uint_0:%[0-9]+]] = OpConstant [[uint]] 0 | ||
; CHECK: [[uint_1:%[0-9]+]] = OpConstant [[uint]] 1 | ||
; CHECK: [[uint_2:%[0-9]+]] = OpConstant [[uint]] 2 | ||
|
||
; CHECK: [[ptr_uint:%[0-9]+]] = OpTypePointer Function [[uint]] | ||
; CHECK: [[ptr_A:%[0-9]+]] = OpTypePointer Function [[A]] | ||
; CHECK: [[ptr_B:%[0-9]+]] = OpTypePointer Function [[B]] | ||
|
||
define void @main() #1 { | ||
entry: | ||
%0 = alloca %B, align 4 | ||
; CHECK: [[tmp:%[0-9]+]] = OpVariable [[ptr_B]] Function | ||
|
||
%1 = getelementptr %B, ptr %0, i32 0, i32 0 | ||
; CHECK: {{%[0-9]+}} = OpAccessChain [[ptr_A]] [[tmp]] [[uint_0]] | ||
%2 = getelementptr inbounds %B, ptr %0, i32 0, i32 0 | ||
; CHECK: {{%[0-9]+}} = OpInBoundsAccessChain [[ptr_A]] [[tmp]] [[uint_0]] | ||
|
||
%3 = getelementptr %B, ptr %0, i32 0, i32 1 | ||
; CHECK: {{%[0-9]+}} = OpAccessChain [[ptr_uint]] [[tmp]] [[uint_1]] | ||
%4 = getelementptr inbounds %B, ptr %0, i32 0, i32 1 | ||
; CHECK: {{%[0-9]+}} = OpInBoundsAccessChain [[ptr_uint]] [[tmp]] [[uint_1]] | ||
|
||
%5 = getelementptr %B, ptr %0, i32 0, i32 2 | ||
; CHECK: {{%[0-9]+}} = OpAccessChain [[ptr_A]] [[tmp]] [[uint_2]] | ||
%6 = getelementptr inbounds %B, ptr %0, i32 0, i32 2 | ||
; CHECK: {{%[0-9]+}} = OpInBoundsAccessChain [[ptr_A]] [[tmp]] [[uint_2]] | ||
|
||
%7 = getelementptr %B, ptr %0, i32 0, i32 2, i32 1 | ||
; CHECK: {{%[0-9]+}} = OpAccessChain [[ptr_uint]] [[tmp]] [[uint_2]] [[uint_1]] | ||
%8 = getelementptr inbounds %B, ptr %0, i32 0, i32 2, i32 1 | ||
; CHECK: {{%[0-9]+}} = OpInBoundsAccessChain [[ptr_uint]] [[tmp]] [[uint_2]] [[uint_1]] | ||
|
||
%9 = getelementptr %B, ptr %0, i32 0, i32 2 | ||
%10 = getelementptr %A, ptr %9, i32 0, i32 1 | ||
; CHECK: [[x:%[0-9]+]] = OpAccessChain [[ptr_A]] [[tmp]] [[uint_2]] | ||
; CHECK: {{%[0-9]+}} = OpAccessChain [[ptr_uint]] [[x]] [[uint_1]] | ||
|
||
ret void | ||
} | ||
|
||
attributes #1 = { "hlsl.numthreads"="4,8,16" "hlsl.shader"="compute" } |