summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Grosser <tobias@grosser.es>2015-08-19 08:22:06 +0000
committerTobias Grosser <tobias@grosser.es>2015-08-19 08:22:06 +0000
commit161c9081e5f09085aa0675751bfd16469826e966 (patch)
tree595f733086fab4361fbd2399530776907c4a122f
parentf10f4636ff44b992e5c0e0869f09491ea36cbaf7 (diff)
downloadbcm5719-llvm-161c9081e5f09085aa0675751bfd16469826e966.tar.gz
bcm5719-llvm-161c9081e5f09085aa0675751bfd16469826e966.zip
Do not use negative option name
Instead of -polly-no-tiling, we use -polly-tiling=false to disable tiling. llvm-svn: 245423
-rw-r--r--polly/lib/Transform/ScheduleOptimizer.cpp14
-rw-r--r--polly/test/ScheduleOptimizer/line-tiling-2.ll3
-rw-r--r--polly/test/ScheduleOptimizer/prevectorization-without-tiling.ll2
-rw-r--r--polly/test/ScheduleOptimizer/rectangular-tiling.ll2
-rw-r--r--polly/www/example_load_Polly_into_clang.html2
5 files changed, 10 insertions, 13 deletions
diff --git a/polly/lib/Transform/ScheduleOptimizer.cpp b/polly/lib/Transform/ScheduleOptimizer.cpp
index 4c9c9719111..9a54c1da67a 100644
--- a/polly/lib/Transform/ScheduleOptimizer.cpp
+++ b/polly/lib/Transform/ScheduleOptimizer.cpp
@@ -71,14 +71,10 @@ using namespace polly;
#define DEBUG_TYPE "polly-opt-isl"
-namespace polly {
-bool DisablePollyTiling;
-}
-static cl::opt<bool, true>
- DisableTiling("polly-no-tiling",
- cl::desc("Disable tiling in the scheduler"),
- cl::location(polly::DisablePollyTiling), cl::init(false),
- cl::ZeroOrMore, cl::cat(PollyCategory));
+static cl::opt<bool> EnableTiling("polly-tiling",
+ cl::desc("Enable loop tiling"),
+ cl::init(true), cl::ZeroOrMore,
+ cl::cat(PollyCategory));
static cl::opt<std::string>
OptimizeDeps("polly-opt-optimize-only",
@@ -283,7 +279,7 @@ isl_schedule_node *IslScheduleOptimizer::optimizeBand(isl_schedule_node *Node,
return Node;
}
- if (!DisableTiling) {
+ if (EnableTiling) {
auto Ctx = isl_schedule_node_get_ctx(Node);
auto Sizes = isl_multi_val_zero(isl_space_copy(Space));
for (unsigned i = 0; i < Dims; i++) {
diff --git a/polly/test/ScheduleOptimizer/line-tiling-2.ll b/polly/test/ScheduleOptimizer/line-tiling-2.ll
index fffc79bba84..bde6668feef 100644
--- a/polly/test/ScheduleOptimizer/line-tiling-2.ll
+++ b/polly/test/ScheduleOptimizer/line-tiling-2.ll
@@ -1,4 +1,5 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-opt-isl -analyze -polly-no-tiling=0 -polly-ast -polly-tile-sizes=1,64 < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-opt-isl -analyze \
+; RUN: -polly-ast -polly-tile-sizes=1,64 < %s | FileCheck %s
; CHECK: for (int c0 = 0; c0 <= 1023; c0 += 1)
; CHECK: for (int c1 = 0; c1 <= 7; c1 += 1)
diff --git a/polly/test/ScheduleOptimizer/prevectorization-without-tiling.ll b/polly/test/ScheduleOptimizer/prevectorization-without-tiling.ll
index d045305fcb3..ca177f13e14 100644
--- a/polly/test/ScheduleOptimizer/prevectorization-without-tiling.ll
+++ b/polly/test/ScheduleOptimizer/prevectorization-without-tiling.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S %loadPolly -polly-detect-unprofitable -basicaa -polly-opt-isl -polly-no-tiling -polly-vectorizer=polly -polly-ast -analyze < %s | FileCheck %s
+; RUN: opt -S %loadPolly -polly-detect-unprofitable -basicaa -polly-opt-isl -polly-tiling=false -polly-vectorizer=polly -polly-ast -analyze < %s | FileCheck %s
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
@C = common global [1536 x [1536 x float]] zeroinitializer, align 16
diff --git a/polly/test/ScheduleOptimizer/rectangular-tiling.ll b/polly/test/ScheduleOptimizer/rectangular-tiling.ll
index 62d488616b6..56e9262346d 100644
--- a/polly/test/ScheduleOptimizer/rectangular-tiling.ll
+++ b/polly/test/ScheduleOptimizer/rectangular-tiling.ll
@@ -1,5 +1,5 @@
; RUN: opt %loadPolly -polly-detect-unprofitable -polly-opt-isl -analyze -polly-ast -polly-tile-sizes=256,16 < %s | FileCheck %s
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-opt-isl -analyze -polly-no-tiling -polly-ast -polly-tile-sizes=256,16 -polly-no-early-exit < %s | FileCheck %s --check-prefix=NOTILING
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-opt-isl -analyze -polly-tiling=false -polly-ast -polly-tile-sizes=256,16 -polly-no-early-exit < %s | FileCheck %s --check-prefix=NOTILING
; CHECK: for (int c0 = 0; c0 <= 3; c0 += 1)
; CHECK: for (int c1 = 0; c1 <= 31; c1 += 1)
diff --git a/polly/www/example_load_Polly_into_clang.html b/polly/www/example_load_Polly_into_clang.html
index 5e6514f3100..fdf3132a01c 100644
--- a/polly/www/example_load_Polly_into_clang.html
+++ b/polly/www/example_load_Polly_into_clang.html
@@ -120,7 +120,7 @@ To disable the optimizer entirely use the option <b>-polly-optimizer=none</b>.
<h3>Disable tiling in the optimizer</h3>
By default both optimizers perform tiling, if possible. In case this is not
-wanted the option <b>-polly-no-tiling</b> can be used to disable it. (This
+wanted the option <b>-polly-tiling=false</b> can be used to disable it. (This
option disables tiling for both optimizers).
<h3>Ignore possible aliasing</h3>
OpenPOWER on IntegriCloud