[PPC][PPC64] Improve some llvm-objdump -d -D tests

[MaskRay]

Summary

Various improvement:

Some offsets in disassembly are incorrect after several layout adjustment. Fix them.
llvm-objdump -D should not be used. -D dumps unrelated non-text sections. Replace them with llvm-objdump -d, llvm-readelf -x, etc
Many llvm-objdump -d tests use {{.*}} . Add the option --no-show-raw-insn to avoid check hex bytes.

ppc64-long-branch.s does not need a shared object. Delete it.
Make ppc64-ifunc.s check 2 ifuncs.

[ruiu]

LGTM

Thank you for doing this.

[MaskRay]

Update more tests

test/ELF/ppc-relocs.s

 # REQUIRES: ppc
-# RUN: llvm-mc -filetype=obj -triple=powerpc-unknown-freebsd %s -o %t
-# RUN: ld.lld %t -o %t2
-# RUN: llvm-objdump -d %t2 | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=powerpc-unknown-freebsd %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
+# RUN: llvm-objdump -s --no-show-raw-insn %t | FileCheck --check-prefix=HEX %s
 
 .section .R_PPC_ADDR16_HA,"ax",@progbits
 .globl _start
 _start:
   lis 4, msg@ha
 msg:
   .string "foo"
   len = . - msg
 
 # CHECK: Disassembly of section .R_PPC_ADDR16_HA:
 # CHECK: _start:
-# CHECK:    11000:       3c 80 00 01     lis 4, 1
+# CHECK:    11000:       lis 4, 1
 # CHECK: msg:
-# CHECK:    11004:       66 6f 6f 00     oris 15, 19, 28416
+# CHECK:    11004:       oris 15, 19, 28416
 
 .section .R_PPC_ADDR16_HI,"ax",@progbits
 .globl _starti
 _starti:
   lis 4,msgi@h
 msgi:
   .string "foo"
   leni = . - msgi
 
 # CHECK: Disassembly of section .R_PPC_ADDR16_HI:
 # CHECK: _starti:
-# CHECK:    11008:       3c 80 00 01     lis 4, 1
+# CHECK:    11008:       lis 4, 1
 # CHECK: msgi:
-# CHECK:    1100c:       66 6f 6f 00     oris 15, 19, 28416
+# CHECK:    1100c:       oris 15, 19, 28416
 
 .section .R_PPC_ADDR16_LO,"ax",@progbits
   addi 4, 4, msg@l
 mystr:
   .asciz "blah"
   len = . - mystr
 
 # CHECK: Disassembly of section .R_PPC_ADDR16_LO:
 # CHECK: .R_PPC_ADDR16_LO:
-# CHECK:    11010:       38 84 10 04     addi 4, 4, 4100
+# CHECK:    11010:       addi 4, 4, 4100
 # CHECK: mystr:
-# CHECK:    11014:       62 6c 61 68     ori 12, 19, 24936
+# CHECK:    11014:       ori 12, 19, 24936
 
 .align  2
 .section .R_PPC_REL24,"ax",@progbits
 .globl .FR_PPC_REL24
 .FR_PPC_REL24:
   b .Lfoox
 .section .R_PPC_REL24_2,"ax",@progbits
 .Lfoox:
 
 # CHECK: Disassembly of section .R_PPC_REL24:
 # CHECK: .FR_PPC_REL24:
-# CHECK:    1101c:       48 00 00 04     b .+4
+# CHECK:    1101c:       b .+4
 
 .section .R_PPC_REL14,"ax",@progbits
 .globl .FR_PPC_REL14
 .FR_PPC_REL14:
   beq .Lfooy
 .section .R_PPC_REL14_2,"ax",@progbits
 .Lfooy:
 
 # CHECK: Disassembly of section .R_PPC_REL14:
 # CHECK: .FR_PPC_REL14:
-# CHECK:    11020: {{.*}} bt 2, .+4
+# CHECK:    11020:       bt 2, .+4
 
 .section .R_PPC_REL32,"ax",@progbits
 .globl .FR_PPC_REL32
 .FR_PPC_REL32:
   .long .Lfoox3 - .
 .section .R_PPC_REL32_2,"ax",@progbits
 .Lfoox3:
 
-# CHECK: Disassembly of section .R_PPC_REL32:
-# CHECK: .FR_PPC_REL32:
-# CHECK:    11024:       00 00 00 04
+# HEX:     .R_PPC_REL32:
+# HEX-NEXT: 11024 00000004
 
 .section .R_PPC_ADDR32,"ax",@progbits
 .globl .FR_PPC_ADDR32
 .FR_PPC_ADDR32:
   .long .Lfoox2
 .section .R_PPC_ADDR32_2,"ax",@progbits
 .Lfoox2:
 
-# CHECK: Disassembly of section .R_PPC_ADDR32:
-# CHECK: .FR_PPC_ADDR32:
-# CHECK:    11028:       00 01 10 2c
+# HEX:     .R_PPC_ADDR32:
+# HEX-NEXT: 11028 0001102c
 
 .align  2
 .section .R_PPC_PLTREL24,"ax",@progbits
 .globl .R_PPC_PLTREL24
 .FR_PPC_PLTREL24:
   b .Lfoox4@PLT
 .section .R_PPC_PLTREL24_2,"ax",@progbits
 .Lfoox4:
 
 # CHECK: Disassembly of section .R_PPC_PLTREL24:
 # CHECK: .R_PPC_PLTREL24:
-# CHECK:    1102c:       48 00 00 04     b .+4
+# CHECK:    1102c:       b .+4

test/ELF/ppc64-call-reach.s

 # REQUIRES: ppc
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
 # RUN: ld.lld --defsym callee=0x12010010 --defsym tail_callee=0x12010020 \
 # RUN: %t.o -o %t
-# RUN: llvm-objdump -d %t | FileCheck %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 # RUN: ld.lld --defsym callee=0x12010010 --defsym tail_callee=0x12010020 \
 # RUN: %t.o -o %t
-# RUN: llvm-objdump -d %t | FileCheck %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 # RUN: ld.lld --defsym callee=0xE010014 --defsym tail_callee=0xE010024 \
 # RUN: %t.o -o %t
-# RUN: llvm-objdump -d %t | FileCheck --check-prefix=NEGOFFSET  %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=NEGOFFSET  %s
 # RUN: ld.lld --defsym callee=0x12010018 --defsym tail_callee=0x12010028 \
 # RUN: %t.o -o %t
-# RUN: llvm-objdump -d %t | FileCheck --check-prefix=THUNK %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=THUNK %s
 # RUN: llvm-readelf --sections %t | FileCheck --check-prefix=BRANCHLT %s
 # RUN: not ld.lld --defsym callee=0x1001002D --defsym tail_callee=0x1001002F \
 # RUN: %t.o -o %t 2>&1 | FileCheck --check-prefix=MISSALIGNED %s
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
 # RUN: ld.lld --defsym callee=0x12010010 --defsym tail_callee=0x12010020 \
 # RUN: %t.o -o %t
-# RUN: llvm-objdump -d %t | FileCheck %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 # RUN: ld.lld --defsym callee=0x12010010 --defsym tail_callee=0x12010020 \
 # RUN: %t.o -o %t
-# RUN: llvm-objdump -d %t | FileCheck %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 # RUN: ld.lld --defsym callee=0xE010014 --defsym tail_callee=0xE010024 \
 # RUN: %t.o -o %t
-# RUN: llvm-objdump -d %t | FileCheck --check-prefix=NEGOFFSET  %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=NEGOFFSET  %s
 # RUN: ld.lld --defsym callee=0x12010018 --defsym tail_callee=0x12010028 \
 # RUN: %t.o -o %t
-# RUN: llvm-objdump -d %t | FileCheck --check-prefix=THUNK %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=THUNK %s
 # RUN: llvm-readelf --sections %t | FileCheck --check-prefix=BRANCHLT %s
 # RUN: not ld.lld --defsym callee=0x1001002D --defsym tail_callee=0x1001002F \
 # RUN: %t.o -o %t 2>&1 | FileCheck --check-prefix=MISSALIGNED %s
 
 # MISSALIGNED: ld.lld: error: {{.*}}.o:(.text+0x14): improper alignment for relocation R_PPC64_REL24: 0x19 is not aligned to 4 bytes
 # MISSALIGNED: ld.lld: error: {{.*}}.o:(.text+0x24): improper alignment for relocation R_PPC64_REL24: 0xB is not aligned to 4 bytes
 
         .global test
