Skip to content

Commit ebc5020

Browse files
dstuttdstutt
authored
[AMDGPU] Update entry point name for PAL metadata (#123581)
Old entry-point metadata being updated. Nothing is required to account for deprecation as nothing uses the old style
1 parent 67b9d3f commit ebc5020

File tree

12 files changed

+16
-15
lines changed

12 files changed

+16
-15
lines changed

‎llvm/lib/Target/AMDGPU/Utils/AMDGPUPALMetadata.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,8 @@ void AMDGPUPALMetadata::setEntryPoint(unsigned CC, StringRef Name) {
232232
if (isLegacy())
233233
return;
234234
// Msgpack format.
235-
getHwStage(CC)[".entry_point"] = MsgPackDoc.getNode(Name, /*Copy=*/true);
235+
getHwStage(CC)[".entry_point_symbol"] =
236+
MsgPackDoc.getNode(Name, /*Copy=*/true);
236237
}
237238

238239
// Set the number of used vgprs in the metadata. This is an optional

‎llvm/test/CodeGen/AMDGPU/amdpal-cs.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
; GCN-NEXT: amdpal.pipelines:
99
; GCN-NEXT: - .hardware_stages:
1010
; GCN-NEXT: .cs:
11-
; GCN-NEXT: .entry_point: cs_amdpal
11+
; GCN-NEXT: .entry_point_symbol: cs_amdpal
1212
; GCN-NEXT: .scratch_memory_size: 0
1313
; GCN: .registers:
1414
; GCN-NEXT: '0x2e12 (COMPUTE_PGM_RSRC1)':

‎llvm/test/CodeGen/AMDGPU/amdpal-es.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
; GCN-NEXT: amdpal.pipelines:
88
; GCN-NEXT: - .hardware_stages:
99
; GCN-NEXT: .es:
10-
; GCN-NEXT: .entry_point: es_amdpal
10+
; GCN-NEXT: .entry_point_symbol: es_amdpal
1111
; GCN-NEXT: .scratch_memory_size: 0
1212
; GCN: .registers:
1313
; GCN-NEXT: '0x2cca (SPI_SHADER_PGM_RSRC1_ES)': 0

‎llvm/test/CodeGen/AMDGPU/amdpal-gs.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
; GCN-NEXT: amdpal.pipelines:
99
; GCN-NEXT: - .hardware_stages:
1010
; GCN-NEXT: .gs:
11-
; GCN-NEXT: .entry_point: gs_amdpal
11+
; GCN-NEXT: .entry_point_symbol: gs_amdpal
1212
; GCN-NEXT: .scratch_memory_size: 0
1313
; GCN: .registers:
1414
; GCN-NEXT: '0x2c8a (SPI_SHADER_PGM_RSRC1_GS)': 0

‎llvm/test/CodeGen/AMDGPU/amdpal-hs.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
; GCN-NEXT: amdpal.pipelines:
99
; GCN-NEXT: - .hardware_stages:
1010
; GCN-NEXT: .hs:
11-
; GCN-NEXT: .entry_point: hs_amdpal
11+
; GCN-NEXT: .entry_point_symbol: hs_amdpal
1212
; GCN-NEXT: .scratch_memory_size: 0
1313
; GCN: .registers:
1414
; GCN-NEXT: '0x2d0a (SPI_SHADER_PGM_RSRC1_HS)': 0

‎llvm/test/CodeGen/AMDGPU/amdpal-ls.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
; GCN-NEXT: amdpal.pipelines:
88
; GCN-NEXT: - .hardware_stages:
99
; GCN-NEXT: .ls:
10-
; GCN-NEXT: .entry_point: ls_amdpal
10+
; GCN-NEXT: .entry_point_symbol: ls_amdpal
1111
; GCN-NEXT: .scratch_memory_size: 0
1212
; GCN: .registers:
1313
; GCN-NEXT: '0x2d4a (SPI_SHADER_PGM_RSRC1_LS)': 0

‎llvm/test/CodeGen/AMDGPU/amdpal-psenable.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
; GCN-NEXT: amdpal.pipelines:
1212
; GCN-NEXT: - .hardware_stages:
1313
; GCN-NEXT: .ps:
14-
; GCN-NEXT: .entry_point: amdpal_psenable
14+
; GCN-NEXT: .entry_point_symbol: amdpal_psenable
1515
; GCN-NEXT: .scratch_memory_size: 0
1616
; GCN: .registers:
1717
; GCN-NEXT: '0x2c0a (SPI_SHADER_PGM_RSRC1_PS)':

‎llvm/test/CodeGen/AMDGPU/amdpal-vs.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
; GCN-NEXT: amdpal.pipelines:
99
; GCN-NEXT: - .hardware_stages:
1010
; GCN-NEXT: .vs:
11-
; GCN-NEXT: .entry_point: vs_amdpal
11+
; GCN-NEXT: .entry_point_symbol: vs_amdpal
1212
; GCN-NEXT: .scratch_memory_size: 0
1313
; GCN: .registers:
1414
; GCN-NEXT: '0x2c4a (SPI_SHADER_PGM_RSRC1_VS)': 0

‎llvm/test/CodeGen/AMDGPU/amdpal.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ declare void @llvm.amdgcn.raw.ptr.buffer.store.f32(float, ptr addrspace(8), i32,
8686
; PAL-NEXT: amdpal.pipelines:
8787
; PAL-NEXT: - .hardware_stages:
8888
; PAL-NEXT: .cs:
89-
; PAL-NEXT: .entry_point: scratch2_cs
89+
; PAL-NEXT: .entry_point_symbol: scratch2_cs
9090
; PAL-NEXT: .scratch_memory_size: 0x10
9191
; PAL-NEXT: .sgpr_count: 0x
9292
; PAL-NEXT: .vgpr_count: 0x

‎llvm/test/CodeGen/AMDGPU/elf-notes.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
; OSABI-PAL-ELF: amdpal.pipelines:
6767
; OSABI-PAL-ELF: - .hardware_stages:
6868
; OSABI-PAL-ELF: .cs:
69-
; OSABI-PAL-ELF: .entry_point: elf_notes
69+
; OSABI-PAL-ELF: .entry_point_symbol: elf_notes
7070
; OSABI-PAL-ELF: .scratch_memory_size: 0
7171
; OSABI-PAL-ELF: .sgpr_count: 96
7272
; OSABI-PAL-ELF: .vgpr_count: 1

‎llvm/test/CodeGen/AMDGPU/pal-metadata-3.0.ll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
; CHECK-NEXT: .cs:
5454
; CHECK-NEXT: .checksum_value: 0x9444d7d0
5555
; CHECK-NEXT: .debug_mode: false
56-
; CHECK-NEXT: .entry_point: _amdgpu_cs_main
56+
; CHECK-NEXT: .entry_point_symbol: _amdgpu_cs_main
5757
; CHECK-NEXT: .excp_en: 0
5858
; CHECK-NEXT: .float_mode: 0xc0
5959
; CHECK-NEXT: .ieee_mode: false
@@ -109,7 +109,7 @@
109109
; CHECK-NEXT: .wgp_mode: false
110110
; CHECK-NEXT: .gs:
111111
; CHECK-NEXT: .debug_mode: false
112-
; CHECK-NEXT: .entry_point: gs_shader
112+
; CHECK-NEXT: .entry_point_symbol: gs_shader
113113
; CHECK-NEXT: .ieee_mode: false
114114
; CHECK-NEXT: .lds_size: 0x200
115115
; CHECK-NEXT: .mem_ordered: true
@@ -120,7 +120,7 @@
120120
; CHECK-NEXT: .wgp_mode: true
121121
; CHECK-NEXT: .hs:
122122
; CHECK-NEXT: .debug_mode: false
123-
; CHECK-NEXT: .entry_point: hs_shader
123+
; CHECK-NEXT: .entry_point_symbol: hs_shader
124124
; CHECK-NEXT: .ieee_mode: false
125125
; CHECK-NEXT: .lds_size: 0x1000
126126
; CHECK-NEXT: .mem_ordered: true
@@ -131,7 +131,7 @@
131131
; CHECK-NEXT: .wgp_mode: true
132132
; CHECK-NEXT: .ps:
133133
; CHECK-NEXT: .debug_mode: false
134-
; CHECK-NEXT: .entry_point: ps_shader
134+
; CHECK-NEXT: .entry_point_symbol: ps_shader
135135
; CHECK-NEXT: .ieee_mode: false
136136
; CHECK-NEXT: .lds_size: 0
137137
; CHECK-NEXT: .mem_ordered: true

‎llvm/test/CodeGen/AMDGPU/wave_dispatch_regs.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
; GCN-NEXT: amdpal.pipelines:
1313
; GCN-NEXT: - .hardware_stages:
1414
; GCN-NEXT: .cs:
15-
; GCN-NEXT: .entry_point: _amdgpu_cs_main
15+
; GCN-NEXT: .entry_point_symbol: _amdgpu_cs_main
1616
; GCN-NEXT: .scratch_memory_size: 0
1717
; SI-NEXT: .sgpr_count: 0x11
1818
; VI-NEXT: .sgpr_count: 0x60

0 commit comments

Comments
 (0)