[polly] r272500 - Update isl to isl-0.17.1-57-g1879898

Tobias Grosser via llvm-commits llvm-commits at lists.llvm.org
Sat Jun 11 21:30:41 PDT 2016


Modified: polly/trunk/lib/External/isl/m4/lt~obsolete.m4
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/m4/lt%7Eobsolete.m4?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/m4/lt~obsolete.m4 (original)
+++ polly/trunk/lib/External/isl/m4/lt~obsolete.m4 Sat Jun 11 23:30:40 2016
@@ -1,7 +1,6 @@
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
-#   Foundation, Inc.
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
 # This file is free software; the Free Software Foundation gives
@@ -12,7 +11,7 @@
 
 # These exist entirely to fool aclocal when bootstrapping libtool.
 #
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
 # which have later been changed to m4_define as they aren't part of the
 # exported API, or moved to Autoconf or Automake where they belong.
 #
@@ -26,7 +25,7 @@
 # included after everything else.  This provides aclocal with the
 # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
 # because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
 #
 # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
 # Yes, that means every name once taken will need to remain here until

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/atomic3.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/atomic3.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/atomic3.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/atomic3.c Sat Jun 11 23:30:40 2016
@@ -3,6 +3,7 @@ for (int c0 = 0; c0 <= 64; c0 += 1) {
     sync();
   } else if (c0 >= 1) {
     sync();
-  } else
+  } else {
     sync();
+  }
 }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/cloog/pouchet.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/cloog/pouchet.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/cloog/pouchet.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/cloog/pouchet.c Sat Jun 11 23:30:40 2016
@@ -5,7 +5,8 @@ for (int c0 = 1; c0 <= floord(Ny, 2) + 2
         S1(c0 - c1, c1, 2 * c0 - 2 * c1, -2 * c0 + 4 * c1, c2);
         S2(c0 - c1, c1, 2 * c0 - 2 * c1, -2 * c0 + 4 * c1 - 1, c2);
       }
-    } else
+    } else {
       for (int c2 = 1; c2 <= 2; c2 += 1)
         S2((-Ny + 2 * c0) / 4, (Ny + 2 * c0) / 4, (-Ny / 2) + c0, Ny - 1, c2);
+    }
   }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/cloog/union.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/cloog/union.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/cloog/union.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/cloog/union.c Sat Jun 11 23:30:40 2016
@@ -1,6 +1,7 @@
 if (M >= 11) {
   for (int c0 = -100; c0 <= 0; c0 += 1)
     S1(-c0);
-} else
+} else {
   for (int c0 = 0; c0 <= 100; c0 += 1)
     S1(c0);
+}

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/cloog/vasilache.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/cloog/vasilache.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/cloog/vasilache.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/cloog/vasilache.c Sat Jun 11 23:30:40 2016
@@ -16,8 +16,9 @@
         }
         if (32 * c2 + 31 >= N) {
           S6(c0, c1, c2, N - 1);
-        } else
+        } else {
           S6(c0, c1, c2, 32 * c2 + 31);
+        }
       }
   S8();
 }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/cloog/vivien.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/cloog/vivien.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/cloog/vivien.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/cloog/vivien.c Sat Jun 11 23:30:40 2016
@@ -46,8 +46,9 @@
       }
       if (n == 2 && c0 == 4)
         S1(3);
-    } else
+    } else {
       S1(1);
+    }
     if (c0 % 2 == 0)
       S3(c0 / 2);
     for (int c1 = max(1, -n + c0); c1 < (c0 + 1) / 2; c1 += 1)

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/cloog/vivien2.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/cloog/vivien2.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/cloog/vivien2.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/cloog/vivien2.c Sat Jun 11 23:30:40 2016
@@ -23,9 +23,10 @@
           S6(2, n);
           S1(n + 1);
         }
-      } else if (c0 + 2 >= 2 * n)
+      } else if (c0 + 2 >= 2 * n) {
         for (int c2 = 1; c2 < -n + c0; c2 += 1)
           S5(-n + c0, n, c2);
+      }
       if (c0 >= n + 3) {
         S6(-n + c0, n);
         S1(c0 - 1);
@@ -39,8 +40,9 @@
         if (n + 1 >= c0)
           S6(1, c0 - 1);
       }
-    } else
+    } else {
       S1(1);
+    }
     if (c0 % 2 == 0)
       S3(c0 / 2);
     for (int c1 = max(1, -n + c0); c1 < (c0 + 1) / 2; c1 += 1)

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/cloog/walters.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/cloog/walters.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/cloog/walters.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/cloog/walters.c Sat Jun 11 23:30:40 2016
@@ -8,8 +8,9 @@
       S1(c0, c0 / 3, c0 / 3, c0 / 3);
     } else if ((c0 - 1) % 3 == 0) {
       S2(c0, (c0 - 1) / 3, (c0 + 2) / 3, (c0 - 1) / 3);
-    } else
+    } else {
       S3(c0, (c0 - 2) / 3, (c0 + 1) / 3, (c0 + 1) / 3);
+    }
     S4(c0, c0 / 3, (c0 - 1) / 3 + 1, c0 - (c0 - 1) / 3 - c0 / 3 - 1);
   }
 }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/correlation.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/correlation.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/correlation.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/correlation.c Sat Jun 11 23:30:40 2016
