projects
/
platform
/
upstream
/
isl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
isl_pw_aff_non_zero_set: don't assume isl_pw_aff is total
[platform/upstream/isl.git]
/
isl_map_piplib.c
diff --git
a/isl_map_piplib.c
b/isl_map_piplib.c
index
08a3104
..
1718153
100644
(file)
--- a/
isl_map_piplib.c
+++ b/
isl_map_piplib.c
@@
-7,13
+7,14
@@
* Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium
*/
* Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium
*/
-#include "isl_set.h"
-#include "isl_map.h"
-#include "isl_mat.h"
-#include "isl_seq.h"
+#include <isl_ctx_private.h>
+#include <isl_map_private.h>
+#include <isl/set.h>
+#include <isl/map.h>
+#include <isl/mat.h>
+#include <isl/seq.h>
#include "isl_piplib.h"
#include "isl_map_piplib.h"
#include "isl_piplib.h"
#include "isl_map_piplib.h"
-#include "isl_map_private.h"
static void copy_values_from(isl_int *dst, Entier *src, unsigned n)
{
static void copy_values_from(isl_int *dst, Entier *src, unsigned n)
{
@@
-231,7
+232,7
@@
static struct isl_map *scan_quast_r(struct scan_data *data, PipQuast *q,
if (add_equality(data->ctx, bmap, data->pos, j,
l->vector) < 0)
goto error;
if (add_equality(data->ctx, bmap, data->pos, j,
l->vector) < 0)
goto error;
- map = isl_map_add(map, isl_basic_map_copy(bmap));
+ map = isl_map_add
_basic_map
(map, isl_basic_map_copy(bmap));
if (isl_basic_map_free_equality(bmap, n_out))
goto error;
} else if (data->rest) {
if (isl_basic_map_free_equality(bmap, n_out))
goto error;
} else if (data->rest) {
@@
-240,7
+241,7
@@
static struct isl_map *scan_quast_r(struct scan_data *data, PipQuast *q,
bset = isl_basic_set_drop_dims(bset, n_in, n_out);
if (!bset)
goto error;
bset = isl_basic_set_drop_dims(bset, n_in, n_out);
if (!bset)
goto error;
- *data->rest = isl_set_add(*data->rest, bset);
+ *data->rest = isl_set_add
_basic_set
(*data->rest, bset);
}
if (isl_basic_map_free_inequality(bmap, 2*(bmap->n_div - old_n_div)))
}
if (isl_basic_map_free_inequality(bmap, 2*(bmap->n_div - old_n_div)))
@@
-255,11
+256,11
@@
error:
/*
* Returns a map of dimension "keep_dim" with "context" as domain and
/*
* Returns a map of dimension "keep_dim" with "context" as domain and
- * as range the first "isl_
dim_size
(keep_dim, isl_dim_out)" variables
+ * as range the first "isl_
space_dim
(keep_dim, isl_dim_out)" variables
* in the quast lists.
*/
static struct isl_map *isl_map_from_quast(struct isl_ctx *ctx, PipQuast *q,
* in the quast lists.
*/
static struct isl_map *isl_map_from_quast(struct isl_ctx *ctx, PipQuast *q,
-
struct isl_dim
*keep_dim,
+
isl_space
*keep_dim,
struct isl_basic_set *context,
struct isl_set **rest)
{
struct isl_basic_set *context,
struct isl_set **rest)
{
@@
-269,7
+270,7
@@
static struct isl_map *isl_map_from_quast(struct isl_ctx *ctx, PipQuast *q,
int n_sol, n_nosol;
struct scan_data data;
struct isl_map *map = NULL;
int n_sol, n_nosol;
struct scan_data data;
struct isl_map *map = NULL;
-
struct isl_dim
*dims;
+
isl_space
*dims;
unsigned nparam;
unsigned dim;
unsigned keep;
unsigned nparam;
unsigned dim;
unsigned keep;
@@
-284,7
+285,7
@@
static struct isl_map *isl_map_from_quast(struct isl_ctx *ctx, PipQuast *q,
dim = isl_basic_set_n_dim(context);
nparam = isl_basic_set_n_param(context);
dim = isl_basic_set_n_dim(context);
nparam = isl_basic_set_n_param(context);
- keep = isl_
dim_size
(keep_dim, isl_dim_out);
+ keep = isl_
space_dim
(keep_dim, isl_dim_out);
pip_param = nparam + dim;
max_depth = 0;
pip_param = nparam + dim;
max_depth = 0;
@@
-295,19
+296,19
@@
static struct isl_map *isl_map_from_quast(struct isl_ctx *ctx, PipQuast *q,
nexist -= pip_param-1;
if (rest) {
nexist -= pip_param-1;
if (rest) {
- *rest = isl_set_alloc_
dim(isl_dim
_copy(context->dim), n_nosol,
+ *rest = isl_set_alloc_
space(isl_space
_copy(context->dim), n_nosol,
ISL_MAP_DISJOINT);
if (!*rest)
goto error;
}
ISL_MAP_DISJOINT);
if (!*rest)
goto error;
}
- map = isl_map_alloc_
dim(isl_dim
_copy(keep_dim), n_sol,
+ map = isl_map_alloc_
space(isl_space
_copy(keep_dim), n_sol,
ISL_MAP_DISJOINT);
if (!map)
goto error;
ISL_MAP_DISJOINT);
if (!map)
goto error;
- dims = isl_
dim_reverse(isl_dim
_copy(context->dim));
+ dims = isl_
space_reverse(isl_space
_copy(context->dim));
data.bmap = isl_basic_map_from_basic_set(context, dims);
data.bmap = isl_basic_map_from_basic_set(context, dims);
- data.bmap = isl_basic_map_extend_
dim
(data.bmap,
+ data.bmap = isl_basic_map_extend_
space
(data.bmap,
keep_dim, nexist, keep, max_depth+2*nexist);
if (!data.bmap)
goto error2;
keep_dim, nexist, keep, max_depth+2*nexist);
if (!data.bmap)
goto error2;
@@
-336,7
+337,7
@@
static struct isl_map *isl_map_from_quast(struct isl_ctx *ctx, PipQuast *q,
return map;
error:
isl_basic_set_free(context);
return map;
error:
isl_basic_set_free(context);
- isl_
dim
_free(keep_dim);
+ isl_
space
_free(keep_dim);
error2:
if (data.pos)
free(data.pos);
error2:
if (data.pos)
free(data.pos);
@@
-443,7
+444,7
@@
struct isl_map *isl_pip_basic_map_lexopt(
struct isl_basic_set *copy;
copy = isl_basic_set_copy(dom);
map = isl_map_from_quast(ctx, sol,
struct isl_basic_set *copy;
copy = isl_basic_set_copy(dom);
map = isl_map_from_quast(ctx, sol,
- isl_
dim
_copy(bmap->dim), copy, empty);
+ isl_
space
_copy(bmap->dim), copy, empty);
} else {
map = isl_map_empty_like_basic_map(bmap);
if (empty)
} else {
map = isl_map_empty_like_basic_map(bmap);
if (empty)