[llvm-commits] [polly] r142775 - in /polly/trunk: include/polly/ScheduleOptimizer.h lib/Pocc.cpp lib/ScheduleOptimizer.cpp www/example_load_Polly_into_clang.html

[Tobias Grosser]

Author: grosser
Date: Sun Oct 23 15:59:44 2011
New Revision: 142775

URL: http://llvm.org/viewvc/llvm-project?rev=142775&view=rev
Log:
Only have a single option to disable tiling for both isl and Pocc optimzer

This also documents the new option on the website.

Added:
    polly/trunk/include/polly/ScheduleOptimizer.h
Modified:
    polly/trunk/lib/Pocc.cpp
    polly/trunk/lib/ScheduleOptimizer.cpp
    polly/trunk/www/example_load_Polly_into_clang.html

Added: polly/trunk/include/polly/ScheduleOptimizer.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/ScheduleOptimizer.h?rev=142775&view=auto
==============================================================================
--- polly/trunk/include/polly/ScheduleOptimizer.h (added)
+++ polly/trunk/include/polly/ScheduleOptimizer.h Sun Oct 23 15:59:44 2011
@@ -0,0 +1,19 @@
+//===------ polly/ScheduleOptimizer.h - The Schedule Optimizer *- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef POLLY_SCEDULE_OPTIMIZER_H
+#define POLLY_SCHEDULE_OPTIMZER_H
+
+namespace polly {
+  extern bool DisablePollyTiling;
+}
+
+#endif

Modified: polly/trunk/lib/Pocc.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Pocc.cpp?rev=142775&r1=142774&r2=142775&view=diff
==============================================================================
--- polly/trunk/lib/Pocc.cpp (original)
+++ polly/trunk/lib/Pocc.cpp Sun Oct 23 15:59:44 2011
@@ -23,6 +23,7 @@
 #include "polly/ScopInfo.h"
 #include "polly/Dependences.h"
 #include "polly/CodeGeneration.h"
+#include "polly/ScheduleOptimizer.h"
 
 #include "llvm/Support/Path.h"
 #include "llvm/Support/Program.h"
@@ -41,11 +42,6 @@
 using namespace llvm;
 using namespace polly;
 
-static cl::opt<bool>
-PlutoTile("enable-pluto-tile",
-          cl::desc("Enable pluto tiling for polly"), cl::Hidden,
-          cl::value_desc("Pluto tiling enabled if true"),
-          cl::init(false));
 static cl::opt<std::string>
 PlutoFuse("pluto-fuse",
            cl::desc(""), cl::Hidden,
@@ -120,7 +116,7 @@
 
   arguments.push_back(PlutoFuse.c_str());
 
-  if (PlutoTile)
+  if (!DisablePollyTiling)
     arguments.push_back("--pluto-tile");
 
   if (EnablePollyVector)

Modified: polly/trunk/lib/ScheduleOptimizer.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/ScheduleOptimizer.cpp?rev=142775&r1=142774&r2=142775&view=diff
==============================================================================
--- polly/trunk/lib/ScheduleOptimizer.cpp (original)
+++ polly/trunk/lib/ScheduleOptimizer.cpp Sun Oct 23 15:59:44 2011
@@ -17,9 +17,10 @@
 // Design and Implementation, PLDI ’08, pages 101–113. ACM, 2008.
 //===----------------------------------------------------------------------===//
 
+#include "polly/ScheduleOptimizer.h"
+
 #include "polly/Cloog.h"
 #include "polly/LinkAllPasses.h"
-
 #include "polly/CodeGeneration.h"
 #include "polly/Support/GICHelper.h"
 #include "polly/Dependences.h"
@@ -38,10 +39,13 @@
 using namespace llvm;
 using namespace polly;
 
-static cl::opt<bool>
+namespace polly {
+  bool DisablePollyTiling;
+}
+static cl::opt<bool, true>
 DisableTiling("polly-no-tiling",
-	  cl::desc("Disable tiling in the isl scheduler"), cl::Hidden,
-	  cl::init(false));
+	      cl::desc("Disable tiling in the scheduler"), cl::Hidden,
+              cl::location(polly::DisablePollyTiling), cl::init(false));
 
 namespace {
 

Modified: polly/trunk/www/example_load_Polly_into_clang.html
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/www/example_load_Polly_into_clang.html?rev=142775&r1=142774&r2=142775&view=diff
==============================================================================
--- polly/trunk/www/example_load_Polly_into_clang.html (original)
+++ polly/trunk/www/example_load_Polly_into_clang.html Sun Oct 23 15:59:44 2011
@@ -82,6 +82,10 @@
 able to compare is good in general, it is possible to switch the used optimizer
 back to PoCC. For this add the option '-polly-use-pocc'.
 
+<h3>Disable tiling in the optimizer</h3>
+By default both optimizers perform tiling, if possible. In case this is not
+wanted the option '-polly-no-tiling' can be used to disable it. (This option
+works for both optimizers).
 </div>
 </body>
 </html>