[llvm] r364997 - [ThinLTO] Reenable test with workaround for known failure

[Teresa Johnson via llvm-commits]

Author: tejohnson
Date: Tue Jul  2 19:14:47 2019
New Revision: 364997

URL: http://llvm.org/viewvc/llvm-project?rev=364997&view=rev
Log:
[ThinLTO] Reenable test with workaround for known failure

Reenable the testing disabled in r364978 with the same workaround used
for this failure in the cfi-devirt.ll test. The known issue is PR39436,
and the workaround is to add -verify-machineinstrs=0.

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

Modified: llvm/trunk/test/ThinLTO/X86/devirt.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ThinLTO/X86/devirt.ll?rev=364997&r1=364996&r2=364997&view=diff
==============================================================================
--- llvm/trunk/test/ThinLTO/X86/devirt.ll (original)
+++ llvm/trunk/test/ThinLTO/X86/devirt.ll Tue Jul  2 19:14:47 2019
@@ -35,48 +35,49 @@
 
 ; TODO: Test index-based WPD one %t2.o once implemented.
 
-; TODO: Re-enable the below testing of the hybrid Thin/Regular LTO WPD, once expensive checks
-; failure is addressed.
-
 ; Legacy PM
-; RUN llvm-lto2 run %t.o -save-temps -pass-remarks=. \
-; RUN   -o %t3 \
-; RUN   -r=%t.o,test,px \
-; RUN   -r=%t.o,_ZN1A1nEi,p \
-; RUN   -r=%t.o,_ZN1B1fEi,p \
-; RUN   -r=%t.o,_ZN1C1fEi,p \
-; RUN   -r=%t.o,_ZN1D1mEi,p \
-; RUN   -r=%t.o,_ZTV1B, \
-; RUN   -r=%t.o,_ZTV1C, \
-; RUN   -r=%t.o,_ZTV1D, \
-; RUN   -r=%t.o,_ZN1A1nEi, \
-; RUN   -r=%t.o,_ZN1B1fEi, \
-; RUN   -r=%t.o,_ZN1C1fEi, \
-; RUN   -r=%t.o,_ZN1D1mEi, \
-; RUN   -r=%t.o,_ZTV1B,px \
-; RUN   -r=%t.o,_ZTV1C,px \
-; RUN   -r=%t.o,_ZTV1D,px 2>&1 | FileCheck %s --check-prefix=REMARK --dump-input=fail
-; RUN llvm-dis %t3.1.4.opt.bc -o - | FileCheck %s --check-prefix=CHECK-IR
+; FIXME: Fix machine verifier issues and remove -verify-machineinstrs=0. PR39436.
+; RUN: llvm-lto2 run %t.o -save-temps -pass-remarks=. \
+; RUN:   -verify-machineinstrs=0 \
+; RUN:   -o %t3 \
+; RUN:   -r=%t.o,test,px \
+; RUN:   -r=%t.o,_ZN1A1nEi,p \
+; RUN:   -r=%t.o,_ZN1B1fEi,p \
+; RUN:   -r=%t.o,_ZN1C1fEi,p \
+; RUN:   -r=%t.o,_ZN1D1mEi,p \
+; RUN:   -r=%t.o,_ZTV1B, \
+; RUN:   -r=%t.o,_ZTV1C, \
+; RUN:   -r=%t.o,_ZTV1D, \
+; RUN:   -r=%t.o,_ZN1A1nEi, \
+; RUN:   -r=%t.o,_ZN1B1fEi, \
+; RUN:   -r=%t.o,_ZN1C1fEi, \
+; RUN:   -r=%t.o,_ZN1D1mEi, \
+; RUN:   -r=%t.o,_ZTV1B,px \
+; RUN:   -r=%t.o,_ZTV1C,px \
+; RUN:   -r=%t.o,_ZTV1D,px 2>&1 | FileCheck %s --check-prefix=REMARK --dump-input=fail
+; RUN: llvm-dis %t3.1.4.opt.bc -o - | FileCheck %s --check-prefix=CHECK-IR
 
 ; New PM
-; RUN llvm-lto2 run %t.o -save-temps -use-new-pm -pass-remarks=. \
-; RUN   -o %t3 \
-; RUN   -r=%t.o,test,px \
-; RUN   -r=%t.o,_ZN1A1nEi,p \
-; RUN   -r=%t.o,_ZN1B1fEi,p \
-; RUN   -r=%t.o,_ZN1C1fEi,p \
-; RUN   -r=%t.o,_ZN1D1mEi,p \
-; RUN   -r=%t.o,_ZTV1B, \
-; RUN   -r=%t.o,_ZTV1C, \
-; RUN   -r=%t.o,_ZTV1D, \
-; RUN   -r=%t.o,_ZN1A1nEi, \
-; RUN   -r=%t.o,_ZN1B1fEi, \
-; RUN   -r=%t.o,_ZN1C1fEi, \
-; RUN   -r=%t.o,_ZN1D1mEi, \
-; RUN   -r=%t.o,_ZTV1B,px \
-; RUN   -r=%t.o,_ZTV1C,px \
-; RUN   -r=%t.o,_ZTV1D,px 2>&1 | FileCheck %s --check-prefix=REMARK --dump-input=fail
-; RUN llvm-dis %t3.1.4.opt.bc -o - | FileCheck %s --check-prefix=CHECK-IR
+; FIXME: Fix machine verifier issues and remove -verify-machineinstrs=0. PR39436.
+; RUN: llvm-lto2 run %t.o -save-temps -use-new-pm -pass-remarks=. \
+; RUN:   -verify-machineinstrs=0 \
+; RUN:   -o %t3 \
+; RUN:   -r=%t.o,test,px \
+; RUN:   -r=%t.o,_ZN1A1nEi,p \
+; RUN:   -r=%t.o,_ZN1B1fEi,p \
+; RUN:   -r=%t.o,_ZN1C1fEi,p \
+; RUN:   -r=%t.o,_ZN1D1mEi,p \
+; RUN:   -r=%t.o,_ZTV1B, \
+; RUN:   -r=%t.o,_ZTV1C, \
+; RUN:   -r=%t.o,_ZTV1D, \
+; RUN:   -r=%t.o,_ZN1A1nEi, \
+; RUN:   -r=%t.o,_ZN1B1fEi, \
+; RUN:   -r=%t.o,_ZN1C1fEi, \
+; RUN:   -r=%t.o,_ZN1D1mEi, \
+; RUN:   -r=%t.o,_ZTV1B,px \
+; RUN:   -r=%t.o,_ZTV1C,px \
+; RUN:   -r=%t.o,_ZTV1D,px 2>&1 | FileCheck %s --check-prefix=REMARK --dump-input=fail
+; RUN: llvm-dis %t3.1.4.opt.bc -o - | FileCheck %s --check-prefix=CHECK-IR
 
 ; REMARK-DAG: single-impl: devirtualized a call to _ZN1A1nEi
 ; REMARK-DAG: single-impl: devirtualized a call to _ZN1D1mEi