Revert "[polly] Port polly tests to use NPM" (llvm#92215)

Reverts llvm#90632.

Causing failures on buildbots that dynamically load polly. Reverting
while we sort it out.

Author: efriedma-quic

polly/test/CodeGen/20100617.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen < %s
+; RUN: opt %loadPolly -polly-codegen < %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"
 
 define void @init_array() nounwind {

polly/test/CodeGen/20100622.ll

@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly -passes=polly-codegen -disable-output < %s
-; RUN: opt %loadPolly '-passes=print<polly-detect>' -disable-output < %s | not FileCheck %s
+; RUN: opt %loadPolly -polly-codegen -disable-output < %s
+; RUN: opt %loadPolly -polly-print-detect -disable-output < %s | not FileCheck %s
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32"
 

polly/test/CodeGen/20100707.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen < %s
+; RUN: opt %loadPolly -polly-codegen < %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"
 
 define void @clause_SetSplitField(i32 %Length) nounwind inlinehint {

polly/test/CodeGen/20100707_2.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen < %s
+; RUN: opt %loadPolly -polly-codegen < %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"
 
 @win193 = external global [4 x [36 x double]], align 32 ; <ptr> [#uses=3]

polly/test/CodeGen/20100708.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly '-passes=print<polly-detect>' < %s
+; RUN: opt %loadPolly -polly-detect < %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"
 
 define fastcc void @execute() nounwind {

polly/test/CodeGen/20100708_2.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen < %s
+; RUN: opt %loadPolly -polly-codegen < %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"
 
 define void @init_array() nounwind {

polly/test/CodeGen/20100713.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen < %s
+; RUN: opt %loadPolly -polly-codegen < %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"
 
 define void @fft_float(i32 %NumSamples) nounwind {

polly/test/CodeGen/20100713_2.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen < %s
+; RUN: opt %loadPolly -polly-codegen < %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"
 
 define hidden void @luaD_callhook() nounwind {

polly/test/CodeGen/20100717.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly  -passes=polly-codegen -disable-output < %s
+; RUN: opt %loadPolly  -polly-codegen -disable-output < %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"
 
 define void @matrixTranspose(ptr %A) nounwind {

polly/test/CodeGen/20100718-DomInfo-2.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen -verify-dom-info -disable-output < %s
+; RUN: opt %loadPolly -polly-codegen -verify-dom-info -disable-output < %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"
 
 define void @getNonAffNeighbour() nounwind {

polly/test/CodeGen/20100718-DomInfo.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen -verify-dom-info -disable-output < %s
+; RUN: opt %loadPolly -polly-codegen -verify-dom-info -disable-output < %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"
 
 define void @intrapred_luma_16x16(i32 %predmode) nounwind {

polly/test/CodeGen/20100720-MultipleConditions.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly '-passes=print<polly-ast>' -disable-output < %s
+; RUN: opt %loadPolly -polly-ast -disable-output < %s
 
 ;int bar1();
 ;int bar2();

polly/test/CodeGen/20100809-IndependentBlock.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen -disable-output < %s
+; RUN: opt %loadPolly -polly-codegen -disable-output < %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"
 define void @cfft2(ptr %x) nounwind {
 entry:

polly/test/CodeGen/20100811-ScalarDependencyBetweenBrAndCnd.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen -disable-output < %s
+; RUN: opt %loadPolly -polly-codegen -disable-output < %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"
 

polly/test/CodeGen/20101030-Overflow.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen < %s
+; RUN: opt %loadPolly -polly-codegen < %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"
 
 define void @compdecomp() nounwind {

polly/test/CodeGen/20101103-Overflow3.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen < %s
+; RUN: opt %loadPolly -polly-codegen < %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"
 define void @Reflection_coefficients(ptr %r) nounwind {
 bb20:

polly/test/CodeGen/20101103-signmissmatch.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen < %s
+; RUN: opt %loadPolly -polly-codegen < %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"
 
 define void @CleanNet() nounwind {

polly/test/CodeGen/20110226-Ignore-Dead-Code.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen < %s
+; RUN: opt %loadPolly -polly-codegen < %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"
 
 define void @main() nounwind {

polly/test/CodeGen/20110226-PHI-Node-removed.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen < %s
+; RUN: opt %loadPolly -polly-codegen < %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"
 

polly/test/CodeGen/20120316-InvalidCast.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -S -passes=polly-codegen < %s | FileCheck %s
+; RUN: opt %loadPolly -S -polly-codegen < %s | FileCheck %s
 
 ; CHECK: polly.start
 

polly/test/CodeGen/20120403-RHS-type-mismatch.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen < %s
+; RUN: opt %loadPolly -polly-codegen < %s
 
 ; We just check that this compilation does not crash.
 

polly/test/CodeGen/20130221.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen -S < %s
+; RUN: opt %loadPolly -polly-codegen -S < %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-S128"
 
 define void @list_sequence(ptr %A) {

polly/test/CodeGen/20150328-SCEVExpanderIntroducesNewIV.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen -S < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-codegen -S < %s | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 

polly/test/CodeGen/Intrinsics/llvm-expect.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -S -passes=polly-codegen < %s | FileCheck %s
+; RUN: opt %loadPolly -S -polly-codegen < %s | FileCheck %s
 ;
 ; Check that we generate code without crashing.
 ;

polly/test/CodeGen/LoopParallelMD/do_not_mutate_debug_info.ll

@@ -1,6 +1,6 @@
 ; This test checks that we do not accidently mutate the debug info when
 ; inserting loop parallel metadata.
-; RUN: opt %loadPolly < %s  -S -polly -passes=polly-codegen -polly-ast-detect-parallel | FileCheck %s
+; RUN: opt %loadPolly < %s  -S -polly -polly-codegen -polly-ast-detect-parallel | FileCheck %s
 ; CHECK-NOT: !7 = !{!7}
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 

polly/test/CodeGen/LoopParallelMD/loop_nest_param_parallel.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen -polly-ast-detect-parallel -S < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-codegen -polly-ast-detect-parallel -S < %s | FileCheck %s
 ;
 ; Check that we mark multiple parallel loops correctly including the memory instructions.
 ;

polly/test/CodeGen/LoopParallelMD/single_loop_param_parallel.ll

@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly -passes=polly-codegen -S < %s | FileCheck %s -check-prefix=SEQUENTIAL
-; RUN: opt %loadPolly -passes=polly-codegen -polly-ast-detect-parallel -S < %s | FileCheck %s -check-prefix=PARALLEL
+; RUN: opt %loadPolly -polly-codegen -S < %s | FileCheck %s -check-prefix=SEQUENTIAL
+; RUN: opt %loadPolly -polly-codegen -polly-ast-detect-parallel -S < %s | FileCheck %s -check-prefix=PARALLEL
 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"
 
 ; This is a trivially parallel loop. We just use it to ensure that we actually

polly/test/CodeGen/MemAccess/bad_alignment.ll

@@ -1,4 +1,4 @@
-; RUN: not --crash opt %loadPolly -passes=polly-import-jscop -disable-output 2>&1 < %s | FileCheck %s
+; RUN: not --crash opt %loadPolly -polly-import-jscop -disable-output 2>&1 < %s | FileCheck %s
 ;
 ; Check that we do not allow to access elements not accessed before because the
 ; alignment information would become invalid.

polly/test/CodeGen/MemAccess/codegen_address_space.ll

@@ -1,4 +1,4 @@
-;RUN: opt %loadPolly '-passes=polly-import-jscop,polly-codegen' -polly-import-jscop-postfix=transformed < %s -S | FileCheck %s
+;RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-postfix=transformed -polly-codegen < %s -S | FileCheck %s
 
 ;int A[100];
 ;

polly/test/CodeGen/MemAccess/codegen_constant_offset.ll

@@ -1,4 +1,4 @@
-;RUN: opt %loadPolly '-passes=polly-import-jscop,polly-codegen' -polly-import-jscop-postfix=transformed < %s -S | FileCheck %s
+;RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-postfix=transformed -polly-codegen < %s -S | FileCheck %s
 
 ;int A[100];
 ;

polly/test/CodeGen/MemAccess/codegen_simple.ll

@@ -1,4 +1,4 @@
-;RUN: opt %loadPolly '-passes=polly-import-jscop,polly-codegen' -polly-import-jscop-postfix=transformed < %s -S | FileCheck %s
+;RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-postfix=transformed -polly-codegen < %s -S | FileCheck %s
 
 ;int A[100];
 ;

polly/test/CodeGen/MemAccess/codegen_simple_float.ll

@@ -1,4 +1,4 @@
-;RUN: opt %loadPolly '-passes=polly-import-jscop,polly-codegen' -polly-import-jscop-postfix=transformed < %s -S | FileCheck %s
+;RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-postfix=transformed -polly-codegen < %s -S | FileCheck %s
 ;
 ;float A[100];
 ;

polly/test/CodeGen/MemAccess/codegen_simple_md.ll

@@ -1,5 +1,5 @@
-;RUN: opt %loadPolly '-passes=polly-import-jscop,polly-codegen' -polly-import-jscop-postfix=transformed+withconst < %s -S | FileCheck -check-prefix=WITHCONST %s
-;RUN: opt %loadPolly '-passes=polly-import-jscop,polly-codegen' -polly-import-jscop-postfix=transformed+withoutconst < %s -S | FileCheck -check-prefix=WITHOUTCONST %s
+;RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-postfix=transformed+withconst -polly-codegen < %s -S | FileCheck -check-prefix=WITHCONST %s
+;RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-postfix=transformed+withoutconst -polly-codegen < %s -S | FileCheck -check-prefix=WITHOUTCONST %s
 
 ;int A[1040];
 ;

polly/test/CodeGen/MemAccess/codegen_simple_md_float.ll

@@ -1,5 +1,5 @@
-;RUN: opt %loadPolly '-passes=polly-import-jscop,polly-codegen' -polly-import-jscop-postfix=transformed+withconst < %s -S | FileCheck -check-prefix=WITHCONST %s
-;RUN: opt %loadPolly '-passes=polly-import-jscop,polly-codegen' -polly-import-jscop-postfix=transformed+withoutconst < %s -S | FileCheck -check-prefix=WITHOUTCONST %s
+;RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-postfix=transformed+withconst -polly-codegen < %s -S | FileCheck -check-prefix=WITHCONST %s
+;RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-postfix=transformed+withoutconst -polly-codegen < %s -S | FileCheck -check-prefix=WITHOUTCONST %s
 ;
 ;float A[1040];
 ;

polly/test/CodeGen/MemAccess/different_types.ll

@@ -1,6 +1,6 @@
-; RUN: opt %loadPolly '-passes=polly-import-jscop,polly-codegen' \
+; RUN: opt %loadPolly -polly-import-jscop \
 ; RUN: \
-; RUN: -S < %s | FileCheck %s
+; RUN: -polly-codegen -S < %s | FileCheck %s
 ;
 ;    void foo(float A[], float B[]) {
 ;      for (long i = 0; i < 100; i++)

polly/test/CodeGen/MemAccess/generate-all.ll

@@ -1,6 +1,6 @@
-; RUN: opt %loadPolly -passes=polly-codegen -polly-codegen-generate-expressions=false \
+; RUN: opt %loadPolly -polly-codegen -polly-codegen-generate-expressions=false \
 ; RUN:     -S < %s | FileCheck %s -check-prefix=SCEV
-; RUN: opt %loadPolly -passes=polly-codegen -polly-codegen-generate-expressions=true \
+; RUN: opt %loadPolly -polly-codegen -polly-codegen-generate-expressions=true \
 ; RUN:     -S < %s | FileCheck %s -check-prefix=ASTEXPR
 ;
 ;    void foo(float A[]) {

polly/test/CodeGen/MemAccess/invariant_base_ptr.ll

@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly '-passes=polly-import-jscop,polly-codegen' \
-; RUN:   -polly-invariant-load-hoisting -S \
+; RUN: opt %loadPolly -polly-import-jscop \
+; RUN:   -polly-codegen -polly-invariant-load-hoisting -S \
 ; RUN:   2>&1 < %s | FileCheck %s
 
 ; Setting new access functions where the base pointer of the array that is newly

polly/test/CodeGen/MemAccess/multiple_types.ll

@@ -1,6 +1,6 @@
-; RUN: opt %loadPolly -polly-stmt-granularity=bb '-passes=polly-import-jscop,polly-codegen' \
+; RUN: opt %loadPolly -polly-stmt-granularity=bb -polly-import-jscop \
 ; RUN: -polly-allow-differing-element-types \
-; RUN:   -S    < %s | FileCheck %s
+; RUN:   -polly-codegen -S    < %s | FileCheck %s
 ;
 ;    // Check that accessing one array with different types works.
 ;    void multiple_types(char *Short, char *Float, char *Double) {

polly/test/CodeGen/MemAccess/simple.ll

@@ -1,4 +1,4 @@
-;RUN: opt %loadPolly -passes=polly-import-jscop -polly-import-jscop-postfix=transformed -stats < %s 2>&1  | FileCheck %s
+;RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-postfix=transformed -stats < %s 2>&1  | FileCheck %s
 ; REQUIRES: asserts
 
 ;int A[100];

polly/test/CodeGen/MemAccess/update_access_functions.ll

@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly '-passes=polly-import-jscop,polly-codegen' \
-; RUN:                -polly-import-jscop-postfix=transformed \
+; RUN: opt %loadPolly -polly-import-jscop \
+; RUN:                -polly-import-jscop-postfix=transformed -polly-codegen \
 ; RUN:                 < %s -S | FileCheck %s
 
 ; CHECK-LABEL: polly.stmt.loop1:

polly/test/CodeGen/OpenMP/alias-metadata.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen -polly-parallel -S < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-codegen -polly-parallel -S < %s | FileCheck %s
 ;
 ;    void foo(float *A, float *B) {
 ;      for (long i = 0; i < 1000; i++)

polly/test/CodeGen/OpenMP/floord-as-argument-to-subfunction.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-opt-isl -polly-opt-max-coefficient=-1 -polly-parallel -passes=polly-codegen -S < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-opt-isl -polly-opt-max-coefficient=-1 -polly-parallel -polly-codegen -S < %s | FileCheck %s
 ;
 ; Check that we do not crash but generate parallel code
 ;

polly/test/CodeGen/OpenMP/inlineasm.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly '-passes=polly-opt-isl,polly-codegen' -polly-parallel -S < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-opt-isl -polly-parallel -polly-codegen -S < %s | FileCheck %s
 ; llvm.org/PR51960
 
 ; CHECK-LABEL: define internal void @foo_polly_subfn

polly/test/CodeGen/OpenMP/invariant_base_pointer_preloaded.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen -polly-invariant-load-hoisting=true -polly-parallel \
+; RUN: opt %loadPolly -polly-codegen -polly-invariant-load-hoisting=true -polly-parallel \
 ; RUN: -polly-parallel-force -S < %s | FileCheck %s
 ;
 ; Test to verify that we hand down the preloaded A[0] to the OpenMP subfunction.

polly/test/CodeGen/OpenMP/invariant_base_pointer_preloaded_different_bb.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen -polly-invariant-load-hoisting=true -polly-parallel \
+; RUN: opt %loadPolly -polly-codegen -polly-invariant-load-hoisting=true -polly-parallel \
 ; RUN: -polly-parallel-force -S < %s | FileCheck %s
 ;
 ; Test to verify that we hand down the preloaded A[0] to the OpenMP subfunction.

polly/test/CodeGen/OpenMP/invariant_base_pointer_preloaded_pass_only_needed.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen -polly-invariant-load-hoisting=true -polly-parallel \
+; RUN: opt %loadPolly -polly-codegen -polly-invariant-load-hoisting=true -polly-parallel \
 ; RUN: -polly-parallel-force -S < %s | FileCheck %s
 ;
 ; Test to verify that we hand down the preloaded A[0] to the OpenMP subfunction but

polly/test/CodeGen/OpenMP/invariant_base_pointers_preloaded.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -passes=polly-codegen -polly-invariant-load-hoisting=true -polly-parallel \
+; RUN: opt %loadPolly -polly-codegen -polly-invariant-load-hoisting=true -polly-parallel \
 ; RUN: -polly-parallel-force -S < %s | FileCheck %s
 ;
 ; Test to verify that we hand down the preloaded A[0] to the OpenMP subfunction.

polly/test/CodeGen/OpenMP/loop-body-references-outer-iv.ll

@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly -polly-parallel -polly-parallel-force '-passes=print<polly-ast>' -disable-output < %s | FileCheck %s -check-prefix=AST
-; RUN: opt %loadPolly -polly-parallel -polly-parallel-force -passes=polly-codegen -S -verify-dom-info < %s | FileCheck %s -check-prefix=IR
+; RUN: opt %loadPolly -polly-parallel -polly-parallel-force -polly-print-ast -disable-output < %s | FileCheck %s -check-prefix=AST
+; RUN: opt %loadPolly -polly-parallel -polly-parallel-force -polly-codegen -S -verify-dom-info < %s | FileCheck %s -check-prefix=IR
 
 ; This code has failed the scev based code generation as the scev in the scop
 ; contains an AddRecExpr of an outer loop. When generating code, we did not

polly/test/CodeGen/OpenMP/loop-body-references-outer-values-2.ll

@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly -polly-parallel -polly-parallel-force '-passes=print<polly-ast>' -disable-output < %s | FileCheck %s -check-prefix=AST
-; RUN: opt %loadPolly -polly-parallel -polly-parallel-force -passes=polly-codegen -S -verify-dom-info < %s | FileCheck %s -check-prefix=IR
+; RUN: opt %loadPolly -polly-parallel -polly-parallel-force -polly-print-ast -disable-output < %s | FileCheck %s -check-prefix=AST
+; RUN: opt %loadPolly -polly-parallel -polly-parallel-force -polly-codegen -S -verify-dom-info < %s | FileCheck %s -check-prefix=IR
 
 ; AST: #pragma simd
 ; AST: #pragma omp parallel for

polly/test/CodeGen/OpenMP/loop-body-references-outer-values-3.ll

@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly -aa-pipeline=basic-aa -polly-parallel -polly-parallel-force -polly-invariant-load-hoisting=true '-passes=print<polly-ast>' -disable-output < %s | FileCheck %s -check-prefix=AST
-; RUN: opt %loadPolly -aa-pipeline=basic-aa -polly-parallel -polly-parallel-force -polly-invariant-load-hoisting=true -passes=polly-codegen -S -verify-dom-info < %s | FileCheck %s -check-prefix=IR
+; RUN: opt %loadPolly -basic-aa -polly-parallel -polly-parallel-force -polly-invariant-load-hoisting=true -polly-print-ast -disable-output < %s | FileCheck %s -check-prefix=AST
+; RUN: opt %loadPolly -basic-aa -polly-parallel -polly-parallel-force -polly-invariant-load-hoisting=true -polly-codegen -S -verify-dom-info < %s | FileCheck %s -check-prefix=IR
 
 ; The interesting part of this test case is the instruction:
 ;   %tmp = bitcast i8* %call to i64**

polly/test/CodeGen/OpenMP/loop-body-references-outer-values.ll

@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly -polly-parallel -polly-parallel-force '-passes=print<polly-ast>' -disable-output < %s | FileCheck %s -check-prefix=AST
-; RUN: opt %loadPolly -polly-parallel -polly-parallel-force -passes=polly-codegen -S < %s | FileCheck %s -check-prefix=IR
+; RUN: opt %loadPolly -polly-parallel -polly-parallel-force -polly-print-ast -disable-output < %s | FileCheck %s -check-prefix=AST
+; RUN: opt %loadPolly -polly-parallel -polly-parallel-force -polly-codegen -S < %s | FileCheck %s -check-prefix=IR
 
 ; Make sure we correctly forward the reference to 'A' to the OpenMP subfunction.
 ;

polly/test/CodeGen/OpenMP/loop-bounds-reference-outer-ids.ll

@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly -polly-parallel '-passes=print<polly-ast>' -disable-output < %s | FileCheck %s -check-prefix=AST
-; RUN: opt %loadPolly -polly-parallel -passes=polly-codegen -S < %s | FileCheck %s -check-prefix=IR
+; RUN: opt %loadPolly -polly-parallel -polly-print-ast -disable-output < %s | FileCheck %s -check-prefix=AST
+; RUN: opt %loadPolly -polly-parallel -polly-codegen -S < %s | FileCheck %s -check-prefix=IR
 ;
 ; float A[100];
 ;

polly/test/CodeGen/OpenMP/mapped-phi-access.ll

@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-stmt-granularity=bb -polly-parallel '-passes=polly-delicm,polly-codegen' -S < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-stmt-granularity=bb -polly-parallel -polly-delicm -polly-codegen -S < %s | FileCheck %s
 ;
 ; Verify that -polly-parallel can handle mapped scalar MemoryAccesses.
 ;

polly/test/CodeGen/OpenMP/matmul-parallel.ll

@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly -polly-parallel '-passes=polly-opt-isl,print<polly-ast>' -disable-output -debug-only=polly-ast < %s 2>&1 | FileCheck --check-prefix=AST %s
-; RUN: opt %loadPolly -polly-parallel '-passes=polly-opt-isl,polly-codegen' -S < %s | FileCheck --check-prefix=CODEGEN %s
+; RUN: opt %loadPolly -polly-parallel -polly-opt-isl -polly-ast -disable-output -debug-only=polly-ast < %s 2>&1 | FileCheck --check-prefix=AST %s
+; RUN: opt %loadPolly -polly-parallel -polly-opt-isl -polly-codegen -S < %s | FileCheck --check-prefix=CODEGEN %s
 ; REQUIRES: asserts
 
 ; Parallelization of detected matrix-multiplication.