.Llep:
         addi 1, 1, 32
         ld 0, 16(1)
         mtlr 0
         b tail_callee
 
 # Check that we are branching to the definitions, and not range-extending
 # thunks.
 # CHECK-LABEL: test
-# CHECK:  10010014: {{.*}}  bl .+33554428
-# CHECK:  10010024: {{.*}}  b  .+33554428
+# CHECK:  10010014:       bl .+33554428
+# CHECK:  10010024:       b  .+33554428
 
 # NEGOFFSET-LABEL: test
-# NEGOFFSET:  10010014: {{.*}}  bl .-33554432
-# NEGOFFSET:  10010024: {{.*}}  b  .+33554432
+# NEGOFFSET:  10010014:       bl .-33554432
+# NEGOFFSET:  10010024:       b  .+33554432
 
 # .branch_lt[0]
 # THUNK-LABEL: __long_branch_callee:
-# THUNK-NEXT: 10010000: {{.*}} addis 12, 2, 1
-# THUNK-NEXT:                  ld 12, -32768(12)
-# THUNK-NEXT:                  mtctr 12
-# THUNK-NEXT:                  bctr
+# THUNK-NEXT: 10010000:       addis 12, 2, 1
+# THUNK-NEXT:                 ld 12, -32768(12)
+# THUNK-NEXT:                 mtctr 12
+# THUNK-NEXT:                 bctr
 
 # .branch_lt[1]
 # THUNK-LABEL: __long_branch_tail_callee:
-# THUNK-NEXT: 10010010: {{.*}} addis 12, 2, 1
-# THUNK-NEXT:                  ld 12, -32760(12)
-# THUNK-NEXT:                  mtctr 12
-# THUNK-NEXT:                  bctr
+# THUNK-NEXT: 10010010:       addis 12, 2, 1
+# THUNK-NEXT:                 ld 12, -32760(12)
+# THUNK-NEXT:                 mtctr 12
+# THUNK-NEXT:                 bctr
 
 # Each call now branches to a thunk, and although it is printed as positive
 # the offset is interpreted as a signed 26 bit value so 67108812 is actually
 # -52.
 # THUNK-LABEL: test:
-# THUNK: 10010034: {{.*}}  bl .-52
-# THUNK: 10010044: {{.*}}  b .+67108812
+# THUNK: 10010034:       bl .-52
+# THUNK: 10010044:       b .+67108812
 
 # The offset from the TOC to the .branch_lt section  is (-1 << 16) - 32768.
 #                Name             Type            Address          Off    Size
 # BRANCHLT:     .got              PROGBITS        0000000010020000 020000 000008
 # BRANCHLT:     .branch_lt        PROGBITS        0000000010030000 030000 000010
 # BRANCHLT-NOT: .plt
-

test/ELF/ppc64-dtprel.s

 // REQUIRES: ppc
 
 // RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
 // RUN: ld.lld -shared %t.o -o %t.so
 // RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s
 // RUN: llvm-readelf -r %t.so | FileCheck --check-prefix=OutputRelocs %s
-// RUN: llvm-objdump -D %t.so | FileCheck --check-prefix=Dis %s
-// RUN: llvm-objdump -D %t.so | FileCheck --check-prefix=GotDisLE %s
+// RUN: llvm-readelf -x .got %t.so | FileCheck --check-prefix=HEX-LE %s
+// RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck --check-prefix=Dis %s
 
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
 // RUN: ld.lld -shared %t.o -o %t.so
 // RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s
 // RUN: llvm-readelf -r %t.so | FileCheck --check-prefix=OutputRelocs %s
-// RUN: llvm-objdump -D %t.so | FileCheck --check-prefix=Dis %s
-// RUN: llvm-objdump -D %t.so | FileCheck --check-prefix=GotDisBE %s
+// RUN: llvm-readelf -x .got %t.so | FileCheck --check-prefix=HEX-BE %s
+// RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck --check-prefix=Dis %s
 
         .text
         .abiversion 2
         .globl  test
         .p2align        4
         .type   test,@function
 test:
 .Lfunc_gep0:

 // InputRelocs: R_PPC64_DTPREL64          {{[0-9a-f]+}} i + 8000
 
 // Expect a single dynamic relocation in the '.rela.dyn section for the module id.
 // OutputRelocs:      Relocation section '.rela.dyn' at offset 0x{{[0-9a-f]+}} contains 1 entries:
 // OutputRelocs-NEXT: Offset Info Type Symbol's Value Symbol's Name + Addend
 // OutputRelocs-NEXT: R_PPC64_DTPMOD64
 
 
-// i@dtprel  --> (1024 - 0x8000) = -31744
-// Dis: test:
-// Dis:    addi 4, 3, -31744
-// Dis:    lwa 4, -31744(3)
+// The got entry for i is at .got+8*3 = 0x420510
+// i@dtprel = 1024 - 0x8000 = -31744 = 0xffffffffffff8400
+// HEX-LE:      section '.got':
+// HEX-LE-NEXT: 4204f8 f8844200 00000000 00000000 00000000
+// HEX-LE-NEXT: 420508 00000000 00000000 0084ffff ffffffff
+
+// HEX-BE:      section '.got':
+// HEX-BE-NEXT: 4204f8 00000000 004284f8 00000000 00000000
+// HEX-BE-NEXT: 420508 00000000 00000000 ffffffff ffff8400
+
+// Dis:     test:
+// Dis:      addi 4, 3, -31744
+// Dis-NEXT: lwa 4, -31744(3)
 
 // #k@dtprel(1024 + 4 + 1024 * 1024 * 4) = 0x400404
 
 // #highesta(k@dtprel) --> ((0x400404 - 0x8000 + 0x8000) >> 48) & 0xffff = 0
 // #highera(k@dtprel)  --> ((0x400404 - 0x8000 + 0x8000) >> 32) & 0xffff = 0
 // #ha(k@dtprel)       --> ((0x400404 - 0x8000 + 0x8000) >> 16) & 0xffff = 64
 // #lo(k@dtprel)       --> ((0x400404 - 0x8000) & 0xffff = -31740
 // Dis:  test_adjusted:
 // Dis:     lis 4, 0
 // Dis:     ori 4, 4, 0
 // Dis:     lis 5, 64
 // Dis:     addi 5, 5, -31740
 
 // #highest(k@dtprel) --> ((0x400404 - 0x8000) >> 48) & 0xffff = 0
 // #higher(k@dtprel)  --> ((0x400404 - 0x8000) >> 32) & 0xffff = 0
 // #hi(k@dtprel)      --> ((0x400404 - 0x8000) >> 16) & 0xffff = 63
 // #lo(k@dtprel)      --> ((0x400404 - 0x8000) & 0xffff = 33796
 // Dis:  test_not_adjusted:
 // Dis:    lis 4, 0
 // Dis:    ori 4, 4, 0
 // Dis:    oris 4, 4, 63
 // Dis:    ori 4, 4, 33796
 