@@ -32,16 +32,18 @@ for (int c0 = 0; c0 < m; c0 += 32)
         if (c0 + 31 >= m && c1 + 31 >= n && c2 == c0) {
           for (int c5 = m - c0 - 1; c5 <= min(31, 2 * m - c0 - 3); c5 += 1)
             S_29(-m + c0 + c5 + 1, m - 1);
-        } else if (m >= c0 + 32 && c1 + 31 >= n && c2 == c0)
+        } else if (m >= c0 + 32 && c1 + 31 >= n && c2 == c0) {
           S_29(0, c0 + 31);
+        }
       } else if (c1 + 31 >= n && c2 >= m) {
         for (int c3 = max(0, (c2 / 2) - c0 + 1); c3 <= min(31, m - c0 - 1); c3 += 1)
           for (int c5 = 0; c5 <= min(31, 2 * c0 - c2 + 2 * c3 - 1); c5 += 1)
             S_29(-c0 + c2 - c3 + c5, c0 + c3);
-      } else if (c1 <= -32 && c1 + 31 >= n && m >= c2 + 1)
+      } else if (c1 <= -32 && c1 + 31 >= n && m >= c2 + 1) {
         for (int c3 = max(0, (c2 / 2) - c0 + 1); c3 <= min(31, m - c0 - 1); c3 += 1)
           for (int c5 = max(0, c0 - c2 + c3); c5 <= min(31, 2 * c0 - c2 + 2 * c3 - 1); c5 += 1)
             S_29(-c0 + c2 - c3 + c5, c0 + c3);
+      }
       if (m == 1 && c0 == 0 && c1 >= 32 && c2 == 0) {
         for (int c4 = 0; c4 <= min(31, n - c1 - 1); c4 += 1)
           S_19(c1 + c4, 0);

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/dwt.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/dwt.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/dwt.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/dwt.c Sat Jun 11 23:30:40 2016
@@ -3,6 +3,7 @@ for (int c0 = 0; c0 < Ncl; c0 += 1) {
     S(c0, 28);
   } else if (c0 == 0) {
     S(0, 26);
-  } else
+  } else {
     S(Ncl - 1, 27);
+  }
 }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/filter.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/filter.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/filter.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/filter.c Sat Jun 11 23:30:40 2016
@@ -2,7 +2,8 @@ if (n >= m + 1) {
   for (int c0 = 0; c0 < n; c0 += 1)
     for (int c2 = 0; c2 < n; c2 += 1)
       A(c0, c2);
-} else
+} else {
   for (int c0 = 0; c0 < n; c0 += 1)
     for (int c2 = 0; c2 < n; c2 += 1)
       A(c0, c2);
+}

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/isolate2.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/isolate2.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/isolate2.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/isolate2.c Sat Jun 11 23:30:40 2016
@@ -2,10 +2,8 @@ for (int c0 = 0; c0 <= 99; c0 += 1) {
   if (c0 >= 4 && c0 <= 6) {
     for (int c1 = 0; c1 <= 99; c1 += 1)
       A(c0, c1);
-  } else if (c0 >= 7) {
-    for (int c1 = 0; c1 <= 99; c1 += 1)
-      A(c0, c1);
-  } else
+  } else {
     for (int c1 = 0; c1 <= 99; c1 += 1)
       A(c0, c1);
+  }
 }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/isolate5.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/isolate5.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/isolate5.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/isolate5.c Sat Jun 11 23:30:40 2016
@@ -3,21 +3,24 @@
     for (int c1 = 0; c1 <= 1; c1 += 1) {
       if (c0 % 2 == 0) {
         A(c0 / 2, c1);
-      } else
+      } else {
         B((c0 - 1) / 2, c1);
+      }
     }
   for (int c0 = 10; c0 <= 89; c0 += 1)
     for (int c1 = 0; c1 <= 1; c1 += 1) {
       if (c0 % 2 == 0) {
         A(c0 / 2, c1);
-      } else
+      } else {
         B((c0 - 1) / 2, c1);
+      }
     }
   for (int c0 = 90; c0 <= 199; c0 += 1)
     for (int c1 = 0; c1 <= 1; c1 += 1) {
       if (c0 % 2 == 0) {
         A(c0 / 2, c1);
-      } else
+      } else {
         B((c0 - 1) / 2, c1);
+      }
     }
 }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/isolate7.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/isolate7.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/isolate7.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/isolate7.c Sat Jun 11 23:30:40 2016
@@ -5,23 +5,25 @@
         for (int c2 = 0; c2 <= 31; c2 += 1)
           for (int c3 = 0; c3 <= 31; c3 += 1)
             S_1(c0 + c2, c1 + c3);
-      } else
+      } else {
         for (int c2 = 0; c2 <= 31; c2 += 1) {
           for (int c3 = 0; c3 < n - c1; c3 += 1)
             S_1(c0 + c2, c1 + c3);
           S_2(c0 + c2);
         }
+      }
     }
   for (int c1 = 0; c1 < n; c1 += 32) {
     if (n >= c1 + 32) {
       for (int c2 = 0; c2 < (n + 32) % 32; c2 += 1)
         for (int c3 = 0; c3 <= 31; c3 += 1)
           S_1(-((n + 32) % 32) + n + c2, c1 + c3);
-    } else
+    } else {
       for (int c2 = 0; c2 < n - c1; c2 += 1) {
         for (int c3 = 0; c3 < n - c1; c3 += 1)
           S_1(c1 + c2, c1 + c3);
         S_2(c1 + c2);
       }
+    }
   }
 }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/lu.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/lu.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/lu.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/lu.c Sat Jun 11 23:30:40 2016
@@ -6,7 +6,7 @@ for (int c0 = 0; c0 < n - 1; c0 += 32)
           for (int c4 = c1; c4 <= min(n - 1, c1 + 31); c4 += 1)
             for (int c5 = max(c2, c3 + 1); c5 <= min(n - 1, c2 + 31); c5 += 1)
               S_6(c3, c4, c5);
-      } else
+      } else {
         for (int c3 = c0; c3 <= min(min(n - 2, c0 + 31), c2 + 30); c3 += 1) {
           for (int c5 = max(c2, c3 + 1); c5 <= min(n - 1, c2 + 31); c5 += 1)
             S_2(c3, c5);
@@ -14,4 +14,5 @@ for (int c0 = 0; c0 < n - 1; c0 += 32)
             for (int c5 = max(c2, c3 + 1); c5 <= min(n - 1, c2 + 31); c5 += 1)
               S_6(c3, c4, c5);
         }
+      }
     }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/code_gen-1.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/code_gen-1.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/code_gen-1.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/code_gen-1.c Sat Jun 11 23:30:40 2016
@@ -9,7 +9,8 @@ for (int c0 = 1; c0 <= 8; c0 += 1) {
     }
     for (int c1 = max(5, c0 - 1); c1 <= 7; c1 += 1)
       s0(c0, c1);
-  } else
+  } else {
     for (int c1 = 0; c1 <= 7; c1 += 1)
       s0(1, c1);
+  }
 }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/if_then-0.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/if_then-0.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/if_then-0.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/if_then-0.c Sat Jun 11 23:30:40 2016
@@ -6,7 +6,8 @@ if (m <= 1) {
   for (int c0 = 1; c0 <= n; c0 += 1)
     for (int c1 = 1; c1 <= n; c1 += 1)
       s0(c0, c1);
-} else
+} else {
   for (int c0 = 1; c0 <= n; c0 += 1)
     for (int c1 = 1; c1 <= n; c1 += 1)
       s1(c0, c1);
+}

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/if_then-2.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/if_then-2.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/if_then-2.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/if_then-2.c Sat Jun 11 23:30:40 2016
@@ -5,7 +5,8 @@ for (int c0 = 1; c0 <= 100; c0 += 1) {
       s1(c0, c1);
       s2(c0, c1);
     }
-  } else
+  } else {
     for (int c1 = 1; c1 <= 100; c1 += 1)
       s2(c0, c1);
+  }
 }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/if_then-3.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/if_then-3.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/if_then-3.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/if_then-3.c Sat Jun 11 23:30:40 2016
@@ -6,7 +6,8 @@ if (n >= 2) {
       s2(c0, c1);
     }
   }
-} else
+} else {
   for (int c0 = 1; c0 <= 100; c0 += 1)
     for (int c1 = 1; c1 <= 100; c1 += 1)
       s2(c0, c1);
+}

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift1-1.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift1-1.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift1-1.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift1-1.c Sat Jun 11 23:30:40 2016
@@ -5,9 +5,10 @@ for (int c0 = 1; c0 <= 100; c0 += 1)
         if (c0 >= 61) {
           for (int c4 = 1; c4 <= 100; c4 += 1)
             s1(c0, c1, c2, c3, c4);
-        } else
+        } else {
           for (int c4 = 1; c4 <= 100; c4 += 1) {
             s1(c0, c1, c2, c3, c4);
             s0(c0, c1, c2, c3, c4);
           }
+        }
       }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift1-2.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift1-2.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift1-2.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift1-2.c Sat Jun 11 23:30:40 2016
@@ -5,10 +5,11 @@ for (int c0 = 1; c0 <= 100; c0 += 1)
         for (int c3 = 1; c3 <= 100; c3 += 1)
           for (int c4 = 1; c4 <= 100; c4 += 1)
             s1(c0, c1, c2, c3, c4);
-      } else
+      } else {
         for (int c3 = 1; c3 <= 100; c3 += 1)
           for (int c4 = 1; c4 <= 100; c4 += 1) {
             s1(c0, c1, c2, c3, c4);
             s0(c0, c1, c2, c3, c4);
           }
+      }
     }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift1-3.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift1-3.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift1-3.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift1-3.c Sat Jun 11 23:30:40 2016
@@ -5,11 +5,12 @@ for (int c0 = 1; c0 <= 100; c0 += 1)
         for (int c3 = 1; c3 <= 100; c3 += 1)
           for (int c4 = 1; c4 <= 100; c4 += 1)
             s1(c0, c1, c2, c3, c4);
-    } else
+    } else {
       for (int c2 = 1; c2 <= 100; c2 += 1)
         for (int c3 = 1; c3 <= 100; c3 += 1)
           for (int c4 = 1; c4 <= 100; c4 += 1) {
             s1(c0, c1, c2, c3, c4);
             s0(c0, c1, c2, c3, c4);
           }
+    }
   }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift1-4.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift1-4.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift1-4.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift1-4.c Sat Jun 11 23:30:40 2016
