Skip to content

Commit 91c22e3

Browse files
JanekvOJanekvO
committed
Feedback, rename amdgcn prefix to amdgpu
1 parent a079460 commit 91c22e3

File tree

6 files changed

+62
-62
lines changed

6 files changed

+62
-62
lines changed

‎llvm/lib/Target/AMDGPU/AMDGPUMCResourceInfo.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@ void MCResourceInfo::finalize(MCContext &OutContext) {
7878
}
7979

8080
MCSymbol *MCResourceInfo::getMaxVGPRSymbol(MCContext &OutContext) {
81-
return OutContext.getOrCreateSymbol("amdgcn.max_num_vgpr");
81+
return OutContext.getOrCreateSymbol("amdgpu.max_num_vgpr");
8282
}
8383

8484
MCSymbol *MCResourceInfo::getMaxAGPRSymbol(MCContext &OutContext) {
85-
return OutContext.getOrCreateSymbol("amdgcn.max_num_agpr");
85+
return OutContext.getOrCreateSymbol("amdgpu.max_num_agpr");
8686
}
8787

8888
MCSymbol *MCResourceInfo::getMaxSGPRSymbol(MCContext &OutContext) {
89-
return OutContext.getOrCreateSymbol("amdgcn.max_num_sgpr");
89+
return OutContext.getOrCreateSymbol("amdgpu.max_num_sgpr");
9090
}
9191

9292
void MCResourceInfo::assignResourceInfoExpr(

‎llvm/test/CodeGen/AMDGPU/agpr-register-count.ll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ declare void @undef_func()
156156
; GCN-LABEL: {{^}}kernel_call_undef_func:
157157
; GCN: .amdhsa_next_free_vgpr max(totalnumvgprs(kernel_call_undef_func.num_agpr, kernel_call_undef_func.num_vgpr), 1, 0)
158158
; GFX90A: .amdhsa_accum_offset ((((((alignto(max(1, kernel_call_undef_func.num_vgpr), 4))/4)-1)&(~65536))&63)+1)*4
159-
; GCN: .set kernel_call_undef_func.num_vgpr, max(32, amdgcn.max_num_vgpr)
160-
; GCN: .set kernel_call_undef_func.num_agpr, max(0, amdgcn.max_num_agpr)
159+
; GCN: .set kernel_call_undef_func.num_vgpr, max(32, amdgpu.max_num_vgpr)
160+
; GCN: .set kernel_call_undef_func.num_agpr, max(0, amdgpu.max_num_agpr)
161161
; GCN: NumVgprs: kernel_call_undef_func.num_vgpr
162162
; GCN: NumAgprs: kernel_call_undef_func.num_agpr
163163
; GCN: TotalNumVgprs: totalnumvgprs(kernel_call_undef_func.num_agpr, kernel_call_undef_func.num_vgpr)
@@ -174,8 +174,8 @@ bb:
174174
ret void
175175
}
176176

177-
; GCN: .set amdgcn.max_num_vgpr, 32
178-
; GCN-NEXT: .set amdgcn.max_num_agpr, 32
179-
; GCN-NEXT: .set amdgcn.max_num_sgpr, 34
177+
; GCN: .set amdgpu.max_num_vgpr, 32
178+
; GCN-NEXT: .set amdgpu.max_num_agpr, 32
179+
; GCN-NEXT: .set amdgpu.max_num_sgpr, 34
180180

181181
attributes #0 = { nounwind noinline "amdgpu-flat-work-group-size"="1,512" "amdgpu-no-workitem-id-x" "amdgpu-no-workitem-id-y" "amdgpu-no-workitem-id-z" }

‎llvm/test/CodeGen/AMDGPU/amdpal-metadata-agpr-register-count.ll‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ bb:
6060
declare void @undef_func()
6161

6262
; CHECK: .type kernel_call_undef_func
63-
; CHECK: .set kernel_call_undef_func.num_agpr, max(0, amdgcn.max_num_agpr)
63+
; CHECK: .set kernel_call_undef_func.num_agpr, max(0, amdgpu.max_num_agpr)
6464
; CHECK: NumAgprs: kernel_call_undef_func.num_agpr
65-
; CHECK: .set amdgcn.max_num_agpr, 32
65+
; CHECK: .set amdgpu.max_num_agpr, 32
6666
define amdgpu_kernel void @kernel_call_undef_func() #0 {
6767
bb:
6868
call void @undef_func()