-// Check for GOT entry for i. There should be a got entry which holds the offset
-// of i relative to the dynamic thread pointer.
-// i@dtprel ->  (1024 - 0x8000) = 0xffff8400
-// GotDisBE: Disassembly of section .got:
-// GotDisBE: 4204f8: 00 00 00 00
-// GotDisBE: 4204fc: 00 42 84 f8
-// GotDisBE: 420510: ff ff ff ff
-// GotDisBE: 420514: ff ff 84 00
-
-// GotDisLE: Disassembly of section .got:
-// GotDisLE: 4204f8: f8 84 42 00
-// GotDisLE: 420510: 00 84 ff ff
-// GotDisLE: 420514: ff ff ff ff
-
-// Check that we have the correct offset to the got entry for i@got@dtprel
-// The got entry for i is 0x420510, and the TOC pointer is 0x4284f8.
-// #ha(i@got@dtprel) --> ((0x420510 - 0x4284f8 + 0x8000) >> 16) & 0xffff = 0
-// #lo(i@got@dtprel) --> (0x420510 - 0x4284f8) & 0xffff = -32744
-// #hi(i@got@dtprel) --> ((0x420510 - 0x4284f8) >> 16) & 0xffff = -1
-// i@got@dtprel --> 0x420510 - 0x4284f8 = -32744
+// #ha(i@got@dtprel) = ((0x420510 - (.got+0x8000) + 0x8000) >> 16) & 0xffff = 0
+// #lo(i@got@dtprel) = (0x420510 - (.got+0x8000)) & 0xffff = -32744
+// #hi(i@got@dtprel) = ((0x420510 - (.got+0x8000)) >> 16) & 0xffff = -1
+// i@got@dtprel --> 0x420510 - (.got+0x8000) = -32744
 // Dis: test_got_dtprel:
 // Dis:    addis 3, 2, 0
 // Dis:    ld 3, -32744(3)
 // Dis:    addis 3, 2, -1
 // Dis:    addi 3, 2, -32744

test/ELF/ppc64-entry-point.s

 # REQUIRES: ppc
 
-# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t
-# RUN: ld.lld %t -o %t2
-# RUN: llvm-objdump -D %t2 | FileCheck %s
-# RUN: llvm-objdump -D %t2 | FileCheck -check-prefix=CHECK-LE %s
-
-# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t
-# RUN: ld.lld %t -o %t2
-# RUN: llvm-objdump -D %t2 | FileCheck %s
-# RUN: llvm-objdump -D %t2 | FileCheck -check-prefix=CHECK-BE %s
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
+
+# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 
 .text
 .abiversion 2
 .globl  _start
 .p2align        4
 .type   _start,@function
 
 _start:
 .Lfunc_begin0:
 .Lfunc_gep0:
   lis   4, .Lfunc_gep0@ha
   addi  4, 4, .Lfunc_gep0@l
   # now r4 should contain the address of _start
 
-  lis   5, .TOC.-.Lfunc_gep0@ha
-  addi  5, 5, .TOC.-.Lfunc_gep0@l
+  lis   5, .TOC.-.Lfunc_gep0@ha   # R_PPC64_REL16_HA
+  addi  5, 5, .TOC.-.Lfunc_gep0@l # R_PPC64_REL16_LO
   # now r5 should contain the offset s.t. r4 + r5 = TOC base
 
   # exit 55
   li    0, 1
   li    3, 55
   sc
 .Lfunc_end0:
     .size   _start, .Lfunc_end0-.Lfunc_begin0
 
-// CHECK: 10010000:       {{.*}}     lis 4, 4097
-// CHECK-NEXT: 10010004:       {{.*}}     addi 4, 4, 0
-// CHECK-NEXT: 10010008:       {{.*}}     lis 5, 2
-// CHECK-NEXT: 1001000c:       {{.*}}     addi 5, 5, -32768
-
-// CHECK-LE: Disassembly of section .got:
-// CHECK-LE-NEXT: .got:
-// CHECK-LE-NEXT: 10020000:       00 80 02 10
-
-// CHECK-BE: Disassembly of section .got:
-// CHECK-BE-NEXT: .got:
-// CHECK-BE-NEXT: 10020000:       00 00 00 00 {{.*}}
-// CHECK-BE-NEXT: 10020004:       10 02 80 00 {{.*}}
+# NM-DAG: 0000000010028000 d .TOC.
+# NM-DAG: 0000000010010000 T _start
+
+# 0x10010000 = (4097<<16) + 0
+# CHECK:      10010000:       lis 4, 4097
+# CHECK-NEXT: 10010004:       addi 4, 4, 0
+# .TOC. - _start = (2<<16) - 32768
+# CHECK-NEXT: 10010008:       lis 5, 2
+# CHECK-NEXT: 1001000c:       addi 5, 5, -32768

test/ELF/ppc64-ifunc.s

 # REQUIRES: ppc
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
-# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/shared-ppc64.s -o %t2.o
-# RUN: ld.lld -shared %t2.o -o %t2.so
-# RUN: ld.lld %t.o %t2.so -o %t
-# RUN: llvm-objdump -D %t | FileCheck %s
-# RUN: llvm-readelf -dynamic-table %t | FileCheck --check-prefix=DT %s
-# RUN: llvm-readelf -dyn-relocations %t | FileCheck --check-prefix=DYNREL %s
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
+# RUN: llvm-readelf -S %t | FileCheck --check-prefix=SECTIONS %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
+# RUN: llvm-readelf -r %t | FileCheck --check-prefix=DYNREL %s
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/shared-ppc64.s -o %t2.o
-# RUN: ld.lld -shared %t2.o -o %t2.so
-# RUN: ld.lld %t.o %t2.so -o %t
-# RUN: llvm-objdump -D %t | FileCheck %s
-# RUN: llvm-readelf -dynamic-table %t | FileCheck --check-prefix=DT %s
-# RUN: llvm-readelf -dyn-relocations %t | FileCheck --check-prefix=DYNREL %s
-
-# CHECK: Disassembly of section .text:
-
-# Tocbase    + (0 << 16) + 32560
-# 0x100280e0 +  0        + 32560 = 0x10030010 (.plt[2])
-# CHECK: __plt_foo:
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
+# RUN: llvm-readelf -S %t | FileCheck --check-prefix=SECTIONS %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
+# RUN: llvm-readelf -r %t | FileCheck --check-prefix=DYNREL %s
+
+# NM-DAG: 0000000010028000 d .TOC.
+# NM-DAG: 0000000010010028 T ifunc
+# NM-DAG: 000000001001002c T ifunc2
+
+# SECTIONS: .plt NOBITS 0000000010030000
+
+# .plt[0] - .TOC. = 0x10030000 - 0x10028000 = (1<<16) - 32768
+# CHECK: __plt_ifunc:
 # CHECK-NEXT:     std 2, 24(1)
-# CHECK-NEXT:     addis 12, 2, 0
-# CHECK-NEXT:     ld 12, 32560(12)
+# CHECK-NEXT:     addis 12, 2, 1
+# CHECK-NEXT:     ld 12, -32768(12)
 # CHECK-NEXT:     mtctr 12
 # CHECK-NEXT:     bctr
 
-# Tocbase    + (0 << 16)  +  32568
-# 0x100280e0 +  0          + 32568 = 0x1003018 (.plt[3])
-# CHECK: __plt_ifunc:
+# .plt[1] - .TOC. = 0x10030000+8 - 0x10028000 = (1<<16) - 32760
+# CHECK: __plt_ifunc2:
 # CHECK-NEXT:     std 2, 24(1)
-# CHECK-NEXT:     addis 12, 2, 0
-# CHECK-NEXT:     ld 12, 32568(12)
+# CHECK-NEXT:     addis 12, 2, 1
+# CHECK-NEXT:     ld 12, -32760(12)
 # CHECK-NEXT:     mtctr 12
 # CHECK-NEXT:     bctr
 
-# CHECK: ifunc:
-# CHECK-NEXT: 10010028:  {{.*}} nop
-
+# __plt_ifunc - . = 0x10010000 - 0x10010038 = -56
+# __plt_ifunc2 - . = 0x10010014 - 0x10010040 = -44
 # CHECK: _start:
-# CHECK-NEXT:     addis 2, 12, 2
-# CHECK-NEXT:     addi 2, 2, -32588
-# CHECK-NEXT:     bl .-52
-# CHECK-NEXT:     ld 2, 24(1)
-# CHECK-NEXT:     bl .-40
-# CHECK-NEXT:     ld 2, 24(1)
+# CHECK-NEXT:                 addis 2, 12, 1
+# CHECK-NEXT:                 addi 2, 2, 32720
+# CHECK-NEXT: 10010038:       bl .-56
+# CHECK-NEXT:                 ld 2, 24(1)
+# CHECK-NEXT: 10010040:       bl .-44
+# CHECK-NEXT:                 ld 2, 24(1)
 
