summaryloggraphiclog1graphiclog2commitcommitdifftreerefseditfork
rawpatchinlineside by side (parent: 46a3630)
rawpatchinlineside by side (parent: 46a3630)
| author | Sven Verdoolaege <sven.verdoolaege@gmail.com> | |
| Thu, 12 Apr 2018 07:38:02 +0000 (12 09:38 +0200) | ||
| committer | Sven Verdoolaege <sven@cerebras.net> | |
| Thu, 2 May 2019 16:19:13 +0000 (2 18:19 +0200) |
This type of objects keeps track of a space along with
identifiers for the set dimensions. This will be useful
for transforming parameters into set dimensions with
the identifiers specifying the parameters that need
to be transformed into the set dimensions at the corresponding
positions and vice versa.
While a space itself can also have names for set dimensions,
these are transient and only meant for pretty printing.
They are not guaranteed to survive any operation
(on the space itself or indeed on any other object somehow
related to the space).
Signed-off-by: Sven Verdoolaege <sven.verdoolaege@gmail.com>
identifiers for the set dimensions. This will be useful
for transforming parameters into set dimensions with
the identifiers specifying the parameters that need
to be transformed into the set dimensions at the corresponding
positions and vice versa.
While a space itself can also have names for set dimensions,
these are transient and only meant for pretty printing.
They are not guaranteed to survive any operation
(on the space itself or indeed on any other object somehow
related to the space).
Signed-off-by: Sven Verdoolaege <sven.verdoolaege@gmail.com>
diff --git a/doc/user.pod b/doc/user.pod
--- a/doc/user.pod
+++ b/doc/user.pod
#include <isl/id.h>
isl_ctx *isl_id_get_ctx(__isl_keep isl_id *id);
+ isl_ctx *isl_multi_id_get_ctx(
+ __isl_keep isl_multi_id *mi);
#include <isl/local_space.h>
isl_ctx *isl_local_space_get_ctx(
__isl_give isl_space *isl_union_pw_qpolynomial_fold_get_space(
__isl_keep isl_union_pw_qpolynomial_fold *upwf);
+ #include <isl/id.h>
+ __isl_give isl_space *isl_multi_id_get_space(
+ __isl_keep isl_multi_id *mi);
+
#include <isl/val.h>
__isl_give isl_space *isl_multi_val_get_space(
__isl_keep isl_multi_val *mv);
or names of the parameters. Identifiers of individual dimensions are
essentially only useful for printing. They are ignored by all other
operations and may not be preserved across those operations.
+To keep track of a space along with names/identifiers of
+the set dimensions, use an C<isl_multi_id> as described in
+L</"Functions">.
#include <isl/space.h>
__isl_give isl_space *isl_space_set_dim_id(
__isl_give isl_union_map *isl_union_map_reset_user(
__isl_take isl_union_map *umap);
+ #include <isl/id.h>
+ __isl_give isl_multi_id *isl_multi_id_reset_user(
+ __isl_take isl_multi_id *mi);
+
#include <isl/val.h>
__isl_give isl_multi_val *isl_multi_val_reset_user(
__isl_take isl_multi_val *mv);
Each of these types is derived from the value type (see L</"Values">)
or from one of two primitive function types
through the application of zero or more type constructors.
+As a special case, a multiple expression can also be derived
+from an identifier (see L</"Identifiers">) although the result
+is not really a function.
We first describe the primitive type and then we describe
the types derived from these primitive types.
can be any space. In case the base expressions have
a set space, the corresponding multiple expression
also has a set space.
-Objects of the value type do not have an associated space.
-The space of a multiple value is therefore always a set space.
+Objects of the value or identifier type do not have an associated space.
+The space of a multiple value or
+multiple identifier is therefore always a set space.
Similarly, the space of a multiple union piecewise
affine expression is always a set space.
If the base expressions are not total, then
outside of any base expressions.
The multiple expression types defined by C<isl>
-are C<isl_multi_val>, C<isl_multi_aff>, C<isl_multi_pw_aff>,
+are C<isl_multi_val>, C<isl_multi_id>, C<isl_multi_aff>, C<isl_multi_pw_aff>,
C<isl_multi_union_pw_aff>.
A multiple expression with the value zero for
If the base expressions have a set space (or no associated space),
then this space also needs to be a set space.
+ #include <isl/id.h>
+ __isl_give isl_multi_id *isl_multi_id_from_id_list(
+ __isl_take isl_space *space,
+ __isl_take isl_id_list *list);
+
#include <isl/val.h>
__isl_give isl_multi_val *isl_multi_val_from_val_list(
__isl_take isl_space *space,
Multiple expressions can be copied and freed using
the following functions.
+ #include <isl/id.h>
+ __isl_give isl_multi_id *isl_multi_id_copy(
+ __isl_keep isl_multi_id *mi);
+ __isl_null isl_multi_id *isl_multi_id_free(
+ __isl_take isl_multi_id *mi);
+
#include <isl/val.h>
__isl_give isl_multi_val *isl_multi_val_copy(
__isl_keep isl_multi_val *mv);
The number of base expressions in a multiple
expression can be obtained using the following functions.
+ #include <isl/id.h>
+ int isl_multi_id_size(__isl_keep isl_multi_id *mi);
+
#include <isl/val.h>
isl_size isl_multi_val_size(__isl_keep isl_multi_val *mv);
The base expression at a given position of a multiple
expression can be extracted using the following functions.
+ #include <isl/id.h>
+ __isl_give isl_id *isl_multi_id_get_id(
+ __isl_keep isl_multi_id *mi, int pos);
+
#include <isl/val.h>
__isl_give isl_val *isl_multi_val_get_val(
__isl_keep isl_multi_val *mv, int pos);
It can be replaced using the following functions.
+ #include <isl/id.h>
+ __isl_give isl_multi_id *isl_multi_id_set_id(
+ __isl_take isl_multi_id *mi, int pos,
+ __isl_take isl_id *id);
+
#include <isl/val.h>
__isl_give isl_multi_val *isl_multi_val_set_val(
__isl_take isl_multi_val *mv, int pos,
__isl_take isl_printer *p,
__isl_keep isl_multi_val *mv);
+ #include <isl/id.h>
+ __isl_give isl_printer *isl_printer_print_multi_id(
+ __isl_take isl_printer *p,
+ __isl_keep isl_multi_id *mi);
+
#include <isl/aff.h>
__isl_give isl_printer *isl_printer_print_aff(
__isl_take isl_printer *p, __isl_keep isl_aff *aff);
#include <isl/id.h>
__isl_give char *isl_id_to_str(
__isl_keep isl_id *id);
+ __isl_give char *isl_multi_id_to_str(
+ __isl_keep isl_multi_id *mi);
#include <isl/space.h>
__isl_give char *isl_space_to_str(
__isl_keep isl_map *map);
isl_bool isl_map_is_product(__isl_keep isl_map *map);
+ #include <isl/id.h>
+ isl_bool isl_multi_id_range_is_wrapping(
+ __isl_keep isl_multi_id *mi);
+
#include <isl/val.h>
isl_bool isl_multi_val_range_is_wrapping(
__isl_keep isl_multi_val *mv);
__isl_keep isl_union_map *umap1,
__isl_keep isl_union_map *umap2);
+ #include <isl/id.h>
+ isl_bool isl_multi_id_plain_is_equal(
+ __isl_keep isl_multi_id *mi1,
+ __isl_keep isl_multi_id *mi2);
+
#include <isl/val.h>
isl_bool isl_multi_val_plain_is_equal(
__isl_keep isl_multi_val *mv1,
__isl_take isl_union_set *domain,
__isl_take isl_union_set *range);
+ #include <isl/id.h>
+ __isl_give isl_multi_id *isl_multi_id_from_range(
+ __isl_take isl_multi_id *mi);
+
#include <isl/val.h>
__isl_give isl_multi_val *isl_multi_val_from_range(
__isl_take isl_multi_val *mv);
__isl_give isl_map *isl_map_flatten(
__isl_take isl_map *map);
+ #include <isl/id.h>
+ __isl_give isl_multi_id *isl_multi_id_flatten_range(
+ __isl_take isl_multi_id *mi);
+
#include <isl/val.h>
__isl_give isl_multi_val *isl_multi_val_flatten_range(
__isl_take isl_multi_val *mv);
__isl_take isl_map *map,
__isl_take isl_space *model);
+ #include <isl/id.h>
+ __isl_give isl_multi_id *isl_multi_id_align_params(
+ __isl_take isl_multi_id *mi,
+ __isl_take isl_space *model);
+
#include <isl/val.h>
__isl_give isl_multi_val *isl_multi_val_align_params(
__isl_take isl_multi_val *mv,
__isl_take isl_union_map *umap1,
__isl_take isl_union_map *umap2);
+ #include <isl/id.h>
+ __isl_give isl_multi_id *isl_multi_id_range_product(
+ __isl_take isl_multi_id *mi1,
+ __isl_take isl_multi_id *mi2);
+
#include <isl/val.h>
__isl_give isl_multi_val *isl_multi_val_range_product(
__isl_take isl_multi_val *mv1,
__isl_take isl_union_map *umap1,
__isl_take isl_union_map *umap2);
+ #include <isl/id.h>
+ __isl_give isl_multi_id *
+ isl_multi_id_flat_range_product(
+ __isl_take isl_multi_id *mi1,
+ __isl_take isl_multi_id *mi2);
+
#include <isl/val.h>
__isl_give isl_multi_val *isl_multi_val_flat_range_product(
__isl_take isl_multi_val *mv1,
isl_union_map_range_factor_range(
__isl_take isl_union_map *umap);
+ #include <isl/id.h>
+ __isl_give isl_multi_id *isl_multi_id_factor_range(
+ __isl_take isl_multi_id *mi);
+ __isl_give isl_multi_id *
+ isl_multi_id_range_factor_domain(
+ __isl_take isl_multi_id *mi);
+ __isl_give isl_multi_id *
+ isl_multi_id_range_factor_range(
+ __isl_take isl_multi_id *mi);
+
#include <isl/val.h>
__isl_give isl_multi_val *isl_multi_val_factor_range(
__isl_take isl_multi_val *mv);
C<isl_multi_union_pw_aff_factor_range>
take functions that live in a set space.
+ #include <isl/id.h>
+ __isl_give isl_multi_id *isl_multi_id_range_splice(
+ __isl_take isl_multi_id *mi1, unsigned pos,
+ __isl_take isl_multi_id *mi2);
+
#include <isl/val.h>
__isl_give isl_multi_val *isl_multi_val_range_splice(
__isl_take isl_multi_val *mv1, unsigned pos,
diff --git a/include/isl/id.h b/include/isl/id.h
--- a/include/isl/id.h
+++ b/include/isl/id.h
#include <isl/ctx.h>
#include <isl/id_type.h>
#include <isl/list.h>
+#include <isl/multi.h>
#include <isl/printer_type.h>
#include <isl/stdint.h>
ISL_DECLARE_EXPORTED_LIST_FN(id)
+ISL_DECLARE_MULTI(id)
+
isl_ctx *isl_id_get_ctx(__isl_keep isl_id *id);
uint32_t isl_id_get_hash(__isl_keep isl_id *id);
__isl_keep isl_id *id);
void isl_id_dump(__isl_keep isl_id *id);
+__isl_give isl_printer *isl_printer_print_multi_id(__isl_take isl_printer *p,
+ __isl_keep isl_multi_id *mi);
+void isl_multi_id_dump(__isl_keep isl_multi_id *mi);
+__isl_give char *isl_multi_id_to_str(__isl_keep isl_multi_id *mi);
+
#if defined(__cplusplus)
}
#endif
diff --git a/include/isl/id_type.h b/include/isl/id_type.h
--- a/include/isl/id_type.h
+++ b/include/isl/id_type.h
ISL_DECLARE_EXPORTED_LIST_TYPE(id)
+struct __isl_export isl_multi_id;
+typedef struct isl_multi_id isl_multi_id;
+
#if defined(__cplusplus)
}
#endif
diff --git a/isl_id.c b/isl_id.c
--- a/isl_id.c
+++ b/isl_id.c
isl_stream_free(s);
return id;
}
+
+/* Is "id1" (obviously) equal to "id2"?
+ *
+ * isl_id objects can be compared by pointer value, but
+ * isl_multi_*_plain_is_equal needs an isl_*_plain_is_equal.
+ */
+static isl_bool isl_id_plain_is_equal(__isl_keep isl_id *id1,
+ __isl_keep isl_id *id2)
+{
+ if (!id1 || !id2)
+ return isl_bool_error;
+ return id1 == id2;
+}
+
+#undef BASE
+#define BASE id
+
+#include <isl_multi_no_domain_templ.c>
+#include <isl_multi_no_explicit_domain.c>
+#include <isl_multi_templ.c>
diff --git a/isl_id_private.h b/isl_id_private.h
--- a/isl_id_private.h
+++ b/isl_id_private.h
extern isl_id isl_id_none;
+#undef BASE
+#define BASE id
+
+#include <isl_multi_templ.h>
+
#endif
diff --git a/isl_output.c b/isl_output.c
--- a/isl_output.c
+++ b/isl_output.c
#include <isl_local.h>
#include <isl_local_space_private.h>
#include <isl_aff_private.h>
+#include <isl_id_private.h>
#include <isl_val_private.h>
#include <isl_constraint_private.h>
#include <isl/ast_build.h>
/* Print dimension "pos" of data->space to "p".
*
+ * data->user is assumed to be an isl_multi_id.
+ *
+ * If the current dimension is an output dimension, then print
+ * the corresponding identifier. Otherwise, print the name of the dimension.
+ */
+static __isl_give isl_printer *print_dim_mi(__isl_take isl_printer *p,
+ struct isl_print_space_data *data, unsigned pos)
+{
+ isl_multi_id *mi = data->user;
+
+ if (data->type == isl_dim_out)
+ return isl_printer_print_id(p, mi->u.p[pos]);
+ else
+ return print_name(data->space, p, data->type, pos, data->latex);
+}
+
+/* Print the isl_multi_id "mi" to "p" in isl format.
+ */
+static __isl_give isl_printer *print_multi_id_isl(__isl_take isl_printer *p,
+ __isl_keep isl_multi_id *mi)
+{
+ isl_space *space;
+ struct isl_print_space_data data = { 0 };
+
+ space = isl_multi_id_peek_space(mi);
+ p = print_param_tuple(p, space, &data);
+ p = isl_printer_print_str(p, "{ ");
+ data.print_dim = &print_dim_mi;
+ data.user = mi;
+ p = isl_print_space(space, p, 0, &data);
+ p = isl_printer_print_str(p, " }");
+ return p;
+}
+
+/* Print the isl_multi_id "mi" to "p".
+ *
+ * Currently only supported in isl format.
+ */
+__isl_give isl_printer *isl_printer_print_multi_id(
+ __isl_take isl_printer *p, __isl_keep isl_multi_id *mi)
+{
+ if (!p || !mi)
+ return isl_printer_free(p);
+
+ if (p->output_format == ISL_FORMAT_ISL)
+ return print_multi_id_isl(p, mi);
+ isl_die(isl_printer_get_ctx(p), isl_error_unsupported,
+ "unsupported output format", return isl_printer_free(p));
+}
+
+/* Print dimension "pos" of data->space to "p".
+ *
* data->user is assumed to be an isl_multi_union_pw_aff.
*
* The current dimension is necessarily a set dimension, so