[Passes] Improve opt-pipeline-vector-passes.ll test.

Add -NOT lines to ensure that no extra passes are run if
-extra-vectorizer-passes is not specified.

Also add a loop that actually gets vectorized in preparation for
D115052.

(cherry-picked from 31413c4 and
5da920b)

The test has also been updated to check for the new-pm only.

Author: fhahn

llvm/test/Other/opt-pipeline-vector-passes.ll

@@ -1,8 +1,3 @@
-; RUN: opt -enable-new-pm=0 -O1                          -debug-pass=Structure  < %s -o /dev/null 2>&1 | FileCheck %s --check-prefixes=OLDPM_O1
-; RUN: opt -enable-new-pm=0 -O2                          -debug-pass=Structure  < %s -o /dev/null 2>&1 | FileCheck %s --check-prefixes=OLDPM_O2
-; RUN: opt -enable-new-pm=0 -O2 -extra-vectorizer-passes -debug-pass=Structure  < %s -o /dev/null 2>&1 | FileCheck %s --check-prefixes=OLDPM_O2_EXTRA
-; RUN: opt -enable-new-pm=0 -O1 -vectorize-loops=0       -debug-pass=Structure  < %s -o /dev/null 2>&1 | FileCheck %s --check-prefixes=OLDPM_O1_FORCE_OFF
-; RUN: opt -enable-new-pm=0 -O2 -vectorize-loops=0       -debug-pass=Structure  < %s -o /dev/null 2>&1 | FileCheck %s --check-prefixes=OLDPM_O2_FORCE_OFF
 ; RUN: opt -disable-verify -debug-pass-manager -passes='default<O1>' -S %s 2>&1 | FileCheck %s --check-prefixes=NEWPM_O1
 ; RUN: opt -disable-verify -debug-pass-manager -passes='default<O2>' -S %s 2>&1 | FileCheck %s --check-prefixes=NEWPM_O2
 ; RUN: opt -disable-verify -debug-pass-manager -passes='default<O2>' -extra-vectorizer-passes -S %s 2>&1 | FileCheck %s --check-prefixes=NEWPM_O2_EXTRA
@@ -18,41 +13,11 @@
 ; OLDPM_O1:        Optimize scalar/vector ops
 
 ; Everything runs at -O2.
-
-; OLDPM_O2-LABEL:  Pass Arguments:
-; OLDPM_O2:        Loop Vectorization
-; OLDPM_O2:        SLP Vectorizer
-; OLDPM_O2:        Optimize scalar/vector ops
-
-; Optionally run cleanup passes.
-
-; OLDPM_O2_EXTRA-LABEL:  Pass Arguments:
-; OLDPM_O2_EXTRA:        Loop Vectorization
-; OLDPM_O2_EXTRA:        Early CSE
-; OLDPM_O2_EXTRA:        Value Propagation
-; OLDPM_O2_EXTRA:        Combine redundant instructions
-; OLDPM_O2_EXTRA:        Loop Invariant Code Motion
-; OLDPM_O2_EXTRA:        Unswitch loops
-; OLDPM_O2_EXTRA:        Simplify the CFG
-; OLDPM_O2_EXTRA:        Combine redundant instructions
-; OLDPM_O2_EXTRA:        SLP Vectorizer
-; OLDPM_O2_EXTRA:        Early CSE
-; OLDPM_O2_EXTRA:        Optimize scalar/vector ops
-
-
-; The loop vectorizer still runs at both -O1/-O2 even with the
-; debug flag, but it only works on loops explicitly annotated
-; with pragmas.
-
-; OLDPM_O1_FORCE_OFF-LABEL:  Pass Arguments:
-; OLDPM_O1_FORCE_OFF:        Loop Vectorization
-; OLDPM_O1_FORCE_OFF-NOT:    SLP Vectorizer
-; OLDPM_O1_FORCE_OFF:        Optimize scalar/vector ops
-
-; OLDPM_O2_FORCE_OFF-LABEL:  Pass Arguments:
-; OLDPM_O2_FORCE_OFF:        Loop Vectorization
-; OLDPM_O2_FORCE_OFF:        SLP Vectorizer
-; OLDPM_O2_FORCE_OFF:        Optimize scalar/vector ops
+; O2-LABEL:  Running pass: LoopVectorizePass
+; O2-NOT:    Running pass: EarlyCSEPass
+; O2-NOT:    Running pass: LICMPass
+; O2:        Running pass: SLPVectorizerPass
+; O2:        Running pass: VectorCombinePass
 
 ; There should be no difference with the new pass manager.
 ; This is tested more thoroughly in other test files.
@@ -77,14 +42,20 @@
 ; NEWPM_O2_EXTRA: Running pass: EarlyCSEPass
 ; NEWPM_O2_EXTRA: Running pass: VectorCombinePass
 
-define i64 @f(i1 %cond) {
+define i64 @f(i1 %cond, i32* %src, i32* %dst) {
 entry:
   br label %loop
 
 loop:
   %i = phi i64 [ 0, %entry ], [ %inc, %loop ]
-  %inc = add i64 %i, 1
-  br i1 %cond, label %loop, label %exit
+  %src.i = getelementptr i32, i32* %src, i64 %i
+  %src.v = load i32, i32* %src.i
+  %add = add i32 %src.v, 10
+  %dst.i = getelementptr i32, i32* %dst, i64 %i
+  store i32 %add, i32* %dst.i
+  %inc = add nuw nsw i64 %i, 1
+  %ec = icmp ne i64 %inc, 1000
+  br i1 %ec, label %loop, label %exit
 
 exit:
   ret i64 %i