-# Check tocbase
-# CHECK:       Disassembly of section .got:
-# CHECK-NEXT:    .got:
-# CHECK-NEXT:    100200e0
-
-# Check .plt address
-# DT_PLTGOT should point to the start of the .plt section.
-# DT: 0x0000000000000003 PLTGOT 0x10030000
-
-# Check that we emit the correct dynamic relocation type for an ifunc
-# DYNREL: 'PLT' relocation section at offset 0x{{[0-9a-f]+}} contains 48 bytes:
-# 48 bytes --> 2 Elf64_Rela relocations
-# DYNREL-NEXT: Offset        Info           Type               Symbol's Value  Symbol's Name + Addend
-# DYNREL-NEXT: {{[0-9a-f]+}} {{[0-9a-f]+}}  R_PPC64_JMP_SLOT      {{0+}}            foo + 0
-# DYNREL-NEXT: {{[0-9a-f]+}} {{[0-9a-f]+}}  R_PPC64_IRELATIVE     10010028
-
-
-    .text
-    .abiversion 2
+# Check that we emit 2 R_PPC64_IRELATIVE.
+# DYNREL: R_PPC64_IRELATIVE       10010028
+# DYNREL: R_PPC64_IRELATIVE       1001002c
 
 .type ifunc STT_GNU_IFUNC
 .globl ifunc
 ifunc:
   nop
 
-    .global _start
-    .type   _start,@function
+.type ifunc2 STT_GNU_IFUNC
+.globl ifunc2
+ifunc2:
+  nop
+
 
 _start:
 .Lfunc_gep0:
   addis 2, 12, .TOC.-.Lfunc_gep0@ha
   addi 2, 2, .TOC.-.Lfunc_gep0@l
 .Lfunc_lep0:
   .localentry     _start, .Lfunc_lep0-.Lfunc_gep0
-  bl foo
-  nop
   bl ifunc
   nop
+  bl ifunc2
+  nop

test/ELF/ppc64-long-branch.s

 # REQUIRES: ppc
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
-# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/ppc64-func-global-entry.s -o %t2.o
-# RUN: ld.lld  -shared %t2.o  -o %t3.so
-# RUN: ld.lld --no-toc-optimize %t.o %t3.so -o %t
-# RUN: llvm-objdump -d -start-address=0x10010000 -stop-address=0x10010018 %t | FileCheck %s -check-prefix=CALLEE_DUMP
-# RUN: llvm-objdump -d -start-address=0x12010020 -stop-address=0x12010084 %t | FileCheck %s -check-prefix=CALLER_DUMP
-# RUN: llvm-objdump -D -start-address=0x12030008 -stop-address=0x12030010 %t | FileCheck %s -check-prefix=BRANCH_LT_LE
-# RUN: llvm-readelf --sections %t | FileCheck %s -check-prefix=SECTIONS
+# RUN: ld.lld --no-toc-optimize %t.o -o %t
+# RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
+# RUN: llvm-readelf -x .branch_lt %t | FileCheck %s -check-prefix=BRANCH-LE
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/ppc64-func-global-entry.s -o %t2.o
-# RUN: ld.lld  -shared %t2.o  -o %t3.so
-# RUN: ld.lld --no-toc-optimize %t.o %t3.so -o %t
-# RUN: llvm-objdump -d -start-address=0x10010000 -stop-address=0x10010018 %t | FileCheck %s -check-prefix=CALLEE_DUMP
-# RUN: llvm-objdump -d -start-address=0x12010020 -stop-address=0x12010084 %t | FileCheck %s -check-prefix=CALLER_DUMP
-# RUN: llvm-objdump -D -start-address=0x12030008 -stop-address=0x12030010 %t | FileCheck %s -check-prefix=BRANCH_LT_BE
-# RUN: llvm-readelf --sections %t | FileCheck %s -check-prefix=SECTIONS
+# RUN: ld.lld --no-toc-optimize %t.o -o %t
+# RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
+# RUN: llvm-readelf -x .branch_lt %t | FileCheck %s -check-prefix=BRANCH-BE
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 
         .text
         .abiversion 2
         .protected callee
         .globl callee
         .p2align 4
         .type callee,@function
 callee:
.Lfunc_gep1:
     addis 2, 12, .TOC.-.Lfunc_gep1@ha
     addi 2, 2, .TOC.-.Lfunc_gep1@l
 .Lfunc_lep1:
     .localentry _start, .Lfunc_lep1-.Lfunc_gep1
     mflr 0
     std  0, 16(1)
     stdu 1, -32(1)
     bl callee
-    bl foo_external_diff
-    nop
+    bl callee
     addi 1, 1, 32
     ld   0, 16(1)
     mtlr 0
 
-    addis 4, 2, .LC1@toc@ha
-    ld    4, .LC1@toc@l(4)
-    lwz   4, 0(4)
-    add   3, 3, 4
-    blr
-
-
         .section        .toc,"aw",@progbits
 .LC0:
        .tc a[TC],a
-.LC1:
-       .tc b[TC],b
 
 
         .data
         .type a,@object
         .globl a
         .p2align 2
 a:
         .long 11
         .size a, 4
 
-        .type b,@object
-        .global b
-        .p2align 2
-b:
-        .long 33
-        .size b, 4
-
-# Verify address of the callee
-# CALLEE_DUMP: callee:
-# CALLEE_DUMP:   10010000:  {{.*}}  addis 2, 12, 514
-# CALLEE_DUMP:   10010004:  {{.*}}  addi 2, 2, -32544
-# CALLEE_DUMP:   10010008:  {{.*}}  addis 4, 2, 0
-
-# Verify the address of _start, and the call to the long-branch thunk.
-# CALLER_DUMP: _start:
-# CALLER_DUMP:   12010020:  {{.*}}  addis 2, 12, 2
-# CALLER_DUMP:   12010038:  {{.*}}  bl .+56
-
-# Verify the thunks contents: TOC-pointer + offset = .branch_lt[0]
-#                             0x120380e8  + (-2 << 16 + 32552) = 0x12020008
-# CALLER_DUMP: __long_branch_callee:
-# CALLER_DUMP:   12010060:  {{.*}}  addis 12, 2, 0
-# CALLER_DUMP:   12010064:  {{.*}}  ld 12, 32552(12)
-# CALLER_DUMP:   12010068:  {{.*}}  mtctr 12
-# CALLER_DUMP:   1201006c:  {{.*}}  bctr
-
-# BRANCH_LT_LE:     Disassembly of section .branch_lt:
-# BRANCH_LT_LE-NEXT:  .branch_lt:
-# BRANCH_LT_LE-NEXT:  12030008:   08 00 01 10
-# BRANCH_LT_LE-NEXT:  1203000c:   00 00 00 00
-
-# BRANCH_LT_BE:     Disassembly of section .branch_lt:
-# BRANCH_LT_BE-NEXT:  .branch_lt:
-# BRANCH_LT_BE-NEXT:  12030008:   00 00 00 00
-# BRANCH_LT_BE-NEXT:  1203000c:   10 01 00 08
-
-#            [Nr] Name        Type            Address          Off     Size
-# SECTIONS:  [ 9] .got        PROGBITS        00000000120200e0 20200e0 000008
-# SECTIONS:  [12] .branch_lt  PROGBITS        0000000012030008 2030008 000008
+# NM: 0000000012028000 d .TOC.
+
+# Without --toc-optimize, compute the address of .toc[0] first. .toc[0] stores
+# the address of a.
+# .TOC. - callee = 0x12030000 - 0x10010000 = (514<<16) - 32768
+# CHECK: callee:
+# CHECK:   10010000:       addis 2, 12, 514
+# CHECK:   10010004:       addi 2, 2, -32768
+# CHECK:   10010008:       addis 4, 2, 0
+
+# __long_branch_callee - . = 0x12010050 - 0x12010034 = 20
+# __long_branch_callee is not a PLT call stub. Calling it does not need TOC
+# restore, so it doesn't have to be followed by a nop.
+# CHECK: _start:
+# CHECK:   12010034:       bl .+20
+# CHECK:   12010038:       bl .+16
+
+# BRANCH-LE:     section '.branch_lt':
+# BRANCH-LE-NEXT: 0x12030008 08000110 00000000
+# BRANCH-BE:     section '.branch_lt':
+# BRANCH-BE-NEXT: 0x12030008 00000000 10010008
+
+# .branch_lt - .TOC. = 0x12030008 - 0x12028000 = (1<<16) - 32760
+# CHECK:     __long_branch_callee:
+# CHECK-NEXT: 12010048:       addis 12, 2, 1
+# CHECK-NEXT:                 ld 12, -32760(12)
+# CHECK-NEXT:                 mtctr 12
+# CHECK-NEXT:                 bctr

