From 4c882d90aad6dff10254dac45252ddb97eb41d2c Mon Sep 17 00:00:00 2001 From: Konstantin Zhuravlyov Date: Mon, 5 Jun 2017 20:57:17 +0000 Subject: [PATCH] AMDGPU/LLD: Remove deprecated and unused elf definitions from tests Differential Revision: https://reviews.llvm.org/D33691 llvm-svn: 304734 --- lld/test/ELF/amdgpu-globals.s | 146 +++++++++------------------------- lld/test/ELF/amdgpu-kernels.s | 16 ++-- 2 files changed, 42 insertions(+), 120 deletions(-) diff --git a/lld/test/ELF/amdgpu-globals.s b/lld/test/ELF/amdgpu-globals.s index 17dfc82ef8f30..e32159b332e7f 100644 --- a/lld/test/ELF/amdgpu-globals.s +++ b/lld/test/ELF/amdgpu-globals.s @@ -1,130 +1,56 @@ # RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri %s -o %t.o -# RUN: ld.lld %t.o -o %t +# RUN: ld.lld -shared %t.o -o %t # RUN: llvm-readobj -sections -symbols -program-headers %t | FileCheck %s # REQUIRES: amdgpu - .amdgpu_hsa_module_global module_global_program - .size module_global_program, 4 - .hsadata_global_program -module_global_program: - .long 0 ; 0x0 +.type glob0, @object +.data + .globl glob0 +glob0: + .long 1 + .size glob0, 4 - .amdgpu_hsa_program_global program_global_program - .size program_global_program, 4 - .hsadata_global_program -program_global_program: - .long 0 ; 0x0 - - .amdgpu_hsa_module_global module_global_agent - .size module_global_agent, 4 - .hsadata_global_agent -module_global_agent: - .long 0 ; 0x0 - - .amdgpu_hsa_program_global program_global_agent - .size program_global_agent, 4 - .hsadata_global_agent -program_global_agent: - .long 0 ; 0x0 - - .amdgpu_hsa_module_global module_global_readonly - .size module_global_readonly, 4 - .hsatext -module_global_readonly: - .long 0 ; 0x0 - - .amdgpu_hsa_program_global program_global_readonly - .size program_global_readonly, 4 - .hsatext -program_global_readonly: - .long 0 ; 0x0 - -# CHECK: Section { -# CHECK: Name: .hsatext -# CHECK: Type: SHT_PROGBITS -# CHECK: Flags [ (0xC00007) -# CHECK: SHF_ALLOC (0x2) -# CHECK: SHF_AMDGPU_HSA_AGENT (0x800000) -# CHECK: SHF_AMDGPU_HSA_CODE (0x400000) -# CHECK: SHF_EXECINSTR (0x4) -# CHECK: SHF_WRITE (0x1) -# CHECK: ] -# CHECK: Address: [[HSATEXT_ADDR:[0-9xa-f]+]] -# CHECK: } +.type glob1, @object +.section .rodata, #alloc + .globl glob1 +glob1: + .long 2 + .size glob1, 4 # CHECK: Section { -# CHECK: Name: .hsadata_global_program -# CHECK: Type: SHT_PROGBITS (0x1) -# CHECK: Flags [ (0x100003) -# CHECK: SHF_ALLOC (0x2) -# CHECK: SHF_AMDGPU_HSA_GLOBAL (0x100000) -# CHECK: SHF_WRITE (0x1) -# CHECK: ] -# CHECK: Address: [[HSADATA_GLOBAL_PROGRAM_ADDR:[0-9xa-f]+]] +# CHECK: Name: .rodata +# CHECK: Type: SHT_PROGBITS +# CHECK: Flags [ (0x2) +# CHECK: SHF_ALLOC (0x2) +# CHECK: ] +# CHECK: Address: [[RODATA_ADDR:[0-9xa-f]+]] # CHECK: } # CHECK: Section { -# CHECK: Name: .hsadata_global_agent -# CHECK: Type: SHT_PROGBITS (0x1) -# CHECK: Flags [ (0x900003) -# CHECK: SHF_ALLOC (0x2) -# CHECK: SHF_AMDGPU_HSA_AGENT (0x800000) -# CHECK: SHF_AMDGPU_HSA_GLOBAL (0x100000) -# CHECK: SHF_WRITE (0x1) -# CHECK: ] -# CHECK: } - -# CHECK: Symbol { -# CHECK: Name: module_global_agent -# CHECK: Value: -# CHECK: Size: 4 -# CHECK: Binding: Local -# CHECK: Section: .hsadata_global_agent -# CHECK: } - -# CHECK: Symbol { -# CHECK: Name: module_global_program -# CHECK: Value: -# CHECK: Size: 4 -# CHECK: Binding: Local -# CHECK: Section: .hsadata_global_program -# CHECK: } - -# CHECK: Symbol { -# CHECK: Name: module_global_readonly -# CHECK: Value: -# CHECK: Size: 4 -# CHECK: Binding: Local -# CHECK: Type: Object -# CHECK: Section: .hsatext -# CHECK: } - -# CHECK: Symbol { -# CHECK: Name: program_global_agent -# CHECK: Value: -# CHECK: Size: 4 -# CHECK: Binding: Global -# CHECK: Type: Object -# CHECK: Section: .hsadata_global_agent +# CHECK: Name: .data +# CHECK: Type: SHT_PROGBITS +# CHECK: Flags [ (0x3) +# CHECK: SHF_ALLOC (0x2) +# CHECK: SHF_WRITE (0x1) +# CHECK: ] +# CHECK: Address: [[DATA_ADDR:[0-9xa-f]+]] # CHECK: } # CHECK: Symbol { -# CHECK: Name: program_global_program -# CHECK: Value: -# CHECK: Size: 4 -# CHECK: Binding: Global -# CHECK: Type: Object -# CHECK: Section: .hsadata_global_program +# CHECK: Name: glob0 +# CHECK: Value: [[DATA_ADDR]] +# CHECK: Size: 4 +# CHECK: Type: Object +# CHECK: Section: .data # CHECK: } # CHECK: Symbol { -# CHECK: Name: program_global_readonly -# CHECK: Value: -# CHECK: Size: 4 -# CHECK: Binding: Global -# CHECK: Type: Object -# CHECK: Section: .hsatext +# CHECK: Name: glob1 +# CHECK: Value: [[RODATA_ADDR]] +# CHECK: Size: 4 +# CHECK: Type: Object +# CHECK: Section: .rodata # CHECK: } # CHECK: ProgramHeader { diff --git a/lld/test/ELF/amdgpu-kernels.s b/lld/test/ELF/amdgpu-kernels.s index 62a8cb74a5416..c76613f1a336e 100644 --- a/lld/test/ELF/amdgpu-kernels.s +++ b/lld/test/ELF/amdgpu-kernels.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri %s -o %t.o -# RUN: ld.lld %t.o -o %t +# RUN: ld.lld -shared %t.o -o %t # RUN: llvm-readobj -sections -symbols -program-headers %t | FileCheck %s # REQUIRES: amdgpu @@ -7,7 +7,7 @@ .hsa_code_object_version 1,0 .hsa_code_object_isa 7,0,0,"AMD","AMDGPU" -.hsatext +.text .globl kernel0 .align 256 .amdgpu_hsa_kernel kernel0 @@ -27,16 +27,12 @@ kernel1: # CHECK: Section { -# CHECK: Name: .hsatext +# CHECK: Name: .text # CHECK: Type: SHT_PROGBITS -# CHECK: Flags [ (0xC00007) +# CHECK: Flags [ (0x6) # CHECK: SHF_ALLOC (0x2) -# CHECK: SHF_AMDGPU_HSA_AGENT (0x800000) -# CHECK: SHF_AMDGPU_HSA_CODE (0x400000) # CHECK: SHF_EXECINSTR (0x4) -# CHECK: SHF_WRITE (0x1) # CHECK: ] -# CHECK: Address: [[HSATEXT_ADDR:[0-9xa-f]+]] # CHECK: } # CHECK: Symbol { @@ -45,7 +41,7 @@ kernel1: # CHECK: Size: 4 # CHECK: Binding: Global # CHECK: Type: AMDGPU_HSA_KERNEL -# CHECK: Section: .hsatext +# CHECK: Section: .text # CHECK: } # CHECK: Symbol { @@ -54,7 +50,7 @@ kernel1: # CHECK: Size: 8 # CHECK: Binding: Global # CHECK: Type: AMDGPU_HSA_KERNEL -# CHECK: Section: .hsatext +# CHECK: Section: .text # CHECK: } # CHECK: ProgramHeader {