[test][NewPM] Fix LoopLoadElim tests under NPM

diff --git a/llvm/test/Transforms/LoopLoadElim/loop-simplify-dep.ll b/llvm/test/Transforms/LoopLoadElim/loop-simplify-dep.ll
index f6bfe96..a4f5ec1 100644 (file)
--- a/llvm/test/Transforms/LoopLoadElim/loop-simplify-dep.ll
+++ b/llvm/test/Transforms/LoopLoadElim/loop-simplify-dep.ll
@@ -1,6 +1,8 @@
-; RUN: opt -loop-load-elim -S < %s | FileCheck %s
+; RUN: opt -loop-load-elim -S < %s -enable-new-pm=0 | FileCheck %s
+; New PM does not allow a pass to require another pass to have been run
+; RUN: opt -passes=loop-simplify,loop-load-elim -S < %s | FileCheck %s
 
-; Make sure we create a preheader if we dont' have one.
+; Make sure we create a preheader if we don't have one.
 
 target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
 

diff --git a/llvm/test/Transforms/LoopLoadElim/opt-size.ll b/llvm/test/Transforms/LoopLoadElim/opt-size.ll
index d9fc6bd..bc4c38f 100644 (file)
--- a/llvm/test/Transforms/LoopLoadElim/opt-size.ll
+++ b/llvm/test/Transforms/LoopLoadElim/opt-size.ll
@@ -1,5 +1,6 @@
 ; RUN: opt -basic-aa -loop-load-elim -S < %s | FileCheck %s
-; RUN: opt -basic-aa -loop-load-elim -pgso -S < %s | FileCheck %s -check-prefix=PGSO
+; RUN: opt -basic-aa -loop-load-elim -pgso -S < %s -enable-new-pm=0 | FileCheck %s -check-prefix=PGSO
+; RUN: opt -aa-pipeline=basic-aa -passes='require<profile-summary>,function(loop-load-elim)' -S < %s | FileCheck %s -check-prefix=PGSO
 ; RUN: opt -basic-aa -loop-load-elim -pgso=false -S < %s | FileCheck %s -check-prefix=NPGSO
 
 ; When optimizing for size don't eliminate in this loop because the loop would

diff --git a/llvm/test/Transforms/LoopLoadElim/pr46854-adress-spaces.ll b/llvm/test/Transforms/LoopLoadElim/pr46854-adress-spaces.ll
index 396899d..c230eeb 100644 (file)
--- a/llvm/test/Transforms/LoopLoadElim/pr46854-adress-spaces.ll
+++ b/llvm/test/Transforms/LoopLoadElim/pr46854-adress-spaces.ll
@@ -1,7 +1,7 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; REQUIRES: amdgpu-registered-target
 
-; RUN: opt -globals-aa -loop-load-elim -S %s | FileCheck %s
+; RUN: opt -globals-aa -loop-simplify -loop-load-elim -S %s | FileCheck %s
 
 target datalayout = "e-p:64:64-p1:64:64-p2:32:32-p3:32:32-p4:64:64-p5:32:32-p6: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-S32-A5-ni:7"
 target triple = "amdgcn-amd-amdhsa"