test/ELF/ppc64-relocs.s

 # REQUIRES: ppc
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-objdump -D %t2 | FileCheck %s --check-prefix=DATALE
-# RUN: llvm-objdump -D %t2 | FileCheck %s
+# RUN: llvm-readelf -x .rodata -x .eh_frame %t2 | FileCheck %s --check-prefix=DATALE
+# RUN: llvm-objdump -d --no-show-raw-insn %t2 | FileCheck %s
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-objdump -D %t2 | FileCheck %s --check-prefix=DATABE
-# RUN: llvm-objdump -D %t2 | FileCheck %s
+# RUN: llvm-readelf -x .rodata -x .eh_frame %t2 | FileCheck %s --check-prefix=DATABE
+# RUN: llvm-objdump -d --no-show-raw-insn %t2 | FileCheck %s
 
 .text
 .global _start
 _start:
 .Lfoo:
   li      0,1
   li      3,42
   sc

 
 .section .R_PPC64_TOC16_LO_DS,"ax",@progbits
 .globl .FR_PPC64_TOC16_LO_DS
 .FR_PPC64_TOC16_LO_DS:
   ld 1, .L1@toc@l(2)
 
 # CHECK: Disassembly of section .R_PPC64_TOC16_LO_DS:
 # CHECK: .FR_PPC64_TOC16_LO_DS:
-# CHECK: 1001000c:       {{.*}}     ld 1, -32768(2)
+# CHECK: 1001000c:       ld 1, -32768(2)
 
 .section .R_PPC64_TOC16_LO,"ax",@progbits
 .globl .FR_PPC64_TOC16_LO
 .FR_PPC64_TOC16_LO:
   addi  1, 2, .L1@toc@l
 
 # CHECK: Disassembly of section .R_PPC64_TOC16_LO:
 # CHECK: .FR_PPC64_TOC16_LO:
-# CHECK: 10010010: {{.*}} addi 1, 2, -32768
+# CHECK: 10010010:       addi 1, 2, -32768
 
 .section .R_PPC64_TOC16_HI,"ax",@progbits
 .globl .FR_PPC64_TOC16_HI
 .FR_PPC64_TOC16_HI:
   addis 1, 2, .L1@toc@h
 
 # CHECK: Disassembly of section .R_PPC64_TOC16_HI:
 # CHECK: .FR_PPC64_TOC16_HI:
-# CHECK: 10010014: {{.*}} addis 1, 2, -1
+# CHECK: 10010014:       addis 1, 2, -1
 
 .section .R_PPC64_TOC16_HA,"ax",@progbits
 .globl .FR_PPC64_TOC16_HA
 .FR_PPC64_TOC16_HA:
   addis 1, 2, .L1@toc@ha
 
 # CHECK: Disassembly of section .R_PPC64_TOC16_HA:
 # CHECK: .FR_PPC64_TOC16_HA:
-# CHECK: 10010018: {{.*}} nop
+# CHECK: 10010018:       nop
 
 .section .R_PPC64_REL24,"ax",@progbits
 .globl .FR_PPC64_REL24
 .FR_PPC64_REL24:
   b .Lfoox
 .section .R_PPC64_REL24_2,"ax",@progbits
 .Lfoox:
 
 # CHECK: Disassembly of section .R_PPC64_REL24:
 # CHECK: .FR_PPC64_REL24:
-# CHECK: 1001001c: {{.*}} b .+4
+# CHECK: 1001001c:       b .+4
 
 .section .R_PPC64_REL14,"ax",@progbits
 .globl .FR_PPC64_REL14
 .FR_PPC64_REL14:
   beq .Lfooy
 .section .R_PPC64_REL14_2,"ax",@progbits
 .Lfooy:
 
 # CHECK: Disassembly of section .R_PPC64_REL14:
 # CHECK: .FR_PPC64_REL14:
-# CHECK: 10010020: {{.*}} bt 2, .+4
+# CHECK: 10010020:       bt 2, .+4
 
 .section .R_PPC64_ADDR16_LO,"ax",@progbits
 .globl .FR_PPC64_ADDR16_LO
 .FR_PPC64_ADDR16_LO:
   li 1, .Lfoo@l
 
 # CHECK: Disassembly of section .R_PPC64_ADDR16_LO:
 # CHECK: .FR_PPC64_ADDR16_LO:
-# CHECK: 10010024: {{.*}} li 1, 0
+# CHECK: 10010024:       li 1, 0
 
 .section .R_PPC64_ADDR16_HI,"ax",@progbits
 .globl .FR_PPC64_ADDR16_HI
 .FR_PPC64_ADDR16_HI:
   li 1, .Lfoo@h
 
 # CHECK: Disassembly of section .R_PPC64_ADDR16_HI:
 # CHECK: .FR_PPC64_ADDR16_HI:
-# CHECK: 10010028: {{.*}} li 1, 4097
+# CHECK: 10010028:       li 1, 4097
 
 .section .R_PPC64_ADDR16_HA,"ax",@progbits
 .globl .FR_PPC64_ADDR16_HA
 .FR_PPC64_ADDR16_HA:
   li 1, .Lfoo@ha
 
 # CHECK: Disassembly of section .R_PPC64_ADDR16_HA:
 # CHECK: .FR_PPC64_ADDR16_HA:
-# CHECK: 1001002c: {{.*}} li 1, 4097
+# CHECK: 1001002c:       li 1, 4097
 
 .section .R_PPC64_ADDR16_HIGHER,"ax",@progbits
 .globl .FR_PPC64_ADDR16_HIGHER
 .FR_PPC64_ADDR16_HIGHER:
   li 1, .Lfoo@higher
 
 # CHECK: Disassembly of section .R_PPC64_ADDR16_HIGHER:
 # CHECK: .FR_PPC64_ADDR16_HIGHER:
-# CHECK: 10010030: {{.*}} li 1, 0
+# CHECK: 10010030:       li 1, 0
 
 .section .R_PPC64_ADDR16_HIGHERA,"ax",@progbits
 .globl .FR_PPC64_ADDR16_HIGHERA
 .FR_PPC64_ADDR16_HIGHERA:
   li 1, .Lfoo@highera
 
 # CHECK: Disassembly of section .R_PPC64_ADDR16_HIGHERA:
 # CHECK: .FR_PPC64_ADDR16_HIGHERA:
-# CHECK: 10010034: {{.*}} li 1, 0
+# CHECK: 10010034:       li 1, 0
 
 .section .R_PPC64_ADDR16_HIGHEST,"ax",@progbits
 .globl .FR_PPC64_ADDR16_HIGHEST
 .FR_PPC64_ADDR16_HIGHEST:
   li 1, .Lfoo@highest
 
 # CHECK: Disassembly of section .R_PPC64_ADDR16_HIGHEST:
 # CHECK: .FR_PPC64_ADDR16_HIGHEST:
-# CHECK: 10010038: {{.*}} li 1, 0
+# CHECK: 10010038:       li 1, 0
 
 .section .R_PPC64_ADDR16_HIGHESTA,"ax",@progbits
 .globl .FR_PPC64_ADDR16_HIGHESTA
 .FR_PPC64_ADDR16_HIGHESTA:
   li 1, .Lfoo@highesta
 
 # CHECK: Disassembly of section .R_PPC64_ADDR16_HIGHESTA:
 # CHECK: .FR_PPC64_ADDR16_HIGHESTA:
-# CHECK: 1001003c: {{.*}} li 1, 0
+# CHECK: 1001003c:       li 1, 0
 
 .section  .R_PPC64_REL32, "ax",@progbits
 .globl .FR_PPC64_REL32
 .FR_PPC64_REL32:
   addis 5, 2, .LC0@toc@ha
   ld 5, .LC0@toc@l(5)
 .LBB0_2:
   add 3, 3, 4
 
-# DATALE: Disassembly of section .rodata:
-# DATALE: .rodata:
-# DATALE: 100001c8: 80 fe 00 00
-
-# DATABE: Disassembly of section .rodata:
-# DATABE: .rodata:
-# DATABE: 100001c8: 00 00 fe 80
+# DATALE: '.rodata':
+# DATALE: 0x100001c8 80fe0000
+
+# DATABE: '.rodata':
+# DATABE: 0x100001c8 0000fe80
 
 # Address of rodata + value stored at rodata entry
 # should equal address of LBB0_2.
 # 0x10000190 + 0xfeb4 = 0x10010044
 # CHECK: Disassembly of section .R_PPC64_REL32:
 # CHECK: .FR_PPC64_REL32:
-# CHECK: 10010040: {{.*}} nop
-# CHECK: 10010044: {{.*}} ld 5, -32736(2)
-# CHECK: 10010048: {{.*}} add 3, 3, 4
+# CHECK: 10010040:       nop
+# CHECK: 10010044:       ld 5, -32736(2)
+# CHECK: 10010048:       add 3, 3, 4
 
 .section .R_PPC64_REL64, "ax",@progbits
 .globl  .FR_PPC64_REL64
 .FR_PPC64_REL64:
         .cfi_startproc
         .cfi_personality 148, __foo
         li 0, 1
         li 3, 55
         sc
         .cfi_endproc
 __foo:
   li 3,0
 
-# Check that address of eh_frame entry + value stored
-# should equal the address of foo. Since it is not aligned,
-# the entry is not stored exactly at 10000198. It starts at
-# address 0x1000019a and has the value 0xfeaa.
-# 0x100001aa + 0xfeae = 0x10010058
-# DATALE: Disassembly of section .eh_frame:
-# DATALE: .eh_frame:
-# DATALE: 100001d0: {{.*}} 00 00
-
-# DATABE: Disassembly of section .eh_frame:
-# DATABE: .eh_frame:
-# DATABE: 100001e8: fe 76 {{.*}}
+# Check that the personality (relocated by R_PPC64_REL64) in the .eh_frame
+# equals the address of __foo.
+# 0x100001e2 + 0x76fe = 0x10010058
+# DATALE: section '.eh_frame':
+# DATALE: 0x100001e0 {{....}}76fe
+
+# DATABE: section '.eh_frame':
+# DATABE: 0x100001e0 {{[0-9a-f]+ [0-9a-f]+}} fe76{{....}}
 
 # CHECK: __foo
-# CHECK-NEXT: 10010058: {{.*}} li 3, 0
+# CHECK-NEXT: 10010058:       li 3, 0

test/ELF/ppc64-tls-gd-le-small.s

 # REQUIRES: ppc
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
-# RUN: llvm-objdump -d -r %t.o | FileCheck --check-prefix=CHECK-INPUT %s
+# RUN: llvm-objdump -d --no-show-raw-insn -r %t.o | FileCheck --check-prefix=CHECK-INPUT %s
 # RUN: ld.lld  --defsym __tls_get_addr=0x10001000 %t.o -o %t
-# RUN: llvm-objdump -d %t | FileCheck --check-prefix=CHECK-DIS %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=CHECK-DIS %s
 # RUN: llvm-readelf -relocations %t | FileCheck --check-prefix=DYN-RELOCS %s
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
-# RUN: llvm-objdump -d -r %t.o | FileCheck --check-prefix=CHECK-INPUT %s
+# RUN: llvm-objdump -d --no-show-raw-insn -r %t.o | FileCheck --check-prefix=CHECK-INPUT %s
 # RUN: ld.lld  --defsym __tls_get_addr=0x10001000 %t.o -o %t
-# RUN: llvm-objdump -d %t | FileCheck --check-prefix=CHECK-DIS %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=CHECK-DIS %s
 # RUN: llvm-readelf -relocations %t | FileCheck --check-prefix=DYN-RELOCS %s
 
 # Test checks the relaxation of a 'small' general-dynamic tls access into a
 # local-exec tls access.
 
         .text
         .abiversion 2
 

test/ELF/ppc64-tls-ie-le.s

 // REQUIRES: ppc
 
 // RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/ppc64-tls-ie-le.s -o %t2.o
 // RUN: ld.lld -dynamic-linker /lib64/ld64.so.2 %t.o %t2.o -o %t
 // RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s
 // RUN: llvm-readelf -r %t | FileCheck --check-prefix=OutputRelocs %s
-// RUN: llvm-objdump -d %t | FileCheck --check-prefix=Dis %s
+// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=Dis %s
 
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/ppc64-tls-ie-le.s -o %t2.o
 // RUN: ld.lld -dynamic-linker /lib64/ld64.so.2 %t.o %t2.o -o %t
 // RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s
 // RUN: llvm-readelf -r %t | FileCheck --check-prefix=OutputRelocs %s
-// RUN: llvm-objdump -d %t | FileCheck --check-prefix=Dis %s
+// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=Dis %s
 
   .text
   .abiversion 2
 test1:                                  # @test1
   addis 3, 2, c@got@tprel@ha
   ld 3, c@got@tprel@l(3)
   lbzx 3, 3, c@tls
   blr

test/ELF/ppc64-tls-ld-le.s

 // REQUIRES: ppc
 
 // RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
 // RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s
 // RUN: ld.lld  %t.o -o %t
-// RUN: llvm-objdump -d %t | FileCheck --check-prefix=Dis %s
+// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=Dis %s
 // RUN: llvm-readelf -r %t | FileCheck --check-prefix=OutputRelocs %s
 
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
 // RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s
 // RUN: ld.lld  %t.o -o %t
-// RUN: llvm-objdump -d %t | FileCheck --check-prefix=Dis %s
+// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=Dis %s
 // RUN: llvm-readelf -r %t | FileCheck --check-prefix=OutputRelocs %s
 
   .text
   .abiversion 2
   .globl  _start                    # -- Begin function _start
   .p2align  4
   .type _start,@function
 _start:                                   # @_start

test/ELF/ppc64-toc-addis-nop-lqsq.s

 # REQUIRES: ppc
 
 # RUN: llvm-readelf -relocations --wide  %p/Inputs/ppc64le-quadword-ldst.o | FileCheck --check-prefix=QuadInputRelocs %s
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/shared-ppc64.s -o %t2.o
 # RUN: ld.lld -shared %t2.o -o %t2.so
 
 # RUN: ld.lld  %t2.so %p/Inputs/ppc64le-quadword-ldst.o -o %t
-# RUN: llvm-objdump -D %t | FileCheck --check-prefix=Dis %s
+# RUN: llvm-objdump -d %t | FileCheck --check-prefix=Dis %s
 
 # RUN: ld.lld --no-toc-optimize %t2.so %p/Inputs/ppc64le-quadword-ldst.o -o %t
-# RUN: llvm-objdump -D %t | FileCheck --check-prefix=NoOpt %s
+# RUN: llvm-objdump -d %t | FileCheck --check-prefix=NoOpt %s
 
 # QuadInputRelocs: Relocation section '.rela.text'
 # QuadInputRelocs:  R_PPC64_TOC16_LO_DS    0000000000000000 quadLd
 # QuadInputRelocs:  R_PPC64_TOC16_LO_DS    0000000000000010 quadSt
 
 # The powerpc backend doesn't support the quadword load/store instructions yet.
 # So they are tested by linking against an object file assembled with
 # `as -mpower9 -o ppc64le-quadword-ldst.o in.s` and checking the encoding of

 # NoOpt-LABEL: quads:
 # NoOpt-NEXT:    addis
 # NoOpt-NEXT:    addi
 # NoOpt-NEXT:    addis 3, 2, 0
 # NoOpt-NEXT:    70 7f 83 e0  <unknown>
 # NoOpt-NEXT:    addis 3, 2, 0
 # NoOpt-NEXT:    82 7f 83 f8  <unknown>
 # NoOpt-NEXT:    blr
-

test/ELF/ppc64-toc-addis-nop.s

 # REQUIRES: ppc
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
-# RUN: llvm-readelf -relocations --wide %t.o | FileCheck --check-prefix=InputRelocs %s
+# RUN: llvm-readelf -r %t.o | FileCheck --check-prefix=InputRelocs %s
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/shared-ppc64.s -o %t2.o
 # RUN: ld.lld -shared %t2.o -o %t2.so
 #
 # RUN: ld.lld  %t2.so %t.o -o %t