‎llvm/test/CodeGen/AMDGPU/attr-amdgpu-flat-work-group-size-vgpr-limit.ll‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -547,17 +547,17 @@ define amdgpu_kernel void @f256() #256 {
547547
attributes #256 = { nounwind "amdgpu-flat-work-group-size"="256,256" }
548548

549549
; GCN-LABEL: {{^}}f512:
550-
; GFX9: .set f512.num_vgpr, max(128, amdgcn.max_num_vgpr)
551-
; GFX90A: .set f512.num_vgpr, max(128, amdgcn.max_num_vgpr)
552-
; GFX90A: .set f512.num_agpr, max(128, amdgcn.max_num_agpr)
553-
; GFX10WGP-WAVE32: .set f512.num_vgpr, max(256, amdgcn.max_num_vgpr)
554-
; GFX10WGP-WAVE64: .set f512.num_vgpr, max(256, amdgcn.max_num_vgpr)
555-
; GFX10CU-WAVE32: .set f512.num_vgpr, max(128, amdgcn.max_num_vgpr)
556-
; GFX10CU-WAVE64: .set f512.num_vgpr, max(128, amdgcn.max_num_vgpr)
557-
; GFX11WGP-WAVE32: .set f512.num_vgpr, max(256, amdgcn.max_num_vgpr)
558-
; GFX11WGP-WAVE64: .set f512.num_vgpr, max(256, amdgcn.max_num_vgpr)
559-
; GFX11CU-WAVE32: .set f512.num_vgpr, max(192, amdgcn.max_num_vgpr)
560-
; GFX11CU-WAVE64: .set f512.num_vgpr, max(192, amdgcn.max_num_vgpr)
550+
; GFX9: .set f512.num_vgpr, max(128, amdgpu.max_num_vgpr)
551+
; GFX90A: .set f512.num_vgpr, max(128, amdgpu.max_num_vgpr)
552+
; GFX90A: .set f512.num_agpr, max(128, amdgpu.max_num_agpr)
553+
; GFX10WGP-WAVE32: .set f512.num_vgpr, max(256, amdgpu.max_num_vgpr)
554+
; GFX10WGP-WAVE64: .set f512.num_vgpr, max(256, amdgpu.max_num_vgpr)
555+
; GFX10CU-WAVE32: .set f512.num_vgpr, max(128, amdgpu.max_num_vgpr)
556+
; GFX10CU-WAVE64: .set f512.num_vgpr, max(128, amdgpu.max_num_vgpr)
557+
; GFX11WGP-WAVE32: .set f512.num_vgpr, max(256, amdgpu.max_num_vgpr)
558+
; GFX11WGP-WAVE64: .set f512.num_vgpr, max(256, amdgpu.max_num_vgpr)
559+
; GFX11CU-WAVE32: .set f512.num_vgpr, max(192, amdgpu.max_num_vgpr)
560+
; GFX11CU-WAVE64: .set f512.num_vgpr, max(192, amdgpu.max_num_vgpr)
561561
; GCN: NumVgprs: f512.num_vgpr
562562
; GFX90A: NumAgprs: f512.num_agpr
563563
; GFX90A: TotalNumVgprs: totalnumvgprs(f512.num_agpr, f512.num_vgpr)
@@ -569,17 +569,17 @@ define amdgpu_kernel void @f512() #512 {
569569
attributes #512 = { nounwind "amdgpu-flat-work-group-size"="512,512" }
570570

