[polly] r298352 - Update isl to isl-0.18-395-g77701b3
Tobias Grosser via llvm-commits
llvm-commits at lists.llvm.org
Tue Mar 21 02:12:12 PDT 2017
Author: grosser
Date: Tue Mar 21 04:12:11 2017
New Revision: 298352
URL: http://llvm.org/viewvc/llvm-project?rev=298352&view=rev
Log:
Update isl to isl-0.18-395-g77701b3
This is a normal maintenance update.
Modified:
polly/trunk/lib/External/isl/GIT_HEAD_ID
polly/trunk/lib/External/isl/doc/user.pod
polly/trunk/lib/External/isl/include/isl/aff.h
polly/trunk/lib/External/isl/include/isl/map.h
polly/trunk/lib/External/isl/include/isl/point.h
polly/trunk/lib/External/isl/include/isl/set.h
polly/trunk/lib/External/isl/isl_aff.c
polly/trunk/lib/External/isl/isl_aff_private.h
polly/trunk/lib/External/isl/isl_affine_hull.c
polly/trunk/lib/External/isl/isl_convex_hull.c
polly/trunk/lib/External/isl/isl_map.c
polly/trunk/lib/External/isl/isl_map_private.h
polly/trunk/lib/External/isl/isl_point.c
polly/trunk/lib/External/isl/isl_test.c
Modified: polly/trunk/lib/External/isl/GIT_HEAD_ID
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/GIT_HEAD_ID?rev=298352&r1=298351&r2=298352&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/GIT_HEAD_ID (original)
+++ polly/trunk/lib/External/isl/GIT_HEAD_ID Tue Mar 21 04:12:11 2017
@@ -1 +1 @@
-isl-0.18-387-g3fa6191
+isl-0.18-395-g77701b3
Modified: polly/trunk/lib/External/isl/doc/user.pod
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/doc/user.pod?rev=298352&r1=298351&r2=298352&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/doc/user.pod (original)
+++ polly/trunk/lib/External/isl/doc/user.pod Tue Mar 21 04:12:11 2017
@@ -2362,7 +2362,8 @@ Points can be copied or freed using
__isl_give isl_point *isl_point_copy(
__isl_keep isl_point *pnt);
- void isl_point_free(__isl_take isl_point *pnt);
+ __isl_null isl_point *isl_point_free(
+ __isl_take isl_point *pnt);
A singleton set can be created from a point using
@@ -6274,12 +6275,21 @@ into the first expression.
__isl_give isl_set *isl_aff_le_set(
__isl_take isl_aff *aff1,
__isl_take isl_aff *aff2);
+ __isl_give isl_basic_set *isl_aff_lt_basic_set(
+ __isl_take isl_aff *aff1,
+ __isl_take isl_aff *aff2);
+ __isl_give isl_set *isl_aff_lt_set(
+ __isl_take isl_aff *aff1,
+ __isl_take isl_aff *aff2);
__isl_give isl_basic_set *isl_aff_ge_basic_set(
__isl_take isl_aff *aff1,
__isl_take isl_aff *aff2);
__isl_give isl_set *isl_aff_ge_set(
__isl_take isl_aff *aff1,
__isl_take isl_aff *aff2);
+ __isl_give isl_basic_set *isl_aff_gt_basic_set(
+ __isl_take isl_aff *aff1,
+ __isl_take isl_aff *aff2);
__isl_give isl_set *isl_pw_aff_eq_set(
__isl_take isl_pw_aff *pwaff1,
__isl_take isl_pw_aff *pwaff2);
Modified: polly/trunk/lib/External/isl/include/isl/aff.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/include/isl/aff.h?rev=298352&r1=298351&r2=298352&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/include/isl/aff.h (original)
+++ polly/trunk/lib/External/isl/include/isl/aff.h Tue Mar 21 04:12:11 2017
@@ -138,10 +138,16 @@ __isl_give isl_basic_set *isl_aff_le_bas
__isl_take isl_aff *aff2);
__isl_give isl_set *isl_aff_le_set(__isl_take isl_aff *aff1,
__isl_take isl_aff *aff2);
+__isl_give isl_basic_set *isl_aff_lt_basic_set(__isl_take isl_aff *aff1,
+ __isl_take isl_aff *aff2);
+__isl_give isl_set *isl_aff_lt_set(__isl_take isl_aff *aff1,
+ __isl_take isl_aff *aff2);
__isl_give isl_basic_set *isl_aff_ge_basic_set(__isl_take isl_aff *aff1,
__isl_take isl_aff *aff2);
__isl_give isl_set *isl_aff_ge_set(__isl_take isl_aff *aff1,
__isl_take isl_aff *aff2);
+__isl_give isl_basic_set *isl_aff_gt_basic_set(__isl_take isl_aff *aff1,
+ __isl_take isl_aff *aff2);
__isl_constructor
__isl_give isl_aff *isl_aff_read_from_str(isl_ctx *ctx, const char *str);
Modified: polly/trunk/lib/External/isl/include/isl/map.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/include/isl/map.h?rev=298352&r1=298351&r2=298352&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/include/isl/map.h (original)
+++ polly/trunk/lib/External/isl/include/isl/map.h Tue Mar 21 04:12:11 2017
@@ -569,6 +569,7 @@ __isl_give isl_map *isl_map_uncurry(__is
__isl_give isl_map *isl_map_make_disjoint(__isl_take isl_map *map);
__isl_give isl_map *isl_basic_map_compute_divs(__isl_take isl_basic_map *bmap);
__isl_give isl_map *isl_map_compute_divs(__isl_take isl_map *map);
+ISL_DEPRECATED
__isl_give isl_map *isl_map_align_divs(__isl_take isl_map *map);
__isl_give isl_basic_map *isl_basic_map_drop_constraints_involving_dims(
Modified: polly/trunk/lib/External/isl/include/isl/point.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/include/isl/point.h?rev=298352&r1=298351&r2=298352&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/include/isl/point.h (original)
+++ polly/trunk/lib/External/isl/include/isl/point.h Tue Mar 21 04:12:11 2017
@@ -17,7 +17,7 @@ __isl_give isl_space *isl_point_get_spac
__isl_give isl_point *isl_point_zero(__isl_take isl_space *dim);
__isl_give isl_point *isl_point_copy(__isl_keep isl_point *pnt);
-void isl_point_free(__isl_take isl_point *pnt);
+__isl_null isl_point *isl_point_free(__isl_take isl_point *pnt);
__isl_give isl_val *isl_point_get_coordinate_val(__isl_keep isl_point *pnt,
enum isl_dim_type type, int pos);
Modified: polly/trunk/lib/External/isl/include/isl/set.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/include/isl/set.h?rev=298352&r1=298351&r2=298352&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/include/isl/set.h (original)
+++ polly/trunk/lib/External/isl/include/isl/set.h Tue Mar 21 04:12:11 2017
@@ -395,6 +395,7 @@ __isl_give isl_set *isl_set_neg(__isl_ta
__isl_give isl_set *isl_set_make_disjoint(__isl_take isl_set *set);
struct isl_set *isl_basic_set_compute_divs(struct isl_basic_set *bset);
__isl_give isl_set *isl_set_compute_divs(__isl_take isl_set *set);
+ISL_DEPRECATED
__isl_give isl_set *isl_set_align_divs(__isl_take isl_set *set);
__isl_give isl_val *isl_set_plain_get_val_if_fixed(__isl_keep isl_set *set,
Modified: polly/trunk/lib/External/isl/isl_aff.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/isl_aff.c?rev=298352&r1=298351&r2=298352&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/isl_aff.c (original)
+++ polly/trunk/lib/External/isl/isl_aff.c Tue Mar 21 04:12:11 2017
@@ -2229,13 +2229,21 @@ __isl_give isl_basic_set *isl_aff_nonneg
}
/* Return a basic set containing those elements in the domain space
+ * of "aff" where it is positive.
+ */
+__isl_give isl_basic_set *isl_aff_pos_basic_set(__isl_take isl_aff *aff)
+{
+ aff = isl_aff_add_constant_num_si(aff, -1);
+ return isl_aff_nonneg_basic_set(aff);
+}
+
+/* Return a basic set containing those elements in the domain space
* of aff where it is negative.
*/
__isl_give isl_basic_set *isl_aff_neg_basic_set(__isl_take isl_aff *aff)
{
aff = isl_aff_neg(aff);
- aff = isl_aff_add_constant_num_si(aff, -1);
- return isl_aff_nonneg_basic_set(aff);
+ return isl_aff_pos_basic_set(aff);
}
/* Return a basic set containing those elements in the space
@@ -2286,6 +2294,17 @@ __isl_give isl_basic_set *isl_aff_ge_bas
return isl_aff_nonneg_basic_set(aff1);
}
+/* Return a basic set containing those elements in the shared domain space
+ * of "aff1" and "aff2" where "aff1" is greater than "aff2".
+ */
+__isl_give isl_basic_set *isl_aff_gt_basic_set(__isl_take isl_aff *aff1,
+ __isl_take isl_aff *aff2)
+{
+ aff1 = isl_aff_sub(aff1, aff2);
+
+ return isl_aff_pos_basic_set(aff1);
+}
+
/* Return a set containing those elements in the shared space
* of aff1 and aff2 where aff1 is greater than or equal to aff2.
*/
@@ -2304,6 +2323,15 @@ __isl_give isl_basic_set *isl_aff_le_bas
return isl_aff_ge_basic_set(aff2, aff1);
}
+/* Return a basic set containing those elements in the shared domain space
+ * of "aff1" and "aff2" where "aff1" is smaller than "aff2".
+ */
+__isl_give isl_basic_set *isl_aff_lt_basic_set(__isl_take isl_aff *aff1,
+ __isl_take isl_aff *aff2)
+{
+ return isl_aff_gt_basic_set(aff2, aff1);
+}
+
/* Return a set containing those elements in the shared space
* of aff1 and aff2 where aff1 is smaller than or equal to aff2.
*/
@@ -2313,6 +2341,15 @@ __isl_give isl_set *isl_aff_le_set(__isl
return isl_aff_ge_set(aff2, aff1);
}
+/* Return a set containing those elements in the shared domain space
+ * of "aff1" and "aff2" where "aff1" is smaller than "aff2".
+ */
+__isl_give isl_set *isl_aff_lt_set(__isl_take isl_aff *aff1,
+ __isl_take isl_aff *aff2)
+{
+ return isl_set_from_basic_set(isl_aff_lt_basic_set(aff1, aff2));
+}
+
/* Return a basic set containing those elements in the shared space
* of aff1 and aff2 where aff1 and aff2 are equal.
*/
Modified: polly/trunk/lib/External/isl/isl_aff_private.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/isl_aff_private.h?rev=298352&r1=298351&r2=298352&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/isl_aff_private.h (original)
+++ polly/trunk/lib/External/isl/isl_aff_private.h Tue Mar 21 04:12:11 2017
@@ -154,6 +154,8 @@ isl_bool isl_pw_aff_matching_params(__is
isl_stat isl_pw_aff_check_match_domain_space(__isl_keep isl_pw_aff *pa,
__isl_keep isl_space *space);
+__isl_give isl_basic_set *isl_aff_pos_basic_set(__isl_take isl_aff *aff);
+
#undef BASE
#define BASE pw_aff
Modified: polly/trunk/lib/External/isl/isl_affine_hull.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/isl_affine_hull.c?rev=298352&r1=298351&r2=298352&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/isl_affine_hull.c (original)
+++ polly/trunk/lib/External/isl/isl_affine_hull.c Tue Mar 21 04:12:11 2017
@@ -1202,7 +1202,7 @@ __isl_give isl_basic_map *isl_map_affine
map = isl_map_local_affine_hull(map);
map = isl_map_remove_empty_parts(map);
map = isl_map_remove_unknown_divs(map);
- map = isl_map_align_divs(map);
+ map = isl_map_align_divs_internal(map);
if (!map)
return NULL;
Modified: polly/trunk/lib/External/isl/isl_convex_hull.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/isl_convex_hull.c?rev=298352&r1=298351&r2=298352&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/isl_convex_hull.c (original)
+++ polly/trunk/lib/External/isl/isl_convex_hull.c Tue Mar 21 04:12:11 2017
@@ -1923,7 +1923,7 @@ struct isl_basic_map *isl_map_convex_hul
struct isl_set *set = NULL;
map = isl_map_detect_equalities(map);
- map = isl_map_align_divs(map);
+ map = isl_map_align_divs_internal(map);
if (!map)
goto error;
@@ -2415,7 +2415,7 @@ static __isl_give isl_basic_map *map_sim
return map_simple_hull_trivial(map);
affine_hull = isl_map_affine_hull(isl_map_copy(map));
input = isl_map_copy(map);
- map = isl_map_align_divs(map);
+ map = isl_map_align_divs_internal(map);
model = map ? isl_basic_map_copy(map->p[0]) : NULL;
set = isl_map_underlying_set(map);
Modified: polly/trunk/lib/External/isl/isl_map.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/isl_map.c?rev=298352&r1=298351&r2=298352&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/isl_map.c (original)
+++ polly/trunk/lib/External/isl/isl_map.c Tue Mar 21 04:12:11 2017
@@ -8485,7 +8485,7 @@ __isl_give isl_basic_map *isl_basic_map_
return dst;
}
-struct isl_map *isl_map_align_divs(struct isl_map *map)
+__isl_give isl_map *isl_map_align_divs_internal(__isl_take isl_map *map)
{
int i;
@@ -8510,9 +8510,14 @@ struct isl_map *isl_map_align_divs(struc
return map;
}
+__isl_give isl_map *isl_map_align_divs(__isl_take isl_map *map)
+{
+ return isl_map_align_divs_internal(map);
+}
+
struct isl_set *isl_set_align_divs(struct isl_set *set)
{
- return set_from_map(isl_map_align_divs(set_to_map(set)));
+ return set_from_map(isl_map_align_divs_internal(set_to_map(set)));
}
/* Align the divs of the basic maps in "map" to those
@@ -8542,7 +8547,7 @@ __isl_give isl_map *isl_map_align_divs_t
if (!map->p[0])
return isl_map_free(map);
- return isl_map_align_divs(map);
+ return isl_map_align_divs_internal(map);
}
/* Align the divs of each element of "list" to those of "bmap".
@@ -10041,7 +10046,7 @@ __isl_give isl_set *isl_set_lift(__isl_t
isl_space *dim;
unsigned n_div;
- set = isl_set_align_divs(set);
+ set = set_from_map(isl_map_align_divs_internal(set_to_map(set)));
if (!set)
return NULL;
Modified: polly/trunk/lib/External/isl/isl_map_private.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/isl_map_private.h?rev=298352&r1=298351&r2=298352&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/isl_map_private.h (original)
+++ polly/trunk/lib/External/isl/isl_map_private.h Tue Mar 21 04:12:11 2017
@@ -272,6 +272,7 @@ __isl_give isl_map *isl_map_align_divs_t
__isl_take isl_map *map, __isl_keep isl_basic_map_list *list);
__isl_give isl_basic_map_list *isl_basic_map_list_align_divs_to_basic_map(
__isl_take isl_basic_map_list *list, __isl_keep isl_basic_map *bmap);
+__isl_give isl_map *isl_map_align_divs_internal(__isl_take isl_map *map);
__isl_give isl_basic_set *isl_basic_set_sort_divs(
__isl_take isl_basic_set *bset);
__isl_give isl_basic_map *isl_basic_map_sort_divs(
Modified: polly/trunk/lib/External/isl/isl_point.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/isl_point.c?rev=298352&r1=298351&r2=298352&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/isl_point.c (original)
+++ polly/trunk/lib/External/isl/isl_point.c Tue Mar 21 04:12:11 2017
@@ -103,17 +103,18 @@ __isl_give isl_point *isl_point_copy(__i
return pnt;
}
-void isl_point_free(__isl_take isl_point *pnt)
+__isl_null isl_point *isl_point_free(__isl_take isl_point *pnt)
{
if (!pnt)
- return;
+ return NULL;
if (--pnt->ref > 0)
- return;
+ return NULL;
isl_space_free(pnt->dim);
isl_vec_free(pnt->vec);
free(pnt);
+ return NULL;
}
__isl_give isl_point *isl_point_void(__isl_take isl_space *dim)
Modified: polly/trunk/lib/External/isl/isl_test.c
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/External/isl/isl_test.c?rev=298352&r1=298351&r2=298352&view=diff
==============================================================================
--- polly/trunk/lib/External/isl/isl_test.c (original)
+++ polly/trunk/lib/External/isl/isl_test.c Tue Mar 21 04:12:11 2017
@@ -1926,7 +1926,7 @@ static int test_coalesce_special(struct
"(exists (e0 = [(-2 + y)/3]: 3e0 = -2 + y and y <= 200 and "
"y >= 5 and o1 <= 241 and o1 >= 212)) }";
map1 = isl_map_read_from_str(ctx, str);
- map1 = isl_map_align_divs(map1);
+ map1 = isl_map_align_divs_internal(map1);
map1 = isl_map_coalesce(map1);
str = "[y] -> { [S_L220_OUT[] -> T7[]] -> "
"[[S_L309_IN[] -> T11[]] -> ce_imag2[o0, o1]] : "
@@ -1935,7 +1935,7 @@ static int test_coalesce_special(struct
"o0 >= 3 - y and o0 <= -2 + y and o0 >= 0) }";
map2 = isl_map_read_from_str(ctx, str);
map2 = isl_map_union(map2, map1);
- map2 = isl_map_align_divs(map2);
+ map2 = isl_map_align_divs_internal(map2);
map2 = isl_map_coalesce(map2);
isl_map_free(map2);
if (!map2)
More information about the llvm-commits
mailing list