[polly] r200155 - Update to isl 1b3ba3b72c0482fd36bf0b4a1186a259f7bafeed

[Tobias Grosser]

Author: grosser
Date: Sun Jan 26 13:36:28 2014
New Revision: 200155

URL: http://llvm.org/viewvc/llvm-project?rev=200155&view=rev
Log:
Update to isl 1b3ba3b72c0482fd36bf0b4a1186a259f7bafeed

This includes the following very useful isl commit:

commit d962967ab42323ea5ca0398956fbff6a98c782fa
Author: Sven Verdoolaege <skimo at kotnet.org>
Date:   Wed Dec 18 12:05:32 2013 +0100

allow the user to impose a bound on the number of low-level operations

This should allow the user to deterministically limit the effort spent on a
computation.

Modified:
    polly/trunk/lib/CodeGen/IslCodeGeneration.cpp
    polly/trunk/lib/ScheduleOptimizer.cpp
    polly/trunk/utils/checkout_cloog.sh

Modified: polly/trunk/lib/CodeGen/IslCodeGeneration.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/IslCodeGeneration.cpp?rev=200155&r1=200154&r2=200155&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/IslCodeGeneration.cpp (original)
+++ polly/trunk/lib/CodeGen/IslCodeGeneration.cpp Sun Jan 26 13:36:28 2014
@@ -445,6 +445,8 @@ Value *IslExprBuilder::createOp(__isl_ta
   case isl_ast_op_and_then:
   case isl_ast_op_or_else:
   case isl_ast_op_call:
+  case isl_ast_op_member:
+  case isl_ast_op_access:
     llvm_unreachable("Unsupported isl ast expression");
   case isl_ast_op_max:
   case isl_ast_op_min:

Modified: polly/trunk/lib/ScheduleOptimizer.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/ScheduleOptimizer.cpp?rev=200155&r1=200154&r2=200155&view=diff
==============================================================================
--- polly/trunk/lib/ScheduleOptimizer.cpp (original)
+++ polly/trunk/lib/ScheduleOptimizer.cpp Sun Jan 26 13:36:28 2014
@@ -396,7 +396,7 @@ IslScheduleOptimizer::getScheduleForBand
       isl_band_list_free(Children);
     } else if (PollyVectorizerChoice != VECTORIZER_NONE) {
       for (int j = 0; j < isl_band_n_member(Band); j++) {
-        if (isl_band_member_is_zero_distance(Band, j)) {
+        if (isl_band_member_is_coincident(Band, j)) {
           isl_map *TileMap;
           isl_union_map *TileUMap;
 
@@ -514,8 +514,17 @@ bool IslScheduleOptimizer::runOnScop(Sco
   isl_options_set_schedule_max_coefficient(S.getIslCtx(), MaxCoefficient);
 
   isl_options_set_on_error(S.getIslCtx(), ISL_ON_ERROR_CONTINUE);
+
+  isl_schedule_constraints *ScheduleConstraints;
+  ScheduleConstraints = isl_schedule_constraints_on_domain(Domain);
+  ScheduleConstraints =
+      isl_schedule_constraints_set_proximity(ScheduleConstraints, Proximity);
+  ScheduleConstraints = isl_schedule_constraints_set_validity(
+      ScheduleConstraints, isl_union_map_copy(Validity));
+  ScheduleConstraints =
+      isl_schedule_constraints_set_coincidence(ScheduleConstraints, Validity);
   isl_schedule *Schedule;
-  Schedule = isl_union_set_compute_schedule(Domain, Validity, Proximity);
+  Schedule = isl_schedule_constraints_compute_schedule(ScheduleConstraints);
   isl_options_set_on_error(S.getIslCtx(), ISL_ON_ERROR_ABORT);
 
   // In cases the scheduler is not able to optimize the code, we just do not

Modified: polly/trunk/utils/checkout_cloog.sh
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/utils/checkout_cloog.sh?rev=200155&r1=200154&r2=200155&view=diff
==============================================================================
--- polly/trunk/utils/checkout_cloog.sh (original)
+++ polly/trunk/utils/checkout_cloog.sh Sun Jan 26 13:36:28 2014
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 CLOOG_HASH="2d8b7c6b43ee46fee978a57fa6877de49675f357"
-ISL_HASH="34eb3a0c3d52875ec93e926f12713feff4d08af0"
+ISL_HASH="1b3ba3b72c0482fd36bf0b4a1186a259f7bafeed"
 
 PWD=`pwd`