This is an archive of the discontinued LLVM Phabricator instance.

Differential D17665

Fix LLD tests that used CHECK-NEXT-NOT
ClosedPublic

Authored by probinson on Feb 26 2016, 4:31 PM.

Details

Reviewers
grimar
Commits
rG2ce5cf03931d: Fix LLD tests that used CHECK-NEXT-NOT. FileCheck does not support combined…
rLLD262237: Fix LLD tests that used CHECK-NEXT-NOT. FileCheck does not support
rL262237: Fix LLD tests that used CHECK-NEXT-NOT. FileCheck does not support
Summary

FileCheck does not support combined suffixes.

Diff Detail

Event Timeline

probinson updated this revision to Diff 49266.Feb 26 2016, 4:31 PM
probinson retitled this revision from to Fix LLD tests that used CHECK-NEXT-NOT.
probinson updated this object.
probinson added a reviewer: grimar.
probinson added subscribers: • rafael, llvm-commits.
• rafael added a comment.Feb 27 2016, 5:39 PM

Lgtm

grimar accepted this revision.Feb 27 2016, 11:00 PM
grimar edited edge metadata.

LGTM, thanks !

This revision is now accepted and ready to land.Feb 27 2016, 11:00 PM
grimar added inline comments.Feb 28 2016, 3:14 AM
test/ELF/plt.s
112

please format this accordinly here then (add a 2 spaces after ':'):

// DISASM2-NEXT:  1104b:  e9 d0 ff ff ff      jmp -48 <.plt>
// DISASM2-NOT:   110C0
probinson marked an inline comment as done.Feb 29 2016, 9:54 AM
Closed by commit rL262237: Fix LLD tests that used CHECK-NEXT-NOT. FileCheck does not support (authored by probinson). · Explain WhyFeb 29 2016, 10:10 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 49266

test/ELF/aarch64-gnu-ifunc-nosym.s

// RUN: llvm-mc -filetype=obj -triple=aarch64-none-linux-gnu %s -o %t.o // RUN: llvm-mc -filetype=obj -triple=aarch64-none-linux-gnu %s -o %t.o
// RUN: ld.lld -static %t.o -o %tout // RUN: ld.lld -static %t.o -o %tout
// RUN: llvm-readobj -symbols %tout | FileCheck %s // RUN: llvm-readobj -symbols %tout | FileCheck %s
// REQUIRES: aarch64 // REQUIRES: aarch64
// Check that no __rela_iplt_end/__rela_iplt_start // Check that no __rela_iplt_end/__rela_iplt_start
// appear in symtab if there is no references to them. // appear in symtab if there is no references to them.
// CHECK: Symbols [ // CHECK: Symbols [
// CHECK-NEXT-NOT: __rela_iplt_end // CHECK-NOT: __rela_iplt_end
// CHECK-NEXT-NOT: __rela_iplt_start // CHECK-NOT: __rela_iplt_start
// CHECK: ] // CHECK: ]
.text .text
.type foo STT_GNU_IFUNC .type foo STT_GNU_IFUNC
.globl foo .globl foo
.type foo, @function .type foo, @function
foo: foo:
ret ret
Show All 11 Lines

test/ELF/gnu-ifunc-nosym-i386.s

// RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t.o // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t.o
// RUN: ld.lld -static %t.o -o %tout // RUN: ld.lld -static %t.o -o %tout
// RUN: llvm-readobj -symbols %tout | FileCheck %s // RUN: llvm-readobj -symbols %tout | FileCheck %s
// REQUIRES: x86 // REQUIRES: x86
// Check that no __rel_iplt_end/__rel_iplt_start // Check that no __rel_iplt_end/__rel_iplt_start
// appear in symtab if there is no references to them. // appear in symtab if there is no references to them.
// CHECK: Symbols [ // CHECK: Symbols [
// CHECK-NEXT-NOT: __rel_iplt_end // CHECK-NOT: __rel_iplt_end
// CHECK-NEXT-NOT: __rel_iplt_start // CHECK-NOT: __rel_iplt_start
// CHECK: ] // CHECK: ]
.text .text
.type foo STT_GNU_IFUNC .type foo STT_GNU_IFUNC
.globl foo .globl foo
.type foo, @function .type foo, @function
foo: foo:
ret ret
Show All 11 Lines

test/ELF/gnu-ifunc-nosym.s

// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
// RUN: ld.lld -static %t.o -o %tout // RUN: ld.lld -static %t.o -o %tout
// RUN: llvm-readobj -symbols %tout | FileCheck %s // RUN: llvm-readobj -symbols %tout | FileCheck %s
// REQUIRES: x86 // REQUIRES: x86
// Check that no __rela_iplt_end/__rela_iplt_start // Check that no __rela_iplt_end/__rela_iplt_start
// appear in symtab if there is no references to them. // appear in symtab if there is no references to them.
// CHECK: Symbols [ // CHECK: Symbols [
// CHECK-NEXT-NOT: __rela_iplt_end // CHECK-NOT: __rela_iplt_end
// CHECK-NEXT-NOT: __rela_iplt_start // CHECK-NOT: __rela_iplt_start
// CHECK: ] // CHECK: ]
.text .text
.type foo STT_GNU_IFUNC .type foo STT_GNU_IFUNC
.globl foo .globl foo
.type foo, @function .type foo, @function
foo: foo:
ret ret
Show All 11 Lines

test/ELF/plt.s

Show First 20 Lines • Show All 103 Lines • ▼ Show 20 Lines
// DISASM2-NEXT: 11026: ff 25 e4 1f 00 00 jmpq *8164(%rip) // DISASM2-NEXT: 11026: ff 25 e4 1f 00 00 jmpq *8164(%rip)
// DISASM2-NEXT: 1102c: 0f 1f 40 00 nopl (%rax) // DISASM2-NEXT: 1102c: 0f 1f 40 00 nopl (%rax)
// DISASM2-NEXT: 11030: ff 25 e2 1f 00 00 jmpq *8162(%rip) // DISASM2-NEXT: 11030: ff 25 e2 1f 00 00 jmpq *8162(%rip)
// DISASM2-NEXT: 11036: 68 00 00 00 00 pushq $0 // DISASM2-NEXT: 11036: 68 00 00 00 00 pushq $0
// DISASM2-NEXT: 1103b: e9 e0 ff ff ff jmp -32 <.plt> // DISASM2-NEXT: 1103b: e9 e0 ff ff ff jmp -32 <.plt>
// DISASM2-NEXT: 11040: ff 25 da 1f 00 00 jmpq *8154(%rip) // DISASM2-NEXT: 11040: ff 25 da 1f 00 00 jmpq *8154(%rip)
// DISASM2-NEXT: 11046: 68 01 00 00 00 pushq $1 // DISASM2-NEXT: 11046: 68 01 00 00 00 pushq $1
// DISASM2-NEXT: 1104b: e9 d0 ff ff ff jmp -48 <.plt> // DISASM2-NEXT: 1104b: e9 d0 ff ff ff jmp -48 <.plt>
// DISASM2-NEXT-NOT: 110C0 // DISASM2-NOT: 110C0
grimarUnsubmitted
Done
ReplyInline Actions

please format this accordinly here then (add a 2 spaces after ':'):

// DISASM2-NEXT:  1104b:  e9 d0 ff ff ff      jmp -48 <.plt>
// DISASM2-NOT:   110C0
grimar: please format this accordinly here then (add a 2 spaces after ':'): ``` // DISASM2-NEXT…
.global _start .global _start
_start: _start:
jmp bar@PLT jmp bar@PLT
jmp bar@PLT jmp bar@PLT
jmp zed@PLT jmp zed@PLT
jmp _start@plt jmp _start@plt