[PATCH] D59604: [LLD] Update tests for LTO pipeline change

[Robert Lougher via Phabricator via llvm-commits]

rob.lougher created this revision.
rob.lougher added reviewers: ruiu, peter.smith, grimar, pcc.
Herald added subscribers: dexonsmith, steven_wu, MaskRay, arichardson, inglorion, emaste.
Herald added a reviewer: espindola.
Herald added a project: LLVM.

In D58391 <https://reviews.llvm.org/D58391> the LTO pipelines were changed to add the tailcall elimination pass. This caused some LLD LTO tests to fail so I reverted it. This change updates the tests.


Repository:
  rLLD LLVM Linker

https://reviews.llvm.org/D59604

Files:
  test/ELF/lto/defsym.ll
  test/ELF/lto/opt-remarks.ll
  test/ELF/lto/wrap-2.ll


Index: test/ELF/lto/wrap-2.ll
===================================================================
--- test/ELF/lto/wrap-2.ll
+++ test/ELF/lto/wrap-2.ll
@@ -10,7 +10,7 @@
 ; RUN: opt -module-summary %s -o %t.o
 ; RUN: opt -module-summary %S/Inputs/wrap-bar.ll -o %t1.o
 ; RUN: ld.lld %t.o %t1.o -shared -o %t.so -wrap=bar
-; RUN: llvm-objdump -d %t.so | FileCheck %s -check-prefix=THIN
+; RUN: llvm-objdump -d %t.so | FileCheck %s
 ; RUN: llvm-readobj -t %t.so | FileCheck -check-prefix=BIND %s
 
 ; Make sure that calls in foo() are not eliminated and that bar is
@@ -19,13 +19,8 @@
 ; CHECK:      foo:
 ; CHECK-NEXT: pushq	%rax
 ; CHECK-NEXT: callq{{.*}}<__wrap_bar>
-; CHECK-NEXT: callq{{.*}}<bar>
-
-; THIN:      foo:
-; THIN-NEXT: pushq	%rax
-; THIN-NEXT: callq{{.*}}<__wrap_bar>
-; THIN-NEXT: popq  %rax
-; THIN-NEXT: jmp{{.*}}<bar>
+; CHECK-NEXT: popq  %rax
+; CHECK-NEXT: jmp{{.*}}<bar>
 
 ; Check that bar and __wrap_bar retain their original binding.
 ; BIND:      Name: bar
Index: test/ELF/lto/opt-remarks.ll
===================================================================
--- test/ELF/lto/opt-remarks.ll
+++ test/ELF/lto/opt-remarks.ll
@@ -14,7 +14,7 @@
 
 ; Check that @tinkywinky is inlined after optimizations.
 ; CHECK-LABEL: define i32 @main
-; CHECK-NEXT:  %a.i = call i32 @patatino()
+; CHECK-NEXT:  %a.i = {{.*}}call i32 @patatino()
 ; CHECK-NEXT:  ret i32 %a.i
 ; CHECK-NEXT: }
 
Index: test/ELF/lto/defsym.ll
===================================================================
--- test/ELF/lto/defsym.ll
+++ test/ELF/lto/defsym.ll
@@ -11,7 +11,7 @@
 ; RUN: opt -module-summary %S/Inputs/defsym-bar.ll -o %t1.o
 ; RUN: ld.lld %t.o %t1.o -shared -o %t2.so -defsym=bar2=bar3 -save-temps
 ; RUN: llvm-readelf --symbols %t2.so1.lto.o | FileCheck --check-prefix=OBJ %s
-; RUN: llvm-objdump -d %t2.so | FileCheck %s --check-prefix=THIN
+; RUN: llvm-objdump -d %t2.so | FileCheck %s
 
 ; OBJ:  UND bar2
 
@@ -19,17 +19,11 @@
 ; Symbol bar3 should not be eliminated
 
 ; CHECK:      foo:
-; CHECK-NEXT: pushq	%rax
+; CHECK-NEXT: pushq %rax
 ; CHECK-NEXT: callq
 ; CHECK-NEXT: callq{{.*}}<bar3>
-; CHECK-NEXT: callq
-
-; THIN:       foo
-; THIN-NEXT:  pushq %rax
-; THIN-NEXT:  callq
-; THIN-NEXT:  callq{{.*}}<bar3>
-; THIN-NEXT:  popq %rax
-; THIN-NEXT:  jmp
+; CHECK-NEXT: popq %rax
+; CHECK-NEXT: jmp
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D59604.191519.patch
Type: text/x-patch
Size: 2427 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190320/56929912/attachment.bin>