Merge branch 'maint'

diff --git a/ChangeLog b/ChangeLog
index e653bdb..2f7588c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+version: 0.11.1
+date: Mon Dec 10 11:55:30 CET 2012
+changes:
+       - add LICENSE file to distribution
+       - make code generation output independent of endianness
+---
 version: 0.11
 date: Mon Dec  3 08:17:18 CET 2012
 changes:

diff --git a/configure.ac b/configure.ac
index d66a409..88de460 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
-AC_INIT([isl], [0.11], [isl-development@googlegroups.com])
+AC_INIT([isl], [0.11.1], [isl-development@googlegroups.com])
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 AC_SUBST(versioninfo)
-versioninfo=11:0:1
+versioninfo=11:1:1
 
 if test "x$prefix" != "xNONE"; then
        prefix_wd=`cd $prefix && pwd`

diff --git a/interface/python.cc b/interface/python.cc
index 784b4be..3b54a03 100644 (file)
--- a/interface/python.cc
+++ b/interface/python.cc
@@ -34,6 +34,7 @@
 #include <stdio.h>
 #include <iostream>
 #include <map>
+#include <clang/AST/Attr.h>
 #include "extract_interface.h"
 #include "python.h"
 

diff --git a/isl_ast_codegen.c b/isl_ast_codegen.c
index 9d4d93b..b262fed 100644 (file)
--- a/isl_ast_codegen.c
+++ b/isl_ast_codegen.c
@@ -2520,6 +2520,7 @@ static int compute_class_domains(__isl_take isl_point *pnt, void *user)
        class_set = isl_set_from_point(pnt);
        domain = isl_map_domain(isl_map_intersect_range(
                                isl_map_copy(domains->sep_class), class_set));
+       domain = isl_ast_build_compute_gist(domains->build, domain);
        domain = isl_ast_build_eliminate(domains->build, domain);
 
        disjoint = isl_set_plain_is_disjoint(domain, domains->schedule_domain);

diff --git a/test_inputs/codegen/separation_class3.c b/test_inputs/codegen/separation_class3.c
new file mode 100644 (file)
index 0000000..14f722a
--- /dev/null
+++ b/test_inputs/codegen/separation_class3.c
@@ -0,0 +1,28 @@
+for (int c0 = 0; c0 <= 4; c0 += 1) {
+  if (c0 >= 1) {
+    S_0(2 * c0 - 1, 1);
+    if (c0 == 4)
+      for (int c6 = 3; c6 <= 5; c6 += 1)
+        S_0(7, c6);
+    if (c0 <= 3)
+      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);
+  } else
+    S_0(0, 4);
+  for (int c4 = max(0, 2 * c0 - 1); c4 <= min(2 * c0, 7); c4 += 1)
+    for (int c6 = -2 * c0 + c4 + 8; c6 <= 8; c6 += 1)
+      S_0(c4, c6);
+  if (c0 >= 1 && c0 <= 3) {
+    for (int c2 = 0; c2 <= 1; c2 += 1)
+      for (int c4 = 2 * c0 - 1; c4 <= 2 * c0; c4 += 1)
+        for (int c6 = 2 * c0 + 4 * c2 - c4 + 1; c6 <= -2 * c0 + 4 * c2 + c4 + 3; c6 += 1)
+          S_0(c4, c6);
+  } else if (c0 == 4) {
+    for (int c2 = 0; c2 <= 1; c2 += 1)
+      S_0(7, 4 * c2 + 2);
+  } 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);
+}

diff --git a/test_inputs/codegen/separation_class3.in b/test_inputs/codegen/separation_class3.in
new file mode 100644 (file)
index 0000000..1aaf251
--- /dev/null
+++ b/test_inputs/codegen/separation_class3.in
@@ -0,0 +1,4 @@
+{ S_0[t, i] -> [o0, 1, o2, 0, t, 0, i] : 4o2 >= -4 + t + i - 2o0 and 4o2 >= -3 - t + i + 2o0 and 2o0 <= 1 + t and 2o0 >= t and 4o2 <= -1 + t + i - 2o0 and t >= 0 and t <= 7 and i >= 1 and i <= 8; S_0[t, i] -> [o0, 0, o2, 0, t, 0, i] : 4o2 >= t + i - 2o0 and 4o2 <= -t + i + 2o0 and 2o0 <= 1 + t and 2o0 >= t and t >= 0 and t <= 7 and i >= 1 and i <= 8 }
+{:}
+{ [i0, 1, i2, i3, i4, i5, i6] -> separation_class[[2] -> [0]] : i2 <= 1 and i2 >= 0 and i0 <= 3 and i0 >= 1; [i0, 0, 1, i3, i4, i5, i6] -> separation_class[[2] -> [0]] : i0 <= 3 and i0 >= 1; [i0, i1, i2, i3, i4, i5, i6] -> unroll[1] }
+