<div dir="ltr">Hi,<div><br></div><div>Some of these new tests are failing on an X86 bot:</div><div><a href="http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast/builds/48513/">http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast/builds/48513/</a> </div><div><br></div>FAIL: lld :: ELF/relocation-none-aarch64.s (48524 of 49081)<br>FAIL: lld :: ELF/relocation-none-arm.s (48525 of 49081)<br><br><div>I think that the REQUIRES from the previous tests need re-instating. Please could you take a look?</div><div><br></div><div>Thanks</div><div>Russ</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, 17 May 2019 at 11:41, Fangrui Song via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Author: maskray<br>
Date: Fri May 17 03:44:05 2019<br>
New Revision: 361013<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=361013&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=361013&view=rev</a><br>
Log:<br>
[ELF][test] Reorganize some R_*_NONE tests<br>
<br>
Change R_{386,AARCH64}_NONE yaml2obj tests/icf10.test to use assembly<br>
<br>
Add relocation-none-{arm,x86_64}.s.<br>
Check the referenced section survives under --gc-sections.<br>
Check -r copies R_X86_64_NONE R_AARCH64_NONE. (Elf*_Rel arches currently have a bug)<br>
Delete the dtrace tests as they are covered by the R_X86_64_NONE test.<br>
<br>
Reviewed By: ruiu<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D62051" rel="noreferrer" target="_blank">https://reviews.llvm.org/D62051</a><br>
<br>
Added:<br>
lld/trunk/test/ELF/icf10.s<br>
lld/trunk/test/ELF/relocation-none-aarch64.s<br>
lld/trunk/test/ELF/relocation-none-arm.s<br>
lld/trunk/test/ELF/relocation-none-i386.s<br>
lld/trunk/test/ELF/relocation-none-x86-64.s<br>
Removed:<br>
lld/trunk/test/ELF/Inputs/dtrace-r.o<br>
lld/trunk/test/ELF/dtrace-r.test<br>
lld/trunk/test/ELF/icf10.test<br>
lld/trunk/test/ELF/relocation-dtrace.test<br>
lld/trunk/test/ELF/relocation-none-aarch64.test<br>
lld/trunk/test/ELF/relocation-none-i686.test<br>
<br>
Removed: lld/trunk/test/ELF/Inputs/dtrace-r.o<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/dtrace-r.o?rev=361012&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/dtrace-r.o?rev=361012&view=auto</a><br>
==============================================================================<br>
Binary files lld/trunk/test/ELF/Inputs/dtrace-r.o (original) and lld/trunk/test/ELF/Inputs/dtrace-r.o (removed) differ<br>
<br>
Removed: lld/trunk/test/ELF/dtrace-r.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/dtrace-r.test?rev=361012&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/dtrace-r.test?rev=361012&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/dtrace-r.test (original)<br>
+++ lld/trunk/test/ELF/dtrace-r.test (removed)<br>
@@ -1,8 +0,0 @@<br>
-RUN: ld.lld -r -o %t.o %p/Inputs/dtrace-r.o<br>
-RUN: llvm-readobj -r %t.o | FileCheck %s<br>
-<br>
-CHECK: Relocations [<br>
-CHECK-NEXT: Section ({{.*}}) .rela.text {<br>
-CHECK-NEXT: 0x0 R_X86_64_NONE - 0x0<br>
-CHECK-NEXT: }<br>
-CHECK-NEXT: ]<br>
<br>
Added: lld/trunk/test/ELF/icf10.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/icf10.s?rev=361013&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/icf10.s?rev=361013&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/icf10.s (added)<br>
+++ lld/trunk/test/ELF/icf10.s Fri May 17 03:44:05 2019<br>
@@ -0,0 +1,17 @@<br>
+# REQUIRES: x86<br>
+<br>
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-freebsd %s -o %t.o<br>
+# RUN: ld.lld --icf=all %t.o -o /dev/null --print-icf-sections 2>&1 | FileCheck %s<br>
+<br>
+# Checks that ICF does not merge 2 sections the offset of<br>
+# the relocations of which differ.<br>
+<br>
+# CHECK-NOT: selected<br>
+<br>
+.section .text.foo,"ax"<br>
+ .quad -1<br>
+ .reloc 0, R_X86_64_NONE, 0<br>
+<br>
+.section .text.bar,"ax"<br>
+ .quad -1<br>
+ .reloc 1, R_X86_64_NONE, 0<br>
<br>
Removed: lld/trunk/test/ELF/icf10.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/icf10.test?rev=361012&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/icf10.test?rev=361012&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/icf10.test (original)<br>
+++ lld/trunk/test/ELF/icf10.test (removed)<br>
@@ -1,38 +0,0 @@<br>
-# RUN: yaml2obj %s -o %t.o<br>
-# RUN: ld.lld --icf=all %t.o -o /dev/null --print-icf-sections 2>&1 | FileCheck %s<br>
-<br>
-# Checks that ICF does not merge 2 sections the offset of<br>
-# the relocations of which differ.<br>
-<br>
-# CHECK-NOT: selected<br>
-<br>
-!ELF<br>
-FileHeader:<br>
- Class: ELFCLASS64<br>
- Data: ELFDATA2LSB<br>
- OSABI: ELFOSABI_FREEBSD<br>
- Type: ET_REL<br>
- Machine: EM_X86_64<br>
-Sections:<br>
- - Name: .text.foo<br>
- Type: SHT_PROGBITS<br>
- Flags: [ SHF_ALLOC, SHF_EXECINSTR]<br>
- Content: "FFFFFFFFFFFFFFFF"<br>
- - Name: .text.bar<br>
- Type: SHT_PROGBITS<br>
- Flags: [ SHF_ALLOC, SHF_EXECINSTR]<br>
- Content: "FFFFFFFFFFFFFFFF"<br>
- - Name: .rela.text.foo<br>
- Type: SHT_RELA<br>
- Link: .symtab<br>
- Info: .text.foo<br>
- Relocations:<br>
- - Offset: 0x0000000000000000<br>
- Type: R_X86_64_NONE<br>
- - Name: .rela.text.bar<br>
- Type: SHT_RELA<br>
- Link: .symtab<br>
- Info: .text.bar<br>
- Relocations:<br>
- - Offset: 0x0000000000000001<br>
- Type: R_X86_64_NONE<br>
<br>
Removed: lld/trunk/test/ELF/relocation-dtrace.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-dtrace.test?rev=361012&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-dtrace.test?rev=361012&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/relocation-dtrace.test (original)<br>
+++ lld/trunk/test/ELF/relocation-dtrace.test (removed)<br>
@@ -1,23 +0,0 @@<br>
-# RUN: yaml2obj %s -o %t.o<br>
-# RUN: ld.lld -shared %t.o -o /dev/null<br>
-<br>
-# Test that we can handle R_X86_64_NONE as produced by dtrace.<br>
-<br>
-!ELF<br>
-FileHeader:<br>
- Class: ELFCLASS64<br>
- Data: ELFDATA2LSB<br>
- OSABI: ELFOSABI_FREEBSD<br>
- Type: ET_REL<br>
- Machine: EM_X86_64<br>
-Sections:<br>
- - Name: .text<br>
- Type: SHT_PROGBITS<br>
- Flags: [ SHF_ALLOC ]<br>
- - Name: .rela.text<br>
- Type: SHT_RELA<br>
- Link: .symtab<br>
- Info: .text<br>
- Relocations:<br>
- - Offset: 0x0000000000000000<br>
- Type: R_X86_64_NONE<br>
<br>
Added: lld/trunk/test/ELF/relocation-none-aarch64.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-none-aarch64.s?rev=361013&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-none-aarch64.s?rev=361013&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/relocation-none-aarch64.s (added)<br>
+++ lld/trunk/test/ELF/relocation-none-aarch64.s Fri May 17 03:44:05 2019<br>
@@ -0,0 +1,24 @@<br>
+# RUN: llvm-mc -filetype=obj -triple=aarch64-linux-musl %s -o %t.o<br>
+# RUN: ld.lld --gc-sections %t.o -o %t<br>
+# RUN: llvm-readelf -S -r %t | FileCheck %s<br>
+<br>
+# Test that we discard R_AARCH64_NONE, but respect the references it creates<br>
+# among sections.<br>
+<br>
+# CHECK: .data<br>
+# CHECK: There are no relocations in this file.<br>
+<br>
+# RUN: ld.lld -r %t.o -o %t<br>
+# RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOC %s<br>
+<br>
+# RELOC: Section ({{.*}}) .rela.text {<br>
+# RELOC-NEXT: 0x0 R_AARCH64_NONE .data 0x0<br>
+# RELOC-NEXT: }<br>
+<br>
+.globl _start<br>
+_start:<br>
+ ret<br>
+ .reloc 0, R_AARCH64_NONE, .data<br>
+<br>
+.data<br>
+ .long 0<br>
<br>
Removed: lld/trunk/test/ELF/relocation-none-aarch64.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-none-aarch64.test?rev=361012&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-none-aarch64.test?rev=361012&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/relocation-none-aarch64.test (original)<br>
+++ lld/trunk/test/ELF/relocation-none-aarch64.test (removed)<br>
@@ -1,23 +0,0 @@<br>
-# REQUIRES: aarch64<br>
-<br>
-# RUN: yaml2obj %s -o %t.o<br>
-# RUN: ld.lld %t.o -o /dev/null<br>
-<br>
-!ELF<br>
-FileHeader:<br>
- Class: ELFCLASS64<br>
- Data: ELFDATA2LSB<br>
- Type: ET_REL<br>
- Machine: EM_AARCH64<br>
-Sections:<br>
- - Type: SHT_PROGBITS<br>
- Name: .text<br>
- Flags: [ SHF_ALLOC, SHF_EXECINSTR ]<br>
- Content: "00000000"<br>
- - Type: SHT_RELA<br>
- Name: .rela.text<br>
- Link: .symtab<br>
- Info: .text<br>
- Relocations:<br>
- - Offset: 0<br>
- Type: R_AARCH64_NONE<br>
<br>
Added: lld/trunk/test/ELF/relocation-none-arm.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-none-arm.s?rev=361013&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-none-arm.s?rev=361013&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/relocation-none-arm.s (added)<br>
+++ lld/trunk/test/ELF/relocation-none-arm.s Fri May 17 03:44:05 2019<br>
@@ -0,0 +1,17 @@<br>
+# RUN: llvm-mc -filetype=obj -triple=armv7-linux-musl %s -o %t.o<br>
+# RUN: ld.lld --gc-sections %t.o -o %t<br>
+# RUN: llvm-readelf -S -r %t | FileCheck %s<br>
+<br>
+# Test that we discard R_ARM_NONE, but respect the references it creates among<br>
+# sections.<br>
+<br>
+# CHECK: .data<br>
+# CHECK: There are no relocations in this file.<br>
+<br>
+.globl _start<br>
+_start:<br>
+ nop<br>
+ .reloc 0, R_ARM_NONE, .data<br>
+<br>
+.data<br>
+ .long 0<br>
<br>
Added: lld/trunk/test/ELF/relocation-none-i386.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-none-i386.s?rev=361013&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-none-i386.s?rev=361013&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/relocation-none-i386.s (added)<br>
+++ lld/trunk/test/ELF/relocation-none-i386.s Fri May 17 03:44:05 2019<br>
@@ -0,0 +1,17 @@<br>
+# RUN: llvm-mc -filetype=obj -triple=i386-linux-musl %s -o %t.o<br>
+# RUN: ld.lld --gc-sections %t.o -o %t<br>
+# RUN: llvm-readelf -S -r %t | FileCheck %s<br>
+<br>
+# Test that we discard R_386_NONE, but respect the<br>
+# references it creates among sections.<br>
+<br>
+# CHECK: .data<br>
+# CHECK: There are no relocations in this file.<br>
+<br>
+.globl _start<br>
+_start:<br>
+ ret<br>
+ .reloc 0, R_386_NONE, .data<br>
+<br>
+.data<br>
+ .long 0<br>
<br>
Removed: lld/trunk/test/ELF/relocation-none-i686.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-none-i686.test?rev=361012&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-none-i686.test?rev=361012&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/relocation-none-i686.test (original)<br>
+++ lld/trunk/test/ELF/relocation-none-i686.test (removed)<br>
@@ -1,22 +0,0 @@<br>
-# RUN: yaml2obj %s -o %t.o<br>
-# RUN: ld.lld %t.o -o /dev/null<br>
-<br>
-# Test that we can handle R_386_NONE.<br>
-<br>
-!ELF<br>
-FileHeader:<br>
- Class: ELFCLASS32<br>
- Data: ELFDATA2LSB<br>
- Type: ET_REL<br>
- Machine: EM_386<br>
-Sections:<br>
- - Name: .text<br>
- Type: SHT_PROGBITS<br>
- Flags: [ SHF_ALLOC ]<br>
- - Name: .rel.text<br>
- Type: SHT_RELA<br>
- Link: .symtab<br>
- Info: .text<br>
- Relocations:<br>
- - Offset: 0x0000000000000000<br>
- Type: R_386_NONE<br>
<br>
Added: lld/trunk/test/ELF/relocation-none-x86-64.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-none-x86-64.s?rev=361013&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/relocation-none-x86-64.s?rev=361013&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/relocation-none-x86-64.s (added)<br>
+++ lld/trunk/test/ELF/relocation-none-x86-64.s Fri May 17 03:44:05 2019<br>
@@ -0,0 +1,24 @@<br>
+# RUN: llvm-mc -filetype=obj -triple=x86_64-linux-musl %s -o %t.o<br>
+# RUN: ld.lld --gc-sections %t.o -o %t<br>
+# RUN: llvm-readelf -S -r %t | FileCheck %s<br>
+<br>
+# Test that we discard R_X86_64_NONE, but respect the<br>
+# references it creates among sections.<br>
+<br>
+# CHECK: .data<br>
+# CHECK: There are no relocations in this file.<br>
+<br>
+# RUN: ld.lld -r %t.o -o %t<br>
+# RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOC %s<br>
+<br>
+# RELOC: Section ({{.*}}) .rela.text {<br>
+# RELOC-NEXT: 0x0 R_X86_64_NONE .data 0x0<br>
+# RELOC-NEXT: }<br>
+<br>
+.globl _start<br>
+_start:<br>
+ ret<br>
+ .reloc 0, R_X86_64_NONE, .data<br>
+<br>
+.data<br>
+ .long 0<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>