@@ -5,7 +5,7 @@ for (int c0 = 1; c0 <= 100; c0 += 1) {
         for (int c3 = 1; c3 <= 100; c3 += 1)
           for (int c4 = 1; c4 <= 100; c4 += 1)
             s1(c0, c1, c2, c3, c4);
-  } else
+  } else {
     for (int c1 = 1; c1 <= 100; c1 += 1)
       for (int c2 = 1; c2 <= 100; c2 += 1)
         for (int c3 = 1; c3 <= 100; c3 += 1)
@@ -13,4 +13,5 @@ for (int c0 = 1; c0 <= 100; c0 += 1) {
             s1(c0, c1, c2, c3, c4);
             s0(c0, c1, c2, c3, c4);
           }
+  }
 }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift2-1.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift2-1.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift2-1.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift2-1.c Sat Jun 11 23:30:40 2016
@@ -8,9 +8,10 @@ for (int c0 = 1; c0 <= 100; c0 += 1)
         } else if (c0 <= 4) {
           for (int c4 = 1; c4 <= 100; c4 += 1)
             s1(c0, c1, c2, c3, c4);
-        } else
+        } else {
           for (int c4 = 1; c4 <= 100; c4 += 1) {
             s1(c0, c1, c2, c3, c4);
             s0(c0, c1, c2, c3, c4);
           }
+        }
       }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift2-2.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift2-2.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift2-2.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift2-2.c Sat Jun 11 23:30:40 2016
@@ -9,10 +9,11 @@ for (int c0 = 1; c0 <= 100; c0 += 1)
         for (int c3 = 1; c3 <= 100; c3 += 1)
           for (int c4 = 1; c4 <= 100; c4 += 1)
             s1(c0, c1, c2, c3, c4);
-      } else
+      } else {
         for (int c3 = 1; c3 <= 100; c3 += 1)
           for (int c4 = 1; c4 <= 100; c4 += 1) {
             s1(c0, c1, c2, c3, c4);
             s0(c0, c1, c2, c3, c4);
           }
+      }
     }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift2-3.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift2-3.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift2-3.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift2-3.c Sat Jun 11 23:30:40 2016
@@ -10,11 +10,12 @@ for (int c0 = 1; c0 <= 100; c0 += 1)
         for (int c3 = 1; c3 <= 100; c3 += 1)
           for (int c4 = 1; c4 <= 100; c4 += 1)
             s1(c0, c1, c2, c3, c4);
-    } else
+    } else {
       for (int c2 = 1; c2 <= 100; c2 += 1)
         for (int c3 = 1; c3 <= 100; c3 += 1)
           for (int c4 = 1; c4 <= 100; c4 += 1) {
             s1(c0, c1, c2, c3, c4);
             s0(c0, c1, c2, c3, c4);
           }
+    }
   }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift2-4.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift2-4.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift2-4.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/lift2-4.c Sat Jun 11 23:30:40 2016
@@ -11,7 +11,7 @@ for (int c0 = 1; c0 <= 100; c0 += 1) {
         for (int c3 = 1; c3 <= 100; c3 += 1)
           for (int c4 = 1; c4 <= 100; c4 += 1)
             s1(c0, c1, c2, c3, c4);
-  } else
+  } else {
     for (int c1 = 1; c1 <= 100; c1 += 1)
       for (int c2 = 1; c2 <= 100; c2 += 1)
         for (int c3 = 1; c3 <= 100; c3 += 1)
@@ -19,4 +19,5 @@ for (int c0 = 1; c0 <= 100; c0 += 1) {
             s1(c0, c1, c2, c3, c4);
             s0(c0, c1, c2, c3, c4);
           }
+  }
 }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/lu_spmd-0.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/lu_spmd-0.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/lu_spmd-0.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/lu_spmd-0.c Sat Jun 11 23:30:40 2016
@@ -5,8 +5,9 @@ if (ub >= lb)
         s0(c0, c1);
         if (n >= ub + 1)
           s2(c0, c1);
-      } else if (lb >= c0 + 1)
+      } else if (lb >= c0 + 1) {
         s3(c0, c1, lb, c0, c1);
+      }
       for (int c3 = max(lb, c0); c3 <= ub; c3 += 1)
         s1(c0, c1, c3);
     }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/lu_spmd-1.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/lu_spmd-1.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/lu_spmd-1.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/lu_spmd-1.c Sat Jun 11 23:30:40 2016
@@ -5,8 +5,9 @@ if (ub >= lb)
         s0(c0, c1);
         if (n >= ub + 1)
           s2(c0, c1);
-      } else if (lb >= c0 + 1)
+      } else if (lb >= c0 + 1) {
         s3(c0, c1, lb, c0, c1);
+      }
       for (int c3 = max(lb, c0); c3 <= ub; c3 += 1)
         s1(c0, c1, c3);
     }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/m1-1.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/m1-1.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/m1-1.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/m1-1.c Sat Jun 11 23:30:40 2016
