diff --git a/polly/test/Cloog/CodeGen/20100617.ll b/polly/test/Cloog/CodeGen/20100617.ll
index f9837cc07655..7d122af5adff 100644
--- a/polly/test/Cloog/CodeGen/20100617.ll
+++ b/polly/test/Cloog/CodeGen/20100617.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Cloog/CodeGen/20100622.ll b/polly/test/Cloog/CodeGen/20100622.ll
index f643f84f3aa0..43813302995e 100644
--- a/polly/test/Cloog/CodeGen/20100622.ll
+++ b/polly/test/Cloog/CodeGen/20100622.ll
@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %s
-; RUN: opt %loadPolly %defaultOpts -polly-detect -analyze  < %s | not FileCheck %s
+; RUN: opt %loadPolly -polly-codegen %s
+; RUN: opt %loadPolly -polly-detect -analyze  < %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"
 target triple = "i386-portbld-freebsd8.0"
diff --git a/polly/test/Cloog/CodeGen/20100707.ll b/polly/test/Cloog/CodeGen/20100707.ll
index a6fe774ede73..c03e7c5fa04c 100644
--- a/polly/test/Cloog/CodeGen/20100707.ll
+++ b/polly/test/Cloog/CodeGen/20100707.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Cloog/CodeGen/20100707_2.ll b/polly/test/Cloog/CodeGen/20100707_2.ll
index 557a76318456..b86127c785ae 100644
--- a/polly/test/Cloog/CodeGen/20100707_2.ll
+++ b/polly/test/Cloog/CodeGen/20100707_2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Cloog/CodeGen/20100708_2.ll b/polly/test/Cloog/CodeGen/20100708_2.ll
index 27194181f2f3..b41dd14c3b4b 100644
--- a/polly/test/Cloog/CodeGen/20100708_2.ll
+++ b/polly/test/Cloog/CodeGen/20100708_2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -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"
 target triple = "x86_64-pc-linux-gnu"
 
diff --git a/polly/test/Cloog/CodeGen/20100713.ll b/polly/test/Cloog/CodeGen/20100713.ll
index ad014c4fa7ce..c2f1774c4f75 100644
--- a/polly/test/Cloog/CodeGen/20100713.ll
+++ b/polly/test/Cloog/CodeGen/20100713.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Cloog/CodeGen/20100713_2.ll b/polly/test/Cloog/CodeGen/20100713_2.ll
index a8ad7e19de5d..ebfd4a67eaa6 100644
--- a/polly/test/Cloog/CodeGen/20100713_2.ll
+++ b/polly/test/Cloog/CodeGen/20100713_2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Cloog/CodeGen/20100717.ll b/polly/test/Cloog/CodeGen/20100717.ll
index 123db6c6e109..4a1d861011b6 100644
--- a/polly/test/Cloog/CodeGen/20100717.ll
+++ b/polly/test/Cloog/CodeGen/20100717.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts  -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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Cloog/CodeGen/20100718-DomInfo-2.ll b/polly/test/Cloog/CodeGen/20100718-DomInfo-2.ll
index 8dc279b61f65..b83a5661b92d 100644
--- a/polly/test/Cloog/CodeGen/20100718-DomInfo-2.ll
+++ b/polly/test/Cloog/CodeGen/20100718-DomInfo-2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Cloog/CodeGen/20100718-DomInfo.ll b/polly/test/Cloog/CodeGen/20100718-DomInfo.ll
index a036276eeb93..f98496a3d8ca 100644
--- a/polly/test/Cloog/CodeGen/20100718-DomInfo.ll
+++ b/polly/test/Cloog/CodeGen/20100718-DomInfo.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Cloog/CodeGen/20100720-MultipleConditions.ll b/polly/test/Cloog/CodeGen/20100720-MultipleConditions.ll
index c8f31a7dd581..f186e796e75f 100644
--- a/polly/test/Cloog/CodeGen/20100720-MultipleConditions.ll
+++ b/polly/test/Cloog/CodeGen/20100720-MultipleConditions.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze %s
+; RUN: opt %loadPolly -polly-cloog -analyze %s
 
 ;int bar1();
 ;int bar2();
