[llvm] b056030 - [test] Fix remaining GVN tests under NPM

[Arthur Eubanks via llvm-commits]

Author: Arthur Eubanks
Date: 2020-11-18T12:35:32-08:00
New Revision: b056030d6e3c4115294608bb0a90f02e2767d76e

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

LOG: [test] Fix remaining GVN tests under NPM

Some used analyses are optional but were relied upon in tests, the
legacy PM runs them in a different order than the NPM.

Added: 
    

Modified: 
    llvm/test/Transforms/GVN/PRE/2011-06-01-NonLocalMemdepMiscompile.ll
    llvm/test/Transforms/GVN/PRE/pre-after-rle.ll
    llvm/test/Transforms/GVN/PRE/pre-load-in-loop.ll

Removed: 
    


################################################################################
diff  --git a/llvm/test/Transforms/GVN/PRE/2011-06-01-NonLocalMemdepMiscompile.ll b/llvm/test/Transforms/GVN/PRE/2011-06-01-NonLocalMemdepMiscompile.ll
index 4a6ea1cfee96..17d1bfc9d9e8 100644
--- a/llvm/test/Transforms/GVN/PRE/2011-06-01-NonLocalMemdepMiscompile.ll
+++ b/llvm/test/Transforms/GVN/PRE/2011-06-01-NonLocalMemdepMiscompile.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basic-aa -gvn -S | FileCheck %s
+; RUN: opt < %s -basic-aa -loops -gvn -S | FileCheck %s
 ; This test is checking that (a) this doesn't crash, and (b) we don't
 ; conclude the value of %tmp17 is available in bb1.bb15_crit_edge.
 ; rdar://9429882

diff  --git a/llvm/test/Transforms/GVN/PRE/pre-after-rle.ll b/llvm/test/Transforms/GVN/PRE/pre-after-rle.ll
index 879d20e891be..cc242c1b432a 100644
--- a/llvm/test/Transforms/GVN/PRE/pre-after-rle.ll
+++ b/llvm/test/Transforms/GVN/PRE/pre-after-rle.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn -S < %s | FileCheck %s
+; RUN: opt -phi-values -gvn -S < %s | FileCheck %s
 
 declare noalias i8* @malloc(i64)
 

diff  --git a/llvm/test/Transforms/GVN/PRE/pre-load-in-loop.ll b/llvm/test/Transforms/GVN/PRE/pre-load-in-loop.ll
index 776a95ff031c..73905097dc67 100644
--- a/llvm/test/Transforms/GVN/PRE/pre-load-in-loop.ll
+++ b/llvm/test/Transforms/GVN/PRE/pre-load-in-loop.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basic-aa -gvn -enable-load-in-loop-pre=false -S | FileCheck %s
+; RUN: opt < %s -basic-aa -loops -gvn -enable-load-in-loop-pre=false -S | FileCheck %s
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 
 ;void test1(int N, double *G) {