@@ -5,9 +5,10 @@ for (int c0 = 1; c0 <= 9; c0 += 1) {
   } else if (c0 <= 4) {
     for (int c1 = 1; c1 <= 9; c1 += 1)
       s0(c0, c1);
-  } else
+  } else {
     for (int c1 = 1; c1 <= 9; c1 += 1) {
       s0(5, c1);
       s1(5, c1);
     }
+  }
 }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/m10-1.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/m10-1.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/m10-1.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/m10-1.c Sat Jun 11 23:30:40 2016
@@ -8,7 +8,8 @@ for (int c0 = 1; c0 <= 18; c0 += 1) {
   } else if (c0 == 1) {
     for (int c1 = 1; c1 <= 9; c1 += 1)
       s1(c1, 1);
-  } else if (c0 % 2 == 0)
+  } else if (c0 % 2 == 0) {
     for (int c1 = 1; c1 <= 9; c1 += 1)
       s0(c1, c0 / 2);
+  }
 }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/m2-0.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/m2-0.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/m2-0.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/m2-0.c Sat Jun 11 23:30:40 2016
@@ -5,7 +5,8 @@ for (int c0 = 2; c0 <= 9; c0 += 1) {
       s1(c0, c1);
       s0(c0, c1);
     }
-  } else
+  } else {
     for (int c1 = 2; c1 <= 9; c1 += 1)
       s0(c0, c1);
+  }
 }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/m7-1.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/m7-1.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/m7-1.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/m7-1.c Sat Jun 11 23:30:40 2016
@@ -4,7 +4,8 @@ for (int c0 = 1; c0 <= 9; c0 += 1) {
       s0(c1, c0);
       s1(c1, c0);
     }
-  } else
+  } else {
     for (int c1 = 1; c1 <= 9; c1 += 1)
       s0(c1, c0);
+  }
 }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/m8-1.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/m8-1.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/m8-1.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/m8-1.c Sat Jun 11 23:30:40 2016
@@ -4,7 +4,8 @@ for (int c0 = 2; c0 <= 8; c0 += 2) {
       s0(c1, c0);
       s1(c1, c0);
     }
-  } else
+  } else {
     for (int c1 = 1; c1 <= 9; c1 += 1)
       s1(c1, c0);
+  }
 }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/p.delft2-0.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/p.delft2-0.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/p.delft2-0.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/p.delft2-0.c Sat Jun 11 23:30:40 2016
@@ -5,6 +5,7 @@ if (P1 >= 0 && P1 <= 3 && P2 >= 0 && P2
         if ((5 * P2 + 2 * c3) % 9 <= 3) {
           if (P1 >= 1 && c0 + 1 == P1 && (5 * P1 + 2 * c2) % 9 <= 2) {
             s0(P1 - 1, P2, c2, c3, ((5 * P1 + 2 * c2 + 9) % 9) + 1, -4 * P2 + 2 * c3 - 9 * floord(-4 * P2 + 2 * c3, 9));
-          } else if (P1 == 0 && c0 == 3 && c2 % 4 == 0)
+          } else if (P1 == 0 && c0 == 3 && c2 % 4 == 0) {
             s0(3, P2, c2, c3, (-c2 / 4) + 3, -4 * P2 + 2 * c3 - 9 * floord(-4 * P2 + 2 * c3, 9));
+          }
         }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/stride7-0.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/stride7-0.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/stride7-0.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/stride7-0.c Sat Jun 11 23:30:40 2016
@@ -8,7 +8,8 @@ for (int c0 = 1; c0 <= 36; c0 += 1) {
         s0(c1, c0 / 4);
       s1(c1, c0);
     }
-  } else if (c0 % 4 == 0)
+  } else if (c0 % 4 == 0) {
     for (int c1 = 1; c1 <= 9; c1 += 1)
       s0(c1, c0 / 4);
+  }
 }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/ts1d-check-sblock-0.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/ts1d-check-sblock-0.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/ts1d-check-sblock-0.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/ts1d-check-sblock-0.c Sat Jun 11 23:30:40 2016
