From 4103f4a936ae6eb060d84d007b1d64c17ddf1a91 Mon Sep 17 00:00:00 2001 From: Arthur Eubanks Date: Wed, 5 Aug 2020 11:12:29 -0700 Subject: [PATCH] [MSSA][NewPM] Handle tests with -print-memoryssa -print-memoryssa in legacy PM is print in NPM. Pin tests with -print-memoryssa to legacy PM. Add corresponding tests for NPM where missing. This fixes "unknown pass name 'print-memoryssa'". Some tests still fail in Analysis/MemorySSA due to other passes that haven't been ported. pr43427.ll and pr43438.ll required adding -aa-pipeline=basic-aa, -loop-simplify (since it doesn't run on legacy PM by default), and decrementing some of the MemoryPhi numbers. Reviewed By: asbirlea Differential Revision: https://reviews.llvm.org/D85333 --- llvm/test/Analysis/MemorySSA/assume.ll | 2 +- llvm/test/Analysis/MemorySSA/atomic-clobber.ll | 2 +- llvm/test/Analysis/MemorySSA/basicaa-memcpy.ll | 2 +- llvm/test/Analysis/MemorySSA/constant-memory.ll | 3 ++- llvm/test/Analysis/MemorySSA/cyclicphi.ll | 2 +- llvm/test/Analysis/MemorySSA/debugvalue2.ll | 2 +- llvm/test/Analysis/MemorySSA/function-clobber.ll | 2 +- llvm/test/Analysis/MemorySSA/function-mem-attrs.ll | 2 +- llvm/test/Analysis/MemorySSA/invariant-groups.ll | 3 ++- llvm/test/Analysis/MemorySSA/lifetime-simple.ll | 2 +- llvm/test/Analysis/MemorySSA/load-invariant.ll | 2 +- llvm/test/Analysis/MemorySSA/loop-rotate-disablebasicaa.ll | 3 ++- llvm/test/Analysis/MemorySSA/loop_rotate_remove_trivial_phis.ll | 3 ++- llvm/test/Analysis/MemorySSA/many-dom-backedge.ll | 2 +- llvm/test/Analysis/MemorySSA/many-doms.ll | 2 +- llvm/test/Analysis/MemorySSA/multi-edges.ll | 2 +- llvm/test/Analysis/MemorySSA/multiple-backedges-hal.ll | 2 +- llvm/test/Analysis/MemorySSA/multiple-locations.ll | 2 +- llvm/test/Analysis/MemorySSA/no-disconnected.ll | 2 +- llvm/test/Analysis/MemorySSA/optimize-use.ll | 4 ++-- llvm/test/Analysis/MemorySSA/phi-translation.ll | 4 ++-- llvm/test/Analysis/MemorySSA/pr28880.ll | 2 +- llvm/test/Analysis/MemorySSA/pr36883.ll | 2 +- llvm/test/Analysis/MemorySSA/pr41640.ll | 3 ++- llvm/test/Analysis/MemorySSA/pr43317.ll | 3 ++- llvm/test/Analysis/MemorySSA/pr43427.ll | 7 ++++--- llvm/test/Analysis/MemorySSA/pr43438.ll | 7 ++++--- llvm/test/Analysis/MemorySSA/ptr-const-mem.ll | 2 +- llvm/test/Analysis/MemorySSA/scalable-vec.ll | 2 +- llvm/test/Analysis/MemorySSA/update_unroll.ll | 3 ++- llvm/test/Analysis/MemorySSA/volatile-clobber.ll | 2 +- 31 files changed, 46 insertions(+), 37 deletions(-) diff --git a/llvm/test/Analysis/MemorySSA/assume.ll b/llvm/test/Analysis/MemorySSA/assume.ll index 12d24df..08c82a1 100644 --- a/llvm/test/Analysis/MemorySSA/assume.ll +++ b/llvm/test/Analysis/MemorySSA/assume.ll @@ -1,4 +1,4 @@ -; RUN: opt -basic-aa -memoryssa -analyze < %s 2>&1 | FileCheck %s +; RUN: opt -basic-aa -memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s ; RUN: opt -aa-pipeline=basic-aa -passes='print,verify' -disable-output < %s 2>&1 | FileCheck %s ; ; Ensures that assumes are treated as not reading or writing memory. diff --git a/llvm/test/Analysis/MemorySSA/atomic-clobber.ll b/llvm/test/Analysis/MemorySSA/atomic-clobber.ll index 79a9392..0e3e89d 100644 --- a/llvm/test/Analysis/MemorySSA/atomic-clobber.ll +++ b/llvm/test/Analysis/MemorySSA/atomic-clobber.ll @@ -1,4 +1,4 @@ -; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -analyze < %s 2>&1 | FileCheck %s +; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s ; RUN: opt -aa-pipeline=basic-aa -passes='print,verify' -disable-output < %s 2>&1 | FileCheck %s ; ; Ensures that atomic loads count as MemoryDefs diff --git a/llvm/test/Analysis/MemorySSA/basicaa-memcpy.ll b/llvm/test/Analysis/MemorySSA/basicaa-memcpy.ll index e33169a..83a5544 100644 --- a/llvm/test/Analysis/MemorySSA/basicaa-memcpy.ll +++ b/llvm/test/Analysis/MemorySSA/basicaa-memcpy.ll @@ -1,4 +1,4 @@ -; RUN: opt -disable-output -basic-aa -print-memoryssa %s 2>&1 | FileCheck %s +; RUN: opt -disable-output -basic-aa -enable-new-pm=0 -print-memoryssa %s 2>&1 | FileCheck %s declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture, i8* nocapture, i64, i1) nounwind diff --git a/llvm/test/Analysis/MemorySSA/constant-memory.ll b/llvm/test/Analysis/MemorySSA/constant-memory.ll index 4c25513..5130cd4 100644 --- a/llvm/test/Analysis/MemorySSA/constant-memory.ll +++ b/llvm/test/Analysis/MemorySSA/constant-memory.ll @@ -1,4 +1,5 @@ -; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -analyze < %s 2>&1 | FileCheck %s +; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s +; RUN: opt -aa-pipeline=basic-aa -passes='print' -verify-memoryssa < %s 2>&1 | FileCheck %s ; ; Things that BasicAA can prove points to constant memory should be ; liveOnEntry, as well. diff --git a/llvm/test/Analysis/MemorySSA/cyclicphi.ll b/llvm/test/Analysis/MemorySSA/cyclicphi.ll index 36d34ef..6c3eea7 100644 --- a/llvm/test/Analysis/MemorySSA/cyclicphi.ll +++ b/llvm/test/Analysis/MemorySSA/cyclicphi.ll @@ -1,4 +1,4 @@ -; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -analyze < %s 2>&1 | FileCheck %s +; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s ; RUN: opt -aa-pipeline=basic-aa -passes='print,verify' -disable-output < %s 2>&1 | FileCheck %s %struct.hoge = type { i32, %struct.widget } diff --git a/llvm/test/Analysis/MemorySSA/debugvalue2.ll b/llvm/test/Analysis/MemorySSA/debugvalue2.ll index 90784ae..1876e72 100644 --- a/llvm/test/Analysis/MemorySSA/debugvalue2.ll +++ b/llvm/test/Analysis/MemorySSA/debugvalue2.ll @@ -1,4 +1,4 @@ -; RUN: opt -disable-basic-aa -print-memoryssa -disable-output %s 2>&1 | FileCheck %s +; RUN: opt -disable-basic-aa -enable-new-pm=0 -print-memoryssa -disable-output %s 2>&1 | FileCheck %s ; Note that the test crashes the MemorySSA verification when doing loop-rotate, ; if debuginfo is modelled in MemorySSA, due to the fact that MemorySSA is not diff --git a/llvm/test/Analysis/MemorySSA/function-clobber.ll b/llvm/test/Analysis/MemorySSA/function-clobber.ll index b9b16bd..d223643 100644 --- a/llvm/test/Analysis/MemorySSA/function-clobber.ll +++ b/llvm/test/Analysis/MemorySSA/function-clobber.ll @@ -1,4 +1,4 @@ -; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -analyze < %s 2>&1 | FileCheck %s +; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s ; RUN: opt -aa-pipeline=basic-aa -passes='print,verify' -disable-output < %s 2>&1 | FileCheck %s ; ; Ensuring that external functions without attributes are MemoryDefs diff --git a/llvm/test/Analysis/MemorySSA/function-mem-attrs.ll b/llvm/test/Analysis/MemorySSA/function-mem-attrs.ll index 7860576..05c9772 100644 --- a/llvm/test/Analysis/MemorySSA/function-mem-attrs.ll +++ b/llvm/test/Analysis/MemorySSA/function-mem-attrs.ll @@ -1,4 +1,4 @@ -; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -analyze < %s 2>&1 | FileCheck %s +; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s ; RUN: opt -aa-pipeline=basic-aa -passes='print,verify' -disable-output < %s 2>&1 | FileCheck %s ; ; Test that various function attributes give us sane results. diff --git a/llvm/test/Analysis/MemorySSA/invariant-groups.ll b/llvm/test/Analysis/MemorySSA/invariant-groups.ll index 4558020..56ad579 100644 --- a/llvm/test/Analysis/MemorySSA/invariant-groups.ll +++ b/llvm/test/Analysis/MemorySSA/invariant-groups.ll @@ -1,4 +1,5 @@ -; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -analyze < %s 2>&1 | FileCheck %s +; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s +; RUN: opt -aa-pipeline=basic-aa -passes='print' -verify-memoryssa < %s 2>&1 | FileCheck %s ; ; Currently, MemorySSA doesn't support invariant groups. So, we should ignore ; launder.invariant.group intrinsics entirely. We'll need to pay attention to diff --git a/llvm/test/Analysis/MemorySSA/lifetime-simple.ll b/llvm/test/Analysis/MemorySSA/lifetime-simple.ll index ef274c9..33327c5 100644 --- a/llvm/test/Analysis/MemorySSA/lifetime-simple.ll +++ b/llvm/test/Analysis/MemorySSA/lifetime-simple.ll @@ -1,4 +1,4 @@ -; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -analyze < %s 2>&1 | FileCheck %s +; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s ; RUN: opt -aa-pipeline=basic-aa -passes='print,verify' -disable-output < %s 2>&1 | FileCheck %s ; This test checks a number of things: ; First, the lifetime markers should not clobber any uses of Q or P. diff --git a/llvm/test/Analysis/MemorySSA/load-invariant.ll b/llvm/test/Analysis/MemorySSA/load-invariant.ll index 1375122..2620633 100644 --- a/llvm/test/Analysis/MemorySSA/load-invariant.ll +++ b/llvm/test/Analysis/MemorySSA/load-invariant.ll @@ -1,4 +1,4 @@ -; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -analyze < %s 2>&1 | FileCheck %s +; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s ; RUN: opt -aa-pipeline=basic-aa -passes='print' -verify-memoryssa -disable-output < %s 2>&1 | FileCheck %s ; ; Invariant loads should be considered live on entry, because, once the diff --git a/llvm/test/Analysis/MemorySSA/loop-rotate-disablebasicaa.ll b/llvm/test/Analysis/MemorySSA/loop-rotate-disablebasicaa.ll index 3845f59..0a539e3 100644 --- a/llvm/test/Analysis/MemorySSA/loop-rotate-disablebasicaa.ll +++ b/llvm/test/Analysis/MemorySSA/loop-rotate-disablebasicaa.ll @@ -1,4 +1,5 @@ -; RUN: opt -disable-basic-aa -print-memoryssa -disable-output %s 2>&1 | FileCheck %s +; RUN: opt -disable-basic-aa -enable-new-pm=0 -print-memoryssa -disable-output %s 2>&1 | FileCheck %s +; RUN: opt -passes='print' -disable-output %s 2>&1 | FileCheck %s ; Note: if @foo is modelled as a MemoryDef, this test will assert with -loop-rotate, due to MemorySSA not ; being preserved when moving instructions that may not read from or write to memory. diff --git a/llvm/test/Analysis/MemorySSA/loop_rotate_remove_trivial_phis.ll b/llvm/test/Analysis/MemorySSA/loop_rotate_remove_trivial_phis.ll index e0352df..d96a3d41 100644 --- a/llvm/test/Analysis/MemorySSA/loop_rotate_remove_trivial_phis.ll +++ b/llvm/test/Analysis/MemorySSA/loop_rotate_remove_trivial_phis.ll @@ -1,4 +1,5 @@ -; RUN: opt -loop-rotate -print-memoryssa -disable-output -enable-mssa-loop-dependency -verify-memoryssa %s 2>&1 | FileCheck %s +; RUN: opt -loop-rotate -enable-new-pm=0 -print-memoryssa -disable-output -enable-mssa-loop-dependency -verify-memoryssa %s 2>&1 | FileCheck %s +; RUN: opt -passes='loop-mssa(loop-rotate),print' -disable-output -verify-memoryssa %s 2>&1 | FileCheck %s ; REQUIRES: asserts target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" diff --git a/llvm/test/Analysis/MemorySSA/many-dom-backedge.ll b/llvm/test/Analysis/MemorySSA/many-dom-backedge.ll index 73f9eb2..4e125a7 100644 --- a/llvm/test/Analysis/MemorySSA/many-dom-backedge.ll +++ b/llvm/test/Analysis/MemorySSA/many-dom-backedge.ll @@ -1,4 +1,4 @@ -; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -analyze < %s 2>&1 | FileCheck %s +; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s ; RUN: opt -aa-pipeline=basic-aa -passes='print,verify' -disable-output < %s 2>&1 | FileCheck %s ; ; many-dom.ll, with an added back-edge back into the switch. diff --git a/llvm/test/Analysis/MemorySSA/many-doms.ll b/llvm/test/Analysis/MemorySSA/many-doms.ll index 1a2422c..9eeca0c 100644 --- a/llvm/test/Analysis/MemorySSA/many-doms.ll +++ b/llvm/test/Analysis/MemorySSA/many-doms.ll @@ -1,4 +1,4 @@ -; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -analyze < %s 2>&1 | FileCheck %s +; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s ; RUN: opt -aa-pipeline=basic-aa -passes='print,verify' -disable-output < %s 2>&1 | FileCheck %s ; ; Testing many dominators, specifically from a switch statement in C. diff --git a/llvm/test/Analysis/MemorySSA/multi-edges.ll b/llvm/test/Analysis/MemorySSA/multi-edges.ll index f8b573f..d29c60d 100644 --- a/llvm/test/Analysis/MemorySSA/multi-edges.ll +++ b/llvm/test/Analysis/MemorySSA/multi-edges.ll @@ -1,4 +1,4 @@ -; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -analyze < %s 2>&1 | FileCheck %s +; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s ; RUN: opt -aa-pipeline=basic-aa -passes='print,verify' -disable-output < %s 2>&1 | FileCheck %s ; ; Makes sure we have a sane model if both successors of some block is the same diff --git a/llvm/test/Analysis/MemorySSA/multiple-backedges-hal.ll b/llvm/test/Analysis/MemorySSA/multiple-backedges-hal.ll index 6d1f92a..2b3c6a0 100644 --- a/llvm/test/Analysis/MemorySSA/multiple-backedges-hal.ll +++ b/llvm/test/Analysis/MemorySSA/multiple-backedges-hal.ll @@ -1,4 +1,4 @@ -; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -analyze < %s 2>&1 | FileCheck %s +; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s ; RUN: opt -aa-pipeline=basic-aa -passes='print,verify' -disable-output < %s 2>&1 | FileCheck %s ; hfinkel's case diff --git a/llvm/test/Analysis/MemorySSA/multiple-locations.ll b/llvm/test/Analysis/MemorySSA/multiple-locations.ll index 32a6a20..bbbccb3 100644 --- a/llvm/test/Analysis/MemorySSA/multiple-locations.ll +++ b/llvm/test/Analysis/MemorySSA/multiple-locations.ll @@ -1,4 +1,4 @@ -; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -analyze < %s 2>&1 | FileCheck %s +; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s ; RUN: opt -aa-pipeline=basic-aa -passes='print,verify' -disable-output < %s 2>&1 | FileCheck %s ; ; Checks that basicAA is doing some amount of disambiguation for us diff --git a/llvm/test/Analysis/MemorySSA/no-disconnected.ll b/llvm/test/Analysis/MemorySSA/no-disconnected.ll index d3b2db8..6fb6a10 100644 --- a/llvm/test/Analysis/MemorySSA/no-disconnected.ll +++ b/llvm/test/Analysis/MemorySSA/no-disconnected.ll @@ -1,4 +1,4 @@ -; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -analyze < %s 2>&1 | FileCheck %s +; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s ; RUN: opt -aa-pipeline=basic-aa -passes='print,verify' -disable-output < %s 2>&1 | FileCheck %s ; ; This test ensures we don't end up with multiple reaching defs for a single diff --git a/llvm/test/Analysis/MemorySSA/optimize-use.ll b/llvm/test/Analysis/MemorySSA/optimize-use.ll index 4acb59e..ec0d5c3 100644 --- a/llvm/test/Analysis/MemorySSA/optimize-use.ll +++ b/llvm/test/Analysis/MemorySSA/optimize-use.ll @@ -1,5 +1,5 @@ -; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -analyze < %s 2>&1 | FileCheck %s --check-prefixes=CHECK,NOLIMIT -; RUN: opt -memssa-check-limit=0 -basic-aa -print-memoryssa -verify-memoryssa -analyze < %s 2>&1 | FileCheck %s --check-prefixes=CHECK,LIMIT +; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s --check-prefixes=CHECK,NOLIMIT +; RUN: opt -memssa-check-limit=0 -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s --check-prefixes=CHECK,LIMIT ; RUN: opt -aa-pipeline=basic-aa -passes='print,verify' -disable-output < %s 2>&1 | FileCheck %s --check-prefixes=CHECK,NOLIMIT ; RUN: opt -memssa-check-limit=0 -aa-pipeline=basic-aa -passes='print,verify' -disable-output < %s 2>&1 | FileCheck %s --check-prefixes=CHECK,LIMIT diff --git a/llvm/test/Analysis/MemorySSA/phi-translation.ll b/llvm/test/Analysis/MemorySSA/phi-translation.ll index 93ebc86..3909437 100644 --- a/llvm/test/Analysis/MemorySSA/phi-translation.ll +++ b/llvm/test/Analysis/MemorySSA/phi-translation.ll @@ -1,5 +1,5 @@ -; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -analyze < %s 2>&1 | FileCheck %s --check-prefixes=CHECK,NOLIMIT -; RUN: opt -memssa-check-limit=0 -basic-aa -print-memoryssa -verify-memoryssa -analyze < %s 2>&1 | FileCheck %s --check-prefixes=CHECK,LIMIT +; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s --check-prefixes=CHECK,NOLIMIT +; RUN: opt -memssa-check-limit=0 -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s --check-prefixes=CHECK,LIMIT ; RUN: opt -aa-pipeline=basic-aa -passes='print,verify' -disable-output < %s 2>&1 | FileCheck %s --check-prefixes=CHECK,NOLIMIT ; RUN: opt -memssa-check-limit=0 -aa-pipeline=basic-aa -passes='print,verify' -disable-output < %s 2>&1 | FileCheck %s --check-prefixes=CHECK,LIMIT diff --git a/llvm/test/Analysis/MemorySSA/pr28880.ll b/llvm/test/Analysis/MemorySSA/pr28880.ll index 850ac04..dc542d6 100644 --- a/llvm/test/Analysis/MemorySSA/pr28880.ll +++ b/llvm/test/Analysis/MemorySSA/pr28880.ll @@ -1,4 +1,4 @@ -; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -analyze < %s 2>&1 | FileCheck %s +; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s ; RUN: opt -aa-pipeline=basic-aa -passes='print,verify' -disable-output < %s 2>&1 | FileCheck %s ; This testcase is reduced from SingleSource/Benchmarks/Misc/fbench.c diff --git a/llvm/test/Analysis/MemorySSA/pr36883.ll b/llvm/test/Analysis/MemorySSA/pr36883.ll index 7493df4..49d9c18 100644 --- a/llvm/test/Analysis/MemorySSA/pr36883.ll +++ b/llvm/test/Analysis/MemorySSA/pr36883.ll @@ -1,4 +1,4 @@ -; RUN: opt -basic-aa -memoryssa -analyze < %s 2>&1 -S | FileCheck %s +; RUN: opt -basic-aa -memoryssa -enable-new-pm=0 -analyze < %s 2>&1 -S | FileCheck %s ; RUN: opt -aa-pipeline=basic-aa -passes='print,verify' -S < %s 2>&1 | FileCheck %s ; ; We weren't properly considering the args in callsites in equality or hashing. diff --git a/llvm/test/Analysis/MemorySSA/pr41640.ll b/llvm/test/Analysis/MemorySSA/pr41640.ll index 5d2d523..cf25535 100644 --- a/llvm/test/Analysis/MemorySSA/pr41640.ll +++ b/llvm/test/Analysis/MemorySSA/pr41640.ll @@ -1,4 +1,5 @@ -; RUN: opt -disable-output -licm -print-memoryssa -enable-mssa-loop-dependency=true < %s 2>&1 | FileCheck %s +; RUN: opt -disable-output -licm -enable-new-pm=0 -print-memoryssa -enable-mssa-loop-dependency=true < %s 2>&1 | FileCheck %s +; RUN: opt -disable-output -passes='loop-mssa(licm),print' < %s 2>&1 | FileCheck %s target datalayout = "E-m:e-i1:8:16-i8:8:16-i64:64-f128:64-v128:64-a:8:16-n32:64" target triple = "s390x-ibm-linux" diff --git a/llvm/test/Analysis/MemorySSA/pr43317.ll b/llvm/test/Analysis/MemorySSA/pr43317.ll index b1fbfdb..eb46252 100644 --- a/llvm/test/Analysis/MemorySSA/pr43317.ll +++ b/llvm/test/Analysis/MemorySSA/pr43317.ll @@ -1,4 +1,5 @@ -; RUN: opt -disable-output -licm -print-memoryssa -enable-mssa-loop-dependency=true < %s 2>&1 | FileCheck %s +; RUN: opt -disable-output -licm -enable-new-pm=0 -print-memoryssa -enable-mssa-loop-dependency=true < %s 2>&1 | FileCheck %s +; RUN: opt -disable-output -passes='loop-mssa(licm),print' < %s 2>&1 | FileCheck %s @v_274 = external dso_local global i64, align 1 @v_295 = external dso_local global i16, align 1 @v_335 = external dso_local global i32, align 1 diff --git a/llvm/test/Analysis/MemorySSA/pr43427.ll b/llvm/test/Analysis/MemorySSA/pr43427.ll index f708878..cb8afbb 100644 --- a/llvm/test/Analysis/MemorySSA/pr43427.ll +++ b/llvm/test/Analysis/MemorySSA/pr43427.ll @@ -1,9 +1,10 @@ -; RUN: opt -disable-output -licm -print-memoryssa -enable-mssa-loop-dependency=true < %s 2>&1 | FileCheck %s +; RUN: opt -disable-output -loop-simplify -licm -enable-new-pm=0 -print-memoryssa -enable-mssa-loop-dependency=true < %s 2>&1 | FileCheck %s +; RUN: opt -disable-output -aa-pipeline=basic-aa -passes='loop-mssa(licm),print' < %s 2>&1 | FileCheck %s ; CHECK-LABEL: @f() -; CHECK: 8 = MemoryPhi( ; CHECK: 7 = MemoryPhi( -; CHECK: 9 = MemoryPhi( +; CHECK: 6 = MemoryPhi( +; CHECK: 8 = MemoryPhi( define void @f() { entry: %e = alloca i16, align 1 diff --git a/llvm/test/Analysis/MemorySSA/pr43438.ll b/llvm/test/Analysis/MemorySSA/pr43438.ll index 69bbced..e15ab0e 100644 --- a/llvm/test/Analysis/MemorySSA/pr43438.ll +++ b/llvm/test/Analysis/MemorySSA/pr43438.ll @@ -1,4 +1,5 @@ -; RUN: opt -disable-output -licm -print-memoryssa -enable-mssa-loop-dependency=true < %s 2>&1 | FileCheck %s +; RUN: opt -disable-output -loop-simplify -licm -enable-new-pm=0 -print-memoryssa -enable-mssa-loop-dependency=true < %s 2>&1 | FileCheck %s +; RUN: opt -disable-output -aa-pipeline=basic-aa -passes='loop-mssa(licm),print' < %s 2>&1 | FileCheck %s target triple = "x86_64-unknown-linux-gnu" ; CHECK-LABEL: @main() @@ -46,11 +47,11 @@ if.end569: ; preds = %if.else568, %if.the ; CHECK-LABEL: @f() -; CHECK: 8 = MemoryPhi( ; CHECK: 7 = MemoryPhi( -; CHECK: 11 = MemoryPhi( +; CHECK: 6 = MemoryPhi( ; CHECK: 10 = MemoryPhi( ; CHECK: 9 = MemoryPhi( +; CHECK: 8 = MemoryPhi( define void @f() { entry: %e = alloca i16, align 1 diff --git a/llvm/test/Analysis/MemorySSA/ptr-const-mem.ll b/llvm/test/Analysis/MemorySSA/ptr-const-mem.ll index 47581e3..76d5ef7 100644 --- a/llvm/test/Analysis/MemorySSA/ptr-const-mem.ll +++ b/llvm/test/Analysis/MemorySSA/ptr-const-mem.ll @@ -1,4 +1,4 @@ -; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -analyze -memssa-check-limit=0 < %s 2>&1 | FileCheck %s +; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze -memssa-check-limit=0 < %s 2>&1 | FileCheck %s ; RUN: opt -aa-pipeline=basic-aa -passes='print' -verify-memoryssa -disable-output -memssa-check-limit=0 < %s 2>&1 | FileCheck %s target datalayout = "e-p:32:32-p1:64:64-p2:64:64-p3:32:32-p4:64:64-p5:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64" target triple = "amdgcn" diff --git a/llvm/test/Analysis/MemorySSA/scalable-vec.ll b/llvm/test/Analysis/MemorySSA/scalable-vec.ll index 4efbf48..9c5f745 100644 --- a/llvm/test/Analysis/MemorySSA/scalable-vec.ll +++ b/llvm/test/Analysis/MemorySSA/scalable-vec.ll @@ -1,4 +1,4 @@ -; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -analyze < %s 2>&1 | FileCheck %s +; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s ; RUN: opt -aa-pipeline=basic-aa -passes='print' -verify-memoryssa -disable-output < %s 2>&1 | FileCheck %s ; CHECK-LABEL: define @f( diff --git a/llvm/test/Analysis/MemorySSA/update_unroll.ll b/llvm/test/Analysis/MemorySSA/update_unroll.ll index 5fa4eac..cdf5d18 100644 --- a/llvm/test/Analysis/MemorySSA/update_unroll.ll +++ b/llvm/test/Analysis/MemorySSA/update_unroll.ll @@ -1,4 +1,5 @@ -; RUN: opt -enable-mssa-loop-dependency -verify-memoryssa -loop-rotate -S %s | FileCheck %s +; RUN: opt -enable-new-pm=0 -enable-mssa-loop-dependency -verify-memoryssa -loop-rotate -S %s | FileCheck %s +; RUN: opt -verify-memoryssa -passes='loop-mssa(loop-rotate)' -S %s | FileCheck %s ; REQUIRES: asserts target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" diff --git a/llvm/test/Analysis/MemorySSA/volatile-clobber.ll b/llvm/test/Analysis/MemorySSA/volatile-clobber.ll index be46af7..3a7e989 100644 --- a/llvm/test/Analysis/MemorySSA/volatile-clobber.ll +++ b/llvm/test/Analysis/MemorySSA/volatile-clobber.ll @@ -1,4 +1,4 @@ -; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -analyze < %s 2>&1 | FileCheck %s +; RUN: opt -basic-aa -print-memoryssa -verify-memoryssa -enable-new-pm=0 -analyze < %s 2>&1 | FileCheck %s ; RUN: opt -aa-pipeline=basic-aa -passes='print,verify' -disable-output < %s 2>&1 | FileCheck %s ; ; Ensures that volatile stores/loads count as MemoryDefs -- 2.7.4