[PATCH 5/8] R600/SI: Add global atomicrmw min/umin

[Matt Arsenault]

On Oct 8, 2014, at 6:51 AM, Aaron Watry <awatry at gmail.com> wrote:

> Signed-off-by: Aaron Watry <awatry at gmail.com>
> ---
> lib/Target/R600/AMDGPUInstructions.td |  3 ++
> lib/Target/R600/SIInstructions.td     |  8 +++-
> test/CodeGen/R600/global_atomics.ll   | 76 +++++++++++++++++++++++++++++++++++
> 3 files changed, 85 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/Target/R600/AMDGPUInstructions.td b/lib/Target/R600/AMDGPUInstructions.td
> index f295f33..a6778b4 100644
> --- a/lib/Target/R600/AMDGPUInstructions.td
> +++ b/lib/Target/R600/AMDGPUInstructions.td
> @@ -1,4 +1,5 @@
> //===-- AMDGPUInstructions.td - Common instruction defs ---*- tablegen -*-===//
> +//===-- AMDGPUInstructions.td - Common instruction defs ---*- tablegen -*-===//

Random change here. Other than that LGTM

> //
> //                     The LLVM Compiler Infrastructure
> //
> @@ -389,8 +390,10 @@ class global_binary_atomic_op<SDNode atomic_op> : PatFrag<
> def atomic_add_global : global_binary_atomic_op<atomic_load_add>;
> def atomic_and_global : global_binary_atomic_op<atomic_load_and>;
> def atomic_max_global : global_binary_atomic_op<atomic_load_max>;
> +def atomic_min_global : global_binary_atomic_op<atomic_load_min>;
> def atomic_sub_global : global_binary_atomic_op<atomic_load_sub>;
> def atomic_umax_global : global_binary_atomic_op<atomic_load_umax>;
> +def atomic_umin_global : global_binary_atomic_op<atomic_load_umin>;
> 
> //===----------------------------------------------------------------------===//
> // Misc Pattern Fragments
> diff --git a/lib/Target/R600/SIInstructions.td b/lib/Target/R600/SIInstructions.td
> index ea9adb8..00a635b 100644
> --- a/lib/Target/R600/SIInstructions.td
> +++ b/lib/Target/R600/SIInstructions.td
> @@ -904,8 +904,12 @@ defm BUFFER_ATOMIC_SUB : MUBUF_Atomic <
>   0x00000033, "BUFFER_ATOMIC_SUB", VReg_32, i32, atomic_sub_global
>> ;
> //def BUFFER_ATOMIC_RSUB : MUBUF_ <0x00000034, "BUFFER_ATOMIC_RSUB", []>;
> -//def BUFFER_ATOMIC_SMIN : MUBUF_ <0x00000035, "BUFFER_ATOMIC_SMIN", []>;
> -//def BUFFER_ATOMIC_UMIN : MUBUF_ <0x00000036, "BUFFER_ATOMIC_UMIN", []>;
> +defm BUFFER_ATOMIC_SMIN : MUBUF_Atomic <
> +  0x00000035, "BUFFER_ATOMIC_SMIN", VReg_32, i32, atomic_min_global
> +>;
> +defm BUFFER_ATOMIC_UMIN : MUBUF_Atomic <
> +  0x00000036, "BUFFER_ATOMIC_UMIN", VReg_32, i32, atomic_umin_global
> +>;
> defm BUFFER_ATOMIC_SMAX : MUBUF_Atomic <
>   0x00000037, "BUFFER_ATOMIC_SMAX", VReg_32, i32, atomic_max_global
>> ;
> diff --git a/test/CodeGen/R600/global_atomics.ll b/test/CodeGen/R600/global_atomics.ll
> index 2013bf2..19f32f9 100644
> --- a/test/CodeGen/R600/global_atomics.ll
> +++ b/test/CodeGen/R600/global_atomics.ll
> @@ -189,3 +189,79 @@ entry:
>   store i32 %0, i32 addrspace(1)* %out2
>   ret void
> }
> +
> +; FUNC-LABEL: {{^}}atomic_min_i32_offset:
> +; SI: BUFFER_ATOMIC_SMIN v{{[0-9]+}}, s[{{[0-9]+}}:{{[0-9]+}}], 0{{$}}
> +define void @atomic_min_i32_offset(i32 addrspace(1)* %out, i32 %in) {
> +entry:
> +  %0  = atomicrmw volatile min i32 addrspace(1)* %out, i32 %in seq_cst
> +  ret void
> +}
> +
> +; FUNC-LABEL: {{^}}atomic_min_i32_ret_offset:
> +; SI: BUFFER_ATOMIC_SMIN [[RET:v[0-9]+]], s[{{[0-9]+}}:{{[0-9]+}}], 0 glc
> +; SI: BUFFER_STORE_DWORD [[RET]]
> +define void @atomic_min_i32_ret_offset(i32 addrspace(1)* %out, i32 addrspace(1)* %out2, i32 %in) {
> +entry:
> +  %0  = atomicrmw volatile min i32 addrspace(1)* %out, i32 %in seq_cst
> +  store i32 %0, i32 addrspace(1)* %out2
> +  ret void
> +}
> +
> +; FUNC-LABEL: {{^}}atomic_min_i32_addr64:
> +; SI: BUFFER_ATOMIC_SMIN v{{[0-9]+}}, v[{{[0-9]+}}:{{[0-9]+}}], s[{{[0-9]+}}:{{[0-9]+}}], 0 addr64{{$}}
> +define void @atomic_min_i32_addr64(i32 addrspace(1)* %out, i32 %in, i64 %index) {
> +entry:
> +  %ptr = getelementptr i32 addrspace(1)* %out, i64 %index
> +  %0  = atomicrmw volatile min i32 addrspace(1)* %ptr, i32 %in seq_cst
> +  ret void
> +}
> +
> +; FUNC-LABEL: {{^}}atomic_min_i32_ret_addr64:
> +; SI: BUFFER_ATOMIC_SMIN [[RET:v[0-9]+]], v[{{[0-9]+}}:{{[0-9]+}}], s[{{[0-9]+}}:{{[0-9]+}}], 0 addr64 glc{{$}}
> +; SI: BUFFER_STORE_DWORD [[RET]]
> +define void @atomic_min_i32_ret_addr64(i32 addrspace(1)* %out, i32 addrspace(1)* %out2, i32 %in, i64 %index) {
> +entry:
> +  %ptr = getelementptr i32 addrspace(1)* %out, i64 %index
> +  %0  = atomicrmw volatile min i32 addrspace(1)* %ptr, i32 %in seq_cst
> +  store i32 %0, i32 addrspace(1)* %out2
> +  ret void
> +}
> +
> +; FUNC-LABEL: {{^}}atomic_umin_i32_offset:
> +; SI: BUFFER_ATOMIC_UMIN v{{[0-9]+}}, s[{{[0-9]+}}:{{[0-9]+}}], 0{{$}}
> +define void @atomic_umin_i32_offset(i32 addrspace(1)* %out, i32 %in) {
> +entry:
> +  %0  = atomicrmw volatile umin i32 addrspace(1)* %out, i32 %in seq_cst
> +  ret void
> +}
> +
> +; FUNC-LABEL: {{^}}atomic_umin_i32_ret_offset:
> +; SI: BUFFER_ATOMIC_UMIN [[RET:v[0-9]+]], s[{{[0-9]+}}:{{[0-9]+}}], 0 glc
> +; SI: BUFFER_STORE_DWORD [[RET]]
> +define void @atomic_umin_i32_ret_offset(i32 addrspace(1)* %out, i32 addrspace(1)* %out2, i32 %in) {
> +entry:
> +  %0  = atomicrmw volatile umin i32 addrspace(1)* %out, i32 %in seq_cst
> +  store i32 %0, i32 addrspace(1)* %out2
> +  ret void
> +}
> +
> +; FUNC-LABEL: {{^}}atomic_umin_i32_addr64:
> +; SI: BUFFER_ATOMIC_UMIN v{{[0-9]+}}, v[{{[0-9]+}}:{{[0-9]+}}], s[{{[0-9]+}}:{{[0-9]+}}], 0 addr64{{$}}
> +define void @atomic_umin_i32_addr64(i32 addrspace(1)* %out, i32 %in, i64 %index) {
> +entry:
> +  %ptr = getelementptr i32 addrspace(1)* %out, i64 %index
> +  %0  = atomicrmw volatile umin i32 addrspace(1)* %ptr, i32 %in seq_cst
> +  ret void
> +}
> +
> +; FUNC-LABEL: {{^}}atomic_umin_i32_ret_addr64:
> +; SI: BUFFER_ATOMIC_UMIN [[RET:v[0-9]+]], v[{{[0-9]+}}:{{[0-9]+}}], s[{{[0-9]+}}:{{[0-9]+}}], 0 addr64 glc{{$}}
> +; SI: BUFFER_STORE_DWORD [[RET]]
> +define void @atomic_umin_i32_ret_addr64(i32 addrspace(1)* %out, i32 addrspace(1)* %out2, i32 %in, i64 %index) {
> +entry:
> +  %ptr = getelementptr i32 addrspace(1)* %out, i64 %index
> +  %0  = atomicrmw volatile umin i32 addrspace(1)* %ptr, i32 %in seq_cst
> +  store i32 %0, i32 addrspace(1)* %out2
> +  ret void
> +}
> -- 
> 2.1.0
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits