Updated tests

Author: fzou1

lld/test/ELF/pack-dyn-relocs-tls-x86-64.s

@@ -13,6 +13,7 @@
 foo:
     movq    tlsvar@GOTTPOFF(%rip), %rcx
     movq    tlsvar2@GOTTPOFF(%rip), %r31
+    addq    tlsvar3@GOTTPOFF(%rip), %rcx, %r16
 
 
     .section    .tdata,"awT",@progbits
@@ -21,7 +22,11 @@ tlsvar:
     .word   42
 tlsvar2:
     .word   42
+tlsvar3:
+    .word   42
+
 // CHECK:          Section ({{.+}}) .rela.dyn {
 // CHECK-NEXT:     R_X86_64_TPOFF64 - 0x1234
 // CHECK-NEXT:     R_X86_64_TPOFF64 - 0x1236
+// CHECK-NEXT:     R_X86_64_TPOFF64 - 0x1238
 // CHECK-NEXT:     }

lld/test/ELF/tls-opt.s

@@ -20,20 +20,25 @@
 // DISASM-NEXT:   leaq -4(%r15), %r15
 // DISASM-NEXT:   addq $-4, %rsp
 // DISASM-NEXT:   addq $-4, %r12
+ # EPGR
 // DISASM-NEXT:   movq $-8, %r16
 // DISASM-NEXT:   movq $-8, %r20
 // DISASM-NEXT:   movq $-4, %r16
 // DISASM-NEXT:   addq $-8, %r16
 // DISASM-NEXT:   addq $-8, %r28
 // DISASM-NEXT:   addq $-4, %r16
+ # NDD
 // DISASM-NEXT:   addq $-10, %r16, %r16
 // DISASM-NEXT:   addq $-10, %r16, %r20
 // DISASM-NEXT:   addq $-10, %r16, %rax
 // DISASM-NEXT:   addq $-10, %rax, %r16
 // DISASM-NEXT:   addq $-10, %r8, %r16
 // DISASM-NEXT:   addq $-10, %rax, %r12
+# NDD + NF
 // DISASM-NEXT:   {nf} addq $-10, %r8, %r16
 // DISASM-NEXT:   {nf} addq $-10, %rax, %r12
+# NF
+// DISASM-NEXT:   {nf} addq $-10, %r12
 
 // LD to LE:
 // DISASM-NEXT:   movq %fs:0, %rax
@@ -90,15 +95,18 @@ _start:
  addq tls0@GOTTPOFF(%rip), %r16
  addq tls0@GOTTPOFF(%rip), %r28
  addq tls1@GOTTPOFF(%rip), %r16
-# NDD
+ # NDD
  addq tls0@GOTTPOFF(%rip), %r16, %r16
  addq tls0@GOTTPOFF(%rip), %r16, %r20
  addq tls0@GOTTPOFF(%rip), %r16, %rax
  addq tls0@GOTTPOFF(%rip), %rax, %r16
  addq %r8, tls0@GOTTPOFF(%rip), %r16
  addq tls0@GOTTPOFF(%rip), %rax, %r12
+ # NDD + NF
  {nf} addq %r8, tls0@GOTTPOFF(%rip), %r16
  {nf} addq tls0@GOTTPOFF(%rip), %rax, %r12
+ # NF
+ {nf} addq tls0@GOTTPOFF(%rip), %r12
 
  // LD to LE
  leaq tls0@tlsld(%rip), %rdi

lld/test/ELF/x86-64-tls-ie-local.s

@@ -5,29 +5,47 @@
 # RUN: llvm-readobj -r %t.so | FileCheck --check-prefix=REL %s
 # RUN: llvm-objdump --no-print-imm-hex -d --no-show-raw-insn %t.so | FileCheck %s
 
-# SEC: .got PROGBITS 0000000000002348 000348 000010 00 WA 0 0 8
+# SEC: .got PROGBITS 0000000000002378 000378 000010 00 WA 0 0 8
 
 ## Dynamic relocations for non-preemptable symbols in a shared object have section index 0.
 # REL:      .rela.dyn {
-# REL-NEXT:   0x2348 R_X86_64_TPOFF64 - 0x0
-# REL-NEXT:   0x2350 R_X86_64_TPOFF64 - 0x4
+# REL-NEXT:   0x2378 R_X86_64_TPOFF64 - 0x0
+# REL-NEXT:   0x2380 R_X86_64_TPOFF64 - 0x4
 # REL-NEXT: }
 
-## &.got[0] - 0x127f = 0x2348 - 0x127f = 4297
-## &.got[1] - 0x1286 = 0x2350 - 0x1286 = 4298
-## &.got[2] - 0x128e = 0x2348 - 0x128e = 4282
-## &.got[3] - 0x1296 = 0x2350 - 0x1296 = 4282
+## &.got[0] - 0x127f = 0x2378 - 0x127f = 4345
+## &.got[1] - 0x1286 = 0x2380 - 0x1286 = 4346
+## &.got[2] - 0x128e = 0x2378 - 0x128e = 4330
+## &.got[3] - 0x1296 = 0x2380 - 0x1296 = 4330
+## &.got[0] - 0x12a0 = 0x2376 - 0x12a0 = 4310
+## &.got[1] - 0x12aa = 0x237e - 0x12aa = 4308
+## &.got[0] - 0x12b4 = 0x2376 - 0x12b4 = 4290
+## &.got[1] - 0x12be = 0x237e - 0x12be = 4288
+## &.got[0] - 0x12c8 = 0x2376 - 0x12c8 = 4270
 
-# CHECK:      1278:       addq 4297(%rip), %rax
-# CHECK-NEXT: 127f:       addq 4298(%rip), %rax
-# CHECK-NEXT: 1286:       addq 4282(%rip), %r16
-# CHECK-NEXT: 128e:       addq 4282(%rip), %r16
+# CHECK:      1278:       addq 4345(%rip), %rax
+# CHECK-NEXT: 127f:       addq 4346(%rip), %rax
+# CHECK-NEXT: 1286:       addq 4330(%rip), %r16
+# CHECK-NEXT: 128e:       addq 4330(%rip), %r16
+# CHECK-NEXT: 1296:       addq %r8, 4310(%rip), %r16
+# CHECK-NEXT: 12a0:       addq 4308(%rip), %rax, %r12
+# CHECK-NEXT: 12aa:       {nf} addq %r8, 4290(%rip), %r16
+# CHECK-NEXT: 12b4:       {nf} addq 4288(%rip), %rax, %r12
+# CHECK-NEXT: 12be:       {nf} addq 4270(%rip), %r12
 
 addq foo@GOTTPOFF(%rip), %rax
 addq bar@GOTTPOFF(%rip), %rax
+# EGPR
 addq foo@GOTTPOFF(%rip), %r16
 addq bar@GOTTPOFF(%rip), %r16
-
+# NDD
+addq %r8, foo@GOTTPOFF(%rip), %r16
+addq bar@GOTTPOFF(%rip), %rax, %r12
+# NDD + NF
+{nf} addq %r8, foo@GOTTPOFF(%rip), %r16
+{nf} addq bar@GOTTPOFF(%rip), %rax, %r12
+# NF
+{nf} addq foo@GOTTPOFF(%rip), %r12
 
 .section .tbss,"awT",@nobits
 foo: