isl_flow.c: before: use isl_vec_cmp_element

[platform/upstream/isl.git] / isl_flow.c

diff --git a/isl_flow.c b/isl_flow.c
index 6367a26..68fa0d9 100644 (file)
--- a/isl_flow.c
+++ b/isl_flow.c
@@ -4,7 +4,7 @@
  * Copyright 2010      INRIA Saclay
  * Copyright 2012      Universiteit Leiden
  *
- * Use of this software is governed by the GNU LGPLv2.1 license
+ * Use of this software is governed by the MIT license
  *
  * Written by Sven Verdoolaege, Leiden Institute of Advanced Computer Science,
  * Universiteit Leiden, Niels Bohrweg 1, 2333 CA Leiden, The Netherlands
@@ -17,7 +17,7 @@
 #include <isl/set.h>
 #include <isl/map.h>
 #include <isl/flow.h>
-#include <isl_qsort.h>
+#include <isl_sort.h>
 
 enum isl_restriction_type {
        isl_restriction_type_empty,
@@ -227,17 +227,18 @@ error:
 
 /* Free the given isl_access_info structure.
  */
-void isl_access_info_free(__isl_take isl_access_info *acc)
+void *isl_access_info_free(__isl_take isl_access_info *acc)
 {
        int i;
 
        if (!acc)
-               return;
+               return NULL;
        isl_map_free(acc->domain_map);
        isl_map_free(acc->sink.map);
        for (i = 0; i < acc->n_must + acc->n_may; ++i)
                isl_map_free(acc->source[i].map);
        free(acc);
+       return NULL;
 }
 
 isl_ctx *isl_access_info_get_ctx(__isl_keep isl_access_info *acc)
@@ -268,7 +269,7 @@ __isl_give isl_access_info *isl_access_info_add_source(
        isl_ctx *ctx;
 
        if (!acc)
-               return NULL;
+               goto error;
        ctx = isl_map_get_ctx(acc->sink.map);
        isl_assert(ctx, acc->n_must + acc->n_may < acc->max_source, goto error);
        
@@ -339,8 +340,9 @@ static __isl_give isl_access_info *isl_access_info_sort_sources(
        if (acc->n_must <= 1)
                return acc;
 
-       isl_quicksort(acc->source, acc->n_must, sizeof(struct isl_labeled_map),
-               access_sort_cmp, acc);
+       if (isl_sort(acc->source, acc->n_must, sizeof(struct isl_labeled_map),
+                   access_sort_cmp, acc) < 0)
+               return isl_access_info_free(acc);
 
        return acc;
 }
@@ -1125,7 +1127,6 @@ static __isl_give struct isl_sched_info *sched_info_alloc(
        isl_space *dim;
        struct isl_sched_info *info;
        int i, n;
-       isl_int v;
 
        if (!map)
                return NULL;
@@ -1145,13 +1146,18 @@ static __isl_give struct isl_sched_info *sched_info_alloc(
        if (!info->is_cst || !info->cst)
                goto error;
 
-       isl_int_init(v);
        for (i = 0; i < n; ++i) {
-               info->is_cst[i] = isl_map_plain_is_fixed(map, isl_dim_in, i,
-                                                        &v);
-               info->cst = isl_vec_set_element(info->cst, i, v);
+               isl_val *v;
+
+               v = isl_map_plain_get_val_if_fixed(map, isl_dim_in, i);
+               if (!v)
+                       goto error;
+               info->is_cst[i] = !isl_val_is_nan(v);
+               if (info->is_cst[i])
+                       info->cst = isl_vec_set_element_val(info->cst, i, v);
+               else
+                       isl_val_free(v);
        }
-       isl_int_clear(v);
 
        return info;
 error:
@@ -1252,7 +1258,6 @@ static int before(void *first, void *second)
        struct isl_sched_info *info2 = second;
        int n1, n2;
        int i;
-       isl_int v1, v2;
 
        n1 = isl_vec_size(info1->cst);
        n2 = isl_vec_size(info2->cst);
@@ -1260,28 +1265,22 @@ static int before(void *first, void *second)
        if (n2 < n1)
                n1 = n2;
 
-       isl_int_init(v1);
-       isl_int_init(v2);
        for (i = 0; i < n1; ++i) {
                int r;
+               int cmp;
 
                if (!info1->is_cst[i])
                        continue;
                if (!info2->is_cst[i])
                        continue;
-               isl_vec_get_element(info1->cst, i, &v1);
-               isl_vec_get_element(info2->cst, i, &v2);
-               if (isl_int_eq(v1, v2))
+               cmp = isl_vec_cmp_element(info1->cst, info2->cst, i);
+               if (cmp == 0)
                        continue;
 
-               r = 2 * i + isl_int_lt(v1, v2);
+               r = 2 * i + (cmp < 0);
 
-               isl_int_clear(v1);
-               isl_int_clear(v2);
                return r;
        }
-       isl_int_clear(v1);
-       isl_int_clear(v2);
 
        return 2 * n1;
 }