From 039fb7f68af9f89f8116d769a9e4cae458baca38 Mon Sep 17 00:00:00 2001 From: Arthur Eubanks Date: Wed, 5 Aug 2020 21:12:08 -0700 Subject: [PATCH] [NewPM][GuardWidening] Fix loop guard widening tests under NPM Reviewed By: ychen, asbirlea Differential Revision: https://reviews.llvm.org/D85394 --- llvm/test/Transforms/GuardWidening/basic-loop.ll | 2 +- llvm/test/Transforms/GuardWidening/loop-schedule.ll | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/llvm/test/Transforms/GuardWidening/basic-loop.ll b/llvm/test/Transforms/GuardWidening/basic-loop.ll index 8129a78..092c007 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 09d2630..b8d9291 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,...) -- 2.7.4