Skip to content

Commit c93e001

Browse files
shiltianshiltian
committed
[FIX][AMDGPU] Fix test case failures that caused by reapply of #112403 
1 parent d413335 commit c93e001

File tree

5 files changed

+21
-22
lines changed

5 files changed

+21
-22
lines changed

‎llvm/test/CodeGen/AMDGPU/GlobalISel/extractelement.ll‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3039,7 +3039,7 @@ define amdgpu_kernel void @dyn_extract_v5f64_s_s(ptr addrspace(1) %out, i32 %sel
30393039
; GPRIDX-NEXT: enable_exception = 0
30403040
; GPRIDX-NEXT: enable_sgpr_private_segment_buffer = 1
30413041
; GPRIDX-NEXT: enable_sgpr_dispatch_ptr = 1
3042-
; GPRIDX-NEXT: enable_sgpr_queue_ptr = 0
3042+
; GPRIDX-NEXT: enable_sgpr_queue_ptr = 1
30433043
; GPRIDX-NEXT: enable_sgpr_kernarg_segment_ptr = 1
30443044
; GPRIDX-NEXT: enable_sgpr_dispatch_id = 1
30453045
; GPRIDX-NEXT: enable_sgpr_flat_scratch_init = 0
@@ -3130,7 +3130,7 @@ define amdgpu_kernel void @dyn_extract_v5f64_s_s(ptr addrspace(1) %out, i32 %sel
31303130
; MOVREL-NEXT: enable_exception = 0
31313131
; MOVREL-NEXT: enable_sgpr_private_segment_buffer = 1
31323132
; MOVREL-NEXT: enable_sgpr_dispatch_ptr = 1
3133-
; MOVREL-NEXT: enable_sgpr_queue_ptr = 0
3133+
; MOVREL-NEXT: enable_sgpr_queue_ptr = 1
31343134
; MOVREL-NEXT: enable_sgpr_kernarg_segment_ptr = 1
31353135
; MOVREL-NEXT: enable_sgpr_dispatch_id = 1
31363136
; MOVREL-NEXT: enable_sgpr_flat_scratch_init = 0
@@ -3222,7 +3222,7 @@ define amdgpu_kernel void @dyn_extract_v5f64_s_s(ptr addrspace(1) %out, i32 %sel
32223222
; GFX10-NEXT: enable_exception = 0
32233223
; GFX10-NEXT: enable_sgpr_private_segment_buffer = 1
32243224
; GFX10-NEXT: enable_sgpr_dispatch_ptr = 1
3225-
; GFX10-NEXT: enable_sgpr_queue_ptr = 0
3225+
; GFX10-NEXT: enable_sgpr_queue_ptr = 1
32263226
; GFX10-NEXT: enable_sgpr_kernarg_segment_ptr = 1
32273227
; GFX10-NEXT: enable_sgpr_dispatch_id = 1
32283228
; GFX10-NEXT: enable_sgpr_flat_scratch_init = 0
@@ -3314,7 +3314,7 @@ define amdgpu_kernel void @dyn_extract_v5f64_s_s(ptr addrspace(1) %out, i32 %sel
33143314
; GFX11-NEXT: enable_exception = 0
33153315
; GFX11-NEXT: enable_sgpr_private_segment_buffer = 0
33163316
; GFX11-NEXT: enable_sgpr_dispatch_ptr = 1
3317-
; GFX11-NEXT: enable_sgpr_queue_ptr = 0
3317+
; GFX11-NEXT: enable_sgpr_queue_ptr = 1
33183318
; GFX11-NEXT: enable_sgpr_kernarg_segment_ptr = 1
33193319
; GFX11-NEXT: enable_sgpr_dispatch_id = 1
33203320
; GFX11-NEXT: enable_sgpr_flat_scratch_init = 0
@@ -4054,7 +4054,7 @@ define amdgpu_kernel void @dyn_extract_v4f32_s_s_s(ptr addrspace(1) %out, i32 %s
40544054
; GPRIDX-NEXT: enable_exception = 0
40554055
; GPRIDX-NEXT: enable_sgpr_private_segment_buffer = 1
40564056
; GPRIDX-NEXT: enable_sgpr_dispatch_ptr = 1
4057-
; GPRIDX-NEXT: enable_sgpr_queue_ptr = 0
4057+
; GPRIDX-NEXT: enable_sgpr_queue_ptr = 1
40584058
; GPRIDX-NEXT: enable_sgpr_kernarg_segment_ptr = 1
40594059
; GPRIDX-NEXT: enable_sgpr_dispatch_id = 1
40604060
; GPRIDX-NEXT: enable_sgpr_flat_scratch_init = 0
@@ -4138,7 +4138,7 @@ define amdgpu_kernel void @dyn_extract_v4f32_s_s_s(ptr addrspace(1) %out, i32 %s
41384138
; MOVREL-NEXT: enable_exception = 0
41394139
; MOVREL-NEXT: enable_sgpr_private_segment_buffer = 1
41404140
; MOVREL-NEXT: enable_sgpr_dispatch_ptr = 1
4141-
; MOVREL-NEXT: enable_sgpr_queue_ptr = 0
4141+
; MOVREL-NEXT: enable_sgpr_queue_ptr = 1
41424142
; MOVREL-NEXT: enable_sgpr_kernarg_segment_ptr = 1
41434143
; MOVREL-NEXT: enable_sgpr_dispatch_id = 1
41444144
; MOVREL-NEXT: enable_sgpr_flat_scratch_init = 0
@@ -4223,7 +4223,7 @@ define amdgpu_kernel void @dyn_extract_v4f32_s_s_s(ptr addrspace(1) %out, i32 %s
42234223
; GFX10-NEXT: enable_exception = 0
42244224
; GFX10-NEXT: enable_sgpr_private_segment_buffer = 1
42254225
; GFX10-NEXT: enable_sgpr_dispatch_ptr = 1
4226-
; GFX10-NEXT: enable_sgpr_queue_ptr = 0
4226+
; GFX10-NEXT: enable_sgpr_queue_ptr = 1
42274227
; GFX10-NEXT: enable_sgpr_kernarg_segment_ptr = 1
42284228
; GFX10-NEXT: enable_sgpr_dispatch_id = 1
42294229
; GFX10-NEXT: enable_sgpr_flat_scratch_init = 0
@@ -4308,7 +4308,7 @@ define amdgpu_kernel void @dyn_extract_v4f32_s_s_s(ptr addrspace(1) %out, i32 %s
43084308
; GFX11-NEXT: enable_exception = 0
43094309
; GFX11-NEXT: enable_sgpr_private_segment_buffer = 0
43104310
; GFX11-NEXT: enable_sgpr_dispatch_ptr = 1
4311-
; GFX11-NEXT: enable_sgpr_queue_ptr = 0
4311+
; GFX11-NEXT: enable_sgpr_queue_ptr = 1
43124312
; GFX11-NEXT: enable_sgpr_kernarg_segment_ptr = 1
43134313
; GFX11-NEXT: enable_sgpr_dispatch_id = 1
43144314
; GFX11-NEXT: enable_sgpr_flat_scratch_init = 0
@@ -4399,7 +4399,7 @@ define amdgpu_kernel void @dyn_extract_v4f64_s_s_s(ptr addrspace(1) %out, i32 %s
43994399
; GPRIDX-NEXT: enable_exception = 0
44004400
; GPRIDX-NEXT: enable_sgpr_private_segment_buffer = 1
44014401
; GPRIDX-NEXT: enable_sgpr_dispatch_ptr = 1
4402-
; GPRIDX-NEXT: enable_sgpr_queue_ptr = 0
4402+
; GPRIDX-NEXT: enable_sgpr_queue_ptr = 1
44034403
; GPRIDX-NEXT: enable_sgpr_kernarg_segment_ptr = 1
44044404
; GPRIDX-NEXT: enable_sgpr_dispatch_id = 1
44054405
; GPRIDX-NEXT: enable_sgpr_flat_scratch_init = 0
@@ -4486,7 +4486,7 @@ define amdgpu_kernel void @dyn_extract_v4f64_s_s_s(ptr addrspace(1) %out, i32 %s
44864486
; MOVREL-NEXT: enable_exception = 0
44874487
; MOVREL-NEXT: enable_sgpr_private_segment_buffer = 1
44884488
; MOVREL-NEXT: enable_sgpr_dispatch_ptr = 1
4489-
; MOVREL-NEXT: enable_sgpr_queue_ptr = 0
4489+
; MOVREL-NEXT: enable_sgpr_queue_ptr = 1
44904490
; MOVREL-NEXT: enable_sgpr_kernarg_segment_ptr = 1
44914491
; MOVREL-NEXT: enable_sgpr_dispatch_id = 1
44924492
; MOVREL-NEXT: enable_sgpr_flat_scratch_init = 0
@@ -4574,7 +4574,7 @@ define amdgpu_kernel void @dyn_extract_v4f64_s_s_s(ptr addrspace(1) %out, i32 %s
45744574
; GFX10-NEXT: enable_exception = 0
45754575
; GFX10-NEXT: enable_sgpr_private_segment_buffer = 1
45764576
; GFX10-NEXT: enable_sgpr_dispatch_ptr = 1
4577-
; GFX10-NEXT: enable_sgpr_queue_ptr = 0
4577+
; GFX10-NEXT: enable_sgpr_queue_ptr = 1
45784578
; GFX10-NEXT: enable_sgpr_kernarg_segment_ptr = 1
45794579
; GFX10-NEXT: enable_sgpr_dispatch_id = 1
45804580
; GFX10-NEXT: enable_sgpr_flat_scratch_init = 0
@@ -4662,7 +4662,7 @@ define amdgpu_kernel void @dyn_extract_v4f64_s_s_s(ptr addrspace(1) %out, i32 %s
46624662
; GFX11-NEXT: enable_exception = 0
46634663
; GFX11-NEXT: enable_sgpr_private_segment_buffer = 0
46644664
; GFX11-NEXT: enable_sgpr_dispatch_ptr = 1
4665-
; GFX11-NEXT: enable_sgpr_queue_ptr = 0
4665+
; GFX11-NEXT: enable_sgpr_queue_ptr = 1
46664666
; GFX11-NEXT: enable_sgpr_kernarg_segment_ptr = 1
46674667
; GFX11-NEXT: enable_sgpr_dispatch_id = 1
46684668
; GFX11-NEXT: enable_sgpr_flat_scratch_init = 0

‎llvm/test/CodeGen/AMDGPU/amdhsa-kernarg-preload-num-sgprs.ll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
; OBJDUMP-NEXT: 0010 00000000 00000000 00000000 00000000 ................
77
; OBJDUMP-NEXT: 0020 00000000 00000000 00000000 00000000 ................
88
; OBJDUMP-NOT: 0030 0000af00 94130000 1a000400 00000000 ................
9-
; OBJDUMP-NEXT: 0030 8000af00 98130000 1a000400 00000000 ................
9+
; OBJDUMP-NEXT: 0030 8000af00 98130000 1e000400 00000000 ................
1010

1111
; ASM-LABEL: amdhsa_kernarg_preload_4_implicit_6:
1212
; ASM: .amdhsa_user_sgpr_count 12

‎llvm/test/CodeGen/AMDGPU/attributor-noopt.ll‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; RUN: sed 's/CODE_OBJECT_VERSION/500/g' %s | opt -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -O2 | llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 | FileCheck -check-prefix=OPT %s
2-
; RUN: sed 's/CODE_OBJECT_VERSION/400/g' %s | opt -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -O0 | llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 | FileCheck -check-prefixes=NOOPT,COV4 %s
3-
; RUN: sed 's/CODE_OBJECT_VERSION/500/g' %s | opt -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -O0 | llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 | FileCheck -check-prefixes=NOOPT,COV5 %s
2+
; RUN: sed 's/CODE_OBJECT_VERSION/400/g' %s | opt -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -O0 | llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 | FileCheck -check-prefix=NOOPT %s
3+
; RUN: sed 's/CODE_OBJECT_VERSION/500/g' %s | opt -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -O0 | llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 | FileCheck -check-prefix=NOOPT %s
44

55
; Check that AMDGPUAttributor is not run with -O0.
66
; OPT: .amdhsa_user_sgpr_private_segment_buffer 1
@@ -19,8 +19,7 @@
1919

2020
; NOOPT: .amdhsa_user_sgpr_private_segment_buffer 1
2121
; NOOPT: .amdhsa_user_sgpr_dispatch_ptr 1
22-
; COV4: .amdhsa_user_sgpr_queue_ptr 1
23-
; COV5: .amdhsa_user_sgpr_queue_ptr 0
22+
; NOOPT: .amdhsa_user_sgpr_queue_ptr 1
2423
; NOOPT: .amdhsa_user_sgpr_kernarg_segment_ptr 1
2524
; NOOPT: .amdhsa_user_sgpr_dispatch_id 1
2625
; NOOPT: .amdhsa_user_sgpr_flat_scratch_init 0

‎llvm/test/CodeGen/AMDGPU/callee-special-input-sgprs-fixed-abi.ll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ define hidden void @use_queue_ptr() #1 {
3131

3232
; GCN-LABEL: {{^}}kern_indirect_use_queue_ptr:
3333
; GCN: s_swappc_b64 s[30:31], s[10:11]
34-
; GCN: .amdhsa_user_sgpr_queue_ptr 0
34+
; GCN: .amdhsa_user_sgpr_queue_ptr 1
3535
define amdgpu_kernel void @kern_indirect_use_queue_ptr(i32) #1 {
3636
call void @use_queue_ptr()
3737
ret void
@@ -470,7 +470,7 @@ define hidden void @use_every_sgpr_input() #1 {
470470

471471
; GCN: .amdhsa_user_sgpr_private_segment_buffer 1
472472
; GCN: .amdhsa_user_sgpr_dispatch_ptr 1
473-
; GCN: .amdhsa_user_sgpr_queue_ptr 0
473+
; GCN: .amdhsa_user_sgpr_queue_ptr 1
474474
; GCN: .amdhsa_user_sgpr_kernarg_segment_ptr 1
475475
; GCN: .amdhsa_user_sgpr_dispatch_id 1
476476
; GCN: .amdhsa_user_sgpr_flat_scratch_init 1
@@ -495,7 +495,7 @@ define amdgpu_kernel void @kern_indirect_use_every_sgpr_input(i8) #1 {
495495

496496
; GCN: .amdhsa_user_sgpr_private_segment_buffer 1
497497
; GCN: .amdhsa_user_sgpr_dispatch_ptr 1
498-
; GCN: .amdhsa_user_sgpr_queue_ptr 0
498+
; GCN: .amdhsa_user_sgpr_queue_ptr 1
499499
; GCN: .amdhsa_user_sgpr_kernarg_segment_ptr 0
500500
; GCN: .amdhsa_user_sgpr_dispatch_id 1
501501
; GCN: .amdhsa_user_sgpr_flat_scratch_init 1

‎llvm/test/CodeGen/AMDGPU/gfx11-user-sgpr-init16-bug.ll‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ define amdgpu_kernel void @minimal_kernel_inputs_with_stack() #0 {
9393
; WORKAROUND: .amdhsa_user_sgpr_count 15
9494
; NOWORKAROUND: .amdhsa_user_sgpr_count 4
9595
; GCN-NEXT: .amdhsa_user_sgpr_dispatch_ptr 0
96-
; GCN-NEXT: .amdhsa_user_sgpr_queue_ptr 0
96+
; GCN-NEXT: .amdhsa_user_sgpr_queue_ptr 1
9797
; GCN-NEXT: .amdhsa_user_sgpr_kernarg_segment_ptr 1
9898
; GCN-NEXT: .amdhsa_user_sgpr_dispatch_id 0
9999
; GCN-NEXT: .amdhsa_user_sgpr_private_segment_size 0
@@ -140,7 +140,7 @@ define amdgpu_kernel void @queue_ptr() #1 {
140140
; WORKAROUND: .amdhsa_user_sgpr_count 13
141141
; NOWORKAROUND: .amdhsa_user_sgpr_count 8
142142
; GCN-NEXT: .amdhsa_user_sgpr_dispatch_ptr 1
143-
; GCN-NEXT: .amdhsa_user_sgpr_queue_ptr 0
143+
; GCN-NEXT: .amdhsa_user_sgpr_queue_ptr 1
144144
; GCN-NEXT: .amdhsa_user_sgpr_kernarg_segment_ptr 1
145145
; GCN-NEXT: .amdhsa_user_sgpr_dispatch_id 1
146146
; GCN-NEXT: .amdhsa_user_sgpr_private_segment_size 0

0 commit comments

Comments
 (0)