[polly-PATCH 1/3] Drop option -polly-delinearize
Tobias Grosser
tobias at grosser.es
Sat Apr 18 09:14:42 PDT 2015
We enabled delinearization in Polly since a while. Drop the delinearize option
to reduce the combinations of options that need to be tested.
---
include/polly/ScopDetection.h | 1 -
lib/Analysis/ScopDetection.cpp | 9 +--------
lib/Analysis/TempScopInfo.cpp | 2 +-
test/DependenceInfo/do_pluto_matmult.ll | 2 +-
.../OpenMP/nested_loop_both_parallel_parametric.ll | 2 +-
.../Ast/reduction_clauses_multidimensional_access.ll | 2 +-
test/Isl/Ast/simple-run-time-condition.ll | 2 +-
test/Isl/CodeGen/alias-check-multi-dim.ll | 2 +-
test/Isl/CodeGen/aliasing_multidimensional_access.ll | 2 +-
...multidim_2d_parametric_array_static_loop_bounds.ll | 2 +-
test/Isl/CodeGen/multidim_alias_check.ll | 2 +-
.../run-time-condition-with-scev-parameters.ll | 2 +-
.../scop_never_executed_runtime_check_location.ll | 4 ++--
...multidim_two_accesses_different_delinearization.ll | 2 +-
.../ReportMultipleNonAffineAccesses.ll | 19 +++----------------
test/ScopInfo/constant_start_integer.ll | 2 +-
test/ScopInfo/delinearize-together-all-data-refs.ll | 2 +-
test/ScopInfo/multidim_2d-diagonal-matrix.ll | 2 +-
test/ScopInfo/multidim_2d_outer_parametric_offset.ll | 2 +-
...multidim_2d_parametric_array_static_loop_bounds.ll | 2 +-
...multidim_3d_parametric_array_static_loop_bounds.ll | 2 +-
test/ScopInfo/multidim_ivs_and_integer_offsets_3d.ll | 2 +-
.../multidim_ivs_and_parameteric_offsets_3d.ll | 2 +-
test/ScopInfo/multidim_many_references.ll | 2 +-
test/ScopInfo/multidim_nested_start_integer.ll | 2 +-
.../ScopInfo/multidim_nested_start_share_parameter.ll | 2 +-
test/ScopInfo/multidim_only_ivs_2d.ll | 2 +-
test/ScopInfo/multidim_only_ivs_3d.ll | 2 +-
test/ScopInfo/multidim_only_ivs_3d_cast.ll | 2 +-
test/ScopInfo/multidim_only_ivs_3d_reverse.ll | 2 +-
test/ScopInfo/multidim_single_and_multidim_array.ll | 8 ++------
test/ScopInfo/non_affine_access.ll | 4 ++--
32 files changed, 36 insertions(+), 61 deletions(-)
diff --git a/include/polly/ScopDetection.h b/include/polly/ScopDetection.h
index 8facfb8..b1ddd13 100644
--- a/include/polly/ScopDetection.h
+++ b/include/polly/ScopDetection.h
@@ -110,7 +110,6 @@ typedef std::map<const SCEVUnknown *, const SCEV *> BaseToElSize;
extern bool PollyModelPHINodes;
extern bool PollyTrackFailures;
-extern bool PollyDelinearize;
extern bool PollyUseRuntimeAliasChecks;
/// @brief A function attribute which will cause Polly to skip the function
diff --git a/lib/Analysis/ScopDetection.cpp b/lib/Analysis/ScopDetection.cpp
index 0d75594..ae49880 100644
--- a/lib/Analysis/ScopDetection.cpp
+++ b/lib/Analysis/ScopDetection.cpp
@@ -153,12 +153,6 @@ static cl::opt<bool> KeepGoing("polly-detect-keep-going",
cl::Hidden, cl::ZeroOrMore, cl::init(false),
cl::cat(PollyCategory));
-static cl::opt<bool, true>
- PollyDelinearizeX("polly-delinearize",
- cl::desc("Delinearize array access functions"),
- cl::location(PollyDelinearize), cl::Hidden,
- cl::ZeroOrMore, cl::init(true), cl::cat(PollyCategory));
-
static cl::opt<bool>
VerifyScops("polly-detect-verify",
cl::desc("Verify the detected SCoPs after each transformation"),
@@ -173,7 +167,6 @@ static cl::opt<bool, true> XPollyModelPHINodes(
bool polly::PollyModelPHINodes = false;
bool polly::PollyTrackFailures = false;
-bool polly::PollyDelinearize = false;
StringRef polly::PollySkipFnAttr = "polly.skip.fn";
//===----------------------------------------------------------------------===//
@@ -601,7 +594,7 @@ bool ScopDetection::isValidMemoryAccess(Instruction &Inst,
if (Context.BoxedLoopsSet.count(L))
isVariantInNonAffineLoop = true;
- if (PollyDelinearize && !isVariantInNonAffineLoop) {
+ if (!isVariantInNonAffineLoop) {
Context.Accesses[BasePointer].push_back({&Inst, AccessFunction});
if (!isAffineExpr(&CurRegion, AccessFunction, *SE, BaseValue))
diff --git a/lib/Analysis/TempScopInfo.cpp b/lib/Analysis/TempScopInfo.cpp
index ed09406..a76880c 100644
--- a/lib/Analysis/TempScopInfo.cpp
+++ b/lib/Analysis/TempScopInfo.cpp
@@ -237,7 +237,7 @@ TempScopInfo::buildIRAccess(Instruction *Inst, Loop *L, Region *R,
AccessFunction = SE->getMinusSCEV(AccessFunction, BasePointer);
auto MemAccPtr = InstToMemAcc.find(Inst);
- if (PollyDelinearize && MemAccPtr != InstToMemAcc.end())
+ if (MemAccPtr != InstToMemAcc.end())
return IRAccess(Type, BasePointer->getValue(), AccessFunction, Size, true,
MemAccPtr->second->DelinearizedSubscripts,
MemAccPtr->second->Shape->DelinearizedSizes);
diff --git a/test/DependenceInfo/do_pluto_matmult.ll b/test/DependenceInfo/do_pluto_matmult.ll
index 1a6c506..699ff6c 100644
--- a/test/DependenceInfo/do_pluto_matmult.ll
+++ b/test/DependenceInfo/do_pluto_matmult.ll
@@ -1,5 +1,5 @@
; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -polly-dependences -analyze -polly-dependences-analysis-type=value-based < %s | FileCheck %s -check-prefix=VALUE
-; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -polly-dependences -analyze -polly-dependences-analysis-type=memory-based -polly-delinearize < %s | FileCheck %s -check-prefix=MEMORY
+; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -polly-dependences -analyze -polly-dependences-analysis-type=memory-based < %s | FileCheck %s -check-prefix=MEMORY
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/test/Isl/Ast/OpenMP/nested_loop_both_parallel_parametric.ll b/test/Isl/Ast/OpenMP/nested_loop_both_parallel_parametric.ll
index 912ff2d..f6b8140 100644
--- a/test/Isl/Ast/OpenMP/nested_loop_both_parallel_parametric.ll
+++ b/test/Isl/Ast/OpenMP/nested_loop_both_parallel_parametric.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-ast -polly-parallel -polly-parallel-force -analyze -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-ast -polly-parallel -polly-parallel-force -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"
; int A[1024][1024];
diff --git a/test/Isl/Ast/reduction_clauses_multidimensional_access.ll b/test/Isl/Ast/reduction_clauses_multidimensional_access.ll
index 886eb0c..c5efea3 100644
--- a/test/Isl/Ast/reduction_clauses_multidimensional_access.ll
+++ b/test/Isl/Ast/reduction_clauses_multidimensional_access.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-delinearize -polly-ast -polly-ast-detect-parallel -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-ast -polly-ast-detect-parallel -analyze < %s | FileCheck %s
;
; CHECK: #pragma known-parallel reduction (^ : sum)
; void f(int N, int M, int P, int sum[P][M]) {
diff --git a/test/Isl/Ast/simple-run-time-condition.ll b/test/Isl/Ast/simple-run-time-condition.ll
index 7dc07f9..8f14da9 100644
--- a/test/Isl/Ast/simple-run-time-condition.ll
+++ b/test/Isl/Ast/simple-run-time-condition.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-ast -analyze -polly-no-early-exit -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-ast -analyze -polly-no-early-exit < %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/test/Isl/CodeGen/alias-check-multi-dim.ll b/test/Isl/CodeGen/alias-check-multi-dim.ll
index 1c3d19b..ba69fba 100644
--- a/test/Isl/CodeGen/alias-check-multi-dim.ll
+++ b/test/Isl/CodeGen/alias-check-multi-dim.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-codegen-isl -polly-delinearize -S < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-codegen-isl -S < %s | FileCheck %s
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
diff --git a/test/Isl/CodeGen/aliasing_multidimensional_access.ll b/test/Isl/CodeGen/aliasing_multidimensional_access.ll
index 4cdd1f9..acfdc9b 100644
--- a/test/Isl/CodeGen/aliasing_multidimensional_access.ll
+++ b/test/Isl/CodeGen/aliasing_multidimensional_access.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -S -polly-codegen-isl -polly-code-generator=isl -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -S -polly-codegen-isl -polly-code-generator=isl < %s | FileCheck %s
;
; Check that we calculate the maximal access into array A correctly.
;
diff --git a/test/Isl/CodeGen/multidim_2d_parametric_array_static_loop_bounds.ll b/test/Isl/CodeGen/multidim_2d_parametric_array_static_loop_bounds.ll
index 4136da3..a8edc74 100644
--- a/test/Isl/CodeGen/multidim_2d_parametric_array_static_loop_bounds.ll
+++ b/test/Isl/CodeGen/multidim_2d_parametric_array_static_loop_bounds.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-no-early-exit -polly-codegen-isl -S -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-no-early-exit -polly-codegen-isl -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-S128"
target triple = "x86_64-unknown-linux-gnu"
diff --git a/test/Isl/CodeGen/multidim_alias_check.ll b/test/Isl/CodeGen/multidim_alias_check.ll
index 4a48e5f..8312ffd 100644
--- a/test/Isl/CodeGen/multidim_alias_check.ll
+++ b/test/Isl/CodeGen/multidim_alias_check.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-codegen-isl -polly-delinearize < %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-codegen-isl < %s
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
diff --git a/test/Isl/CodeGen/run-time-condition-with-scev-parameters.ll b/test/Isl/CodeGen/run-time-condition-with-scev-parameters.ll
index 28ebb70..4157497 100644
--- a/test/Isl/CodeGen/run-time-condition-with-scev-parameters.ll
+++ b/test/Isl/CodeGen/run-time-condition-with-scev-parameters.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-no-early-exit -polly-codegen-isl -S -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-no-early-exit -polly-codegen-isl -S < %s | FileCheck %s
; CHECK: polly.split_new_and_old:
; CHECK-NEXT: %1 = zext i32 %n to i64
diff --git a/test/Isl/CodeGen/scop_never_executed_runtime_check_location.ll b/test/Isl/CodeGen/scop_never_executed_runtime_check_location.ll
index a13a475..b92b822 100644
--- a/test/Isl/CodeGen/scop_never_executed_runtime_check_location.ll
+++ b/test/Isl/CodeGen/scop_never_executed_runtime_check_location.ll
@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-no-early-exit -polly-codegen-isl -S -polly-delinearize < %s | FileCheck %s
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-no-early-exit -polly-codegen-isl -S -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-no-early-exit -polly-codegen-isl -S < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-no-early-exit -polly-codegen-isl -S < %s | FileCheck %s
; Verify that we generate the runtime check code after the conditional branch
; in the SCoP region entering block (here %entry).
diff --git a/test/ScopDetect/multidim_two_accesses_different_delinearization.ll b/test/ScopDetect/multidim_two_accesses_different_delinearization.ll
index 74a1e65..8af8a08 100644
--- a/test/ScopDetect/multidim_two_accesses_different_delinearization.ll
+++ b/test/ScopDetect/multidim_two_accesses_different_delinearization.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-detect -analyze -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-detect -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/test/ScopDetectionDiagnostics/ReportMultipleNonAffineAccesses.ll b/test/ScopDetectionDiagnostics/ReportMultipleNonAffineAccesses.ll
index af5c22a..58b5403 100644
--- a/test/ScopDetectionDiagnostics/ReportMultipleNonAffineAccesses.ll
+++ b/test/ScopDetectionDiagnostics/ReportMultipleNonAffineAccesses.ll
@@ -1,9 +1,8 @@
; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -pass-remarks-missed="polly-detect" -polly-detect-track-failures -polly-detect -analyze < %s 2>&1| FileCheck %s
-; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -pass-remarks-missed="polly-detect" -polly-detect-track-failures -polly-detect -polly-delinearize=false -polly-detect-keep-going -analyze < %s 2>&1| FileCheck %s -check-prefix=ALL
-; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -pass-remarks-missed="polly-detect" -polly-detect-track-failures -polly-detect -polly-delinearize -analyze < %s 2>&1| FileCheck %s -check-prefix=DELIN
-; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -pass-remarks-missed="polly-detect" -polly-detect-track-failures -polly-detect -polly-delinearize -polly-detect-keep-going -analyze < %s 2>&1| FileCheck %s -check-prefix=DELIN-ALL
+; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -pass-remarks-missed="polly-detect" -polly-detect-track-failures -polly-detect -analyze < %s 2>&1| FileCheck %s -check-prefix=DELIN
+; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -pass-remarks-missed="polly-detect" -polly-detect-track-failures -polly-detect -polly-detect-keep-going -analyze < %s 2>&1| FileCheck %s -check-prefix=DELIN-ALL
+; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -pass-remarks-missed="polly-detect" -polly-detect-track-failures -polly-detect -polly-allow-nonaffine -analyze < %s 2>&1| FileCheck %s -check-prefix=NONAFFINE
; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -pass-remarks-missed="polly-detect" -polly-detect-track-failures -polly-detect -polly-allow-nonaffine -analyze < %s 2>&1| FileCheck %s -check-prefix=NONAFFINE
-; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -pass-remarks-missed="polly-detect" -polly-detect-track-failures -polly-detect -polly-delinearize -polly-allow-nonaffine -analyze < %s 2>&1| FileCheck %s -check-prefix=NONAFFINE
; 1 void manyaccesses(float A[restrict], long n, float B[restrict][n])
; 2 {
@@ -25,18 +24,6 @@
; CHECK-NEXT: remark: /tmp/test.c:4:16: The array subscript of "A" is not affine
; CHECK-NEXT: remark: /tmp/test.c:13:51: Invalid Scop candidate ends here.
-; ALL: remark: /tmp/test.c:3:20: The following errors keep this region from being a Scop.
-; ALL-NEXT: remark: /tmp/test.c:4:16: The array subscript of "A" is not affine
-; ALL-NEXT: remark: /tmp/test.c:5:16: The array subscript of "A" is not affine
-; -> B[0][0] is affine
-; ALL-NEXT: remark: /tmp/test.c:7:16: The array subscript of "B" is not affine
-; ALL-NEXT: remark: /tmp/test.c:8:16: The array subscript of "B" is not affine
-; ALL-NEXT: remark: /tmp/test.c:9:16: The array subscript of "B" is not affine
-; -> B[0][i] is affine
-; ALL-NEXT: remark: /tmp/test.c:11:16: The array subscript of "B" is not affine
-; ALL-NEXT: remark: /tmp/test.c:13:5: The array subscript of "A" is not affine
-; ALL-NEXT: remark: /tmp/test.c:13:51: Invalid Scop candidate ends here.
-
; DELIN: remark: /tmp/test.c:3:20: The following errors keep this region from being a Scop.
; DELIN-NEXT: remark: /tmp/test.c:4:16: The array subscript of "A" is not affine
; DELIN-NEXT: remark: /tmp/test.c:13:51: Invalid Scop candidate ends here.
diff --git a/test/ScopInfo/constant_start_integer.ll b/test/ScopInfo/constant_start_integer.ll
index 92695a8..a139915 100644
--- a/test/ScopInfo/constant_start_integer.ll
+++ b/test/ScopInfo/constant_start_integer.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -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/test/ScopInfo/delinearize-together-all-data-refs.ll b/test/ScopInfo/delinearize-together-all-data-refs.ll
index d86536e..acb7af5 100644
--- a/test/ScopInfo/delinearize-together-all-data-refs.ll
+++ b/test/ScopInfo/delinearize-together-all-data-refs.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze < %s | FileCheck %s
; void foo(long n, long m, long o, double A[n][m][o]) {
; for (long i = 0; i < n-3; i++)
diff --git a/test/ScopInfo/multidim_2d-diagonal-matrix.ll b/test/ScopInfo/multidim_2d-diagonal-matrix.ll
index 4573558..2b8eff7 100644
--- a/test/ScopInfo/multidim_2d-diagonal-matrix.ll
+++ b/test/ScopInfo/multidim_2d-diagonal-matrix.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -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/test/ScopInfo/multidim_2d_outer_parametric_offset.ll b/test/ScopInfo/multidim_2d_outer_parametric_offset.ll
index 11055aa..ae9212d 100644
--- a/test/ScopInfo/multidim_2d_outer_parametric_offset.ll
+++ b/test/ScopInfo/multidim_2d_outer_parametric_offset.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -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/test/ScopInfo/multidim_2d_parametric_array_static_loop_bounds.ll b/test/ScopInfo/multidim_2d_parametric_array_static_loop_bounds.ll
index 26b5b31..7dc92ef 100644
--- a/test/ScopInfo/multidim_2d_parametric_array_static_loop_bounds.ll
+++ b/test/ScopInfo/multidim_2d_parametric_array_static_loop_bounds.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -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/test/ScopInfo/multidim_3d_parametric_array_static_loop_bounds.ll b/test/ScopInfo/multidim_3d_parametric_array_static_loop_bounds.ll
index d692136..f14da3c 100644
--- a/test/ScopInfo/multidim_3d_parametric_array_static_loop_bounds.ll
+++ b/test/ScopInfo/multidim_3d_parametric_array_static_loop_bounds.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -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/test/ScopInfo/multidim_ivs_and_integer_offsets_3d.ll b/test/ScopInfo/multidim_ivs_and_integer_offsets_3d.ll
index ca96517..0287509 100644
--- a/test/ScopInfo/multidim_ivs_and_integer_offsets_3d.ll
+++ b/test/ScopInfo/multidim_ivs_and_integer_offsets_3d.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -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/test/ScopInfo/multidim_ivs_and_parameteric_offsets_3d.ll b/test/ScopInfo/multidim_ivs_and_parameteric_offsets_3d.ll
index 200904c..ffd903a 100644
--- a/test/ScopInfo/multidim_ivs_and_parameteric_offsets_3d.ll
+++ b/test/ScopInfo/multidim_ivs_and_parameteric_offsets_3d.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -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/test/ScopInfo/multidim_many_references.ll b/test/ScopInfo/multidim_many_references.ll
index 0f1daaf..df07fd3 100644
--- a/test/ScopInfo/multidim_many_references.ll
+++ b/test/ScopInfo/multidim_many_references.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-scops -analyze -polly-delinearize -polly-ignore-aliasing < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-scops -analyze -polly-ignore-aliasing < %s | FileCheck %s
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
diff --git a/test/ScopInfo/multidim_nested_start_integer.ll b/test/ScopInfo/multidim_nested_start_integer.ll
index 42d2cb1..dd3c17e 100644
--- a/test/ScopInfo/multidim_nested_start_integer.ll
+++ b/test/ScopInfo/multidim_nested_start_integer.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -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/test/ScopInfo/multidim_nested_start_share_parameter.ll b/test/ScopInfo/multidim_nested_start_share_parameter.ll
index ce896f6..32db9f5 100644
--- a/test/ScopInfo/multidim_nested_start_share_parameter.ll
+++ b/test/ScopInfo/multidim_nested_start_share_parameter.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -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/test/ScopInfo/multidim_only_ivs_2d.ll b/test/ScopInfo/multidim_only_ivs_2d.ll
index fdc0467..58e46e0 100644
--- a/test/ScopInfo/multidim_only_ivs_2d.ll
+++ b/test/ScopInfo/multidim_only_ivs_2d.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -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/test/ScopInfo/multidim_only_ivs_3d.ll b/test/ScopInfo/multidim_only_ivs_3d.ll
index d922ed1..db688f0 100644
--- a/test/ScopInfo/multidim_only_ivs_3d.ll
+++ b/test/ScopInfo/multidim_only_ivs_3d.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -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/test/ScopInfo/multidim_only_ivs_3d_cast.ll b/test/ScopInfo/multidim_only_ivs_3d_cast.ll
index a726d70..6615f85 100644
--- a/test/ScopInfo/multidim_only_ivs_3d_cast.ll
+++ b/test/ScopInfo/multidim_only_ivs_3d_cast.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze < %s | FileCheck %s
; void foo(int n, int m, int o, double A[n][m][o]) {
;
diff --git a/test/ScopInfo/multidim_only_ivs_3d_reverse.ll b/test/ScopInfo/multidim_only_ivs_3d_reverse.ll
index 24bbe72..b5cbb12 100644
--- a/test/ScopInfo/multidim_only_ivs_3d_reverse.ll
+++ b/test/ScopInfo/multidim_only_ivs_3d_reverse.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze -polly-delinearize < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -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/test/ScopInfo/multidim_single_and_multidim_array.ll b/test/ScopInfo/multidim_single_and_multidim_array.ll
index b52cd29..a83269c 100644
--- a/test/ScopInfo/multidim_single_and_multidim_array.ll
+++ b/test/ScopInfo/multidim_single_and_multidim_array.ll
@@ -1,7 +1,5 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -polly-delinearize=false -analyze < %s | FileCheck %s
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -polly-delinearize=false -polly-allow-nonaffine -analyze < %s | FileCheck %s --check-prefix=NONAFFINE
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -polly-delinearize -analyze < %s | FileCheck %s --check-prefix=DELIN
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -polly-delinearize -polly-allow-nonaffine -analyze < %s | FileCheck %s --check-prefix=DELIN
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze < %s | FileCheck %s --check-prefix=DELIN
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -polly-allow-nonaffine -analyze < %s | FileCheck %s --check-prefix=DELIN
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
@@ -17,8 +15,6 @@ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
; dimensional access whereas the first one was detected as multi-dimensional.
; This test case checks that we now consistently delinearize the array accesses.
-; CHECK-NOT: Stmt_for_i_1
-
; NONAFFINE: p0: %n
; NONAFFINE: p1: ((-1 + %n) * %n)
; NONAFFINE: Statements {
diff --git a/test/ScopInfo/non_affine_access.ll b/test/ScopInfo/non_affine_access.ll
index fa5c1c9..83e872a 100644
--- a/test/ScopInfo/non_affine_access.ll
+++ b/test/ScopInfo/non_affine_access.ll
@@ -1,7 +1,7 @@
; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze < %s | FileCheck %s
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -polly-delinearize -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -polly-allow-nonaffine -analyze < %s | FileCheck %s -check-prefix=NONAFFINE
; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -polly-allow-nonaffine -analyze < %s | FileCheck %s -check-prefix=NONAFFINE
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -polly-delinearize -polly-allow-nonaffine -analyze < %s | FileCheck %s -check-prefix=NONAFFINE
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-apple-macosx10.7.2"
--
2.1.0
More information about the llvm-commits
mailing list