[llvm-branch-commits] [polly] r228339 - Make Polly 3.6 compile with isl 0.14

[Tobias Grosser]

Author: grosser
Date: Thu Feb  5 13:51:51 2015
New Revision: 228339

URL: http://llvm.org/viewvc/llvm-project?rev=228339&view=rev
Log:
Make Polly 3.6 compile with isl 0.14

Modified:
    polly/branches/release_36/lib/CodeGen/IslExprBuilder.cpp
    polly/branches/release_36/test/Isl/Ast/reduction_modulo_schedule_multiple_dimensions_4.ll
    polly/branches/release_36/utils/checkout_isl.sh

Modified: polly/branches/release_36/lib/CodeGen/IslExprBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/branches/release_36/lib/CodeGen/IslExprBuilder.cpp?rev=228339&r1=228338&r2=228339&view=diff
==============================================================================
--- polly/branches/release_36/lib/CodeGen/IslExprBuilder.cpp (original)
+++ polly/branches/release_36/lib/CodeGen/IslExprBuilder.cpp Thu Feb  5 13:51:51 2015
@@ -191,7 +191,6 @@ Value *IslExprBuilder::createOpBin(__isl
   case isl_ast_op_pdiv_r:
   case isl_ast_op_div:
   case isl_ast_op_fdiv_q:
-  case isl_ast_op_zdiv_r:
     // Do nothing
     break;
   case isl_ast_op_add:
@@ -240,7 +239,6 @@ Value *IslExprBuilder::createOpBin(__isl
     break;
   }
   case isl_ast_op_pdiv_r: // Dividend is non-negative
-  case isl_ast_op_zdiv_r: // Result only compared against zero
     Res = Builder.CreateSRem(LHS, RHS);
     break;
   }
@@ -406,7 +404,6 @@ Value *IslExprBuilder::createOp(__isl_ta
   case isl_ast_op_fdiv_q: // Round towards -infty
   case isl_ast_op_pdiv_q: // Dividend is non-negative
   case isl_ast_op_pdiv_r: // Dividend is non-negative
-  case isl_ast_op_zdiv_r: // Result only compared against zero
     return createOpBin(Expr);
   case isl_ast_op_minus:
     return createOpUnary(Expr);

Modified: polly/branches/release_36/test/Isl/Ast/reduction_modulo_schedule_multiple_dimensions_4.ll
URL: http://llvm.org/viewvc/llvm-project/polly/branches/release_36/test/Isl/Ast/reduction_modulo_schedule_multiple_dimensions_4.ll?rev=228339&r1=228338&r2=228339&view=diff
==============================================================================
--- polly/branches/release_36/test/Isl/Ast/reduction_modulo_schedule_multiple_dimensions_4.ll (original)
+++ polly/branches/release_36/test/Isl/Ast/reduction_modulo_schedule_multiple_dimensions_4.ll Thu Feb  5 13:51:51 2015
@@ -7,7 +7,7 @@
 ; CHECK:    for (int c1 = 0; c1 < 2 * n; c1 += 1)
 ; CHECK:      #pragma simd reduction
 ; CHECK:      for (int c3 = -1023; c3 <= 1023; c3 += 1) {
-; CHECK:        if (c3 <= 0 && c3 % 2 == 0) {
+; CHECK:        if (c3 <= 0 && -c3 % 2 == 0)
 ; CHECK:          Stmt_for_body3(c1, -c3);
 ; CHECK:        } else if (c3 >= 1 && (c3 - 1) % 2 == 0)
 ; CHECK:          Stmt_for_body3(c1, c3);

Modified: polly/branches/release_36/utils/checkout_isl.sh
URL: http://llvm.org/viewvc/llvm-project/polly/branches/release_36/utils/checkout_isl.sh?rev=228339&r1=228338&r2=228339&view=diff
==============================================================================
--- polly/branches/release_36/utils/checkout_isl.sh (original)
+++ polly/branches/release_36/utils/checkout_isl.sh Thu Feb  5 13:51:51 2015
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-ISL_HASH="b3e0fa7a05d32f1e0e36e0a42b0b83fa2ba1f609"
+ISL_HASH="0698f8436c523ecc742b13a9b3aa337cc2421fa2"
 
 PWD=`pwd`