571571
; GCN-LABEL: {{^}}f1024:
572-
; GFX9: .set f1024.num_vgpr, max(64, amdgcn.max_num_vgpr)
573-
; GFX90A: .set f1024.num_vgpr, max(64, amdgcn.max_num_vgpr)
574-
; GFX90A: .set f1024.num_agpr, max(64, amdgcn.max_num_agpr)
575-
; GFX10WGP-WAVE32: .set f1024.num_vgpr, max(128, amdgcn.max_num_vgpr)
576-
; GFX10WGP-WAVE64: .set f1024.num_vgpr, max(128, amdgcn.max_num_vgpr)
577-
; GFX10CU-WAVE32: .set f1024.num_vgpr, max(64, amdgcn.max_num_vgpr)
578-
; GFX10CU-WAVE64: .set f1024.num_vgpr, max(64, amdgcn.max_num_vgpr)
579-
; GFX11WGP-WAVE32: .set f1024.num_vgpr, max(192, amdgcn.max_num_vgpr)
580-
; GFX11WGP-WAVE64: .set f1024.num_vgpr, max(192, amdgcn.max_num_vgpr)
581-
; GFX11CU-WAVE32: .set f1024.num_vgpr, max(96, amdgcn.max_num_vgpr)
582-
; GFX11CU-WAVE64: .set f1024.num_vgpr, max(96, amdgcn.max_num_vgpr)
572+
; GFX9: .set f1024.num_vgpr, max(64, amdgpu.max_num_vgpr)
573+
; GFX90A: .set f1024.num_vgpr, max(64, amdgpu.max_num_vgpr)
574+
; GFX90A: .set f1024.num_agpr, max(64, amdgpu.max_num_agpr)
575+
; GFX10WGP-WAVE32: .set f1024.num_vgpr, max(128, amdgpu.max_num_vgpr)
576+
; GFX10WGP-WAVE64: .set f1024.num_vgpr, max(128, amdgpu.max_num_vgpr)
577+
; GFX10CU-WAVE32: .set f1024.num_vgpr, max(64, amdgpu.max_num_vgpr)
578+
; GFX10CU-WAVE64: .set f1024.num_vgpr, max(64, amdgpu.max_num_vgpr)
579+
; GFX11WGP-WAVE32: .set f1024.num_vgpr, max(192, amdgpu.max_num_vgpr)
580+
; GFX11WGP-WAVE64: .set f1024.num_vgpr, max(192, amdgpu.max_num_vgpr)
581+
; GFX11CU-WAVE32: .set f1024.num_vgpr, max(96, amdgpu.max_num_vgpr)
582+
; GFX11CU-WAVE64: .set f1024.num_vgpr, max(96, amdgpu.max_num_vgpr)
583583
; GCN: NumVgprs: f1024.num_vgpr
584584
; GFX90A: NumAgprs: f1024.num_agpr
585585
; GFX90A: TotalNumVgprs: totalnumvgprs(f1024.num_agpr, f1024.num_vgpr)

‎llvm/test/CodeGen/AMDGPU/call-graph-register-usage.ll‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,8 @@ define amdgpu_kernel void @usage_direct_recursion(i32 %n) #0 {
234234
; Make sure there's no assert when a sgpr96 is used.
235235
; GCN-LABEL: {{^}}count_use_sgpr96_external_call
236236
; GCN: ; sgpr96 s[{{[0-9]+}}:{{[0-9]+}}]
237-
; GCN: .set count_use_sgpr96_external_call.num_vgpr, max(0, amdgcn.max_num_vgpr)
238-
; GCN: .set count_use_sgpr96_external_call.numbered_sgpr, max(33, amdgcn.max_num_sgpr)
237+
; GCN: .set count_use_sgpr96_external_call.num_vgpr, max(0, amdgpu.max_num_vgpr)
238+
; GCN: .set count_use_sgpr96_external_call.numbered_sgpr, max(33, amdgpu.max_num_sgpr)
239239
; CI: TotalNumSgprs: count_use_sgpr96_external_call.numbered_sgpr+4
240240
; VI-BUG: TotalNumSgprs: 96
241241
; GCN: NumVgprs: count_use_sgpr96_external_call.num_vgpr
@@ -249,8 +249,8 @@ entry:
249249
; Make sure there's no assert when a sgpr160 is used.
250250
; GCN-LABEL: {{^}}count_use_sgpr160_external_call
251251
; GCN: ; sgpr160 s[{{[0-9]+}}:{{[0-9]+}}]
252-
; GCN: .set count_use_sgpr160_external_call.num_vgpr, max(0, amdgcn.max_num_vgpr)
253-
; GCN: .set count_use_sgpr160_external_call.numbered_sgpr, max(33, amdgcn.max_num_sgpr)
252+
; GCN: .set count_use_sgpr160_external_call.num_vgpr, max(0, amdgpu.max_num_vgpr)
253+
; GCN: .set count_use_sgpr160_external_call.numbered_sgpr, max(33, amdgpu.max_num_sgpr)
254254
; CI: TotalNumSgprs: count_use_sgpr160_external_call.numbered_sgpr+4
255255
; VI-BUG: TotalNumSgprs: 96
256256
; GCN: NumVgprs: count_use_sgpr160_external_call.num_vgpr
@@ -264,8 +264,8 @@ entry:
264264
; Make sure there's no assert when a vgpr160 is used.
265265
; GCN-LABEL: {{^}}count_use_vgpr160_external_call
266266
; GCN: ; vgpr160 v[{{[0-9]+}}:{{[0-9]+}}]
267-
; GCN: .set count_use_vgpr160_external_call.num_vgpr, max(5, amdgcn.max_num_vgpr)
268-
; GCN: .set count_use_vgpr160_external_call.numbered_sgpr, max(33, amdgcn.max_num_sgpr)
267+
; GCN: .set count_use_vgpr160_external_call.num_vgpr, max(5, amdgpu.max_num_vgpr)
268+
; GCN: .set count_use_vgpr160_external_call.numbered_sgpr, max(33, amdgpu.max_num_sgpr)
269269
; CI: TotalNumSgprs: count_use_vgpr160_external_call.numbered_sgpr+4
270270
; VI-BUG: TotalNumSgprs: 96
271271
; GCN: NumVgprs: count_use_vgpr160_external_call.num_vgpr
@@ -276,9 +276,9 @@ entry:
276276
ret void
277277
}
278278