@@ -3,9 +3,10 @@
     if (c1 == 1) {
       s0(1, 1, 1, 0, 0);
       s0(1, 1, 1, N - 1, 0);
-    } else
+    } else {
       for (int c3 = 0; c3 < N; c3 += 1)
         s0(1, 0, 1, c3, 0);
+    }
   }
   for (int c1 = 0; c1 <= floord(T - 1, 1000); c1 += 1)
     for (int c2 = 1000 * c1 + 1; c2 <= min(N + T - 3, N + 1000 * c1 + 997); c2 += 1)

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/ts1d-mp-i_ts-m_b-0.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/ts1d-mp-i_ts-m_b-0.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/ts1d-mp-i_ts-m_b-0.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/ts1d-mp-i_ts-m_b-0.c Sat Jun 11 23:30:40 2016
@@ -5,8 +5,9 @@
         s0(1, -1, c2, 0, 0);
       } else if (c2 == 0) {
         s0(1, c1, 0, 0, 0);
-      } else if (c2 + 1 == N)
+      } else if (c2 + 1 == N) {
         s0(1, c1, N - 1, 0, 0);
+      }
     }
   for (int c1 = 0; c1 <= floord(T - 1, 500); c1 += 1) {
     for (int c3 = -((c1 + 9) / 8) + 2; c3 <= floord(N - 500 * c1 - 3, 4000) + 1; c3 += 1)

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/wak2-0.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/wak2-0.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/wak2-0.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/wak2-0.c Sat Jun 11 23:30:40 2016
@@ -6,7 +6,7 @@
     for (int c0 = max(a1, a2); c0 <= min(b1, b2); c0 += 1)
       for (int c1_0 = c1; c1_0 <= d1; c1_0 += 1)
         s0(c0, c1_0);
-  } else
+  } else {
     for (int c0 = a2; c0 <= b2; c0 += 1) {
       if (c0 >= a1 && b1 >= c0)
         for (int c1_0 = c1; c1_0 <= min(d1, c2 - 1); c1_0 += 1)
@@ -20,6 +20,7 @@
         for (int c1_0 = max(c1, d2 + 1); c1_0 <= d1; c1_0 += 1)
           s0(c0, c1_0);
     }
+  }
   for (int c0 = max(max(a1, a2), b2 + 1); c0 <= b1; c0 += 1)
     for (int c1_0 = c1; c1_0 <= d1; c1_0 += 1)
       s0(c0, c1_0);

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/omega/wak2-1.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/omega/wak2-1.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/omega/wak2-1.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/omega/wak2-1.c Sat Jun 11 23:30:40 2016
@@ -6,7 +6,7 @@
     for (int c0 = max(a1, a2); c0 <= min(b1, b2); c0 += 1)
       for (int c1_0 = c1; c1_0 <= d1; c1_0 += 1)
         s0(c0, c1_0);
-  } else
+  } else {
     for (int c0 = a2; c0 <= b2; c0 += 1) {
       if (a1 >= c0 + 1) {
         for (int c1_0 = c2; c1_0 <= d2; c1_0 += 1)
@@ -29,6 +29,7 @@
           s1(c0, c1_0);
       }
     }
+  }
   for (int c0 = max(max(a1, a2), b2 + 1); c0 <= b1; c0 += 1)
     for (int c1_0 = c1; c1_0 <= d1; c1_0 += 1)
       s0(c0, c1_0);

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/pldi2012/figure7_c.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/pldi2012/figure7_c.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/pldi2012/figure7_c.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/pldi2012/figure7_c.c Sat Jun 11 23:30:40 2016
@@ -5,7 +5,8 @@ for (int c0 = 1; c0 <= 100; c0 += 1) {
       s1(c0, c1);
       s2(c0, c1);
     }
-  } else
+  } else {
     for (int c1 = 1; c1 <= 100; c1 += 1)
       s2(c0, c1);
+  }
 }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/pldi2012/figure7_d.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/pldi2012/figure7_d.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/pldi2012/figure7_d.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/pldi2012/figure7_d.c Sat Jun 11 23:30:40 2016
@@ -6,7 +6,8 @@ if (n >= 2) {
       s2(c0, c1);
     }
   }
-} else
+} else {
   for (int c0 = 1; c0 <= 100; c0 += 1)
     for (int c1 = 1; c1 <= 100; c1 += 1)
       s2(c0, c1);
+}

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/separation_class3.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/separation_class3.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/separation_class3.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/separation_class3.c Sat Jun 11 23:30:40 2016
@@ -6,10 +6,11 @@ for (int c0 = 0; c0 <= 4; c0 += 1) {
     if (c0 == 4) {
       for (int c6 = 3; c6 <= 5; c6 += 1)
         S_0(7, c6);
-    } else
+    } else {
       for (int c4 = 2 * c0 - 1; c4 <= 2 * c0; c4 += 1)
         for (int c6 = -2 * c0 + c4 + 4; c6 <= 2 * c0 - c4 + 4; c6 += 1)
           S_0(c4, c6);
+    }
   }
   for (int c4 = max(0, 2 * c0 - 1); c4 <= min(7, 2 * c0); c4 += 1)
     for (int c6 = -2 * c0 + c4 + 8; c6 <= 8; c6 += 1)
@@ -22,8 +23,9 @@ for (int c0 = 0; c0 <= 4; c0 += 1) {
   } else if (c0 == 4) {
     for (int c2 = 0; c2 <= 1; c2 += 1)
       S_0(7, 4 * c2 + 2);
-  } else
+  } else {
     for (int c2 = 0; c2 <= 1; c2 += 1)
       for (int c6 = 4 * c2 + 1; c6 <= 4 * c2 + 3; c6 += 1)
         S_0(0, c6);
+  }
 }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/separation_class4.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/separation_class4.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/separation_class4.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/separation_class4.c Sat Jun 11 23:30:40 2016
