caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[AMDGPU] Update entry point name for PAL metadata (#123581)

Browse Source 
Old entry-point metadata being updated. Nothing is required
to account for deprecation as nothing uses the old style
This commit is contained in:
David Stuttard
2025-01-21 09:37:22 +00:00
committed by GitHub
parent 67b9d3ffc2
commit ebc5020564
12 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/lib/Target/AMDGPU/Utils/AMDGPUPALMetadata.cpp
View File

@@ -232,7 +232,8 @@ void AMDGPUPALMetadata::setEntryPoint(unsigned CC, StringRef Name) {
if (isLegacy())
return;
// Msgpack format.
getHwStage(CC)[".entry_point"] = MsgPackDoc.getNode(Name, /*Copy=*/true);
getHwStage(CC)[".entry_point_symbol"] =
MsgPackDoc.getNode(Name, /*Copy=*/true);
}
// Set the number of used vgprs in the metadata. This is an optional

2
llvm/test/CodeGen/AMDGPU/amdpal-cs.ll
View File

@@ -8,7 +8,7 @@
; GCN-NEXT: amdpal.pipelines:
; GCN-NEXT: - .hardware_stages:
; GCN-NEXT: .cs:
; GCN-NEXT: .entry_point: cs_amdpal
; GCN-NEXT: .entry_point_symbol: cs_amdpal
; GCN-NEXT: .scratch_memory_size: 0
; GCN: .registers:
; GCN-NEXT: '0x2e12 (COMPUTE_PGM_RSRC1)':

2
llvm/test/CodeGen/AMDGPU/amdpal-es.ll
View File

@@ -7,7 +7,7 @@
; GCN-NEXT: amdpal.pipelines:
; GCN-NEXT: - .hardware_stages:
; GCN-NEXT: .es:
; GCN-NEXT: .entry_point: es_amdpal
; GCN-NEXT: .entry_point_symbol: es_amdpal
; GCN-NEXT: .scratch_memory_size: 0
; GCN: .registers:
; GCN-NEXT: '0x2cca (SPI_SHADER_PGM_RSRC1_ES)': 0

2
llvm/test/CodeGen/AMDGPU/amdpal-gs.ll
View File

@@ -8,7 +8,7 @@
; GCN-NEXT: amdpal.pipelines:
; GCN-NEXT: - .hardware_stages:
; GCN-NEXT: .gs:
; GCN-NEXT: .entry_point: gs_amdpal
; GCN-NEXT: .entry_point_symbol: gs_amdpal
; GCN-NEXT: .scratch_memory_size: 0
; GCN: .registers:
; GCN-NEXT: '0x2c8a (SPI_SHADER_PGM_RSRC1_GS)': 0

2
llvm/test/CodeGen/AMDGPU/amdpal-hs.ll
View File

@@ -8,7 +8,7 @@
; GCN-NEXT: amdpal.pipelines:
; GCN-NEXT: - .hardware_stages:
; GCN-NEXT: .hs:
; GCN-NEXT: .entry_point: hs_amdpal
; GCN-NEXT: .entry_point_symbol: hs_amdpal
; GCN-NEXT: .scratch_memory_size: 0
; GCN: .registers:
; GCN-NEXT: '0x2d0a (SPI_SHADER_PGM_RSRC1_HS)': 0

2
llvm/test/CodeGen/AMDGPU/amdpal-ls.ll
View File

@@ -7,7 +7,7 @@
; GCN-NEXT: amdpal.pipelines:
; GCN-NEXT: - .hardware_stages:
; GCN-NEXT: .ls:
; GCN-NEXT: .entry_point: ls_amdpal
; GCN-NEXT: .entry_point_symbol: ls_amdpal
; GCN-NEXT: .scratch_memory_size: 0
; GCN: .registers:
; GCN-NEXT: '0x2d4a (SPI_SHADER_PGM_RSRC1_LS)': 0

2
llvm/test/CodeGen/AMDGPU/amdpal-psenable.ll
View File

@@ -11,7 +11,7 @@
; GCN-NEXT: amdpal.pipelines:
; GCN-NEXT: - .hardware_stages:
; GCN-NEXT: .ps:
; GCN-NEXT: .entry_point: amdpal_psenable
; GCN-NEXT: .entry_point_symbol: amdpal_psenable
; GCN-NEXT: .scratch_memory_size: 0
; GCN: .registers:
; GCN-NEXT: '0x2c0a (SPI_SHADER_PGM_RSRC1_PS)':

2
llvm/test/CodeGen/AMDGPU/amdpal-vs.ll
View File

@@ -8,7 +8,7 @@
; GCN-NEXT: amdpal.pipelines:
; GCN-NEXT: - .hardware_stages:
; GCN-NEXT: .vs:
; GCN-NEXT: .entry_point: vs_amdpal
; GCN-NEXT: .entry_point_symbol: vs_amdpal
; GCN-NEXT: .scratch_memory_size: 0
; GCN: .registers:
; GCN-NEXT: '0x2c4a (SPI_SHADER_PGM_RSRC1_VS)': 0

2
llvm/test/CodeGen/AMDGPU/amdpal.ll
View File

@@ -86,7 +86,7 @@ declare void @llvm.amdgcn.raw.ptr.buffer.store.f32(float, ptr addrspace(8), i32,
; PAL-NEXT: amdpal.pipelines:
; PAL-NEXT: - .hardware_stages:
; PAL-NEXT: .cs:
; PAL-NEXT: .entry_point: scratch2_cs
; PAL-NEXT: .entry_point_symbol: scratch2_cs
; PAL-NEXT: .scratch_memory_size: 0x10
; PAL-NEXT: .sgpr_count: 0x
; PAL-NEXT: .vgpr_count: 0x

2
llvm/test/CodeGen/AMDGPU/elf-notes.ll
View File

@@ -66,7 +66,7 @@
; OSABI-PAL-ELF: amdpal.pipelines:
; OSABI-PAL-ELF: - .hardware_stages:
; OSABI-PAL-ELF: .cs:
; OSABI-PAL-ELF: .entry_point: elf_notes
; OSABI-PAL-ELF: .entry_point_symbol: elf_notes
; OSABI-PAL-ELF: .scratch_memory_size: 0
; OSABI-PAL-ELF: .sgpr_count: 96
; OSABI-PAL-ELF: .vgpr_count: 1

8
llvm/test/CodeGen/AMDGPU/pal-metadata-3.0.ll
View File

@@ -53,7 +53,7 @@
; CHECK-NEXT: .cs:
; CHECK-NEXT: .checksum_value: 0x9444d7d0
; CHECK-NEXT: .debug_mode: false
; CHECK-NEXT: .entry_point: _amdgpu_cs_main
; CHECK-NEXT: .entry_point_symbol: _amdgpu_cs_main
; CHECK-NEXT: .excp_en: 0
; CHECK-NEXT: .float_mode: 0xc0
; CHECK-NEXT: .ieee_mode: false
@@ -109,7 +109,7 @@
; CHECK-NEXT: .wgp_mode: false
; CHECK-NEXT: .gs:
; CHECK-NEXT: .debug_mode: false
; CHECK-NEXT: .entry_point: gs_shader
; CHECK-NEXT: .entry_point_symbol: gs_shader
; CHECK-NEXT: .ieee_mode: false
; CHECK-NEXT: .lds_size: 0x200
; CHECK-NEXT: .mem_ordered: true
@@ -120,7 +120,7 @@
; CHECK-NEXT: .wgp_mode: true
; CHECK-NEXT: .hs:
; CHECK-NEXT: .debug_mode: false
; CHECK-NEXT: .entry_point: hs_shader
; CHECK-NEXT: .entry_point_symbol: hs_shader
; CHECK-NEXT: .ieee_mode: false
; CHECK-NEXT: .lds_size: 0x1000
; CHECK-NEXT: .mem_ordered: true
@@ -131,7 +131,7 @@
; CHECK-NEXT: .wgp_mode: true
; CHECK-NEXT: .ps:
; CHECK-NEXT: .debug_mode: false
; CHECK-NEXT: .entry_point: ps_shader
; CHECK-NEXT: .entry_point_symbol: ps_shader
; CHECK-NEXT: .ieee_mode: false
; CHECK-NEXT: .lds_size: 0
; CHECK-NEXT: .mem_ordered: true

2
llvm/test/CodeGen/AMDGPU/wave_dispatch_regs.ll
View File

@@ -12,7 +12,7 @@
; GCN-NEXT: amdpal.pipelines:
; GCN-NEXT: - .hardware_stages:
; GCN-NEXT: .cs:
; GCN-NEXT: .entry_point: _amdgpu_cs_main
; GCN-NEXT: .entry_point_symbol: _amdgpu_cs_main
; GCN-NEXT: .scratch_memory_size: 0
; SI-NEXT: .sgpr_count: 0x11
; VI-NEXT: .sgpr_count: 0x60