279-
; GCN: .set amdgcn.max_num_vgpr, 50
280-
; GCN: .set amdgcn.max_num_agpr, 0
281-
; GCN: .set amdgcn.max_num_sgpr, 80
279+
; GCN: .set amdgpu.max_num_vgpr, 50
280+
; GCN: .set amdgpu.max_num_agpr, 0
281+
; GCN: .set amdgpu.max_num_sgpr, 80
282282

283283
; GCN-LABEL: amdhsa.kernels:
284284
; GCN: .name: count_use_sgpr96_external_call

‎llvm/test/CodeGen/AMDGPU/function-resource-usage.ll‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -355,9 +355,9 @@ define amdgpu_kernel void @multi_call_use_use_stack() #0 {
355355
declare void @external() #0
356356

357357
; GCN-LABEL: {{^}}multi_call_with_external:
358-
; GCN: .set multi_call_with_external.num_vgpr, max(41, amdgcn.max_num_vgpr)
359-
; GCN: .set multi_call_with_external.num_agpr, max(0, amdgcn.max_num_agpr)
360-
; GCN: .set multi_call_with_external.numbered_sgpr, max(42, amdgcn.max_num_sgpr)
358+
; GCN: .set multi_call_with_external.num_vgpr, max(41, amdgpu.max_num_vgpr)
359+
; GCN: .set multi_call_with_external.num_agpr, max(0, amdgpu.max_num_agpr)
360+
; GCN: .set multi_call_with_external.numbered_sgpr, max(42, amdgpu.max_num_sgpr)
361361
; GCN: .set multi_call_with_external.private_seg_size, 0
362362
; GCN: .set multi_call_with_external.uses_vcc, 1
363363
; GCN: .set multi_call_with_external.uses_flat_scratch, 1
@@ -375,9 +375,9 @@ define amdgpu_kernel void @multi_call_with_external() #0 {
375375
}
376376

377377
; GCN-LABEL: {{^}}usage_external:
378-
; GCN: .set usage_external.num_vgpr, max(32, amdgcn.max_num_vgpr)
379-
; GCN: .set usage_external.num_agpr, max(0, amdgcn.max_num_agpr)
380-
; GCN: .set usage_external.numbered_sgpr, max(33, amdgcn.max_num_sgpr)
378+
; GCN: .set usage_external.num_vgpr, max(32, amdgpu.max_num_vgpr)
379+
; GCN: .set usage_external.num_agpr, max(0, amdgpu.max_num_agpr)
380+
; GCN: .set usage_external.numbered_sgpr, max(33, amdgpu.max_num_sgpr)
381381
; GCN: .set usage_external.private_seg_size, 0
382382
; GCN: .set usage_external.uses_vcc, 1
383383
; GCN: .set usage_external.uses_flat_scratch, 1
@@ -395,9 +395,9 @@ define amdgpu_kernel void @usage_external() #0 {
395395
declare void @external_recurse() #2
396396

397397
; GCN-LABEL: {{^}}usage_external_recurse:
398-
; GCN: .set usage_external_recurse.num_vgpr, max(32, amdgcn.max_num_vgpr)
399-
; GCN: .set usage_external_recurse.num_agpr, max(0, amdgcn.max_num_agpr)
400-
; GCN: .set usage_external_recurse.numbered_sgpr, max(33, amdgcn.max_num_sgpr)
398+
; GCN: .set usage_external_recurse.num_vgpr, max(32, amdgpu.max_num_vgpr)
399+
; GCN: .set usage_external_recurse.num_agpr, max(0, amdgpu.max_num_agpr)
400+
; GCN: .set usage_external_recurse.numbered_sgpr, max(33, amdgpu.max_num_sgpr)
401401
; GCN: .set usage_external_recurse.private_seg_size, 0
402402
; GCN: .set usage_external_recurse.uses_vcc, 1
403403
; GCN: .set usage_external_recurse.uses_flat_scratch, 1
@@ -460,9 +460,9 @@ define amdgpu_kernel void @usage_direct_recursion(i32 %n) #0 {
460460

