Skip to content

Commit 0eb719f

Browse files
OutOfCacheOutOfCache
authored
[AMDGPU] Fix build failure in raw.atomic.buffer.load tests (llvm#99912)
This fixes the failing tests after rebasing over the attributor move.
1 parent 9374216 commit 0eb719f

File tree

2 files changed

+40
-22
lines changed

2 files changed

+40
-22
lines changed

‎llvm/test/CodeGen/AMDGPU/llvm.amdgcn.raw.atomic.buffer.load.ll

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
define amdgpu_kernel void @raw_atomic_buffer_load_i32(<4 x i32> %addr) {
66
; CHECK-LABEL: raw_atomic_buffer_load_i32:
77
; CHECK: ; %bb.0: ; %bb
8-
; CHECK-NEXT: s_load_b128 s[0:3], s[0:1], 0x24
8+
; CHECK-NEXT: s_load_b128 s[0:3], s[2:3], 0x24
9+
; CHECK-NEXT: v_and_b32_e32 v0, 0x3ff, v0
910
; CHECK-NEXT: s_mov_b32 s4, 0
1011
; CHECK-NEXT: .LBB0_1: ; %bb1
1112
; CHECK-NEXT: ; =>This Inner Loop Header: Depth=1
@@ -33,7 +34,8 @@ bb2:
3334
define amdgpu_kernel void @raw_atomic_buffer_load_i32_off(<4 x i32> %addr) {
3435
; CHECK-LABEL: raw_atomic_buffer_load_i32_off:
3536
; CHECK: ; %bb.0: ; %bb
36-
; CHECK-NEXT: s_load_b128 s[0:3], s[0:1], 0x24
37+
; CHECK-NEXT: s_load_b128 s[0:3], s[2:3], 0x24
38+
; CHECK-NEXT: v_and_b32_e32 v0, 0x3ff, v0
3739
; CHECK-NEXT: s_mov_b32 s4, 0
3840
; CHECK-NEXT: .LBB1_1: ; %bb1
3941
; CHECK-NEXT: ; =>This Inner Loop Header: Depth=1
@@ -60,7 +62,8 @@ bb2:
6062
define amdgpu_kernel void @raw_atomic_buffer_load_i32_soff(<4 x i32> %addr) {
6163
; CHECK-LABEL: raw_atomic_buffer_load_i32_soff:
6264
; CHECK: ; %bb.0: ; %bb
63-
; CHECK-NEXT: s_load_b128 s[0:3], s[0:1], 0x24
65+
; CHECK-NEXT: s_load_b128 s[0:3], s[2:3], 0x24
66+
; CHECK-NEXT: v_and_b32_e32 v0, 0x3ff, v0
6467
; CHECK-NEXT: s_mov_b32 s4, 0
6568
; CHECK-NEXT: .LBB2_1: ; %bb1
6669
; CHECK-NEXT: ; =>This Inner Loop Header: Depth=1
@@ -87,7 +90,8 @@ bb2:
8790
define amdgpu_kernel void @raw_atomic_buffer_load_i32_dlc(<4 x i32> %addr) {
8891
; CHECK-LABEL: raw_atomic_buffer_load_i32_dlc:
8992
; CHECK: ; %bb.0: ; %bb
90-
; CHECK-NEXT: s_load_b128 s[0:3], s[0:1], 0x24
93+
; CHECK-NEXT: s_load_b128 s[0:3], s[2:3], 0x24
94+
; CHECK-NEXT: v_and_b32_e32 v0, 0x3ff, v0
9195
; CHECK-NEXT: s_mov_b32 s4, 0
9296
; CHECK-NEXT: .LBB3_1: ; %bb1
9397
; CHECK-NEXT: ; =>This Inner Loop Header: Depth=1
@@ -115,7 +119,8 @@ bb2:
115119
define amdgpu_kernel void @raw_nonatomic_buffer_load_i32(<4 x i32> %addr) {
116120
; CHECK-LABEL: raw_nonatomic_buffer_load_i32:
117121
; CHECK: ; %bb.0: ; %bb
118-
; CHECK-NEXT: s_load_b128 s[0:3], s[0:1], 0x24
122+
; CHECK-NEXT: s_load_b128 s[0:3], s[2:3], 0x24
123+
; CHECK-NEXT: v_and_b32_e32 v0, 0x3ff, v0
119124
; CHECK-NEXT: s_waitcnt lgkmcnt(0)
120125
; CHECK-NEXT: buffer_load_b32 v1, off, s[0:3], 0 offset:4 glc
121126
; CHECK-NEXT: s_mov_b32 s0, 0
@@ -144,8 +149,8 @@ bb2:
144149
define amdgpu_kernel void @raw_atomic_buffer_load_i64(<4 x i32> %addr) {
145150
; CHECK-LABEL: raw_atomic_buffer_load_i64:
146151
; CHECK: ; %bb.0: ; %bb
147-
; CHECK-NEXT: s_load_b128 s[0:3], s[0:1], 0x24
148-
; CHECK-NEXT: v_mov_b32_e32 v1, 0
152+
; CHECK-NEXT: s_load_b128 s[0:3], s[2:3], 0x24
153+
; CHECK-NEXT: v_dual_mov_b32 v1, 0 :: v_dual_and_b32 v0, 0x3ff, v0
149154
; CHECK-NEXT: s_mov_b32 s4, 0
150155
; CHECK-NEXT: .LBB5_1: ; %bb1
151156
; CHECK-NEXT: ; =>This Inner Loop Header: Depth=1
@@ -174,7 +179,8 @@ bb2:
174179
define amdgpu_kernel void @raw_atomic_buffer_load_v2i16(<4 x i32> %addr) {
175180
; CHECK-LABEL: raw_atomic_buffer_load_v2i16:
176181
; CHECK: ; %bb.0: ; %bb
177-
; CHECK-NEXT: s_load_b128 s[0:3], s[0:1], 0x24
182+
; CHECK-NEXT: s_load_b128 s[0:3], s[2:3], 0x24
183+
; CHECK-NEXT: v_and_b32_e32 v0, 0x3ff, v0
178184
; CHECK-NEXT: s_mov_b32 s4, 0
179185
; CHECK-NEXT: .LBB6_1: ; %bb1
180186
; CHECK-NEXT: ; =>This Inner Loop Header: Depth=1
@@ -203,7 +209,8 @@ bb2:
203209
define amdgpu_kernel void @raw_atomic_buffer_load_v4i16(<4 x i32> %addr) {
204210
; CHECK-LABEL: raw_atomic_buffer_load_v4i16:
205211
; CHECK: ; %bb.0: ; %bb
206-
; CHECK-NEXT: s_load_b128 s[0:3], s[0:1], 0x24
212+
; CHECK-NEXT: s_load_b128 s[0:3], s[2:3], 0x24
213+
; CHECK-NEXT: v_and_b32_e32 v0, 0x3ff, v0
207214
; CHECK-NEXT: s_mov_b32 s4, 0
208215
; CHECK-NEXT: .LBB7_1: ; %bb1
209216
; CHECK-NEXT: ; =>This Inner Loop Header: Depth=1
@@ -236,7 +243,8 @@ bb2:
236243
define amdgpu_kernel void @raw_atomic_buffer_load_v4i32(<4 x i32> %addr) {
237244
; CHECK-LABEL: raw_atomic_buffer_load_v4i32:
238245
; CHECK: ; %bb.0: ; %bb
239-
; CHECK-NEXT: s_load_b128 s[0:3], s[0:1], 0x24
246+
; CHECK-NEXT: s_load_b128 s[0:3], s[2:3], 0x24
247+
; CHECK-NEXT: v_and_b32_e32 v0, 0x3ff, v0
240248
; CHECK-NEXT: s_mov_b32 s4, 0
241249
; CHECK-NEXT: .LBB8_1: ; %bb1
242250
; CHECK-NEXT: ; =>This Inner Loop Header: Depth=1
@@ -265,7 +273,8 @@ bb2:
265273
define amdgpu_kernel void @raw_atomic_buffer_load_ptr(<4 x i32> %addr) {
266274
; CHECK-LABEL: raw_atomic_buffer_load_ptr:
267275
; CHECK: ; %bb.0: ; %bb
268-
; CHECK-NEXT: s_load_b128 s[0:3], s[0:1], 0x24
276+
; CHECK-NEXT: s_load_b128 s[0:3], s[2:3], 0x24
277+
; CHECK-NEXT: v_and_b32_e32 v0, 0x3ff, v0
269278
; CHECK-NEXT: s_mov_b32 s4, 0
270279
; CHECK-NEXT: .LBB9_1: ; %bb1
271280
; CHECK-NEXT: ; =>This Inner Loop Header: Depth=1

‎llvm/test/CodeGen/AMDGPU/llvm.amdgcn.raw.ptr.atomic.buffer.load.ll

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
define amdgpu_kernel void @raw_ptr_atomic_buffer_ptr_load_i32(ptr addrspace(8) %ptr) {
66
; CHECK-LABEL: raw_ptr_atomic_buffer_ptr_load_i32:
77
; CHECK: ; %bb.0: ; %bb
8-
; CHECK-NEXT: s_load_b128 s[0:3], s[0:1], 0x24
8+
; CHECK-NEXT: s_load_b128 s[0:3], s[2:3], 0x24
9+
; CHECK-NEXT: v_and_b32_e32 v0, 0x3ff, v0
910
; CHECK-NEXT: s_mov_b32 s4, 0
1011
; CHECK-NEXT: .LBB0_1: ; %bb1
1112
; CHECK-NEXT: ; =>This Inner Loop Header: Depth=1
@@ -33,7 +34,8 @@ bb2:
3334
define amdgpu_kernel void @raw_ptr_atomic_buffer_load_i32_off(ptr addrspace(8) %ptr) {
3435
; CHECK-LABEL: raw_ptr_atomic_buffer_load_i32_off:
3536
; CHECK: ; %bb.0: ; %bb
36-
; CHECK-NEXT: s_load_b128 s[0:3], s[0:1], 0x24
37+
; CHECK-NEXT: s_load_b128 s[0:3], s[2:3], 0x24
38+
; CHECK-NEXT: v_and_b32_e32 v0, 0x3ff, v0
3739
; CHECK-NEXT: s_mov_b32 s4, 0
3840
; CHECK-NEXT: .LBB1_1: ; %bb1
3941
; CHECK-NEXT: ; =>This Inner Loop Header: Depth=1
@@ -60,7 +62,8 @@ bb2:
6062
define amdgpu_kernel void @raw_ptr_atomic_buffer_load_i32_soff(ptr addrspace(8) %ptr) {
6163
; CHECK-LABEL: raw_ptr_atomic_buffer_load_i32_soff:
6264
; CHECK: ; %bb.0: ; %bb
63-
; CHECK-NEXT: s_load_b128 s[0:3], s[0:1], 0x24
65+
; CHECK-NEXT: s_load_b128 s[0:3], s[2:3], 0x24
66+
; CHECK-NEXT: v_and_b32_e32 v0, 0x3ff, v0
6467
; CHECK-NEXT: s_mov_b32 s4, 0
6568
; CHECK-NEXT: .LBB2_1: ; %bb1
6669
; CHECK-NEXT: ; =>This Inner Loop Header: Depth=1
@@ -87,7 +90,8 @@ bb2:
8790
define amdgpu_kernel void @raw_ptr_atomic_buffer_load_i32_dlc(ptr addrspace(8) %ptr) {
8891
; CHECK-LABEL: raw_ptr_atomic_buffer_load_i32_dlc:
8992
; CHECK: ; %bb.0: ; %bb
90-
; CHECK-NEXT: s_load_b128 s[0:3], s[0:1], 0x24
93+
; CHECK-NEXT: s_load_b128 s[0:3], s[2:3], 0x24
94+
; CHECK-NEXT: v_and_b32_e32 v0, 0x3ff, v0
9195
; CHECK-NEXT: s_mov_b32 s4, 0
9296
; CHECK-NEXT: .LBB3_1: ; %bb1
9397
; CHECK-NEXT: ; =>This Inner Loop Header: Depth=1
@@ -115,7 +119,8 @@ bb2:
115119
define amdgpu_kernel void @raw_nonptr_atomic_buffer_load_i32(ptr addrspace(8) %ptr) {
116120
; CHECK-LABEL: raw_nonptr_atomic_buffer_load_i32:
117121
; CHECK: ; %bb.0: ; %bb
118-
; CHECK-NEXT: s_load_b128 s[0:3], s[0:1], 0x24
122+
; CHECK-NEXT: s_load_b128 s[0:3], s[2:3], 0x24
123+
; CHECK-NEXT: v_and_b32_e32 v0, 0x3ff, v0
119124
; CHECK-NEXT: s_waitcnt lgkmcnt(0)
120125
; CHECK-NEXT: buffer_load_b32 v1, off, s[0:3], 0 offset:4 glc
121126
; CHECK-NEXT: s_mov_b32 s0, 0
@@ -144,8 +149,8 @@ bb2:
144149
define amdgpu_kernel void @raw_ptr_atomic_buffer_load_i64(ptr addrspace(8) %ptr) {
145150
; CHECK-LABEL: raw_ptr_atomic_buffer_load_i64:
146151
; CHECK: ; %bb.0: ; %bb
147-
; CHECK-NEXT: s_load_b128 s[0:3], s[0:1], 0x24
148-
; CHECK-NEXT: v_mov_b32_e32 v1, 0
152+
; CHECK-NEXT: s_load_b128 s[0:3], s[2:3], 0x24
153+
; CHECK-NEXT: v_dual_mov_b32 v1, 0 :: v_dual_and_b32 v0, 0x3ff, v0
149154
; CHECK-NEXT: s_mov_b32 s4, 0
150155
; CHECK-NEXT: .LBB5_1: ; %bb1
151156
; CHECK-NEXT: ; =>This Inner Loop Header: Depth=1
@@ -174,7 +179,8 @@ bb2:
174179
define amdgpu_kernel void @raw_ptr_atomic_buffer_load_v2i16(ptr addrspace(8) %ptr) {
175180
; CHECK-LABEL: raw_ptr_atomic_buffer_load_v2i16:
176181
; CHECK: ; %bb.0: ; %bb
177-
; CHECK-NEXT: s_load_b128 s[0:3], s[0:1], 0x24
182+
; CHECK-NEXT: s_load_b128 s[0:3], s[2:3], 0x24
183+
; CHECK-NEXT: v_and_b32_e32 v0, 0x3ff, v0
178184
; CHECK-NEXT: s_mov_b32 s4, 0
179185
; CHECK-NEXT: .LBB6_1: ; %bb1
180186
; CHECK-NEXT: ; =>This Inner Loop Header: Depth=1
@@ -203,7 +209,8 @@ bb2:
203209
define amdgpu_kernel void @raw_ptr_atomic_buffer_load_v4i16(ptr addrspace(8) %ptr) {
204210
; CHECK-LABEL: raw_ptr_atomic_buffer_load_v4i16:
205211
; CHECK: ; %bb.0: ; %bb
206-
; CHECK-NEXT: s_load_b128 s[0:3], s[0:1], 0x24
212+
; CHECK-NEXT: s_load_b128 s[0:3], s[2:3], 0x24
213+
; CHECK-NEXT: v_and_b32_e32 v0, 0x3ff, v0
207214
; CHECK-NEXT: s_mov_b32 s4, 0
208215
; CHECK-NEXT: .LBB7_1: ; %bb1
209216
; CHECK-NEXT: ; =>This Inner Loop Header: Depth=1
@@ -236,7 +243,8 @@ bb2:
236243
define amdgpu_kernel void @raw_ptr_atomic_buffer_load_v4i32(ptr addrspace(8) %ptr) {
237244
; CHECK-LABEL: raw_ptr_atomic_buffer_load_v4i32:
238245
; CHECK: ; %bb.0: ; %bb
239-
; CHECK-NEXT: s_load_b128 s[0:3], s[0:1], 0x24
246+
; CHECK-NEXT: s_load_b128 s[0:3], s[2:3], 0x24
247+
; CHECK-NEXT: v_and_b32_e32 v0, 0x3ff, v0
240248
; CHECK-NEXT: s_mov_b32 s4, 0
241249
; CHECK-NEXT: .LBB8_1: ; %bb1
242250
; CHECK-NEXT: ; =>This Inner Loop Header: Depth=1
@@ -265,7 +273,8 @@ bb2:
265273
define amdgpu_kernel void @raw_ptr_atomic_buffer_load_ptr(ptr addrspace(8) %ptr) {
266274
; CHECK-LABEL: raw_ptr_atomic_buffer_load_ptr:
267275
; CHECK: ; %bb.0: ; %bb
268-
; CHECK-NEXT: s_load_b128 s[0:3], s[0:1], 0x24
276+
; CHECK-NEXT: s_load_b128 s[0:3], s[2:3], 0x24
277+
; CHECK-NEXT: v_and_b32_e32 v0, 0x3ff, v0
269278
; CHECK-NEXT: s_mov_b32 s4, 0
270279
; CHECK-NEXT: .LBB9_1: ; %bb1
271280
; CHECK-NEXT: ; =>This Inner Loop Header: Depth=1

0 commit comments

Comments
 (0)