Regression tests: Adapt the vectorize option change.

llvm-svn: 156255

15 files changed, 19 insertions, 18 deletions

diff --git a/polly/test/CodeGen/matmul_vec.ll b/polly/test/CodeGen/matmul_vec.ll
index 512e53a1193..14619f2eebf 100644
--- a/polly/test/CodeGen/matmul_vec.ll
+++ b/polly/test/CodeGen/matmul_vec.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-codegen -enable-polly-vector -S -dce %s | FileCheck %s 
+; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-codegen %vector-opt -S -dce %s | FileCheck %s 
 
 ; ModuleID = 'matmul_vec.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/CodeGen/simple_vec_assign_scalar.ll b/polly/test/CodeGen/simple_vec_assign_scalar.ll
index fcde23bce85..6151874fdb6 100644
--- a/polly/test/CodeGen/simple_vec_assign_scalar.ll
+++ b/polly/test/CodeGen/simple_vec_assign_scalar.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen -enable-polly-vector -dce -S %s | FileCheck %s
+; RUN: opt %loadPolly %defaultOpts -polly-codegen %vector-opt -dce -S %s | FileCheck %s
 ; ModuleID = 'simple_vec_assign_scalar.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/CodeGen/simple_vec_assign_scalar_2.ll b/polly/test/CodeGen/simple_vec_assign_scalar_2.ll
index 46d5dea85c0..65f93425b96 100644
--- a/polly/test/CodeGen/simple_vec_assign_scalar_2.ll
+++ b/polly/test/CodeGen/simple_vec_assign_scalar_2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen -enable-polly-vector -dce -S %s | FileCheck %s
+; RUN: opt %loadPolly %defaultOpts -polly-codegen %vector-opt -dce -S %s | FileCheck %s
 ; ModuleID = 'simple_vec_assign_scalar_2.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/CodeGen/simple_vec_call.ll b/polly/test/CodeGen/simple_vec_call.ll
index 6bab7ac991f..a960e6cb164 100644
--- a/polly/test/CodeGen/simple_vec_call.ll
+++ b/polly/test/CodeGen/simple_vec_call.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -basicaa -polly-codegen -enable-polly-vector -S %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-codegen %vector-opt -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/CodeGen/simple_vec_call_2.ll b/polly/test/CodeGen/simple_vec_call_2.ll
index c6fc7f57564..97aa08b2728 100644
--- a/polly/test/CodeGen/simple_vec_call_2.ll
+++ b/polly/test/CodeGen/simple_vec_call_2.ll
@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly -basicaa -polly-codegen -enable-polly-vector -polly-codegen-scev=false -dce -S %s | FileCheck %s
-; RUN: opt %loadPolly -basicaa -polly-codegen -enable-polly-vector -polly-codegen-scev=true -dce -S %s | FileCheck %s -check-prefix=CHECK-SCEV
+; RUN: opt %loadPolly -basicaa -polly-codegen %vector-opt -polly-codegen-scev=false -dce -S %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-codegen %vector-opt -polly-codegen-scev=true -dce -S %s | FileCheck %s -check-prefix=CHECK-SCEV
 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/CodeGen/simple_vec_cast.ll b/polly/test/CodeGen/simple_vec_cast.ll
index 949ecd43187..a3bf52037e4 100644
--- a/polly/test/CodeGen/simple_vec_cast.ll
+++ b/polly/test/CodeGen/simple_vec_cast.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -basicaa -polly-codegen -enable-polly-vector -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/CodeGen/simple_vec_const.ll b/polly/test/CodeGen/simple_vec_const.ll
index f290084b1f4..7b3607ffb1c 100644
--- a/polly/test/CodeGen/simple_vec_const.ll
+++ b/polly/test/CodeGen/simple_vec_const.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen -enable-polly-vector -S %s | FileCheck %s
+; RUN: opt %loadPolly %defaultOpts -polly-codegen %vector-opt -S %s | FileCheck %s
 
 ; ModuleID = 'simple_vec_const.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/CodeGen/simple_vec_impossible.ll b/polly/test/CodeGen/simple_vec_impossible.ll
index 4658252afe2..8b7f57765a3 100644
--- a/polly/test/CodeGen/simple_vec_impossible.ll
+++ b/polly/test/CodeGen/simple_vec_impossible.ll
@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly -basicaa -polly-codegen -enable-polly-vector -S -polly-codegen-scev=false %s | FileCheck %s
-; RUN: opt %loadPolly -basicaa -polly-codegen -enable-polly-vector -S -polly-codegen-scev=true %s | FileCheck %s -check-prefix=CHECK-SCEV
+; RUN: opt %loadPolly -basicaa -polly-codegen %vector-opt -S -polly-codegen-scev=false %s | FileCheck %s
+; RUN: opt %loadPolly -basicaa -polly-codegen %vector-opt -S -polly-codegen-scev=true %s | FileCheck %s -check-prefix=CHECK-SCEV
 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/CodeGen/simple_vec_large_width.ll b/polly/test/CodeGen/simple_vec_large_width.ll