diff --git a/polly/test/Cloog/CodeGen/20100809-IndependentBlock.ll b/polly/test/Cloog/CodeGen/20100809-IndependentBlock.ll
index bd440ec56e56..ec2eb5512582 100644
--- a/polly/test/Cloog/CodeGen/20100809-IndependentBlock.ll
+++ b/polly/test/Cloog/CodeGen/20100809-IndependentBlock.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -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"
 target triple = "x86_64-unknown-linux-gnu"
 define void @cfft2([2 x float]* %x) nounwind {
diff --git a/polly/test/Cloog/CodeGen/20100811-ScalarDependencyBetweenBrAndCnd.ll b/polly/test/Cloog/CodeGen/20100811-ScalarDependencyBetweenBrAndCnd.ll
index 7421a767a1be..ffa626013b81 100644
--- a/polly/test/Cloog/CodeGen/20100811-ScalarDependencyBetweenBrAndCnd.ll
+++ b/polly/test/Cloog/CodeGen/20100811-ScalarDependencyBetweenBrAndCnd.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -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"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/polly/test/Cloog/CodeGen/20101030-Overflow.ll b/polly/test/Cloog/CodeGen/20101030-Overflow.ll
index e8f1a9a1049a..f7e52d1bf972 100644
--- a/polly/test/Cloog/CodeGen/20101030-Overflow.ll
+++ b/polly/test/Cloog/CodeGen/20101030-Overflow.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Cloog/CodeGen/20101103-Overflow3.ll b/polly/test/Cloog/CodeGen/20101103-Overflow3.ll
index b56df93a07b2..a5b14d40ddba 100644
--- a/polly/test/Cloog/CodeGen/20101103-Overflow3.ll
+++ b/polly/test/Cloog/CodeGen/20101103-Overflow3.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -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"
 target triple = "x86_64-unknown-linux-gnu"
 define void @Reflection_coefficients(i16* %r) nounwind {
diff --git a/polly/test/Cloog/CodeGen/20101103-signmissmatch.ll b/polly/test/Cloog/CodeGen/20101103-signmissmatch.ll
index 5821a26e0a0a..10831e1c5220 100644
--- a/polly/test/Cloog/CodeGen/20101103-signmissmatch.ll
+++ b/polly/test/Cloog/CodeGen/20101103-signmissmatch.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -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"
 target triple = "x86_64-pc-linux-gnu"
 
diff --git a/polly/test/Cloog/CodeGen/20110226-Ignore-Dead-Code.ll b/polly/test/Cloog/CodeGen/20110226-Ignore-Dead-Code.ll
index ba90eca979a2..6562921440bb 100644
--- a/polly/test/Cloog/CodeGen/20110226-Ignore-Dead-Code.ll
+++ b/polly/test/Cloog/CodeGen/20110226-Ignore-Dead-Code.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Cloog/CodeGen/20110226-PHI-Node-removed.ll b/polly/test/Cloog/CodeGen/20110226-PHI-Node-removed.ll
index 2263ee4787b6..9e8084f99564 100644
--- a/polly/test/Cloog/CodeGen/20110226-PHI-Node-removed.ll
+++ b/polly/test/Cloog/CodeGen/20110226-PHI-Node-removed.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Cloog/CodeGen/20120316-InvalidCast.ll b/polly/test/Cloog/CodeGen/20120316-InvalidCast.ll
index 9aa1053357a3..3f892cf9a859 100644
--- a/polly/test/Cloog/CodeGen/20120316-InvalidCast.ll
+++ b/polly/test/Cloog/CodeGen/20120316-InvalidCast.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %s
+; RUN: opt %loadPolly -polly-codegen %s
 
 target datalayout = "e-p:32:32:32-i64:64:64-i32:32:32-i16:16:16-i1:32:32-f64:64:64-f32:32:32-a0:0-n32"
 target triple = "hexagon-unknown-linux-gnu"
diff --git a/polly/test/Cloog/CodeGen/OpenMP/add_memref.ll b/polly/test/Cloog/CodeGen/OpenMP/add_memref.ll
index d8218bb186be..ad491fce61c0 100644
--- a/polly/test/Cloog/CodeGen/OpenMP/add_memref.ll
+++ b/polly/test/Cloog/CodeGen/OpenMP/add_memref.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen -enable-polly-openmp -disable-verify -S < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-codegen -enable-polly-openmp -disable-verify -S < %s | FileCheck %s
 
 ;#define N 10
 ;
diff --git a/polly/test/Cloog/CodeGen/OpenMP/extract_memref.ll b/polly/test/Cloog/CodeGen/OpenMP/extract_memref.ll
index 825eb71bc80a..29f196727ff2 100644
--- a/polly/test/Cloog/CodeGen/OpenMP/extract_memref.ll
+++ b/polly/test/Cloog/CodeGen/OpenMP/extract_memref.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen -enable-polly-openmp -S < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-codegen -enable-polly-openmp -S < %s | FileCheck %s
 
 ;#define N 10
 ;
diff --git a/polly/test/Cloog/CodeGen/OpenMP/invalidate_subfn_scops.ll b/polly/test/Cloog/CodeGen/OpenMP/invalidate_subfn_scops.ll
index b4eec09871ce..dde0303a776f 100644
--- a/polly/test/Cloog/CodeGen/OpenMP/invalidate_subfn_scops.ll
+++ b/polly/test/Cloog/CodeGen/OpenMP/invalidate_subfn_scops.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen -enable-polly-openmp -analyze < %s 2>&1 | FileCheck %s
+; RUN: opt %loadPolly -polly-codegen -enable-polly-openmp -analyze < %s 2>&1 | FileCheck %s
 
 ;#define N 500000
 ;float A[N];
diff --git a/polly/test/Cloog/CodeGen/OpenMP/parallel_loop.ll b/polly/test/Cloog/CodeGen/OpenMP/parallel_loop.ll
index f81875d95b7e..0128c9e8ef35 100644
--- a/polly/test/Cloog/CodeGen/OpenMP/parallel_loop.ll
+++ b/polly/test/Cloog/CodeGen/OpenMP/parallel_loop.ll
@@ -1,7 +1,7 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog -polly-codegen -enable-polly-openmp -analyze  < %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-cloog -polly-codegen -enable-polly-openmp -analyze  < %s | FileCheck -check-prefix=IMPORT %s
-; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-cloog -polly-codegen -enable-polly-openmp -analyze  < %s | FileCheck -check-prefix=IMPORT %s
-; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-postfix=tiled -polly-import-jscop-dir=%S -polly-cloog -polly-codegen -enable-polly-openmp -analyze -disable-polly-legality < %s | FileCheck -check-prefix=TILED %s
+; RUN: opt %loadPolly -basicaa -polly-cloog -polly-codegen -enable-polly-openmp -analyze  < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-import-jscop -polly-import-jscop-dir=%S -polly-cloog -polly-codegen -enable-polly-openmp -analyze  < %s | FileCheck -check-prefix=IMPORT %s
+; RUN: opt %loadPolly -basicaa -polly-import-jscop -polly-import-jscop-dir=%S -polly-cloog -polly-codegen -enable-polly-openmp -analyze  < %s | FileCheck -check-prefix=IMPORT %s
+; RUN: opt %loadPolly -basicaa -polly-import-jscop -polly-import-jscop-postfix=tiled -polly-import-jscop-dir=%S -polly-cloog -polly-codegen -enable-polly-openmp -analyze -disable-polly-legality < %s | FileCheck -check-prefix=TILED %s
 
 ;#define M 1024
 ;#define N 1024
diff --git a/polly/test/Cloog/CodeGen/OpenMP/parallel_loop_simple.ll b/polly/test/Cloog/CodeGen/OpenMP/parallel_loop_simple.ll
index f1b3c7c65e5f..036153b0b7a9 100644
--- a/polly/test/Cloog/CodeGen/OpenMP/parallel_loop_simple.ll
+++ b/polly/test/Cloog/CodeGen/OpenMP/parallel_loop_simple.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog -polly-codegen -enable-polly-openmp -analyze  < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-cloog -polly-codegen -enable-polly-openmp -analyze  < %s | FileCheck %s
 
 ;#define M 1024
 ;#define N 1024
diff --git a/polly/test/Cloog/CodeGen/OpenMP/parallel_loop_simple2.ll b/polly/test/Cloog/CodeGen/OpenMP/parallel_loop_simple2.ll
index 70905e911e51..f6af47dfcb4f 100644
--- a/polly/test/Cloog/CodeGen/OpenMP/parallel_loop_simple2.ll
+++ b/polly/test/Cloog/CodeGen/OpenMP/parallel_loop_simple2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog -polly-codegen -enable-polly-openmp -analyze  < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-cloog -polly-codegen -enable-polly-openmp -analyze  < %s | FileCheck %s
 
 ;#define N 1024
 ;
diff --git a/polly/test/Cloog/CodeGen/OpenMP/simple_nested_loop.ll b/polly/test/Cloog/CodeGen/OpenMP/simple_nested_loop.ll
index 27cecf2aa059..8abe63989f30 100644
--- a/polly/test/Cloog/CodeGen/OpenMP/simple_nested_loop.ll
+++ b/polly/test/Cloog/CodeGen/OpenMP/simple_nested_loop.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen -enable-polly-openmp -verify-dom-info -S < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-codegen -enable-polly-openmp -verify-dom-info -S < %s | FileCheck %s
 
 ;#include <string.h>
 ;#define N 10
diff --git a/polly/test/Cloog/CodeGen/OpenMP/structnames.ll b/polly/test/Cloog/CodeGen/OpenMP/structnames.ll
index d6eeb8ba4e94..0079385ca12f 100644
--- a/polly/test/Cloog/CodeGen/OpenMP/structnames.ll
+++ b/polly/test/Cloog/CodeGen/OpenMP/structnames.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen -enable-polly-openmp -S  < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-codegen -enable-polly-openmp -S  < %s | FileCheck %s
 
 ;#include <string.h>
 ;#include <stdio.h>
diff --git a/polly/test/Cloog/CodeGen/OpenMP/two_loop.ll b/polly/test/Cloog/CodeGen/OpenMP/two_loop.ll
index 4f27dfc20c5e..448f427480f0 100644
--- a/polly/test/Cloog/CodeGen/OpenMP/two_loop.ll
+++ b/polly/test/Cloog/CodeGen/OpenMP/two_loop.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -mem2reg -polly-codegen -enable-polly-openmp -S %s
+; RUN: opt %loadPolly -mem2reg -polly-codegen -enable-polly-openmp -S %s
 
 ;#include <string.h>
 ;#define N 10240000
diff --git a/polly/test/Cloog/CodeGen/PHIInExit.ll b/polly/test/Cloog/CodeGen/PHIInExit.ll
index 882a7d2aa4ce..8651db4896a2 100644
--- a/polly/test/Cloog/CodeGen/PHIInExit.ll
+++ b/polly/test/Cloog/CodeGen/PHIInExit.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Cloog/CodeGen/constant_condition.ll b/polly/test/Cloog/CodeGen/constant_condition.ll
index 87fe678151d9..bb84a20b4d94 100644
--- a/polly/test/Cloog/CodeGen/constant_condition.ll
+++ b/polly/test/Cloog/CodeGen/constant_condition.ll
@@ -1,4 +1,4 @@
-;RUN: opt %loadPolly %defaultOpts -polly-detect-scops-in-regions-without-loops -polly-detect-scops-in-functions-without-loops -polly-cloog -analyze < %s | FileCheck %s
+;RUN: opt %loadPolly -polly-prepare -polly-detect-scops-in-regions-without-loops -polly-detect-scops-in-functions-without-loops -polly-cloog -analyze < %s | FileCheck %s
 
 ;#include <string.h>
 ;int A[1];
diff --git a/polly/test/Cloog/CodeGen/do_pluto_matmult.ll b/polly/test/Cloog/CodeGen/do_pluto_matmult.ll
index c20092bbd5e1..8ac446b1a4fa 100644
--- a/polly/test/Cloog/CodeGen/do_pluto_matmult.ll
+++ b/polly/test/Cloog/CodeGen/do_pluto_matmult.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-cloog -analyze < %s | FileCheck %s
 
 ;#define M 36
 ;#define N 36
@@ -75,12 +75,12 @@
 ;  return 0;
 ;}
 
-; RUN: opt %loadPolly %defaultOpts -polly-codegen -disable-output %s
-; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-cloog -analyze  < %s | FileCheck -check-prefix=IMPORT %s
-; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-import-jscop-postfix=valid_reverse -polly-cloog -analyze < %s | FileCheck -check-prefix=REVERSE %s > /dev/null
-; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-import-jscop-postfix=invalid_reverse -polly-cloog -analyze < %s 2>&1  | FileCheck -check-prefix=INVALID %s > /dev/null
-; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-cloog -analyze  < %s | FileCheck -check-prefix=IMPORT %s
-; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-codegen -S < %s | FileCheck -check-prefix=CODEGEN %s
+; RUN: opt %loadPolly -basicaa -polly-codegen -disable-output %s
+; RUN: opt %loadPolly -basicaa -polly-import-jscop -polly-import-jscop-dir=%S -polly-cloog -analyze  < %s | FileCheck -check-prefix=IMPORT %s
+; RUN: opt %loadPolly -basicaa -polly-import-jscop -polly-import-jscop-dir=%S -polly-import-jscop-postfix=valid_reverse -polly-cloog -analyze < %s | FileCheck -check-prefix=REVERSE %s > /dev/null
+; RUN: opt %loadPolly -basicaa -polly-import-jscop -polly-import-jscop-dir=%S -polly-import-jscop-postfix=invalid_reverse -polly-cloog -analyze < %s 2>&1  | FileCheck -check-prefix=INVALID %s > /dev/null
+; RUN: opt %loadPolly -basicaa -polly-import-jscop -polly-import-jscop-dir=%S -polly-cloog -analyze  < %s | FileCheck -check-prefix=IMPORT %s
+; RUN: opt %loadPolly -basicaa -polly-import-jscop -polly-import-jscop-dir=%S -polly-codegen -S < %s | FileCheck -check-prefix=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"
diff --git a/polly/test/Cloog/CodeGen/loop_with_condition.ll b/polly/test/Cloog/CodeGen/loop_with_condition.ll
index a7179e472711..6e37bd60eefe 100644
--- a/polly/test/Cloog/CodeGen/loop_with_condition.ll
+++ b/polly/test/Cloog/CodeGen/loop_with_condition.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-cloog -analyze < %s | FileCheck %s
 
 ;#include <string.h>
 ;#define N 1024
diff --git a/polly/test/Cloog/CodeGen/loop_with_condition_2.ll b/polly/test/Cloog/CodeGen/loop_with_condition_2.ll
index 392b79b792af..476ae6307a06 100644
--- a/polly/test/Cloog/CodeGen/loop_with_condition_2.ll
+++ b/polly/test/Cloog/CodeGen/loop_with_condition_2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-cloog -analyze < %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"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/polly/test/Cloog/CodeGen/loop_with_condition_ineq.ll b/polly/test/Cloog/CodeGen/loop_with_condition_ineq.ll
index dca05e88371f..fac977b17311 100644
--- a/polly/test/Cloog/CodeGen/loop_with_condition_ineq.ll
+++ b/polly/test/Cloog/CodeGen/loop_with_condition_ineq.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-cloog -analyze < %s | FileCheck %s
 
 ;#include <string.h>
 ;#define N 1024
diff --git a/polly/test/Cloog/CodeGen/matmul_vec.ll b/polly/test/Cloog/CodeGen/matmul_vec.ll
index 8a293e842b8b..b45fa03b6786 100644
--- a/polly/test/Cloog/CodeGen/matmul_vec.ll
+++ b/polly/test/Cloog/CodeGen/matmul_vec.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-codegen %vector-opt -S -dce < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-import-jscop -polly-import-jscop-dir=%S -polly-codegen %vector-opt -S -dce < %s | FileCheck %s
 
 ;#define M 1024
 ;#define N 1024
diff --git a/polly/test/Cloog/CodeGen/pluto_matmult.ll b/polly/test/Cloog/CodeGen/pluto_matmult.ll
index e19be65f1efa..f5f5fffb179d 100644
--- a/polly/test/Cloog/CodeGen/pluto_matmult.ll
+++ b/polly/test/Cloog/CodeGen/pluto_matmult.ll
@@ -1,6 +1,6 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze < %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-codegen < %s > /dev/null
-; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-cloog -analyze  -S < %s | FileCheck -check-prefix=IMPORT %s
+; RUN: opt %loadPolly -basicaa -polly-cloog -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-codegen < %s > /dev/null
+; RUN: opt %loadPolly -basicaa -polly-import-jscop -polly-import-jscop-dir=%S -polly-cloog -analyze  -S < %s | FileCheck -check-prefix=IMPORT %s
 
 ;#define M 2048
 ;#define N 2048
diff --git a/polly/test/Cloog/CodeGen/reduction_2.ll b/polly/test/Cloog/CodeGen/reduction_2.ll
index 93e5df4e43cd..119cf96620ac 100644
--- a/polly/test/Cloog/CodeGen/reduction_2.ll
+++ b/polly/test/Cloog/CodeGen/reduction_2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-cloog -analyze < %s | FileCheck %s
 
 ;#include <string.h>
 ;#include <stdio.h>
diff --git a/polly/test/Cloog/CodeGen/sequential_loops.ll b/polly/test/Cloog/CodeGen/sequential_loops.ll
index de3afa0d7850..1c7ee8a62abb 100644
--- a/polly/test/Cloog/CodeGen/sequential_loops.ll
+++ b/polly/test/Cloog/CodeGen/sequential_loops.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-cloog -analyze < %s | FileCheck %s
 
 ;#include <string.h>
 ;#define N 1024
diff --git a/polly/test/Cloog/CodeGen/simple_vec_assign_scalar.ll b/polly/test/Cloog/CodeGen/simple_vec_assign_scalar.ll
index 9a371dc18bb4..03cd5608d8b3 100644
--- a/polly/test/Cloog/CodeGen/simple_vec_assign_scalar.ll
+++ b/polly/test/Cloog/CodeGen/simple_vec_assign_scalar.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %vector-opt -dce -S < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-codegen %vector-opt -dce -S < %s | FileCheck %s
 
 ;#define N 1024
 ;float A[N];
diff --git a/polly/test/Cloog/CodeGen/simple_vec_assign_scalar_2.ll b/polly/test/Cloog/CodeGen/simple_vec_assign_scalar_2.ll
index 0361718b7a5f..2afdc0730ce8 100644
--- a/polly/test/Cloog/CodeGen/simple_vec_assign_scalar_2.ll
+++ b/polly/test/Cloog/CodeGen/simple_vec_assign_scalar_2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %vector-opt -dce -S < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-codegen %vector-opt -dce -S < %s | FileCheck %s
 
 ;#define N 1024
 ;float A[N];
diff --git a/polly/test/Cloog/CodeGen/simple_vec_const.ll b/polly/test/Cloog/CodeGen/simple_vec_const.ll
index a2e0fba59e92..4959a7893144 100644
--- a/polly/test/Cloog/CodeGen/simple_vec_const.ll
+++ b/polly/test/Cloog/CodeGen/simple_vec_const.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %vector-opt -S < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-codegen %vector-opt -S < %s | FileCheck %s
 
 ;#define N 1024
 ;float A[N];
diff --git a/polly/test/Cloog/CodeGen/simple_vec_large_width.ll b/polly/test/Cloog/CodeGen/simple_vec_large_width.ll
index df02ae3e2f44..f00481aae0e6 100644
--- a/polly/test/Cloog/CodeGen/simple_vec_large_width.ll
+++ b/polly/test/Cloog/CodeGen/simple_vec_large_width.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %vector-opt -dce -S < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-codegen %vector-opt -dce -S < %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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Cloog/CodeGen/simple_vec_stride_one.ll b/polly/test/Cloog/CodeGen/simple_vec_stride_one.ll
index 80509243abc9..504a42a2f61c 100644
--- a/polly/test/Cloog/CodeGen/simple_vec_stride_one.ll
+++ b/polly/test/Cloog/CodeGen/simple_vec_stride_one.ll
@@ -1,7 +1,7 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %vector-opt -dce -S < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-codegen %vector-opt -dce -S < %s | FileCheck %s
 ; RUN: opt %loadPolly -basicaa -polly-codegen -polly-vectorizer=unroll-only -S < %s | FileCheck -check-prefix=UNROLL %s
-; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-cloog -analyze   < %s | FileCheck -check-prefix=IMPORT %s
-; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-codegen  < %s -S  %vector-opt | FileCheck -check-prefix=CODEGEN %s
+; RUN: opt %loadPolly -basicaa -polly-import-jscop -polly-import-jscop-dir=%S -polly-cloog -analyze   < %s | FileCheck -check-prefix=IMPORT %s
+; RUN: opt %loadPolly -basicaa -polly-import-jscop -polly-import-jscop-dir=%S -polly-codegen  < %s -S  %vector-opt | FileCheck -check-prefix=CODEGEN %s
 
 ;#define N 1024
 ;float A[N];
diff --git a/polly/test/Cloog/CodeGen/simple_vec_stride_x.ll b/polly/test/Cloog/CodeGen/simple_vec_stride_x.ll
index 30e1bf8a413a..f122009a6222 100644
--- a/polly/test/Cloog/CodeGen/simple_vec_stride_x.ll
+++ b/polly/test/Cloog/CodeGen/simple_vec_stride_x.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %vector-opt  -dce -S < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-codegen %vector-opt  -dce -S < %s | FileCheck %s
 
 ;#define N 1024
 ;float A[N];
diff --git a/polly/test/Cloog/CodeGen/simple_vec_two_stmts.ll b/polly/test/Cloog/CodeGen/simple_vec_two_stmts.ll
index dbbd6201dd8f..7f8efe8ed4cf 100644
--- a/polly/test/Cloog/CodeGen/simple_vec_two_stmts.ll
+++ b/polly/test/Cloog/CodeGen/simple_vec_two_stmts.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %vector-opt -dce -S < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-codegen %vector-opt -dce -S < %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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Cloog/CodeGen/single_do_loop_int_max_iterations.ll b/polly/test/Cloog/CodeGen/single_do_loop_int_max_iterations.ll
index 85cc106dc76a..0127d2fb024b 100644
--- a/polly/test/Cloog/CodeGen/single_do_loop_int_max_iterations.ll
+++ b/polly/test/Cloog/CodeGen/single_do_loop_int_max_iterations.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze  -S < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-cloog -analyze  -S < %s | FileCheck %s
 
 ;#define N 20
 ;#include "limits.h"
diff --git a/polly/test/Cloog/CodeGen/single_do_loop_ll_max_iterations.ll b/polly/test/Cloog/CodeGen/single_do_loop_ll_max_iterations.ll
index 6fdcdb00f71e..71663375c0e9 100644
--- a/polly/test/Cloog/CodeGen/single_do_loop_ll_max_iterations.ll
+++ b/polly/test/Cloog/CodeGen/single_do_loop_ll_max_iterations.ll
@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze  -S < %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-codegen < %s
+; RUN: opt %loadPolly -polly-cloog -analyze  -S < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-codegen < %s
 
 ;#define N 20
 ;#include "limits.h"
diff --git a/polly/test/Cloog/CodeGen/single_do_loop_scev_replace.ll b/polly/test/Cloog/CodeGen/single_do_loop_scev_replace.ll
index 8d8f6f46d563..96a70bb6b830 100644
--- a/polly/test/Cloog/CodeGen/single_do_loop_scev_replace.ll
+++ b/polly/test/Cloog/CodeGen/single_do_loop_scev_replace.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-cloog -analyze < %s | FileCheck %s
 
 ;#define N 20
 ;#include "limits.h"
diff --git a/polly/test/Cloog/CodeGen/single_loop.ll b/polly/test/Cloog/CodeGen/single_loop.ll
index 2d72ade7b410..20c48f842fdb 100644
--- a/polly/test/Cloog/CodeGen/single_loop.ll
+++ b/polly/test/Cloog/CodeGen/single_loop.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-cloog -analyze < %s | FileCheck %s
 
 ;#include <string.h>
 ;#define N 1024
diff --git a/polly/test/Cloog/CodeGen/single_loop_int_max_iterations.ll b/polly/test/Cloog/CodeGen/single_loop_int_max_iterations.ll
index ba304c89a1cb..75e3a92cac6f 100644
--- a/polly/test/Cloog/CodeGen/single_loop_int_max_iterations.ll
+++ b/polly/test/Cloog/CodeGen/single_loop_int_max_iterations.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze  -S < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-cloog -analyze  -S < %s | FileCheck %s
 
 ;#define N 20
 ;#include "limits.h"
diff --git a/polly/test/Cloog/CodeGen/single_loop_ll_max_iterations.ll b/polly/test/Cloog/CodeGen/single_loop_ll_max_iterations.ll
index 7b4b84a9bcc7..5b86d21a8c3d 100644
--- a/polly/test/Cloog/CodeGen/single_loop_ll_max_iterations.ll
+++ b/polly/test/Cloog/CodeGen/single_loop_ll_max_iterations.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze  -S < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-cloog -analyze  -S < %s | FileCheck %s
 
 ;#include "limits.h"
 ;#define N 20
diff --git a/polly/test/Cloog/CodeGen/single_loop_one_iteration.ll b/polly/test/Cloog/CodeGen/single_loop_one_iteration.ll
index abdbbf3e97f7..896753b109ed 100644
--- a/polly/test/Cloog/CodeGen/single_loop_one_iteration.ll
+++ b/polly/test/Cloog/CodeGen/single_loop_one_iteration.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-cloog -analyze < %s | FileCheck %s
 
 ;#define N 20
 ;
diff --git a/polly/test/Cloog/CodeGen/single_loop_param.ll b/polly/test/Cloog/CodeGen/single_loop_param.ll
index c293b2bbc59f..81b9b6411c8c 100644
--- a/polly/test/Cloog/CodeGen/single_loop_param.ll
+++ b/polly/test/Cloog/CodeGen/single_loop_param.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-cloog -analyze < %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"
 target triple = "x86_64-pc-linux-gnu"
 
diff --git a/polly/test/Cloog/CodeGen/single_loop_zero_iterations.ll b/polly/test/Cloog/CodeGen/single_loop_zero_iterations.ll
index 6956fddbfb29..db51ff7e6c4b 100644
--- a/polly/test/Cloog/CodeGen/single_loop_zero_iterations.ll
+++ b/polly/test/Cloog/CodeGen/single_loop_zero_iterations.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze  -S < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-cloog -analyze  -S < %s | FileCheck %s
 
 ;#define N 20
 ;
diff --git a/polly/test/Cloog/ScopDetection/single_function_only.ll b/polly/test/Cloog/ScopDetection/single_function_only.ll
index 527a5ed4a6a1..9d59697db6b6 100644
--- a/polly/test/Cloog/ScopDetection/single_function_only.ll
+++ b/polly/test/Cloog/ScopDetection/single_function_only.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze -polly-only-func=bar < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-cloog -analyze -polly-only-func=bar < %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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Cloog/ambigous_schedule.ll b/polly/test/Cloog/ambigous_schedule.ll
index ac76252379a9..b6c5c5580c94 100644
--- a/polly/test/Cloog/ambigous_schedule.ll
+++ b/polly/test/Cloog/ambigous_schedule.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-import-jscop-dir=%S -polly-import-jscop -polly-cloog -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-import-jscop-dir=%S -polly-import-jscop -polly-cloog -analyze < %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-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Isl/CodeGen/20100617.ll b/polly/test/Isl/CodeGen/20100617.ll
index 398e620e5ba0..6997fd7823be 100644
--- a/polly/test/Isl/CodeGen/20100617.ll
+++ b/polly/test/Isl/CodeGen/20100617.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl %s
+; RUN: opt %loadPolly -polly-codegen-isl %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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Isl/CodeGen/20100622.ll b/polly/test/Isl/CodeGen/20100622.ll
index 02c6775694d8..c0939f3aa893 100644
--- a/polly/test/Isl/CodeGen/20100622.ll
+++ b/polly/test/Isl/CodeGen/20100622.ll
@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl %s
-; RUN: opt %loadPolly %defaultOpts -polly-detect -analyze  < %s | not FileCheck %s
+; RUN: opt %loadPolly -polly-codegen-isl %s
+; RUN: opt %loadPolly -polly-detect -analyze  < %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"
 target triple = "i386-portbld-freebsd8.0"
diff --git a/polly/test/Isl/CodeGen/20100707.ll b/polly/test/Isl/CodeGen/20100707.ll
index a19d636e067a..c92867c8c3cf 100644
--- a/polly/test/Isl/CodeGen/20100707.ll
+++ b/polly/test/Isl/CodeGen/20100707.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl %s
+; RUN: opt %loadPolly -polly-codegen-isl %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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Isl/CodeGen/20100707_2.ll b/polly/test/Isl/CodeGen/20100707_2.ll
index ae46eb2b8ac7..5854bb7ef3f3 100644
--- a/polly/test/Isl/CodeGen/20100707_2.ll
+++ b/polly/test/Isl/CodeGen/20100707_2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl %s
+; RUN: opt %loadPolly -polly-codegen-isl %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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Isl/CodeGen/20100708.ll b/polly/test/Isl/CodeGen/20100708.ll
index 5edfe5228a83..277393179b06 100644
--- a/polly/test/Isl/CodeGen/20100708.ll
+++ b/polly/test/Isl/CodeGen/20100708.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Isl/CodeGen/20100708_2.ll b/polly/test/Isl/CodeGen/20100708_2.ll
index 01a2ad745f0d..596d4fb934b4 100644
--- a/polly/test/Isl/CodeGen/20100708_2.ll
+++ b/polly/test/Isl/CodeGen/20100708_2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl %s
+; RUN: opt %loadPolly -polly-codegen-isl %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"
 target triple = "x86_64-pc-linux-gnu"
 
diff --git a/polly/test/Isl/CodeGen/20100713.ll b/polly/test/Isl/CodeGen/20100713.ll
index cb3cdd4826c6..ed33b5865e5a 100644
--- a/polly/test/Isl/CodeGen/20100713.ll
+++ b/polly/test/Isl/CodeGen/20100713.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl %s
+; RUN: opt %loadPolly -polly-codegen-isl %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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Isl/CodeGen/20100713_2.ll b/polly/test/Isl/CodeGen/20100713_2.ll
index ba81ceee307e..50dd427a7cb2 100644
--- a/polly/test/Isl/CodeGen/20100713_2.ll
+++ b/polly/test/Isl/CodeGen/20100713_2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl %s
+; RUN: opt %loadPolly -polly-codegen-isl %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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Isl/CodeGen/20100717.ll b/polly/test/Isl/CodeGen/20100717.ll
index acadbbcb3d66..1b8bb64701c6 100644
--- a/polly/test/Isl/CodeGen/20100717.ll
+++ b/polly/test/Isl/CodeGen/20100717.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts  -polly-codegen-isl -disable-output %s
+; RUN: opt %loadPolly  -polly-codegen-isl -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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Isl/CodeGen/20100718-DomInfo-2.ll b/polly/test/Isl/CodeGen/20100718-DomInfo-2.ll
index b5b1afa9918d..a51d3e31ee35 100644
--- a/polly/test/Isl/CodeGen/20100718-DomInfo-2.ll
+++ b/polly/test/Isl/CodeGen/20100718-DomInfo-2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl -verify-dom-info -disable-output < %s
+; RUN: opt %loadPolly -polly-codegen-isl -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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Isl/CodeGen/20100718-DomInfo.ll b/polly/test/Isl/CodeGen/20100718-DomInfo.ll
index d0daa2c513a7..afc9db06da13 100644
--- a/polly/test/Isl/CodeGen/20100718-DomInfo.ll
+++ b/polly/test/Isl/CodeGen/20100718-DomInfo.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl -verify-dom-info -disable-output < %s
+; RUN: opt %loadPolly -polly-codegen-isl -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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Isl/CodeGen/20100720-MultipleConditions.ll b/polly/test/Isl/CodeGen/20100720-MultipleConditions.ll
index 64247194fa88..12d8522002df 100644
--- a/polly/test/Isl/CodeGen/20100720-MultipleConditions.ll
+++ b/polly/test/Isl/CodeGen/20100720-MultipleConditions.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-ast -analyze %s
+; RUN: opt %loadPolly -polly-ast -analyze %s
 
 ;int bar1();
 ;int bar2();
diff --git a/polly/test/Isl/CodeGen/20100809-IndependentBlock.ll b/polly/test/Isl/CodeGen/20100809-IndependentBlock.ll
index df64aa0a8534..5a2b146bd61c 100644
--- a/polly/test/Isl/CodeGen/20100809-IndependentBlock.ll
+++ b/polly/test/Isl/CodeGen/20100809-IndependentBlock.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl -disable-output %s
+; RUN: opt %loadPolly -polly-codegen-isl -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"
 target triple = "x86_64-unknown-linux-gnu"
 define void @cfft2([2 x float]* %x) nounwind {
diff --git a/polly/test/Isl/CodeGen/20100811-ScalarDependencyBetweenBrAndCnd.ll b/polly/test/Isl/CodeGen/20100811-ScalarDependencyBetweenBrAndCnd.ll
index e6250fdf1f65..d4b4f665a279 100644
--- a/polly/test/Isl/CodeGen/20100811-ScalarDependencyBetweenBrAndCnd.ll
+++ b/polly/test/Isl/CodeGen/20100811-ScalarDependencyBetweenBrAndCnd.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl -disable-output %s
+; RUN: opt %loadPolly -polly-codegen-isl -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"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/polly/test/Isl/CodeGen/20101030-Overflow.ll b/polly/test/Isl/CodeGen/20101030-Overflow.ll
index 540c2c1f0745..52dc4ac87612 100644
--- a/polly/test/Isl/CodeGen/20101030-Overflow.ll
+++ b/polly/test/Isl/CodeGen/20101030-Overflow.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl %s
+; RUN: opt %loadPolly -polly-codegen-isl %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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Isl/CodeGen/20101103-Overflow3.ll b/polly/test/Isl/CodeGen/20101103-Overflow3.ll
index cc6bb6624322..1aa4c5606f9b 100644
--- a/polly/test/Isl/CodeGen/20101103-Overflow3.ll
+++ b/polly/test/Isl/CodeGen/20101103-Overflow3.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl %s
+; RUN: opt %loadPolly -polly-codegen-isl %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"
 target triple = "x86_64-unknown-linux-gnu"
 define void @Reflection_coefficients(i16* %r) nounwind {
diff --git a/polly/test/Isl/CodeGen/20101103-signmissmatch.ll b/polly/test/Isl/CodeGen/20101103-signmissmatch.ll
index 50636cffdec7..c300f3f8e02c 100644
--- a/polly/test/Isl/CodeGen/20101103-signmissmatch.ll
+++ b/polly/test/Isl/CodeGen/20101103-signmissmatch.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl %s
+; RUN: opt %loadPolly -polly-codegen-isl %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"
 target triple = "x86_64-pc-linux-gnu"
 
diff --git a/polly/test/Isl/CodeGen/20110226-Ignore-Dead-Code.ll b/polly/test/Isl/CodeGen/20110226-Ignore-Dead-Code.ll
index 67b2e6f573c8..ed556910065b 100644
--- a/polly/test/Isl/CodeGen/20110226-Ignore-Dead-Code.ll
+++ b/polly/test/Isl/CodeGen/20110226-Ignore-Dead-Code.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl %s
+; RUN: opt %loadPolly -polly-codegen-isl %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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Isl/CodeGen/20110226-PHI-Node-removed.ll b/polly/test/Isl/CodeGen/20110226-PHI-Node-removed.ll
index 75676be3b470..0de798c697b0 100644
--- a/polly/test/Isl/CodeGen/20110226-PHI-Node-removed.ll
+++ b/polly/test/Isl/CodeGen/20110226-PHI-Node-removed.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl %s
+; RUN: opt %loadPolly -polly-codegen-isl %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"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/polly/test/Isl/CodeGen/20120316-InvalidCast.ll b/polly/test/Isl/CodeGen/20120316-InvalidCast.ll
index c95545f6beba..72e56c61a378 100644
--- a/polly/test/Isl/CodeGen/20120316-InvalidCast.ll
+++ b/polly/test/Isl/CodeGen/20120316-InvalidCast.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl %s
+; RUN: opt %loadPolly -polly-codegen-isl %s
 
 target datalayout = "e-p:32:32:32-i64:64:64-i32:32:32-i16:16:16-i1:32:32-f64:64:64-f32:32:32-a0:0-n32"
 target triple = "hexagon-unknown-linux-gnu"
diff --git a/polly/test/Isl/CodeGen/PHIInExit.ll b/polly/test/Isl/CodeGen/PHIInExit.ll
index d10447e85cb1..7676e2bb9e47 100644
--- a/polly/test/Isl/CodeGen/PHIInExit.ll
+++ b/polly/test/Isl/CodeGen/PHIInExit.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl %s
+; RUN: opt %loadPolly -polly-codegen-isl %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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Isl/CodeGen/constant_condition.ll b/polly/test/Isl/CodeGen/constant_condition.ll
index 181ec3e8eb3c..c62d59a6980d 100644
--- a/polly/test/Isl/CodeGen/constant_condition.ll
+++ b/polly/test/Isl/CodeGen/constant_condition.ll
@@ -1,4 +1,4 @@
-;RUN: opt %loadPolly %defaultOpts -polly-detect-scops-in-regions-without-loops -polly-detect-scops-in-functions-without-loops -polly-ast -analyze < %s | FileCheck %s
+;RUN: opt %loadPolly -polly-prepare -polly-detect-scops-in-regions-without-loops -polly-detect-scops-in-functions-without-loops -polly-ast -analyze < %s | FileCheck %s
 
 ;#include <string.h>
 ;int A[1];
diff --git a/polly/test/Isl/CodeGen/loop_with_condition.ll b/polly/test/Isl/CodeGen/loop_with_condition.ll
index 29eb284186ed..070c41aaee3a 100644
--- a/polly/test/Isl/CodeGen/loop_with_condition.ll
+++ b/polly/test/Isl/CodeGen/loop_with_condition.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-ast -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-ast -analyze < %s | FileCheck %s
 
 ;#include <string.h>
 ;#define N 1024
diff --git a/polly/test/Isl/CodeGen/loop_with_condition_2.ll b/polly/test/Isl/CodeGen/loop_with_condition_2.ll
index 290c27a81db7..d971767cd730 100644
--- a/polly/test/Isl/CodeGen/loop_with_condition_2.ll
+++ b/polly/test/Isl/CodeGen/loop_with_condition_2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-ast -polly-ast-detect-parallel -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-ast -polly-ast-detect-parallel -analyze < %s | FileCheck %s
 
 ; Verify that we actually detect this loop as the innermost loop even though
 ; there is a conditional inside.
diff --git a/polly/test/Isl/CodeGen/loop_with_condition_ineq.ll b/polly/test/Isl/CodeGen/loop_with_condition_ineq.ll
index 3066b8ee5659..d546382931d1 100644
--- a/polly/test/Isl/CodeGen/loop_with_condition_ineq.ll
+++ b/polly/test/Isl/CodeGen/loop_with_condition_ineq.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-ast -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-ast -analyze < %s | FileCheck %s
 
 ;#include <string.h>
 ;#define N 1024
diff --git a/polly/test/Isl/CodeGen/reduction.ll b/polly/test/Isl/CodeGen/reduction.ll
index aa51afa06691..d40e3bcd039c 100644
--- a/polly/test/Isl/CodeGen/reduction.ll
+++ b/polly/test/Isl/CodeGen/reduction.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl -S < %s 2>&1 | not FileCheck %s
+; RUN: opt %loadPolly -polly-codegen-isl -S < %s 2>&1 | not FileCheck %s
 
 ;#include <string.h>
 ;#include <stdio.h>
diff --git a/polly/test/Isl/CodeGen/reduction_2.ll b/polly/test/Isl/CodeGen/reduction_2.ll
index c1daa33a5afd..2626673c010b 100644
--- a/polly/test/Isl/CodeGen/reduction_2.ll
+++ b/polly/test/Isl/CodeGen/reduction_2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-ast -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-ast -analyze < %s | FileCheck %s
 
 ;#include <string.h>
 ;#include <stdio.h>
diff --git a/polly/test/Isl/CodeGen/scev.ll b/polly/test/Isl/CodeGen/scev.ll
index 5511dfca6533..7bfe86257da8 100644
--- a/polly/test/Isl/CodeGen/scev.ll
+++ b/polly/test/Isl/CodeGen/scev.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Isl/CodeGen/sequential_loops.ll b/polly/test/Isl/CodeGen/sequential_loops.ll
index 538e45445309..51d76136d583 100644
--- a/polly/test/Isl/CodeGen/sequential_loops.ll
+++ b/polly/test/Isl/CodeGen/sequential_loops.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-ast -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-ast -analyze < %s | FileCheck %s
 
 ;#include <string.h>
 ;#define N 1024
diff --git a/polly/test/Isl/CodeGen/simple_vec_assign_scalar.ll b/polly/test/Isl/CodeGen/simple_vec_assign_scalar.ll
index 5e388bf36327..1dd0d883e007 100644
--- a/polly/test/Isl/CodeGen/simple_vec_assign_scalar.ll
+++ b/polly/test/Isl/CodeGen/simple_vec_assign_scalar.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl %vector-opt -dce -S < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-codegen-isl %vector-opt -dce -S < %s | FileCheck %s
 
 ;#define N 1024
 ;float A[N];
diff --git a/polly/test/Isl/CodeGen/simple_vec_assign_scalar_2.ll b/polly/test/Isl/CodeGen/simple_vec_assign_scalar_2.ll
index 396cc9551878..7aa9d61cd30d 100644
--- a/polly/test/Isl/CodeGen/simple_vec_assign_scalar_2.ll
+++ b/polly/test/Isl/CodeGen/simple_vec_assign_scalar_2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl %vector-opt -dce -S < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-codegen-isl %vector-opt -dce -S < %s | FileCheck %s
 
 ;#define N 1024
 ;float A[N];
diff --git a/polly/test/Isl/CodeGen/simple_vec_const.ll b/polly/test/Isl/CodeGen/simple_vec_const.ll
index 1c58ba2a6572..df40ccc5a672 100644
--- a/polly/test/Isl/CodeGen/simple_vec_const.ll
+++ b/polly/test/Isl/CodeGen/simple_vec_const.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl %vector-opt -S < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-codegen-isl %vector-opt -S < %s | FileCheck %s
 
 ;#define N 1024
 ;float A[N];
diff --git a/polly/test/Isl/CodeGen/simple_vec_large_width.ll b/polly/test/Isl/CodeGen/simple_vec_large_width.ll
index 8e1cc2059899..0ec865089841 100644
--- a/polly/test/Isl/CodeGen/simple_vec_large_width.ll
+++ b/polly/test/Isl/CodeGen/simple_vec_large_width.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl %vector-opt -dce -S < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-codegen-isl %vector-opt -dce -S < %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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Isl/CodeGen/simple_vec_stride_x.ll b/polly/test/Isl/CodeGen/simple_vec_stride_x.ll
index a7934348fc36..7f56abe704a3 100644
--- a/polly/test/Isl/CodeGen/simple_vec_stride_x.ll
+++ b/polly/test/Isl/CodeGen/simple_vec_stride_x.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl %vector-opt  -dce -S < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-codegen-isl %vector-opt  -dce -S < %s | FileCheck %s
 
 ;#define N 1024
 ;float A[N];
diff --git a/polly/test/Isl/CodeGen/simple_vec_two_stmts.ll b/polly/test/Isl/CodeGen/simple_vec_two_stmts.ll
index 56066377d754..b77ab2320c72 100644
--- a/polly/test/Isl/CodeGen/simple_vec_two_stmts.ll
+++ b/polly/test/Isl/CodeGen/simple_vec_two_stmts.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen-isl %vector-opt -dce -S < %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-codegen-isl %vector-opt -dce -S < %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"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/polly/test/Isl/CodeGen/single_do_loop_int_max_iterations.ll b/polly/test/Isl/CodeGen/single_do_loop_int_max_iterations.ll
index 1751d78b4c93..2560df152402 100644
--- a/polly/test/Isl/CodeGen/single_do_loop_int_max_iterations.ll
+++ b/polly/test/Isl/CodeGen/single_do_loop_int_max_iterations.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-ast -analyze  -S < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-ast -analyze  -S < %s | FileCheck %s
 
 ;#define N 20
 ;#include "limits.h"
diff --git a/polly/test/Isl/CodeGen/single_do_loop_int_param_iterations.ll b/polly/test/Isl/CodeGen/single_do_loop_int_param_iterations.ll
index 7c9163ba5f50..5afec9be34c7 100644
--- a/polly/test/Isl/CodeGen/single_do_loop_int_param_iterations.ll
+++ b/polly/test/Isl/CodeGen/single_do_loop_int_param_iterations.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog-scop -S -analyze  < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-cloog-scop -S -analyze  < %s | FileCheck %s
 ; XFAIL: *
 
 ;define N 20
diff --git a/polly/test/Isl/CodeGen/single_do_loop_one_iteration.ll b/polly/test/Isl/CodeGen/single_do_loop_one_iteration.ll
index 14a08d49ac7a..890ebfeef492 100644
--- a/polly/test/Isl/CodeGen/single_do_loop_one_iteration.ll
+++ b/polly/test/Isl/CodeGen/single_do_loop_one_iteration.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog-scop -S -analyze  < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-cloog-scop -S -analyze  < %s | FileCheck %s
 ; XFAIL: *
 
 ;#define N 20
diff --git a/polly/test/Isl/CodeGen/single_do_loop_scev_replace.ll b/polly/test/Isl/CodeGen/single_do_loop_scev_replace.ll
index 56964157a055..e819559bbce9 100644
--- a/polly/test/Isl/CodeGen/single_do_loop_scev_replace.ll
+++ b/polly/test/Isl/CodeGen/single_do_loop_scev_replace.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-ast -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-ast -analyze < %s | FileCheck %s
 
 ;#define N 20
 ;#include "limits.h"
diff --git a/polly/test/Isl/CodeGen/single_loop.ll b/polly/test/Isl/CodeGen/single_loop.ll
index 4add7d3c1dbb..12ddc9526bd1 100644
--- a/polly/test/Isl/CodeGen/single_loop.ll
+++ b/polly/test/Isl/CodeGen/single_loop.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-ast -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-ast -analyze < %s | FileCheck %s
 
 ;#include <string.h>
 ;#define N 1024
diff --git a/polly/test/Isl/CodeGen/single_loop_int_max_iterations.ll b/polly/test/Isl/CodeGen/single_loop_int_max_iterations.ll
index 52ce1c3a6f57..1ff728f4f305 100644
--- a/polly/test/Isl/CodeGen/single_loop_int_max_iterations.ll
+++ b/polly/test/Isl/CodeGen/single_loop_int_max_iterations.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-ast -analyze  -S < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-ast -analyze  -S < %s | FileCheck %s
 
 ;#define N 20
 ;#include "limits.h"
diff --git a/polly/test/Isl/CodeGen/single_loop_ll_max_iterations.ll b/polly/test/Isl/CodeGen/single_loop_ll_max_iterations.ll
index 4aad4c8c8145..ef454737c2cc 100644
--- a/polly/test/Isl/CodeGen/single_loop_ll_max_iterations.ll
+++ b/polly/test/Isl/CodeGen/single_loop_ll_max_iterations.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-ast -analyze  -S < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-ast -analyze  -S < %s | FileCheck %s
 
 ;#include "limits.h"
 ;#define N 20
diff --git a/polly/test/Isl/CodeGen/single_loop_one_iteration.ll b/polly/test/Isl/CodeGen/single_loop_one_iteration.ll
index 32b1289cb85f..9e973a91e0f9 100644
--- a/polly/test/Isl/CodeGen/single_loop_one_iteration.ll
+++ b/polly/test/Isl/CodeGen/single_loop_one_iteration.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-ast -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-ast -analyze < %s | FileCheck %s
 
 ;#define N 20
 ;
diff --git a/polly/test/Isl/CodeGen/single_loop_param.ll b/polly/test/Isl/CodeGen/single_loop_param.ll
index 570fe03ba36f..6251b6e419a1 100644
--- a/polly/test/Isl/CodeGen/single_loop_param.ll
+++ b/polly/test/Isl/CodeGen/single_loop_param.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-ast -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-ast -analyze < %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"
 target triple = "x86_64-pc-linux-gnu"
 
diff --git a/polly/test/Isl/CodeGen/single_loop_zero_iterations.ll b/polly/test/Isl/CodeGen/single_loop_zero_iterations.ll
index 0417a130fc93..e4c336c88e83 100644
--- a/polly/test/Isl/CodeGen/single_loop_zero_iterations.ll
+++ b/polly/test/Isl/CodeGen/single_loop_zero_iterations.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-ast -analyze  -S < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-ast -analyze  -S < %s | FileCheck %s
 
 ;#define N 20
 ;
diff --git a/polly/test/Isl/single_loop_uint_max_iterations.ll b/polly/test/Isl/single_loop_uint_max_iterations.ll
index cff474593b15..2ad91c6544ee 100644
--- a/polly/test/Isl/single_loop_uint_max_iterations.ll
+++ b/polly/test/Isl/single_loop_uint_max_iterations.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog-scop -S -analyze  < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-cloog-scop -S -analyze  < %s | FileCheck %s
 ; XFAIL: *
 
 ;#include "limits.h"
diff --git a/polly/test/Isl/single_loop_ull_max_iterations.ll b/polly/test/Isl/single_loop_ull_max_iterations.ll
index acab526e8c32..645b16fc1473 100644
--- a/polly/test/Isl/single_loop_ull_max_iterations.ll
+++ b/polly/test/Isl/single_loop_ull_max_iterations.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-cloog-scop -S -analyze  < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-cloog-scop -S -analyze  < %s | FileCheck %s
 ; XFAIL: *
 
 ;#include "limits.h"
diff --git a/polly/test/lit.site.cfg.in b/polly/test/lit.site.cfg.in
index 9cfbca1d57b1..037926d1aecc 100644
--- a/polly/test/lit.site.cfg.in
+++ b/polly/test/lit.site.cfg.in
@@ -39,7 +39,6 @@ if config.link_polly_into_tools == '' or \
 else:
     config.substitutions.append(('%loadPolly', ''))
 
-config.substitutions.append(('%defaultOpts', ' -basicaa -polly-prepare'))
 config.substitutions.append(('%polybenchOpts', ' -O3 -loop-simplify -indvars '))
 config.substitutions.append(('%vector-opt', '-polly-vectorizer=polly'))
 
diff --git a/polly/test/polly.ll b/polly/test/polly.ll
index c09f98332d6d..da2ef0e6f3b4 100644
--- a/polly/test/polly.ll
+++ b/polly/test/polly.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-scops -S < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-scops -S < %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"
 target triple = "x86_64-unknown-linux-gnu"
 define void @foo() nounwind {