461461
; Make sure there's no assert when a sgpr96 is used.
462462
; GCN-LABEL: {{^}}count_use_sgpr96_external_call
463-
; GCN: .set count_use_sgpr96_external_call.num_vgpr, max(32, amdgcn.max_num_vgpr)
464-
; GCN: .set count_use_sgpr96_external_call.num_agpr, max(0, amdgcn.max_num_agpr)
465-
; GCN: .set count_use_sgpr96_external_call.numbered_sgpr, max(33, amdgcn.max_num_sgpr)
463+
; GCN: .set count_use_sgpr96_external_call.num_vgpr, max(32, amdgpu.max_num_vgpr)
464+
; GCN: .set count_use_sgpr96_external_call.num_agpr, max(0, amdgpu.max_num_agpr)
465+
; GCN: .set count_use_sgpr96_external_call.numbered_sgpr, max(33, amdgpu.max_num_sgpr)
466466
; GCN: .set count_use_sgpr96_external_call.private_seg_size, 0
467467
; GCN: .set count_use_sgpr96_external_call.uses_vcc, 1
468468
; GCN: .set count_use_sgpr96_external_call.uses_flat_scratch, 1
@@ -481,9 +481,9 @@ entry:
481481

482482
; Make sure there's no assert when a sgpr160 is used.
483483
; GCN-LABEL: {{^}}count_use_sgpr160_external_call
484-
; GCN: .set count_use_sgpr160_external_call.num_vgpr, max(32, amdgcn.max_num_vgpr)
485-
; GCN: .set count_use_sgpr160_external_call.num_agpr, max(0, amdgcn.max_num_agpr)
486-
; GCN: .set count_use_sgpr160_external_call.numbered_sgpr, max(33, amdgcn.max_num_sgpr)
484+
; GCN: .set count_use_sgpr160_external_call.num_vgpr, max(32, amdgpu.max_num_vgpr)
485+
; GCN: .set count_use_sgpr160_external_call.num_agpr, max(0, amdgpu.max_num_agpr)
486+
; GCN: .set count_use_sgpr160_external_call.numbered_sgpr, max(33, amdgpu.max_num_sgpr)
487487
; GCN: .set count_use_sgpr160_external_call.private_seg_size, 0
488488
; GCN: .set count_use_sgpr160_external_call.uses_vcc, 1
489489
; GCN: .set count_use_sgpr160_external_call.uses_flat_scratch, 1
@@ -502,9 +502,9 @@ entry:
502502

503503
; Make sure there's no assert when a vgpr160 is used.
504504
; GCN-LABEL: {{^}}count_use_vgpr160_external_call
505-
; GCN: .set count_use_vgpr160_external_call.num_vgpr, max(32, amdgcn.max_num_vgpr)
506-
; GCN: .set count_use_vgpr160_external_call.num_agpr, max(0, amdgcn.max_num_agpr)
507-
; GCN: .set count_use_vgpr160_external_call.numbered_sgpr, max(33, amdgcn.max_num_sgpr)
505+
; GCN: .set count_use_vgpr160_external_call.num_vgpr, max(32, amdgpu.max_num_vgpr)
506+
; GCN: .set count_use_vgpr160_external_call.num_agpr, max(0, amdgpu.max_num_agpr)
507+
; GCN: .set count_use_vgpr160_external_call.numbered_sgpr, max(33, amdgpu.max_num_sgpr)
508508
; GCN: .set count_use_vgpr160_external_call.private_seg_size, 0
509509
; GCN: .set count_use_vgpr160_external_call.uses_vcc, 1
510510
; GCN: .set count_use_vgpr160_external_call.uses_flat_scratch, 1
@@ -522,9 +522,9 @@ entry:
522522
}
523523

524524
; Added at the of the .s are the module level maximums
525-
; GCN: .set amdgcn.max_num_vgpr, 50
526-
; GCN: .set amdgcn.max_num_agpr, 0
527-
; GCN: .set amdgcn.max_num_sgpr, 80
525+
; GCN: .set amdgpu.max_num_vgpr, 50
526+
; GCN: .set amdgpu.max_num_agpr, 0
527+
; GCN: .set amdgpu.max_num_sgpr, 80
528528

529529
attributes #0 = { nounwind noinline norecurse }
530530
attributes #1 = { nounwind noinline norecurse }

0 commit comments

Comments
 (0)