[llvm] 039fb7f - [NewPM][GuardWidening] Fix loop guard widening tests under NPM

[Arthur Eubanks via llvm-commits]

Author: Arthur Eubanks
Date: 2020-08-06T15:32:59-07:00
New Revision: 039fb7f68af9f89f8116d769a9e4cae458baca38

URL: https://github.com/llvm/llvm-project/commit/039fb7f68af9f89f8116d769a9e4cae458baca38
DIFF: https://github.com/llvm/llvm-project/commit/039fb7f68af9f89f8116d769a9e4cae458baca38.diff

LOG: [NewPM][GuardWidening] Fix loop guard widening tests under NPM

Reviewed By: ychen, asbirlea

Differential Revision: https://reviews.llvm.org/D85394

Added: 
    

Modified: 
    llvm/test/Transforms/GuardWidening/basic-loop.ll
    llvm/test/Transforms/GuardWidening/loop-schedule.ll

Removed: 
    


################################################################################
diff  --git a/llvm/test/Transforms/GuardWidening/basic-loop.ll b/llvm/test/Transforms/GuardWidening/basic-loop.ll
index 8129a789f33b..092c00744fd6 100644
--- a/llvm/test/Transforms/GuardWidening/basic-loop.ll
+++ b/llvm/test/Transforms/GuardWidening/basic-loop.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -loop-guard-widening < %s        | FileCheck %s
+; RUN: opt -S -loop-guard-widening -enable-new-pm=0 < %s | FileCheck %s
 ; RUN: opt -S -passes="loop(guard-widening)" < %s | FileCheck %s
 
 declare void @llvm.experimental.guard(i1,...)

diff  --git a/llvm/test/Transforms/GuardWidening/loop-schedule.ll b/llvm/test/Transforms/GuardWidening/loop-schedule.ll
index 09d2630deb59..b8d92919c921 100644
--- a/llvm/test/Transforms/GuardWidening/loop-schedule.ll
+++ b/llvm/test/Transforms/GuardWidening/loop-schedule.ll
@@ -1,12 +1,17 @@
-; RUN: opt -S -licm -loop-guard-widening -licm -debug-pass=Structure < %s 2>&1   | FileCheck %s
+; RUN: opt -S -licm -loop-guard-widening -licm -debug-pass=Structure -enable-new-pm=0 < %s 2>&1 | FileCheck %s --check-prefixes=LPM,CHECK
+; RUN: opt -S -passes='licm,guard-widening,licm' -debug-pass-manager < %s 2>&1 | FileCheck %s --check-prefixes=NPM,CHECK
 
 ; Main point of this test is to check the scheduling -- there should be
 ; no analysis passes needed between LICM and LoopGuardWidening
 
-; CHECK: Loop Pass Manager
-; CHECK:   Loop Invariant Code Motion
-; CHECK:   Widen guards (within a single loop, as a loop pass)
-; CHECK:   Loop Invariant Code Motion
+; LPM: Loop Pass Manager
+; LPM:   Loop Invariant Code Motion
+; LPM:   Widen guards (within a single loop, as a loop pass)
+; LPM:   Loop Invariant Code Motion
+
+; NPM: LICMPass
+; NPM-NEXT: GuardWideningPass
+; NPM-NEXT: LICMPass
 
 declare void @llvm.experimental.guard(i1,...)