Update to ISL 0.16.1

llvm-svn: 257898

4 files changed, 16 insertions, 37 deletions

diff --git a/polly/lib/External/isl/test_inputs/codegen/cloog/dealII.c b/polly/lib/External/isl/test_inputs/codegen/cloog/dealII.c
index 939a804a9c7..99ac53ee39a 100644
--- a/polly/lib/External/isl/test_inputs/codegen/cloog/dealII.c
+++ b/polly/lib/External/isl/test_inputs/codegen/cloog/dealII.c
@@ -1,32 +1,18 @@
 {
-  if (T_67 == 0 && T_66 <= -1) {
-    S1(0);
-  } else if (T_2 >= 1 && T_67 >= 1 && T_66 <= -1) {
-    S1(0);
-  } else if (T_2 >= 1 && T_67 >= 1 && T_66 >= 0) {
-    S1(0);
-    S2(0);
-  }
-  for (int c0 = 1; c0 <= min(min(T_2 - 1, T_67 - 1), T_66); c0 += 1) {
+  for (int c0 = 0; c0 <= min(min(T_2 - 1, T_67 - 1), T_66); c0 += 1) {
     S1(c0);
     S2(c0);
   }
-  for (int c0 = max(1, T_66 + 1); c0 < min(T_2, T_67); c0 += 1)
+  for (int c0 = max(0, T_66 + 1); c0 < min(T_2, T_67); c0 += 1)
     S1(c0);
-  if (T_2 >= 1 && T_67 == 0 && T_66 >= 0) {
-    S1(0);
-    S2(0);
-  }
-  for (int c0 = max(1, T_67); c0 <= min(T_2 - 1, T_66); c0 += 1) {
+  for (int c0 = T_67; c0 <= min(T_2 - 1, T_66); c0 += 1) {
     S1(c0);
     S2(c0);
   }
-  for (int c0 = max(max(1, T_67), T_66 + 1); c0 < T_2; c0 += 1)
+  for (int c0 = max(T_67, T_66 + 1); c0 < T_2; c0 += 1)
     S1(c0);
-  if (T_2 == 0 && T_67 >= 1 && T_66 >= 0)
-    S2(0);
-  for (int c0 = max(1, T_2); c0 <= min(T_67 - 1, T_66); c0 += 1)
+  for (int c0 = T_2; c0 <= min(T_67 - 1, T_66); c0 += 1)
     S2(c0);
-  if (T_2 == 0 && T_67 == 0 && T_66 >= 0)
+  if (T_2 == 0 && T_67 == 0)
     S1(0);
 }
diff --git a/polly/lib/External/isl/test_inputs/codegen/cloog/faber.c b/polly/lib/External/isl/test_inputs/codegen/cloog/faber.c
index ab54229b829..984dafcf70c 100644
--- a/polly/lib/External/isl/test_inputs/codegen/cloog/faber.c
+++ b/polly/lib/External/isl/test_inputs/codegen/cloog/faber.c
@@ -85,17 +85,10 @@
         for (int c2 = max(c1 + 24, -2 * c1 + 30); c2 <= c1 - (3 * c0 + 17) / 14 + 56; c2 += 1)
           S1(c0, c1, c2);
       }
-    if (c0 >= 70 && c0 % 14 >= 9) {
+    if (c0 >= 70 && c0 % 14 >= 9)
       for (int c2 = max(c0 / 14 + 19, -((3 * c0 + 14) / 14) + c0 / 14 + 44); c2 <= -((3 * c0 + 17) / 14) + c0 / 14 + 51; c2 += 1)
         S1(c0, c0 / 14 - 5, c2);
-    } else if (c0 <= 69 && c0 % 14 >= 9) {
-      if (c0 <= 41)
-        S7(c0, -3, 6);
-      S6(c0, c0 / 14 - 5, 8);
-      for (int c2 = -((3 * c0 + 14) / 14) + c0 / 14 + 44; c2 <= -((3 * c0 + 17) / 14) + c0 / 14 + 51; c2 += 1)
-        S1(c0, c0 / 14 - 5, c2);
-    }
-    for (int c1 = (c0 + 5) / 14 - 5; c1 < 0; c1 += 1) {
+    for (int c1 = c0 / 14 - 5; c1 < 0; c1 += 1) {
       if (7 * c1 + 114 >= 2 * c0)
         S7(c0, c1, 6);
       for (int c2 = max(8, c1 - (6 * c0 + 77) / 77 + 13); c2 <= c1 - (6 * c0 + 91) / 77 + 15; c2 += 1)
@@ -104,21 +97,21 @@
         S1(c0, c1, c2);
     }
     for (int c1 = max(0, (c0 + 5) / 14 - 5); c1 < c0 / 14 - 2; c1 += 1) {
-      for (int c2 = max(c1, -2 * c1 + 6); c2 <= min(min(-2 * c1 + 24, c1 - (6 * c0 + 91) / 77 + 15), (2 * c0 - 7 * c1 - 10) / 21 + 1); c2 += 1)
+      for (int c2 = max(c1, -2 * c1 + 6); c2 <= min(c1 + 5, -2 * c1 + 24); c2 += 1)
+        S9(c0, c1, c2);
+      for (int c2 = c1 + 6; c2 <= min((2 * c1 + 1) / 5 + 7, (2 * c0 - 7 * c1 - 10) / 21 + 1); c2 += 1)
         S9(c0, c1, c2);
-      if (c1 >= 1 && c1 <= 5 && 14 * c1 + 46 >= c0)
-        S9(c0, c1, c1 + 5);
       for (int c2 = max(c1 + 6, (2 * c0 - 7 * c1 - 10) / 21 + 2); c2 <= (2 * c1 + 1) / 5 + 7; c2 += 1) {
         S7(c0, c1, c2);
         S9(c0, c1, c2);
       }
-      if (c1 <= 3 && 7 * c1 + 21 * ((2 * c1 + 41) / 5) >= 2 * c0 + 12)
+      if (c1 <= 3)
         S9(c0, c1, (2 * c1 + 1) / 5 + 8);
       for (int c2 = (2 * c1 + 1) / 5 + 9; c2 <= c1 - (6 * c0 + 91) / 77 + 15; c2 += 1) {
         S6(c0, c1, c2);
         S9(c0, c1, c2);
       }
-      for (int c2 = c1 - (6 * c0 + 91) / 77 + 16; c2 <= -2 * c1 + 24; c2 += 1)
+      for (int c2 = max(max(c1 + 6, c1 - (6 * c0 + 91) / 77 + 16), (2 * c1 + 1) / 5 + 9); c2 <= -2 * c1 + 24; c2 += 1)
         S9(c0, c1, c2);
       for (int c2 = max(c1, -2 * c1 + 30); c2 <= min(c1 + 24, c1 - (3 * c0 + 17) / 14 + 47); c2 += 1)
         S8(c0, c1, c2);
diff --git a/polly/lib/External/isl/test_inputs/codegen/cloog/jacobi-shared.c b/polly/lib/External/isl/test_inputs/codegen/cloog/jacobi-shared.c
index 50840a86877..0deb1064fd2 100644
--- a/polly/lib/External/isl/test_inputs/codegen/cloog/jacobi-shared.c
+++ b/polly/lib/External/isl/test_inputs/codegen/cloog/jacobi-shared.c
@@ -1,3 +1,3 @@
 if (((t1 + 31) % 32) + g2 >= 2 && N >= ((t1 + 31) % 32) + g2 + 2 && (h0 - 1) % 2 == 0)
   for (int c0 = max(((t0 + 15) % 16) + 1, ((g1 + t0 + 13) % 16) - g1 + 3); c0 <= min(32, N - g1 - 1); c0 += 16)
-    S1(g1 + c0 - 1, ((t1 + 31) % 32) + g2);
+    S1(g1 + c0 - 1, -((g2 - t1 + 32) % 32) + g2 + 31);
diff --git a/polly/lib/External/isl/test_inputs/codegen/cloog/reservoir-liu-zhuge1.c b/polly/lib/External/isl/test_inputs/codegen/cloog/reservoir-liu-zhuge1.c
index 42547118e11..f9e59c1c873 100644
--- a/polly/lib/External/isl/test_inputs/codegen/cloog/reservoir-liu-zhuge1.c
+++ b/polly/lib/External/isl/test_inputs/codegen/cloog/reservoir-liu-zhuge1.c
@@ -1,7 +1,7 @@
 if (M >= 0 && N >= 0)
   for (int c0 = -4; c0 <= 3 * M + N; c0 += 1) {
     if (c0 >= 0 && 3 * M + 1 >= c0 && (c0 + 1) % 3 >= 1 && N + 1 >= (c0 + 1) % 3)
-      S2((c0 + 1) / 3, ((c0 + 1) % 3) - 1);
+      S2((c0 + 3) / 3 - 1, c0 % 3);
     for (int c1 = max(-3 * M + c0 - 2, (c0 + 4) % 3); c1 <= min(min(N - 2, c0 - 2), -3 * M + c0 + 3); c1 += 3)
       S2((c0 - c1 - 2) / 3, c1 + 2);
     for (int c1 = max(-3 * M + c0 + 4, (c0 + 4) % 3); c1 < min(N - 1, c0 - 1); c1 += 3) {
@@ -9,7 +9,7 @@ if (M >= 0 && N >= 0)
       S2((c0 - c1 - 2) / 3, c1 + 2);
     }
     if (3 * M + N >= c0 + 4 && c0 >= N + 1 && ((-N + c0) % 3) + N >= 2 && (-N + c0) % 3 >= 1)
-      S1((-N + c0 + 3) / 3 + 1, ((-N + c0) % 3) + N - 2);
+      S1((-N + c0 - 1) / 3 + 2, ((-N + c0 - 1) % 3) + N - 1);
     for (int c1 = max(max(c0 + 1, -3 * M + c0 + 4), (c0 + 4) % 3); c1 <= min(N, c0 + 4); c1 += 3)
       S1((c0 - c1 + 4) / 3, c1);
     for (int c1 = max(-3 * M + c0, (c0 + 6) % 3); c1 <= min(N, c0); c1 += 3)