@@ -4,17 +4,19 @@ for (int c0 = 0; c0 <= 128; c0 += 1) {
       for (int c3 = 0; c3 <= 1; c3 += 1)
         for (int c5 = c3 + 58; c5 <= -c3 + 61; c5 += 1)
           S_0(c3, c5);
-    } else
+    } else {
       for (int c2 = 1; c2 <= 2; c2 += 1)
         for (int c3 = max(4 * c0 - 2, 4 * c0 + 6 * c2 - 12); c3 <= min(4 * c0 + 1, 4 * c0 + 6 * c2 - 7); c3 += 1)
           for (int c5 = max(4 * c0 - c3 + 57, -4 * c0 + c3 + 58); c5 <= min(4 * c0 - c3 + 61, -4 * c0 + c3 + 62); c5 += 1)
             S_0(c3, c5);
+    }
     for (int c2 = 1; c2 <= 2; c2 += 1)
       for (int c3 = max(4 * c0, 4 * c0 + 6 * c2 - 10); c3 <= min(4 * c0 + 3, 4 * c0 + 6 * c2 - 5); c3 += 1)
         for (int c5 = max(-4 * c0 + c3 + 59, 4 * c0 - c3 + 62); c5 <= min(-4 * c0 + c3 + 63, 4 * c0 - c3 + 66); c5 += 1)
           S_0(c3, c5);
-  } else
+  } else {
     for (int c3 = 510; c3 <= 511; c3 += 1)
       for (int c5 = -c3 + 569; c5 < c3 - 449; c5 += 1)
         S_0(c3, c5);
+  }
 }

Modified: polly/trunk/lib/External/isl/test_inputs/codegen/shift2.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/test_inputs/codegen/shift2.c?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/test_inputs/codegen/shift2.c (original)
+++ polly/trunk/lib/External/isl/test_inputs/codegen/shift2.c Sat Jun 11 23:30:40 2016
@@ -31,8 +31,9 @@ for (int c0 = 0; c0 <= 1; c0 += 1) {
         S_4(c0);
     } else if (length >= 32) {
       S_4(c0);
-    } else
+    } else {
       S_4(c0);
+    }
   }
   for (int c1 = 32; c1 < length - 1; c1 += 32)
     for (int c2 = c1; c2 < length; c2 += 32)

Modified: polly/trunk/test/Isl/Ast/reduction_modulo_and_loop_reversal_schedule.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/Ast/reduction_modulo_and_loop_reversal_schedule.ll?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/test/Isl/Ast/reduction_modulo_and_loop_reversal_schedule.ll (original)
+++ polly/trunk/test/Isl/Ast/reduction_modulo_and_loop_reversal_schedule.ll Sat Jun 11 23:30:40 2016
@@ -2,17 +2,13 @@
 ;
 ; CHECK:          #pragma known-parallel reduction (+ : A)
 ; CHECK-NEXT:     for (int c0 = 0; c0 <= 2; c0 += 1) {
-; CHECK-NEXT:       if (c0 == 2) {
-; CHECK-NEXT:         #pragma simd reduction (+ : A)
-; CHECK-NEXT:         for (int c1 = 1; c1 <= 2 * n; c1 += 2)
-; CHECK-NEXT:           Stmt_S0(2 * n - c1);
-; CHECK-NEXT:       } else if (c0 == 1) {
+; CHECK-NEXT:       if (c0 == 1) {
 ; CHECK-NEXT:         #pragma simd
 ; CHECK-NEXT:         for (int c1 = 0; c1 < 2 * n; c1 += 1)
 ; CHECK-NEXT:           Stmt_S1(c1);
 ; CHECK-NEXT:       } else
 ; CHECK-NEXT:         #pragma simd reduction (+ : A)
-; CHECK-NEXT:         for (int c1 = 2; c1 <= 2 * n; c1 += 2)
+; CHECK-NEXT:         for (int c1 = (-c0 / 2) + 2; c1 <= 2 * n; c1 += 2)
 ; CHECK-NEXT:           Stmt_S0(2 * n - c1);
 ; CHECK-NEXT:     }
 ;

Modified: polly/trunk/test/Isl/Ast/reduction_modulo_schedule.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/Ast/reduction_modulo_schedule.ll?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/test/Isl/Ast/reduction_modulo_schedule.ll (original)
+++ polly/trunk/test/Isl/Ast/reduction_modulo_schedule.ll Sat Jun 11 23:30:40 2016
@@ -2,17 +2,13 @@
 ;
 ; CHECK:          #pragma known-parallel reduction (+ : A)
 ; CHECK-NEXT:     for (int c0 = 0; c0 <= 2; c0 += 1) {
-; CHECK-NEXT:       if (c0 == 2) {
-; CHECK-NEXT:         #pragma simd reduction (+ : A)
-; CHECK-NEXT:         for (int c1 = 1; c1 < 2 * n; c1 += 2)
-; CHECK-NEXT:           Stmt_S0(c1);
-; CHECK-NEXT:       } else if (c0 == 1) {
+; CHECK-NEXT:       if (c0 == 1) {
 ; CHECK-NEXT:         #pragma simd
 ; CHECK-NEXT:         for (int c1 = 0; c1 < 2 * n; c1 += 1)
 ; CHECK-NEXT:           Stmt_S1(c1);
 ; CHECK-NEXT:       } else
 ; CHECK-NEXT:         #pragma simd reduction (+ : A)
-; CHECK-NEXT:         for (int c1 = 0; c1 < 2 * n; c1 += 2)
+; CHECK-NEXT:         for (int c1 = c0 / 2; c1 < 2 * n; c1 += 2)
 ; CHECK-NEXT:           Stmt_S0(c1);
 ; CHECK-NEXT:     }
 ;

Modified: polly/trunk/test/Isl/CodeGen/invariant_load_condition.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/invariant_load_condition.ll?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/invariant_load_condition.ll (original)
+++ polly/trunk/test/Isl/CodeGen/invariant_load_condition.ll Sat Jun 11 23:30:40 2016
@@ -8,10 +8,10 @@
 ; CHECK-LABEL: polly.cond:
 ; CHECK-NEXT:   %[[R0:[0-9]*]] = sext i32 %polly.access.C.load to i64
 ; CHECK-NEXT:   %[[R1:[0-9]*]] = icmp sle i64 %[[R0]], -1
-;
-; CHECK-LABEL: polly.cond4:
 ; CHECK-NEXT:   %[[R2:[0-9]*]] = sext i32 %polly.access.C.load to i64
 ; CHECK-NEXT:   %[[R3:[0-9]*]] = icmp sge i64 %[[R2]], 1
+; CHECK-NEXT:   %[[R4:[0-9]*]] = or i1 %[[R1]], %[[R3]]
+; CHECK-NEXT:   br i1 %[[R4]]
 ;
 ; CHECK-NOT:  polly.stmt.bb2
 ;

Modified: polly/trunk/test/Isl/CodeGen/pointer-type-expressions.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/pointer-type-expressions.ll?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/pointer-type-expressions.ll (original)
+++ polly/trunk/test/Isl/CodeGen/pointer-type-expressions.ll Sat Jun 11 23:30:40 2016
@@ -33,19 +33,15 @@ return:
   ret void
 }
 
-; CHECK:      if (P <= -1) {
-; CHECK-NEXT:   for (int c0 = 0; c0 < N; c0 += 1)
-; CHECK-NEXT:     Stmt_store(c0);
-; CHECK-NEXT: } else if (P >= 1)
+; CHECK:      if (P <= -1 || P >= 1)
 ; CHECK-NEXT:   for (int c0 = 0; c0 < N; c0 += 1)
 ; CHECK-NEXT:     Stmt_store(c0);
 
 ; CODEGEN-LABEL: polly.cond:
 ; CODEGEN-NEXT:   %[[R1:[0-9]*]] = ptrtoint float* %P to i64
 ; CODEGEN-NEXT:   %[[R2:[0-9]*]] = icmp sle i64 %[[R1]], -1
-; CODEGEN-NEXT:   br i1 %[[R2]]
-; CODEGEN-LABEL: polly.cond2:
 ; CODEGEN-NEXT:   %[[R3:[0-9]*]] = ptrtoint float* %P to i64
 ; CODEGEN-NEXT:   %[[R4:[0-9]*]] = icmp sge i64 %[[R3]], 1
-; CODEGEN-NEXT:   br i1 %[[R4]]
+; CODEGEN-NEXT:   %[[R5:[0-9]*]] = or i1 %[[R2]], %[[R4]]
+; CODEGEN-NEXT:   br i1 %[[R5]]
 

Modified: polly/trunk/test/Isl/CodeGen/pointer-type-pointer-type-comparison.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/pointer-type-pointer-type-comparison.ll?rev=272500&r1=272499&r2=272500&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/pointer-type-pointer-type-comparison.ll (original)
+++ polly/trunk/test/Isl/CodeGen/pointer-type-pointer-type-comparison.ll Sat Jun 11 23:30:40 2016
@@ -34,10 +34,7 @@ return:
   ret void
 }
 