index 1f7af30830b..8686d91a185 100644
--- a/polly/test/CodeGen/simple_vec_large_width.ll
+++ b/polly/test/CodeGen/simple_vec_large_width.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen -enable-polly-vector -dce -S %s | FileCheck %s
+; RUN: opt %loadPolly %defaultOpts -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/CodeGen/simple_vec_stride_one.ll b/polly/test/CodeGen/simple_vec_stride_one.ll
index 37a4a3f27f8..ee754bffcf1 100644
--- a/polly/test/CodeGen/simple_vec_stride_one.ll
+++ b/polly/test/CodeGen/simple_vec_stride_one.ll
@@ -1,7 +1,7 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen -enable-polly-vector -dce -S %s | FileCheck %s
-; RUN: opt %loadPolly -basicaa -polly-codegen -enable-polly-vector -enable-polly-grouped-unroll -S %s | FileCheck -check-prefix=UNROLL %s
+; RUN: opt %loadPolly %defaultOpts -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  -enable-polly-vector | FileCheck -check-prefix=CODEGEN %s
+; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-codegen  %s -S  %vector-opt | FileCheck -check-prefix=CODEGEN %s
 ; ModuleID = 'simple_vec_stride_one.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/CodeGen/simple_vec_stride_x.ll b/polly/test/CodeGen/simple_vec_stride_x.ll
index e700b923114..ff44c28c948 100644
--- a/polly/test/CodeGen/simple_vec_stride_x.ll
+++ b/polly/test/CodeGen/simple_vec_stride_x.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen -enable-polly-vector  -dce -S %s | FileCheck %s
+; RUN: opt %loadPolly %defaultOpts -polly-codegen %vector-opt  -dce -S %s | FileCheck %s
 ; ModuleID = 'simple_vec_stride_x.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/CodeGen/simple_vec_two_stmts.ll b/polly/test/CodeGen/simple_vec_two_stmts.ll
index a4cca1ec80e..bfb0d8892e7 100644
--- a/polly/test/CodeGen/simple_vec_two_stmts.ll
+++ b/polly/test/CodeGen/simple_vec_two_stmts.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly %defaultOpts -polly-codegen -enable-polly-vector -dce -S %s | FileCheck %s
+; RUN: opt %loadPolly %defaultOpts -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/ScheduleOptimizer/2011-08-25-crash_in_vectorizer.ll b/polly/test/ScheduleOptimizer/2011-08-25-crash_in_vectorizer.ll
index d5869519855..6cad76f6b75 100644
--- a/polly/test/ScheduleOptimizer/2011-08-25-crash_in_vectorizer.ll
+++ b/polly/test/ScheduleOptimizer/2011-08-25-crash_in_vectorizer.ll
@@ -1,5 +1,5 @@
 ; RUN: opt %loadPolly -polly-opt-isl -polly-cloog -analyze %s -S | FileCheck %s
-; RUN: opt %loadPolly -polly-opt-isl -polly-cloog -analyze -enable-polly-vector %s -S | FileCheck %s -check-prefix=VECTOR
+; RUN: opt %loadPolly -polly-opt-isl -polly-cloog -analyze %vector-opt %s -S | FileCheck %s -check-prefix=VECTOR
 
 
 target datalayout =
diff --git a/polly/test/ScheduleOptimizer/2012-04-16-Trivially-vectorizable-loops.ll b/polly/test/ScheduleOptimizer/2012-04-16-Trivially-vectorizable-loops.ll
index edf11a19348..c25dcf2149f 100644
--- a/polly/test/ScheduleOptimizer/2012-04-16-Trivially-vectorizable-loops.ll
+++ b/polly/test/ScheduleOptimizer/2012-04-16-Trivially-vectorizable-loops.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -basicaa -polly-opt-isl -enable-polly-vector %s
+; RUN: opt %loadPolly -basicaa -polly-opt-isl %vector-opt %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/lit.site.cfg.in b/polly/test/lit.site.cfg.in
index 9b8fae0511a..6cae39f2538 100644
--- a/polly/test/lit.site.cfg.in
+++ b/polly/test/lit.site.cfg.in
@@ -29,6 +29,7 @@ config.substitutions.append(('%loadPolly', '-load '
 config.substitutions.append(('%defaultOpts', ' -basicaa -polly-prepare -polly-region-simplify'))
 config.substitutions.append(('%polybenchOpts', ' -O3 -loop-simplify -indvars '))
 config.substitutions.append(('%EatErrOnX86', EAT_ERR_ON_X86))
+config.substitutions.append(('%vector-opt', '-polly-vectorizer=polly'))
 
 # Let the main config do the real work.
 lit.load_config(config, "@POLLY_SOURCE_DIR@/test/lit.cfg")