-# RUN: llvm-objdump -D %t | FileCheck --check-prefix=Dis %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=Dis %s
 #
 # RUN: ld.lld --no-toc-optimize %t2.so %t.o -o %t
-# RUN: llvm-objdump -D %t | FileCheck --check-prefix=NoOpt %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=NoOpt %s
 
 # InputRelocs:  Relocation section '.rela.text'
 # InputRelocs:   R_PPC64_TOC16_HA
 # InputRelocs:   R_PPC64_TOC16_LO
 # InputRelocs:   R_PPC64_TOC16_LO_DS
 
 
         .text
   .abiversion 2
 
         .global bytes
         .p2align        4
         .type   bytes,@function
 bytes:
 .Lbytes_gep:
         addis 2, 12, .TOC.-.Lbytes_gep@ha
         addi  2, 2,  .TOC.-.Lbytes_gep@l
 .Lbytes_lep:
         .localentry     bytes, .Lbytes_lep-.Lbytes_gep
         addis 3, 2, byteLd@toc@ha
         lbz   3,    byteLd@toc@l(3)
         addis 4, 2, byteSt@toc@ha
         stb   3,    byteSt@toc@l(4)
         blr
-# Dis-LABEL: bytes
+# Dis-LABEL: bytes:
 # Dis-NEXT:   addis
 # Dis-NEXT:   addi
 # Dis-NEXT:   nop
 # Dis-NEXT:   lbz   3, 32624(2)
 # Dis-NEXT:   nop
 # Dis-NEXT:   stb   3, 32625(2)
 # Dis-NEXT:   blr
 
-# NoOpt-LABEL: bytes
+# NoOpt-LABEL: bytes:
 # NoOpt-NEXT:     addis
 # NoOpt-NEXT:     addi
 # NoOpt-NEXT:     addis 3, 2, 0
 # NoOpt-NEXT:     lbz 3, 32624(3)
 # NoOpt-NEXT:     addis 4, 2, 0
 # NoOpt-NEXT:     stb 3, 32625(4)
 # NoOpt-NEXT:     blr
 
         .global  halfs
         .p2align        4
         .type   halfs,@function
 halfs:
 .Lhalfs_gep:
         addis 2, 12, .TOC.-.Lhalfs_gep@ha
         addi  2, 2,  .TOC.-.Lhalfs_gep@l
 .Lhalfs_lep:
         .localentry  halfs, .Lhalfs_lep-.Lhalfs_gep
         addis 3, 2, halfLd@toc@ha
         lhz   3,    halfLd@toc@l(3)
         addis 4, 2, halfLd@toc@ha
         lha   4,    halfLd@toc@l(4)
         addis 5, 2, halfSt@toc@ha
         sth   4,    halfSt@toc@l(5)
         blr
-# Dis-LABEL: halfs
+# Dis-LABEL: halfs:
 # Dis-NEXT:   addis
 # Dis-NEXT:   addi
 # Dis-NEXT:   nop
 # Dis-NEXT:   lhz   3, 32626(2)
 # Dis-NEXT:   nop
 # Dis-NEXT:   lha 4, 32626(2)
 # Dis-NEXT:   nop
 # Dis-NEXT:   sth 4, 32628(2)
 # Dis-NEXT:   blr
 
-# NoOpt-LABEL: halfs
+# NoOpt-LABEL: halfs:
 # NoOpt-NEXT:   addis
 # NoOpt-NEXT:   addi
 # NoOpt-NEXT:   addis 3, 2, 0
 # NoOpt-NEXT:   lhz   3, 32626(3)
 # NoOpt-NEXT:   addis 4, 2, 0
 # NoOpt-NEXT:   lha 4, 32626(4)
 # NoOpt-NEXT:   addis 5, 2, 0
 # NoOpt-NEXT:   sth 4, 32628(5)

 .Lvec_dq_lep:
         .localentry  vec_dq, .Lvec_dq_lep-.Lvec_dq_gep
         addis 3, 2, vecLd@toc@ha
         lxv   3,    vecLd@toc@l(3)
         addis 3, 2, vecSt@toc@ha
         stxv  3,    vecSt@toc@l(3)
         blr
 
-# Dis-LABEL: vec_dq
+# Dis-LABEL: vec_dq:
 # Dis-NEXT:    addis
 # Dis-NEXT:    addi
 # Dis-NEXT:    nop
 # Dis-NEXT:    lxv 3, 32656(2)
 # Dis-NEXT:    nop
 # Dis-NEXT:    stxv 3, 32672(2)
 # Dis-NEXT:    blr
 
-# NoOpt-LABEL: vec_dq
+# NoOpt-LABEL: vec_dq:
 # NoOpt-NEXT:    addis
 # NoOpt-NEXT:    addi
 # NoOpt-NEXT:    addis 3, 2, 0
 # NoOpt-NEXT:    lxv 3, 32656(3)
 # NoOpt-NEXT:    addis 3, 2, 0
 # NoOpt-NEXT:    stxv 3, 32672(3)
 # NoOpt-NEXT:    blr
 
.Lvec_ds_lep:
         lxsd   3,    vecLd@toc@l(3)
         addis  3, 2, vecSt@toc@ha
         stxsd  3,    vecSt@toc@l(3)
         addis  3, 2, vecLd@toc@ha
         lxssp  3,    vecLd@toc@l(3)
         addis  3, 2, vecSt@toc@ha
         stxssp 3,    vecSt@toc@l(3)
         blr
-# Dis-LABEL: vec_ds
+# Dis-LABEL: vec_ds:
 # Dis-NEXT:   addis
 # Dis-NEXT:   addi
 # Dis-NEXT:   nop
 # Dis-NEXT:   lxsd 3, 32656(2)
 # Dis-NEXT:   nop
 # Dis-NEXT:   stxsd 3, 32672(2)
 # Dis-NEXT:   nop
 # Dis-NEXT:   lxssp 3, 32656(2)
 # Dis-NEXT:   nop
 # Dis-NEXT:   stxssp 3, 32672(2)
 # Dis-NEXT:   blr
 
-# NoOpt-LABEL: vec_ds
+# NoOpt-LABEL: vec_ds:
 # NoOpt-NEXT:   addis
 # NoOpt-NEXT:   addi
 # NoOpt-NEXT:   addis 3, 2, 0
 # NoOpt-NEXT:   lxsd 3, 32656(3)
 # NoOpt-NEXT:   addis 3, 2, 0
 # NoOpt-NEXT:   stxsd 3, 32672(3)
 # NoOpt-NEXT:   addis 3, 2, 0
 # NoOpt-NEXT:   lxssp 3, 32656(3)

test/ELF/ppc64-toc-rel.s

 # REQUIRES: ppc
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
 # RUN: llvm-readobj -relocations %t.o | FileCheck -check-prefix=RELOCS-LE %s
-# RUN: ld.lld %t.o -o %t2
-# RUN: llvm-objdump -D %t2 | FileCheck %s
-# RUN: llvm-objdump -D %t2 | FileCheck -check-prefix=CHECK-LE %s
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
+# RUN: llvm-readelf -x .got %t | FileCheck --check-prefix=HEX-LE %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=CHECK %s
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
 # RUN: llvm-readobj -relocations %t.o | FileCheck -check-prefix=RELOCS-BE %s
-# RUN: ld.lld %t.o -o %t2
-# RUN: llvm-objdump -D %t2 | FileCheck %s
-# RUN: llvm-objdump -D %t2 | FileCheck -check-prefix=CHECK-BE %s
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-nm %t | FileCheck --check-prefix=NM %s
+# RUN: llvm-readelf -x .got %t | FileCheck --check-prefix=HEX-BE %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=CHECK %s
 
 # Make sure we calculate the offset correctly for a toc-relative access to a
 # global variable as described by the PPC64 Elf V2 abi.
 .abiversion 2
 
 #  int global_a = 55
    .globl      global_a
    .section    ".data"

 # RELOCS-LE:          0x8 R_PPC64_TOC16_HA global_a 0x0
 # RELOCS-LE:          0xC R_PPC64_TOC16_LO global_a 0x0
 
 # RELOCS-BE:      Relocations [
 # RELOCS-BE-NEXT:   .rela.text {
 # RELOCS-BE:          0xA R_PPC64_TOC16_HA global_a 0x0
 # RELOCS-BE:          0xE R_PPC64_TOC16_LO global_a 0x0
 
