X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=isl_input.c;h=ba10ce89c50684f64f39b61c7acedf0bc3b3af6a;hb=f754c9901913c3cabe7a8ace6ea0c8880418781a;hp=f2e57e7c86f27b766463cf66947cbabc3c7391ae;hpb=b2bdf2f14903a2bbe528987b7318bb6edead3812;p=platform%2Fupstream%2Fisl.git diff --git a/isl_input.c b/isl_input.c index f2e57e7..ba10ce8 100644 --- a/isl_input.c +++ b/isl_input.c @@ -26,6 +26,7 @@ #include #include #include +#include struct variable { char *name; @@ -168,6 +169,86 @@ error: return NULL; } +/* Read an isl_val from "s". + * + * The following token sequences are recognized + * + * "infty" -> infty + * "-" "infty" -> -infty + * "NaN" -> NaN + * n "/" d -> n/d + * v -> v + * + * where n, d and v are integer constants. + */ +__isl_give isl_val *isl_stream_read_val(struct isl_stream *s) +{ + struct isl_token *tok = NULL; + struct isl_token *tok2 = NULL; + isl_val *val; + + tok = next_token(s); + if (!tok) { + isl_stream_error(s, NULL, "unexpected EOF"); + goto error; + } + if (tok->type == ISL_TOKEN_INFTY) { + isl_token_free(tok); + return isl_val_infty(s->ctx); + } + if (tok->type == '-' && + isl_stream_eat_if_available(s, ISL_TOKEN_INFTY)) { + isl_token_free(tok); + return isl_val_neginfty(s->ctx); + } + if (tok->type == ISL_TOKEN_NAN) { + isl_token_free(tok); + return isl_val_nan(s->ctx); + } + if (tok->type != ISL_TOKEN_VALUE) { + isl_stream_error(s, tok, "expecting value"); + goto error; + } + + if (isl_stream_eat_if_available(s, '/')) { + tok2 = next_token(s); + if (!tok2) { + isl_stream_error(s, NULL, "unexpected EOF"); + goto error; + } + if (tok2->type != ISL_TOKEN_VALUE) { + isl_stream_error(s, tok2, "expecting value"); + goto error; + } + val = isl_val_rat_from_isl_int(s->ctx, tok->u.v, tok2->u.v); + val = isl_val_normalize(val); + } else { + val = isl_val_int_from_isl_int(s->ctx, tok->u.v); + } + + isl_token_free(tok); + isl_token_free(tok2); + return val; +error: + isl_token_free(tok); + isl_token_free(tok2); + return NULL; +} + +/* Read an isl_val from "str". + */ +struct isl_val *isl_val_read_from_str(struct isl_ctx *ctx, + const char *str) +{ + isl_val *val; + struct isl_stream *s = isl_stream_new_str(ctx, str); + if (!s) + return NULL; + val = isl_stream_read_val(s); + isl_stream_free(s); + return val; +} + static int accept_cst_factor(struct isl_stream *s, isl_int *f) { struct isl_token *tok; @@ -261,6 +342,21 @@ error: return NULL; } +/* Is "tok" the start of an integer division? + */ +static int is_start_of_div(struct isl_token *tok) +{ + if (!tok) + return 0; + if (tok->type == '[') + return 1; + if (tok->type == ISL_TOKEN_FLOORD) + return 1; + if (tok->type == ISL_TOKEN_CEILD) + return 1; + return 0; +} + static __isl_give isl_pw_aff *accept_div(struct isl_stream *s, __isl_take isl_space *dim, struct vars *v) { @@ -343,6 +439,7 @@ static __isl_give isl_pw_aff *accept_affine_factor(struct isl_stream *s, if (pos < 0) goto error; if (pos >= n) { + vars_drop(v, v->n - n); isl_stream_error(s, tok, "unknown identifier"); goto error; } @@ -374,9 +471,7 @@ static __isl_give isl_pw_aff *accept_affine_factor(struct isl_stream *s, goto error; if (isl_stream_eat(s, ')')) goto error; - } else if (tok->type == '[' || - tok->type == ISL_TOKEN_FLOORD || - tok->type == ISL_TOKEN_CEILD) { + } else if (is_start_of_div(tok)) { isl_stream_push_token(s, tok); tok = NULL; res = accept_div(s, isl_space_copy(dim), v); @@ -462,10 +557,8 @@ static __isl_give isl_pw_aff *accept_affine(struct isl_stream *s, isl_token_free(tok); continue; } - if (tok->type == '(' || tok->type == '[' || + if (tok->type == '(' || is_start_of_div(tok) || tok->type == ISL_TOKEN_MIN || tok->type == ISL_TOKEN_MAX || - tok->type == ISL_TOKEN_FLOORD || - tok->type == ISL_TOKEN_CEILD || tok->type == ISL_TOKEN_IDENT || tok->type == ISL_TOKEN_AFF) { isl_pw_aff *term; @@ -941,7 +1034,11 @@ static __isl_give isl_multi_pw_aff *read_tuple_var_list(struct isl_stream *s, new_name = p >= n; } - if (new_name) { + if (tok->type == '*') { + if (vars_add_anon(v) < 0) + goto error; + isl_token_free(tok); + } else if (new_name) { res = tuple_set_dim_name(res, i, v->v->name); isl_token_free(tok); if (isl_stream_eat_if_available(s, '=')) @@ -1043,6 +1140,8 @@ static __isl_give isl_map *read_map_tuple(struct isl_stream *s, n = isl_multi_pw_aff_dim(tuple, isl_dim_out); space = isl_space_range(isl_multi_pw_aff_get_space(tuple)); + if (!space) + goto error; if (type == isl_dim_param) { if (isl_space_has_tuple_name(space, isl_dim_set) || @@ -1116,28 +1215,24 @@ static __isl_give isl_set *construct_constraints( { isl_set *cond; + left = isl_pw_aff_list_copy(left); + right = isl_pw_aff_list_copy(right); if (rational) { left = isl_pw_aff_list_set_rational(left); right = isl_pw_aff_list_set_rational(right); } if (type == ISL_TOKEN_LE) - cond = isl_pw_aff_list_le_set(isl_pw_aff_list_copy(left), - isl_pw_aff_list_copy(right)); + cond = isl_pw_aff_list_le_set(left, right); else if (type == ISL_TOKEN_GE) - cond = isl_pw_aff_list_ge_set(isl_pw_aff_list_copy(left), - isl_pw_aff_list_copy(right)); + cond = isl_pw_aff_list_ge_set(left, right); else if (type == ISL_TOKEN_LT) - cond = isl_pw_aff_list_lt_set(isl_pw_aff_list_copy(left), - isl_pw_aff_list_copy(right)); + cond = isl_pw_aff_list_lt_set(left, right); else if (type == ISL_TOKEN_GT) - cond = isl_pw_aff_list_gt_set(isl_pw_aff_list_copy(left), - isl_pw_aff_list_copy(right)); + cond = isl_pw_aff_list_gt_set(left, right); else if (type == ISL_TOKEN_NE) - cond = isl_pw_aff_list_ne_set(isl_pw_aff_list_copy(left), - isl_pw_aff_list_copy(right)); + cond = isl_pw_aff_list_ne_set(left, right); else - cond = isl_pw_aff_list_eq_set(isl_pw_aff_list_copy(left), - isl_pw_aff_list_copy(right)); + cond = isl_pw_aff_list_eq_set(left, right); return isl_set_intersect(set, cond); } @@ -1350,7 +1445,7 @@ static __isl_give isl_map *read_conjuncts(struct isl_stream *s, if (negate) res = isl_map_subtract(isl_map_copy(map), res); - while (isl_stream_eat_if_available(s, ISL_TOKEN_AND)) { + while (res && isl_stream_eat_if_available(s, ISL_TOKEN_AND)) { isl_map *res_i; negate = isl_stream_eat_if_available(s, ISL_TOKEN_NOT); @@ -1687,8 +1782,9 @@ static __isl_give isl_pw_qpolynomial *read_factor(struct isl_stream *s, pwqp = isl_pw_qpolynomial_pow(pwqp, pow); } else if (tok->type == ISL_TOKEN_VALUE) { struct isl_token *tok2; - tok2 = isl_stream_next_token(s); isl_qpolynomial *qp; + + tok2 = isl_stream_next_token(s); if (tok2 && tok2->type == '/') { isl_token_free(tok2); tok2 = next_token(s); @@ -1737,7 +1833,7 @@ static __isl_give isl_pw_qpolynomial *read_factor(struct isl_stream *s, pow = optional_power(s); qp = isl_qpolynomial_var_pow_on_domain(isl_map_get_space(map), pos, pow); pwqp = isl_pw_qpolynomial_from_qpolynomial(qp); - } else if (tok->type == '[') { + } else if (is_start_of_div(tok)) { isl_pw_aff *pwaff; int pow; @@ -2586,7 +2682,6 @@ static __isl_give isl_set *read_aff_domain(struct isl_stream *s, error: if (tok) isl_stream_push_token(s, tok); - vars_free(v); isl_set_free(dom); return NULL; } @@ -2750,6 +2845,47 @@ __isl_give isl_pw_multi_aff *isl_pw_multi_aff_read_from_str(isl_ctx *ctx, return pma; } +/* Read an isl_union_pw_multi_aff from "s". + * We currently read a generic object and if it turns out to be a set or + * a map, we convert that to an isl_union_pw_multi_aff. + * It would be more efficient if we were to construct + * the isl_union_pw_multi_aff directly. + */ +__isl_give isl_union_pw_multi_aff *isl_stream_read_union_pw_multi_aff( + struct isl_stream *s) +{ + struct isl_obj obj; + + obj = obj_read(s); + if (!obj.v) + return NULL; + + if (obj.type == isl_obj_map || obj.type == isl_obj_set) + obj = to_union(s->ctx, obj); + if (obj.type == isl_obj_union_map) + return isl_union_pw_multi_aff_from_union_map(obj.v); + if (obj.type == isl_obj_union_set) + return isl_union_pw_multi_aff_from_union_set(obj.v); + + obj.type->free(obj.v); + isl_die(s->ctx, isl_error_invalid, "unexpected object type", + return NULL); +} + +/* Read an isl_union_pw_multi_aff from "str". + */ +__isl_give isl_union_pw_multi_aff *isl_union_pw_multi_aff_read_from_str( + isl_ctx *ctx, const char *str) +{ + isl_union_pw_multi_aff *upma; + struct isl_stream *s = isl_stream_new_str(ctx, str); + if (!s) + return NULL; + upma = isl_stream_read_union_pw_multi_aff(s); + isl_stream_free(s); + return upma; +} + /* Assuming "pa" represents a single affine expression defined on a universe * domain, extract this affine expression. */