From: Sven Verdoolaege <skimo@kotnet.org>
Date: Thu, 8 Aug 2013 12:42:43 +0000 (+0200)
Subject: isl_ast_build_access_from_multi_pw_aff: treat nested ranges as member accesses
X-Git-Tag: isl-0.13~116
X-Git-Url: https://repo.or.cz/w/isl.git/commitdiff_plain/fdc4367bc5ff35e6129ac8846763c34d7d7dc7e9

isl_ast_build_access_from_multi_pw_aff: treat nested ranges as member accesses

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
---

diff --git a/doc/user.pod b/doc/user.pod
index 36741390..7cd5d793 100644
--- a/doc/user.pod
+++ b/doc/user.pod
@@ -6225,6 +6225,10 @@ The domains of C<pa>, C<mpa> and C<pma> should correspond
 to the schedule space of C<build>.
 The tuple id of C<mpa> or C<pma> is used as the array being accessed or
 the function being called.
+If the accessed space is a nested relation, then it is taken
+to represent an access of the member specified by the range
+of this nested relation of the structure specified by the domain
+of the nested relation.
 
 The following functions can be used to modify an C<isl_ast_expr>.
 
diff --git a/isl_ast_build_expr.c b/isl_ast_build_expr.c
index a57dd514..2bd38e9f 100644
--- a/isl_ast_build_expr.c
+++ b/isl_ast_build_expr.c
@@ -1369,11 +1369,51 @@ static __isl_give isl_ast_expr *isl_ast_build_with_arguments(
 	return expr;
 }
 
+static __isl_give isl_ast_expr *isl_ast_build_from_multi_pw_aff_internal(
+	__isl_keep isl_ast_build *build, enum isl_ast_op_type type,
+	__isl_take isl_multi_pw_aff *mpa);
+
+/* Construct an isl_ast_expr that accesses the member specified by "mpa".
+ * The range of "mpa" is assumed to be wrapped relation.
+ * The domain of this wrapped relation specifies the structure being
+ * accessed, while the range of this wrapped relation spacifies the
+ * member of the structure being accessed.
+ *
+ * The domain of "mpa" is assumed to live in the internal schedule domain.
+ */
+static __isl_give isl_ast_expr *isl_ast_build_from_multi_pw_aff_member(
+	__isl_keep isl_ast_build *build, __isl_take isl_multi_pw_aff *mpa)
+{
+	isl_id *id;
+	isl_multi_pw_aff *domain;
+	isl_ast_expr *domain_expr, *expr;
+	enum isl_ast_op_type type = isl_ast_op_access;
+
+	domain = isl_multi_pw_aff_copy(mpa);
+	domain = isl_multi_pw_aff_range_factor_domain(domain);
+	domain_expr = isl_ast_build_from_multi_pw_aff_internal(build,
+								type, domain);
+	mpa = isl_multi_pw_aff_range_factor_range(mpa);
+	if (!isl_multi_pw_aff_has_tuple_id(mpa, isl_dim_out))
+		isl_die(isl_ast_build_get_ctx(build), isl_error_invalid,
+			"missing field name", goto error);
+	id = isl_multi_pw_aff_get_tuple_id(mpa, isl_dim_out);
+	expr = isl_ast_expr_from_id(id);
+	expr = isl_ast_expr_alloc_binary(isl_ast_op_member, domain_expr, expr);
+	return isl_ast_build_with_arguments(build, type, expr, mpa);
+error:
+	isl_multi_pw_aff_free(mpa);
+	return NULL;
+}
+
 /* Construct an isl_ast_expr of type "type" that calls or accesses
  * the element specified by "mpa".
  * The first argument is obtained from the output tuple name.
  * The remaining arguments are given by the piecewise affine expressions.
  *
+ * If the range of "mpa" is a mapped relation, then we assume it
+ * represents an access to a member of a structure.
+ *
  * The domain of "mpa" is assumed to live in the internal schedule domain.
  */
 static __isl_give isl_ast_expr *isl_ast_build_from_multi_pw_aff_internal(
@@ -1384,6 +1424,13 @@ static __isl_give isl_ast_expr *isl_ast_build_from_multi_pw_aff_internal(
 	isl_id *id;
 	isl_ast_expr *expr;
 
+	if (!mpa)
+		return isl_multi_pw_aff_free(mpa);
+
+	if (type == isl_ast_op_access &&
+	    isl_multi_pw_aff_range_is_wrapping(mpa))
+		return isl_ast_build_from_multi_pw_aff_member(build, mpa);
+
 	mpa = set_iterator_names(build, mpa);
 	if (!build || !mpa)
 		return isl_multi_pw_aff_free(mpa);