-; CHECK:      if (Q >= P + 1) {
-; CHECK-NEXT:   for (int c0 = 0; c0 < N; c0 += 1)
-; CHECK-NEXT:     Stmt_store(c0);
-; CHECK-NEXT: } else if (P >= Q + 1)
+; CHECK:      if (Q >= P + 1 || P >= Q + 1)
 ; CHECK-NEXT:   for (int c0 = 0; c0 < N; c0 += 1)
 ; CHECK-NEXT:     Stmt_store(c0);
 
@@ -46,11 +43,9 @@ return:
 ; CODEGEN-NEXT:  %[[P:[_a-zA-Z0-9]+]] = ptrtoint float* %P to i64
 ; CODEGEN-NEXT:  %[[PInc:[_a-zA-Z0-9]+]] = add nsw i64 %[[P]], 1
 ; CODEGEN-NEXT:  %[[CMP:[_a-zA-Z0-9]+]] = icmp sge i64 %[[Q]], %[[PInc]]
-; CODEGEN-NEXT:  br i1 %[[CMP]]
-
-; CODEGEN:       polly.cond2:
 ; CODEGEN-NEXT:  %[[P2:[_a-zA-Z0-9]+]] = ptrtoint float* %P to i64
 ; CODEGEN-NEXT:  %[[Q2:[_a-zA-Z0-9]+]] = ptrtoint float* %Q to i64
 ; CODEGEN-NEXT:  %[[QInc:[_a-zA-Z0-9]+]] = add nsw i64 %[[Q2]], 1
 ; CODEGEN-NEXT:  %[[CMP2:[_a-zA-Z0-9]+]] = icmp sge i64 %[[P2]], %[[QInc]]
-; CODEGEN-NEXT:  br i1 %[[CMP2]]
+; CODEGEN-NEXT:  %[[CMP3:[_a-zA-Z0-9]+]] = or i1 %[[CMP]], %[[CMP2]]
+; CODEGEN-NEXT:  br i1 %[[CMP3]]




More information about the llvm-commits mailing list