pluto-updates.patch

   1 --- pluto-0.11.4/src/constraints_isl.c.orig     2015-12-03 17:30:34.186845391 +0100
   2 +++ pluto-0.11.4/src/constraints_isl.c  2015-12-03 17:33:59.340170110 +0100
   3 @@ -73,7 +73,7 @@
   4  {
   5      int i, j;
   6      int n_eq = 0, n_ineq = 0;
   7 -    isl_dim *dim;
   8 +    isl_space *dim;
   9      isl_mat *eq, *ineq;
  10      isl_basic_set *bset;
  11
  12 @@ -86,7 +86,7 @@
  13      eq = isl_mat_alloc(ctx, n_eq, cst->ncols);
  14      ineq = isl_mat_alloc(ctx, n_ineq, cst->ncols);
  15
  16 -    dim = isl_dim_set_alloc(ctx, 0, cst->ncols - 1);
  17 +    dim = isl_space_set_alloc(ctx, 0, cst->ncols - 1);
  18
  19      n_eq = n_ineq = 0;
  20      for (i = 0; i < cst->nrows; ++i) {
  21 @@ -127,7 +127,7 @@
  22  {
  23      isl_set *set;
  24
  25 -    isl_space *dim = isl_dim_set_alloc(ctx, 0, cst->ncols - 1);
  26 +    isl_space *dim = isl_space_set_alloc(ctx, 0, cst->ncols - 1);
  27      set = isl_set_empty(dim);
  28
  29      while (cst != NULL) {
  30 @@ -353,7 +353,7 @@
  31
  32      // Allow only positive values.
  33      if(negvar == 0) {
  34 -        all_positive = isl_basic_set_positive_orthant(isl_set_get_dim(domain));
  35 +        all_positive = isl_basic_set_positive_orthant(isl_set_get_space(domain));
  36          all_positive_set = isl_set_from_basic_set(all_positive);
  37          domain = isl_set_intersect(domain, all_positive_set);
  38      }
  39 --- pluto-0.11.4/src/framework.c.orig   2015-10-28 16:24:59.000000000 +0100
  40 +++ pluto-0.11.4/src/framework.c        2015-12-03 18:15:00.530066828 +0100
  41 @@ -696,7 +696,7 @@
  42
  43          orthcst_i = isl_basic_set_intersect(orthcst_i,
  44                  isl_basic_set_copy(isl_currcst));
  45 -        if (isl_basic_set_fast_is_empty(orthcst_i)
  46 +        if (isl_basic_set_plain_is_empty(orthcst_i)
  47                  || isl_basic_set_is_empty(orthcst_i)) {
  48              pluto_constraints_negate_row(orthcst[p], 0);
  49          }
  50 --- pluto-0.11.4/src/program.c.orig     2015-10-28 16:24:59.000000000 +0100
  51 +++ pluto-0.11.4/src/program.c  2015-12-03 18:05:22.970091067 +0100
  52 @@ -1439,13 +1439,13 @@
  53  /* Set the dimension names of type "type" according to the elements
  54   * in the array "names".
  55   */
  56 -static __isl_give isl_dim *set_names(__isl_take isl_dim *dim,
  57 +static __isl_give isl_space *set_names(__isl_take isl_space *dim,
  58          enum isl_dim_type type, char **names)
  59  {
  60      int i;
  61
  62 -    for (i = 0; i < isl_dim_size(dim, type); ++i)
  63 -        dim = isl_dim_set_name(dim, type, i, names[i]);
  64 +    for (i = 0; i < isl_space_dim(dim, type); ++i)
  65 +        dim = isl_space_set_dim_name(dim, type, i, names[i]);
  66
  67      return dim;
  68  }
  69 @@ -1456,7 +1456,7 @@
  70   * One shot only; does not take into account the next ptr.
  71   */
  72  static __isl_give isl_set *osl_relation_to_isl_set(osl_relation_p relation,
  73 -        __isl_take isl_dim *dim)
  74 +        __isl_take isl_space *dim)
  75  {
  76      int i, j;
  77      int n_eq = 0, n_ineq = 0;
  78 @@ -1464,7 +1464,7 @@
  79      isl_mat *eq, *ineq;
  80      isl_basic_set *bset;
  81
  82 -    ctx = isl_dim_get_ctx(dim);
  83 +    ctx = isl_space_get_ctx(dim);
  84
  85      for (i = 0; i < relation->nb_rows; ++i)
  86          if (osl_int_zero(relation->precision, relation->m[i][0]))
  87 @@ -1503,18 +1503,18 @@
  88   * to an isl_set.
  89   */
  90  static __isl_give isl_set *osl_relation_list_to_isl_set(
  91 -        osl_relation_p list, __isl_take isl_dim *dim)
  92 +        osl_relation_p list, __isl_take isl_space *dim)
  93  {
  94      isl_set *set;
  95
  96 -    set = isl_set_empty(isl_dim_copy(dim));
  97 +    set = isl_set_empty(isl_space_copy(dim));
  98      for (; list; list = list->next) {
  99          isl_set *set_i;
 100 -        set_i = osl_relation_to_isl_set(list, isl_dim_copy(dim));
 101 +        set_i = osl_relation_to_isl_set(list, isl_space_copy(dim));
 102          set = isl_set_union(set, set_i);
 103      }
 104
 105 -    isl_dim_free(dim);
 106 +    isl_space_free(dim);
 107      return set;
 108  }
 109
 110 @@ -1627,14 +1627,14 @@
 111   * the isl_map { i -> A i + c } in the space prescribed by "dim".
 112   */
 113  static __isl_give isl_map *osl_scattering_to_isl_map(
 114 -        osl_relation_p scattering, __isl_take isl_dim *dim)
 115 +        osl_relation_p scattering, __isl_take isl_space *dim)
 116  {
 117      int n_col;
 118      isl_ctx *ctx;
 119      isl_mat *eq, *ineq;
 120      isl_basic_map *bmap;
 121
 122 -    ctx = isl_dim_get_ctx(dim);
 123 +    ctx = isl_space_get_ctx(dim);
 124      n_col = scattering->nb_columns;
 125
 126      ineq = isl_mat_alloc(ctx, 0, n_col - 1);
 127 @@ -1664,14 +1664,14 @@
 128  {
 129      int len, n_col;
 130      isl_ctx *ctx;
 131 -    isl_dim *dim;
 132 +    isl_space *dim;
 133      isl_mat *eq, *ineq;
 134      isl_union_map *res;
 135
 136      ctx = isl_set_get_ctx(dom);
 137
 138 -    dim = isl_set_get_dim(dom);
 139 -    dim = isl_dim_drop(dim, isl_dim_set, 0, isl_dim_size(dim, isl_dim_set));
 140 +    dim = isl_set_get_space(dom);
 141 +    dim = isl_space_drop_dims(dim, isl_dim_set, 0, isl_space_dim(dim, isl_dim_set));
 142      res = isl_union_map_empty(dim);
 143
 144      for ( ; list; list = list->next) {
 145 @@ -1683,10 +1683,10 @@
 146          isl_map *map;
 147          int arr = osl_relation_get_array_id(list->elt) - 1;
 148
 149 -        dim = isl_set_get_dim(dom);
 150 -        dim = isl_dim_from_domain(dim);
 151 -        dim = isl_dim_add(dim, isl_dim_out, len);
 152 -        dim = isl_dim_set_tuple_name(dim, isl_dim_out, arrays[arr]);
 153 +        dim = isl_set_get_space(dom);
 154 +        dim = isl_space_from_domain(dim);
 155 +        dim = isl_space_add_dims(dim, isl_dim_out, len);
 156 +        dim = isl_space_set_tuple_name(dim, isl_dim_out, arrays[arr]);
 157
 158          ineq = isl_mat_alloc(ctx, 0, n_col);
 159          eq = extract_equalities_osl_access(ctx, list->elt);
 160 @@ -1713,7 +1713,7 @@
 161  {
 162      int len, n_col;
 163      isl_ctx *ctx;
 164 -    isl_dim *dim;
 165 +    isl_space *dim;
 166      isl_mat *eq, *ineq;
 167
 168      ctx = isl_set_get_ctx(dom);
 169 @@ -1726,10 +1726,10 @@
 170      isl_map *map;
 171      int arr = osl_relation_get_array_id(access) - 1;
 172
 173 -    dim = isl_set_get_dim(dom);
 174 -    dim = isl_dim_from_domain(dim);
 175 -    dim = isl_dim_add(dim, isl_dim_out, len);
 176 -    dim = isl_dim_set_tuple_name(dim, isl_dim_out, arrays[arr]);
 177 +    dim = isl_set_get_space(dom);
 178 +    dim = isl_space_from_domain(dim);
 179 +    dim = isl_space_add_dims(dim, isl_dim_out, len);
 180 +    dim = isl_space_set_tuple_name(dim, isl_dim_out, arrays[arr]);
 181
 182      ineq = isl_mat_alloc(ctx, 0, n_col);
 183      eq = extract_equalities_osl_access(ctx, access);
 184 @@ -1754,13 +1754,13 @@
 185  {
 186      int len, n_col;
 187      isl_ctx *ctx;
 188 -    isl_dim *dim;
 189 +    isl_space *dim;
 190      isl_mat *eq, *ineq;
 191
 192      ctx = isl_set_get_ctx(dom);
 193
 194 -    dim = isl_set_get_dim(dom);
 195 -    dim = isl_dim_drop(dim, isl_dim_set, 0, isl_dim_size(dim, isl_dim_set));
 196 +    dim = isl_set_get_space(dom);
 197 +    dim = isl_space_drop_dims(dim, isl_dim_set, 0, isl_space_dim(dim, isl_dim_set));
 198
 199      n_col = mat->ncols;
 200
 201 @@ -1770,10 +1770,10 @@
 202
 203      len = mat->nrows;
 204
 205 -    dim = isl_set_get_dim(dom);
 206 -    dim = isl_dim_from_domain(dim);
 207 -    dim = isl_dim_add(dim, isl_dim_out, len);
 208 -    dim = isl_dim_set_tuple_name(dim, isl_dim_out, access_name);
 209 +    dim = isl_set_get_space(dom);
 210 +    dim = isl_space_from_domain(dim);
 211 +    dim = isl_space_add_dims(dim, isl_dim_out, len);
 212 +    dim = isl_space_set_tuple_name(dim, isl_dim_out, access_name);
 213
 214      ineq = isl_mat_alloc(ctx, 0, len + n_col);
 215      eq = pluto_extract_equalities(ctx, mat);
 216 @@ -1976,7 +1976,7 @@
 217      int i, racc_num, wacc_num;
 218      int nstmts = osl_statement_number(scop->statement);
 219      isl_ctx *ctx;
 220 -    isl_dim *dim;
 221 +    isl_space *dim;
 222      isl_space *param_space;
 223      isl_set *context;
 224      isl_union_map *empty;
 225 @@ -1995,7 +1995,7 @@
 226
 227      osl_names_p names = get_scop_names(scop);
 228
 229 -    dim = isl_dim_set_alloc(ctx, scop->context->nb_parameters, 0);
 230 +    dim = isl_space_set_alloc(ctx, scop->context->nb_parameters, 0);
 231      if (scop->context->nb_parameters){
 232          scop_params = (osl_strings_p)scop->parameters->data;
 233          dim = set_names(dim, isl_dim_param, scop_params->string);
 234 @@ -2003,10 +2003,10 @@
 235      param_space = isl_space_params(isl_space_copy(dim));
 236      context = osl_relation_to_isl_set(scop->context, param_space);
 237
 238 -    if (!options->rar) dep_rar = isl_union_map_empty(isl_dim_copy(dim));
 239 -    empty = isl_union_map_empty(isl_dim_copy(dim));
 240 -    write = isl_union_map_empty(isl_dim_copy(dim));
 241 -    read = isl_union_map_empty(isl_dim_copy(dim));
 242 +    if (!options->rar) dep_rar = isl_union_map_empty(isl_space_copy(dim));
 243 +    empty = isl_union_map_empty(isl_space_copy(dim));
 244 +    write = isl_union_map_empty(isl_space_copy(dim));
 245 +    read = isl_union_map_empty(isl_space_copy(dim));
 246      schedule = isl_union_map_empty(dim);
 247
 248      if (!options->isldepaccesswise) {
 249 @@ -2027,7 +2027,7 @@
 250              snprintf(name, sizeof(name), "S_%d", i);
 251
 252              int niter = osl_statement_get_nb_iterators(stmt);
 253 -            dim = isl_dim_set_alloc(ctx, scop->context->nb_parameters, niter);
 254 +            dim = isl_space_set_alloc(ctx, scop->context->nb_parameters, niter);
 255              if(scop->context->nb_parameters){
 256                  scop_params = (osl_strings_p)scop->parameters->data;
 257                  dim = set_names(dim, isl_dim_param, scop_params->string);
 258 @@ -2036,11 +2036,11 @@
 259                  osl_body_p stmt_body = osl_generic_lookup(stmt->extension, OSL_URI_BODY);
 260                  dim = set_names(dim, isl_dim_set, stmt_body->iterators->string);
 261              }
 262 -            dim = isl_dim_set_tuple_name(dim, isl_dim_set, name);
 263 +            dim = isl_space_set_tuple_name(dim, isl_dim_set, name);
 264              dom = osl_relation_list_to_isl_set(stmt->domain, dim);
 265              dom = isl_set_intersect_params(dom, isl_set_copy(context));
 266
 267 -            dim = isl_dim_alloc(ctx, scop->context->nb_parameters, niter,
 268 +            dim = isl_space_alloc(ctx, scop->context->nb_parameters, niter,
 269                      2 * niter + 1);
 270              if(scop->context->nb_parameters){
 271                  scop_params = (osl_strings_p)scop->parameters->data;
 272 @@ -2050,7 +2050,7 @@
 273                  osl_body_p stmt_body = osl_generic_lookup(stmt->extension, OSL_URI_BODY);
 274                  dim = set_names(dim, isl_dim_in, stmt_body->iterators->string);
 275              }
 276 -            dim = isl_dim_set_tuple_name(dim, isl_dim_in, name);
 277 +            dim = isl_space_set_tuple_name(dim, isl_dim_in, name);
 278              schedule_i = osl_scattering_to_isl_map(stmt->scattering, dim);
 279
 280              osl_relation_list_p rlist  = osl_access_list_filter_read(stmt->access);
 281 @@ -2102,7 +2102,7 @@
 282                  }
 283
 284                  int niter = osl_statement_get_nb_iterators(stmt);
 285 -                dim = isl_dim_set_alloc(ctx, scop->context->nb_parameters, niter);
 286 +                dim = isl_space_set_alloc(ctx, scop->context->nb_parameters, niter);
 287                  if(scop->context->nb_parameters){
 288                      scop_params = (osl_strings_p)scop->parameters->data;
 289                      dim = set_names(dim, isl_dim_param, scop_params->string);
 290 @@ -2117,11 +2117,11 @@
 291                      osl_strings_free(names->iterators);
 292                      names->iterators = osl_strings_clone(stmt_body->iterators);
 293                  }
 294 -                dim = isl_dim_set_tuple_name(dim, isl_dim_set, name);
 295 +                dim = isl_space_set_tuple_name(dim, isl_dim_set, name);
 296                  dom = osl_relation_list_to_isl_set(stmt->domain, dim);
 297                  dom = isl_set_intersect_params(dom, isl_set_copy(context));
 298
 299 -                dim = isl_dim_alloc(ctx, scop->context->nb_parameters, niter,
 300 +                dim = isl_space_alloc(ctx, scop->context->nb_parameters, niter,
 301                          2 * niter + 1);
 302                  if(scop->context->nb_parameters){
 303                      scop_params = (osl_strings_p)scop->parameters->data;
 304 @@ -2131,7 +2131,7 @@
 305                      osl_body_p stmt_body = osl_generic_lookup(stmt->extension, OSL_URI_BODY);
 306                      dim = set_names(dim, isl_dim_in, stmt_body->iterators->string);
 307                  }
 308 -                dim = isl_dim_set_tuple_name(dim, isl_dim_in, name);
 309 +                dim = isl_space_set_tuple_name(dim, isl_dim_in, name);
 310
 311                  schedule_i = osl_scattering_to_isl_map(stmt->scattering, dim);
 312