[llvm] r335766 - [ThinLTO] Fix test

[Teresa Johnson via llvm-commits]

Author: tejohnson
Date: Wed Jun 27 12:00:35 2018
New Revision: 335766

URL: http://llvm.org/viewvc/llvm-project?rev=335766&view=rev
Log:
[ThinLTO] Fix test

Fix test changes added in r335760. Even though we are invoking llvm-lto2
in single threaded mode, the order of processing the modules in the
backend is apparently not deterministic. Handle the expected debug
messages in any order. (The determinism would be good to fix, but not
related to this change.)

This also undoes the change I made in r335764 to help debug this.

Modified:
    llvm/trunk/test/ThinLTO/X86/deadstrip.ll

Modified: llvm/trunk/test/ThinLTO/X86/deadstrip.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ThinLTO/X86/deadstrip.ll?rev=335766&r1=335765&r2=335766&view=diff
==============================================================================
--- llvm/trunk/test/ThinLTO/X86/deadstrip.ll (original)
+++ llvm/trunk/test/ThinLTO/X86/deadstrip.ll Wed Jun 27 12:00:35 2018
@@ -23,9 +23,7 @@
 ; RUN:   -r %t2.bc,_dead_func,l \
 ; RUN:   -r %t2.bc,_another_dead_func,pl \
 ; RUN:   -thinlto-threads=1 \
-; RUN:	 -debug-only=function-import >%t2.out.debug 2>&1
-; RUN: cat %t2.out.debug
-; RUN: cat %t2.out.debug | FileCheck %s --check-prefix=DEBUG
+; RUN:	 -debug-only=function-import 2>&1 | FileCheck %s --check-prefix=DEBUG
 ; RUN: llvm-dis < %t.out.1.3.import.bc | FileCheck %s --check-prefix=LTO2
 ; RUN: llvm-dis < %t.out.2.3.import.bc | FileCheck %s --check-prefix=LTO2-CHECK2
 ; RUN: llvm-nm %t.out.1 | FileCheck %s --check-prefix=CHECK2-NM
@@ -78,12 +76,12 @@
 ; CHECK-NM-NOT: bar
 ; CHECK-NM-NOT: dead
 
-; DEBUG: Live root: 2412314959268824392 (llvm.global_ctors)
-; DEBUG: Live root: 15822663052811949562 (main)
-; DEBUG: Ignores Dead GUID: 7342339837106705152 (dead_func)
-; DEBUG: Ignores Dead GUID: 7546896869197086323 (baz)
-; DEBUG: Initialize import for 15611644523426561710 (boo)
-; DEBUG: Ignores Dead GUID: 2384416018110111308 (another_dead_func)
+; DEBUG-DAG: Live root: 2412314959268824392 (llvm.global_ctors)
+; DEBUG-DAG: Live root: 15822663052811949562 (main)
+; DEBUG-DAG: Ignores Dead GUID: 7342339837106705152 (dead_func)
+; DEBUG-DAG: Ignores Dead GUID: 7546896869197086323 (baz)
+; DEBUG-DAG: Initialize import for 15611644523426561710 (boo)
+; DEBUG-DAG: Ignores Dead GUID: 2384416018110111308 (another_dead_func)
 
 ; Next test the case where Inputs/deadstrip.ll does not get a module index,
 ; which will cause it to be handled by regular LTO in the new LTO API.