-# Want to check _start for the values used to build the offset from the TOC base
-# to global_a. The .TOC. symbol is expected at address 0x10030000, and the
-# TOC base is address-of(.TOC.) + 0x8000.  The expected offset is:
-# 0x10020000(global_a) - 0x10038000(Toc base) = -0x18000(Offset)
-# which gets materialized into r3 as ((-1 << 16) - 32768).
-
-# CHECK:      Disassembly of section .text:
-# CHECK-NEXT: _start:
-# CHECK:      10010008:       {{.*}}     addis 3, 2, 1
-# CHECK-NEXT: 1001000c:       {{.*}}     addi 3, 3, -32768
-
-# CHECK:      Disassembly of section .data:
-# CHECK-NEXT: global_a:
-# CHECK-NEXT: 10030000:       {{.*}}
-
-# CHECK-LE:      Disassembly of section .got:
-# CHECK-LE-NEXT: .got:
-# CHECK-LE-NEXT: 10020000:       00 80 02 10
-
-# CHECK-BE:      Disassembly of section .got:
-# CHECK-BE-NEXT: .got:
-# CHECK-BE-NEXT: 10020000:       00 00 00 00
-# CHECK-BE-NEXT: 10020004:       10 02 80 00
+# The .TOC. symbol represents the TOC base address: .got + 0x8000 = 0x10028000,
+# which is stored in the first entry of .got
+# NM: 0000000010028000 d .TOC.
+# NM: 0000000010030000 D global_a
+# HEX-LE:     section '.got':
+# HEX-LE-NEXT: 0x10020000 00800210 00000000
+# HEX-BE:     section '.got':
+# HEX-BE-NEXT: 0x10020000 00000000 10028000
+
+# r2 stores the TOC base address. To access global_a with r3, it
+# computes the address with TOC plus an offset.
+# The offset global_a - .TOC. = 0x10030000 - 0x10028000 = 0x8000
+# gets materialized as (1 << 16) - 32768.
+# CHECK:      _start:
+# CHECK:      10010008:       addis 3, 2, 1
+# CHECK-NEXT: 1001000c:       addi 3, 3, -32768

test/ELF/ppc64-toc-restore-recursive-call.s

 # REQUIRES: ppc
 
-# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t1.o
-# RUN: ld.lld -shared %t1.o -o %t
-# RUN: llvm-objdump -d -r %t | FileCheck %s
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
+# RUN: ld.lld -shared %t.o -o %t.so
+# RUN: llvm-objdump -d --no-show-raw-insn -r %t.so | FileCheck %s
 
 # For a recursive call that is interposable the linker calls the plt-stub rather
 # then calling the function directly. Since the call is through a plt stub and
 # might be interposed with a different definition at runtime, a toc-restore is
 # required to follow the call.
 
 # The decision to use a plt-stub for the recursive call is not one I feel
 # strongly about either way. It was done because it matches what bfd and gold do
 # for recursive calls as well as keeps the logic for recursive calls consistent
 # with non-recursive calls.
 
 # CHECK-LABEL: __plt_recursive_func:
 # CHECK-NEXT: 10000:
 # CHECK-LABEL: recursive_func
 # CHECK-NEXT:  10014:
-# CHECK:       1003c: {{.*}}  bl .-60
-# CHECK-NEXT:  ld 2, 24(1)
+# CHECK:       1003c:       bl .-60
+# CHECK-NEXT:  10040:       ld 2, 24(1)
 
         .abiversion 2
         .section ".text"
         .p2align 2
         .global recursive_func
         .type recursive_func, @function
 recursive_func:
 .Lrf_gep:

test/ELF/ppc64-toc-restore.s

 // REQUIRES: ppc
 
 // RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/shared-ppc64.s -o %t2.o
 // RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %p/Inputs/ppc64-func.s -o %t3.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld %t.o %t2.so %t3.o -o %t
-// RUN: llvm-objdump -d %t | FileCheck %s
+// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/shared-ppc64.s -o %t2.o
 // RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %p/Inputs/ppc64-func.s -o %t3.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld %t.o %t2.so %t3.o -o %t
-// RUN: llvm-objdump -d %t | FileCheck %s
+// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
 
     .text
     .abiversion 2
 .global bar_local
 bar_local:
   li 3, 2
   blr
 
 # Calling external function foo in a shared object needs a nop.
 # Calling local function bar_local doe not need a nop.
 .global _start
 _start:
   bl foo
   nop
   bl bar_local
 
 
 // CHECK: Disassembly of section .text:
 // CHECK: _start:
-// CHECK:     1001001c: {{.*}}  bl .-28
-// CHECK-NOT: 10010020: {{.*}}  nop
-// CHECK:     10010020: {{.*}}  ld 2, 24(1)
-// CHECK:     10010024: {{.*}}  bl .-16
-// CHECK-NOT: 10010028: {{.*}}  nop
-// CHECK-NOT: 10010028: {{.*}}  ld 2, 24(1)
+// CHECK:     1001001c:       bl .-28
+// CHECK-NOT: 10010020:       nop
+// CHECK:     10010020:       ld 2, 24(1)
+// CHECK:     10010024:       bl .-16
+// CHECK-NOT: 10010028:       nop
+// CHECK-NOT: 10010028:       ld 2, 24(1)
 
 # Calling a function in another object file which will have same
 # TOC base does not need a nop. If nop present, do not rewrite to
 # a toc restore
 .global diff_object
 _diff_object:
   bl foo_not_shared
   bl foo_not_shared
   nop
 
 // CHECK: _diff_object:
-// CHECK-NEXT: 10010028: {{.*}}  bl .+24
-// CHECK-NEXT: 1001002c: {{.*}}  bl .+20
-// CHECK-NEXT: 10010030: {{.*}}  nop
+// CHECK-NEXT: 10010028:       bl .+24
+// CHECK-NEXT: 1001002c:       bl .+20
+// CHECK-NEXT: 10010030:       nop
 
 # Branching to a local function does not need a nop
 .global noretbranch
 noretbranch:
   b bar_local
 // CHECK: noretbranch:
-// CHECK:     10010034:  {{.*}}  b .+67108832
-// CHECK-NOT: 10010038:  {{.*}}  nop
-// CHECK-NOT: 1001003c:  {{.*}}  ld 2, 24(1)
+// CHECK:     10010034:        b .+67108832
+// CHECK-NOT: 10010038:        nop
+// CHECK-NOT: 1001003c:        ld 2, 24(1)
 
 // This should come last to check the end-of-buffer condition.
 .global last
 last:
   bl foo
   nop
 // CHECK: last:
-// CHECK:      10010038: {{.*}}   bl .-56
-// CHECK-NEXT: 1001003c: {{.*}}   ld 2, 24(1)
+// CHECK:      10010038:       bl .-56
+// CHECK-NEXT: 1001003c:       ld 2, 24(1)

test/ELF/ppc64-weak-undef-call.s

 # REQUIRES: ppc
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-objdump -d %t2 | FileCheck %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t2 | FileCheck %s
 
 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2
-# RUN: llvm-objdump -d %t2 | FileCheck %s
+# RUN: llvm-objdump -d --no-show-raw-insn %t2 | FileCheck %s
 
 # CHECK: Disassembly of section .text:
 
 .text
 .global _start
 _start:
   bl weakfunc
   nop
   blr
 
 .weak weakfunc
 
 # It does not really matter how we fixup the bl, if at all, because it needs to
 # be unreachable. But, we should link successfully. We should not, however,
 # generate a .plt entry (this would be wasted space). For now, we do nothing
 # (leaving the zero relative offset present in the input).
-# CHECK: 10010000:       {{.*}}     bl .+0
-# CHECK: 10010004:       {{.*}}     nop
-# CHECK: 10010008:       {{.*}}     blr
+# CHECK: 10010000:       bl .+0
+# CHECK: 10010004:       nop
+# CHECK: 10010008:       blr