Huawei_Technology
/
MindSpore-AKG
Not watched
1
0
Fork 0
Code
Releases 1 Wiki evaluate Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain HPC
You can not select more than 25 topics Topics must start with a chinese character,a letter or number, can include dashes ('-') and can be up to 35 characters long.
Tree: efe42ee8fe
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'efe42ee8fe'
${ noResults }
MindSpore-AKG/third_party/patch/isl/isl.patch

3265 lines
120 kB
Raw Blame History 

  1. diff -Npur isl_0.22/include/isl/aff.h isl/include/isl/aff.h

  2. --- isl_0.22/include/isl/aff.h	2020-04-17 16:49:36.266477000 +0800

  3. +++ isl/include/isl/aff.h	2020-04-29 18:14:39.945681000 +0800

  4. @@ -17,14 +17,19 @@

  5.  extern "C" {

  6.  #endif

  7.  

  8. +__isl_constructor

  9.  __isl_give isl_aff *isl_aff_zero_on_domain(__isl_take isl_local_space *ls);

  10.  __isl_give isl_aff *isl_aff_val_on_domain_space(__isl_take isl_space *space,

  11.  	__isl_take isl_val *val);

  12. +__isl_constructor

  13.  __isl_give isl_aff *isl_aff_val_on_domain(__isl_take isl_local_space *ls,

  14.  	__isl_take isl_val *val);

  15. +

  16. +__isl_export

  17.  __isl_give isl_aff *isl_aff_var_on_domain(__isl_take isl_local_space *ls,

  18.  	enum isl_dim_type type, unsigned pos);

  19.  __isl_give isl_aff *isl_aff_nan_on_domain(__isl_take isl_local_space *ls);

  20. +__isl_overload

  21.  __isl_give isl_aff *isl_aff_param_on_domain_space_id(

  22.  	__isl_take isl_space *space, __isl_take isl_id *id);

  23.  

  24. @@ -41,6 +46,7 @@ isl_bool isl_aff_involves_dims(__isl_kee

  25.  	enum isl_dim_type type, unsigned first, unsigned n);

  26.  

  27.  __isl_give isl_space *isl_aff_get_domain_space(__isl_keep isl_aff *aff);

  28. +__isl_export

  29.  __isl_give isl_space *isl_aff_get_space(__isl_keep isl_aff *aff);

  30.  __isl_give isl_local_space *isl_aff_get_domain_local_space(

  31.  	__isl_keep isl_aff *aff);

  32. @@ -48,12 +54,14 @@ __isl_give isl_local_space *isl_aff_get_

  33.  

  34.  const char *isl_aff_get_dim_name(__isl_keep isl_aff *aff,

  35.  	enum isl_dim_type type, unsigned pos);

  36. +__isl_export

  37.  __isl_give isl_val *isl_aff_get_constant_val(__isl_keep isl_aff *aff);

  38.  __isl_give isl_val *isl_aff_get_coefficient_val(__isl_keep isl_aff *aff,

  39.  	enum isl_dim_type type, int pos);

  40.  int isl_aff_coefficient_sgn(__isl_keep isl_aff *aff,

  41.  	enum isl_dim_type type, int pos);

  42.  __isl_give isl_val *isl_aff_get_denominator_val(__isl_keep isl_aff *aff);

  43. +__isl_export

  44.  __isl_give isl_aff *isl_aff_set_constant_si(__isl_take isl_aff *aff, int v);

  45.  __isl_give isl_aff *isl_aff_set_constant_val(__isl_take isl_aff *aff,

  46.  	__isl_take isl_val *v);

  47. @@ -61,6 +69,7 @@ __isl_give isl_aff *isl_aff_set_coeffici

  48.  	enum isl_dim_type type, int pos, int v);

  49.  __isl_give isl_aff *isl_aff_set_coefficient_val(__isl_take isl_aff *aff,

  50.  	enum isl_dim_type type, int pos, __isl_take isl_val *v);

  51. +__isl_export

  52.  __isl_give isl_aff *isl_aff_add_constant_si(__isl_take isl_aff *aff, int v);

  53.  __isl_overload

  54.  __isl_give isl_aff *isl_aff_add_constant_val(__isl_take isl_aff *aff,

  55. @@ -209,11 +218,13 @@ __isl_give isl_pw_aff *isl_pw_aff_from_a

  56.  __isl_give isl_pw_aff *isl_pw_aff_empty(__isl_take isl_space *space);

  57.  __isl_give isl_pw_aff *isl_pw_aff_alloc(__isl_take isl_set *set,

  58.  	__isl_take isl_aff *aff);

  59. +__isl_constructor

  60.  __isl_give isl_pw_aff *isl_pw_aff_zero_on_domain(

  61.  	__isl_take isl_local_space *ls);

  62.  __isl_give isl_pw_aff *isl_pw_aff_var_on_domain(__isl_take isl_local_space *ls,

  63.  	enum isl_dim_type type, unsigned pos);

  64.  __isl_give isl_pw_aff *isl_pw_aff_nan_on_domain(__isl_take isl_local_space *ls);

  65. +__isl_constructor

  66.  __isl_give isl_pw_aff *isl_pw_aff_val_on_domain(__isl_take isl_set *domain,

  67.  	__isl_take isl_val *v);

  68.  __isl_overload

  69. @@ -240,6 +251,7 @@ int isl_pw_aff_plain_cmp(__isl_keep isl_

  70.  	__isl_keep isl_pw_aff *pa2);

  71.  isl_bool isl_pw_aff_plain_is_equal(__isl_keep isl_pw_aff *pwaff1,

  72.  	__isl_keep isl_pw_aff *pwaff2);

  73. +__isl_export

  74.  isl_bool isl_pw_aff_is_equal(__isl_keep isl_pw_aff *pa1,

  75.  	__isl_keep isl_pw_aff *pa2);

  76.  

  77. @@ -375,7 +387,9 @@ __isl_overload

  78.  __isl_give isl_pw_aff *isl_pw_aff_pullback_multi_pw_aff(

  79.  	__isl_take isl_pw_aff *pa, __isl_take isl_multi_pw_aff *mpa);

  80.  

  81. +__isl_export

  82.  isl_size isl_pw_aff_n_piece(__isl_keep isl_pw_aff *pwaff);

  83. +__isl_export

  84.  isl_stat isl_pw_aff_foreach_piece(__isl_keep isl_pw_aff *pwaff,

  85.  	isl_stat (*fn)(__isl_take isl_set *set, __isl_take isl_aff *aff,

  86.  		    void *user), void *user);

  87. @@ -387,8 +401,11 @@ __isl_give isl_aff *isl_pw_aff_as_aff(__

  88.  __isl_give isl_set *isl_set_from_pw_aff(__isl_take isl_pw_aff *pwaff);

  89.  __isl_give isl_map *isl_map_from_pw_aff(__isl_take isl_pw_aff *pwaff);

  90.  

  91. +__isl_export

  92.  __isl_give isl_set *isl_pw_aff_pos_set(__isl_take isl_pw_aff *pa);

  93. +__isl_export

  94.  __isl_give isl_set *isl_pw_aff_nonneg_set(__isl_take isl_pw_aff *pwaff);

  95. +__isl_export

  96.  __isl_give isl_set *isl_pw_aff_zero_set(__isl_take isl_pw_aff *pwaff);

  97.  __isl_give isl_set *isl_pw_aff_non_zero_set(__isl_take isl_pw_aff *pwaff);

  98.  

  99. @@ -411,10 +428,13 @@ __isl_export

  100.  __isl_give isl_set *isl_pw_aff_gt_set(__isl_take isl_pw_aff *pwaff1,

  101.  	__isl_take isl_pw_aff *pwaff2);

  102.  

  103. +__isl_export

  104.  __isl_give isl_map *isl_pw_aff_eq_map(__isl_take isl_pw_aff *pa1,

  105.  	__isl_take isl_pw_aff *pa2);

  106. +__isl_export

  107.  __isl_give isl_map *isl_pw_aff_lt_map(__isl_take isl_pw_aff *pa1,

  108.  	__isl_take isl_pw_aff *pa2);

  109. +__isl_export

  110.  __isl_give isl_map *isl_pw_aff_gt_map(__isl_take isl_pw_aff *pa1,

  111.  	__isl_take isl_pw_aff *pa2);

  112.  

  113. @@ -467,9 +487,15 @@ ISL_DECLARE_MULTI_BIND_DOMAIN(aff)

  114.  __isl_constructor

  115.  __isl_give isl_multi_aff *isl_multi_aff_from_aff(__isl_take isl_aff *aff);

  116.  __isl_export

  117. +__isl_give isl_multi_aff *isl_multi_aff_identity(__isl_take isl_space *space);

  118. +__isl_export

  119.  __isl_give isl_multi_aff *isl_multi_aff_domain_map(__isl_take isl_space *space);

  120.  __isl_export

  121.  __isl_give isl_multi_aff *isl_multi_aff_range_map(__isl_take isl_space *space);

  122. +__isl_export

  123. +__isl_give isl_multi_aff *isl_multi_aff_wrapped_range_map(

  124. +	__isl_take isl_space *space);

  125. +__isl_export

  126.  __isl_give isl_multi_aff *isl_multi_aff_project_out_map(

  127.  	__isl_take isl_space *space, enum isl_dim_type type,

  128.  	unsigned first, unsigned n);

  129. @@ -533,6 +559,7 @@ ISL_DECLARE_MULTI_PARAM(pw_aff)

  130.  

  131.  __isl_export

  132.  __isl_give isl_pw_multi_aff *isl_pw_multi_aff_zero(__isl_take isl_space *space);

  133. +__isl_export

  134.  __isl_give isl_pw_multi_aff *isl_pw_multi_aff_identity(

  135.  	__isl_take isl_space *space);

  136.  __isl_give isl_pw_multi_aff *isl_pw_multi_aff_range_map(

  137. @@ -559,6 +586,7 @@ isl_bool isl_pw_multi_aff_involves_param

  138.  	__isl_keep isl_id *id);

  139.  isl_bool isl_pw_multi_aff_involves_dims(__isl_keep isl_pw_multi_aff *pma,

  140.  	enum isl_dim_type type, unsigned first, unsigned n);

  141. +__isl_export

  142.  __isl_give isl_pw_aff *isl_pw_multi_aff_get_pw_aff(

  143.  	__isl_keep isl_pw_multi_aff *pma, int pos);

  144.  __isl_give isl_pw_multi_aff *isl_pw_multi_aff_set_pw_aff(

  145. @@ -575,6 +603,7 @@ isl_bool isl_pw_multi_aff_has_tuple_name

  146.  	enum isl_dim_type type);

  147.  const char *isl_pw_multi_aff_get_tuple_name(__isl_keep isl_pw_multi_aff *pma,

  148.  	enum isl_dim_type type);

  149. +__isl_export

  150.  __isl_give isl_id *isl_pw_multi_aff_get_tuple_id(

  151.  	__isl_keep isl_pw_multi_aff *pma, enum isl_dim_type type);

  152.  isl_bool isl_pw_multi_aff_has_tuple_id(__isl_keep isl_pw_multi_aff *pma,

  153. @@ -601,6 +630,7 @@ __isl_give isl_pw_multi_aff *isl_pw_mult

  154.  __isl_give isl_pw_multi_aff *isl_pw_multi_aff_from_domain(

  155.  	__isl_take isl_set *set);

  156.  

  157. +__isl_constructor

  158.  __isl_give isl_pw_multi_aff *isl_pw_multi_aff_multi_val_on_domain(

  159.  	__isl_take isl_set *domain, __isl_take isl_multi_val *mv);

  160.  

  161. @@ -616,6 +646,7 @@ __isl_give isl_pw_multi_aff *isl_pw_mult

  162.  isl_bool isl_pw_multi_aff_involves_nan(__isl_keep isl_pw_multi_aff *pma);

  163.  isl_bool isl_pw_multi_aff_plain_is_equal(__isl_keep isl_pw_multi_aff *pma1,

  164.  	__isl_keep isl_pw_multi_aff *pma2);

  165. +__isl_export

  166.  isl_bool isl_pw_multi_aff_is_equal(__isl_keep isl_pw_multi_aff *pma1,

  167.  	__isl_keep isl_pw_multi_aff *pma2);

  168.  

  169. @@ -721,6 +752,7 @@ __isl_export

  170.  __isl_give isl_multi_aff *isl_pw_multi_aff_as_multi_aff(

  171.  	__isl_take isl_pw_multi_aff *pma);

  172.  

  173. +__isl_overload

  174.  __isl_give isl_map *isl_map_from_pw_multi_aff(__isl_take isl_pw_multi_aff *pma);

  175.  __isl_give isl_set *isl_set_from_pw_multi_aff(__isl_take isl_pw_multi_aff *pma);

  176.  

  177. @@ -729,6 +761,7 @@ __isl_give isl_printer *isl_printer_prin

  178.  	__isl_keep isl_pw_multi_aff *pma);

  179.  

  180.  __isl_give isl_pw_multi_aff *isl_pw_multi_aff_from_set(__isl_take isl_set *set);

  181. +__isl_constructor

  182.  __isl_give isl_pw_multi_aff *isl_pw_multi_aff_from_map(__isl_take isl_map *map);

  183.  

  184.  __isl_export

  185. @@ -758,8 +791,10 @@ __isl_give isl_union_pw_multi_aff *isl_u

  186.  	__isl_take isl_pw_multi_aff *pma);

  187.  __isl_give isl_union_pw_multi_aff *isl_union_pw_multi_aff_from_domain(

  188.  	__isl_take isl_union_set *uset);

  189. +__isl_constructor

  190.  __isl_give isl_union_pw_multi_aff *isl_union_pw_multi_aff_multi_val_on_domain(

  191.  	__isl_take isl_union_set *domain, __isl_take isl_multi_val *mv);

  192. +__isl_overload

  193.  __isl_give isl_union_pw_aff *isl_union_pw_aff_param_on_domain_id(

  194.  	__isl_take isl_union_set *domain, __isl_take isl_id *id);

  195.  __isl_give isl_union_pw_multi_aff *isl_union_pw_multi_aff_copy(

  196. @@ -862,8 +897,10 @@ __isl_give isl_union_pw_multi_aff *isl_u

  197.  	__isl_take isl_union_pw_multi_aff *upma1,

  198.  	__isl_take isl_union_pw_multi_aff *upma2);

  199.  

  200. +__isl_overload

  201.  __isl_give isl_union_pw_multi_aff *isl_union_pw_multi_aff_scale_val(

  202.  	__isl_take isl_union_pw_multi_aff *upma, __isl_take isl_val *val);

  203. +__isl_overload

  204.  __isl_give isl_union_pw_multi_aff *isl_union_pw_multi_aff_scale_down_val(

  205.  	__isl_take isl_union_pw_multi_aff *upma, __isl_take isl_val *val);

  206.  __isl_give isl_union_pw_multi_aff *isl_union_pw_multi_aff_scale_multi_val(

  207. @@ -911,6 +948,7 @@ __isl_give isl_printer *isl_printer_prin

  208.  

  209.  __isl_give isl_union_pw_multi_aff *isl_union_pw_multi_aff_from_union_set(

  210.  	__isl_take isl_union_set *uset);

  211. +__isl_overload

  212.  __isl_give isl_union_pw_multi_aff *isl_union_pw_multi_aff_from_union_map(

  213.  	__isl_take isl_union_map *umap);

  214.  

  215. @@ -947,6 +985,7 @@ __isl_give isl_multi_pw_aff *isl_multi_p

  216.  	__isl_take isl_multi_pw_aff *mpa, __isl_take isl_set *set);

  217.  

  218.  isl_bool isl_multi_pw_aff_is_cst(__isl_keep isl_multi_pw_aff *mpa);

  219. +__isl_export

  220.  isl_bool isl_multi_pw_aff_is_equal(__isl_keep isl_multi_pw_aff *mpa1,

  221.  	__isl_keep isl_multi_pw_aff *mpa2);

  222.  

  223. @@ -967,6 +1006,7 @@ __isl_give isl_multi_pw_aff *isl_multi_p

  224.  

  225.  __isl_give isl_set *isl_set_from_multi_pw_aff(__isl_take isl_multi_pw_aff *mpa);

  226.  __isl_give isl_map *isl_map_from_multi_pw_aff(__isl_take isl_multi_pw_aff *mpa);

  227. +__isl_overload

  228.  __isl_give isl_pw_multi_aff *isl_pw_multi_aff_from_multi_pw_aff(

  229.  	__isl_take isl_multi_pw_aff *mpa);

  230.  __isl_constructor

  231. @@ -1001,6 +1041,7 @@ isl_ctx *isl_union_pw_aff_get_ctx(__isl_

  232.  __isl_export

  233.  __isl_give isl_space *isl_union_pw_aff_get_space(

  234.  	__isl_keep isl_union_pw_aff *upa);

  235. +__isl_export

  236.  __isl_give isl_pw_aff_list *isl_union_pw_aff_get_pw_aff_list(

  237.  	__isl_keep isl_union_pw_aff *upa);

  238.  

  239. @@ -1022,13 +1063,16 @@ __isl_give isl_union_pw_aff *isl_union_p

  240.  __isl_give isl_union_pw_aff *isl_union_pw_aff_empty_ctx(isl_ctx *ctx);

  241.  __isl_give isl_union_pw_aff *isl_union_pw_aff_empty_space(

  242.  	__isl_take isl_space *space);

  243. +__isl_export

  244.  __isl_give isl_union_pw_aff *isl_union_pw_aff_empty(

  245.  	__isl_take isl_space *space);

  246.  __isl_constructor

  247.  __isl_give isl_union_pw_aff *isl_union_pw_aff_from_pw_aff(

  248.  	__isl_take isl_pw_aff *pa);

  249. +__isl_constructor

  250.  __isl_give isl_union_pw_aff *isl_union_pw_aff_val_on_domain(

  251.  	__isl_take isl_union_set *domain, __isl_take isl_val *v);

  252. +__isl_constructor

  253.  __isl_give isl_union_pw_aff *isl_union_pw_aff_aff_on_domain(

  254.  	__isl_take isl_union_set *domain, __isl_take isl_aff *aff);

  255.  __isl_give isl_union_pw_aff *isl_union_pw_aff_pw_aff_on_domain(

  256. @@ -1081,13 +1125,17 @@ __isl_give isl_union_pw_aff *isl_union_p

  257.  	__isl_take isl_union_pw_aff *upa,

  258.  	__isl_take isl_union_pw_multi_aff *upma);

  259.  

  260. +__isl_export

  261.  __isl_give isl_union_pw_aff *isl_union_pw_aff_floor(

  262.  	__isl_take isl_union_pw_aff *upa);

  263.  

  264. +__isl_overload

  265.  __isl_give isl_union_pw_aff *isl_union_pw_aff_scale_val(

  266.  	__isl_take isl_union_pw_aff *upa, __isl_take isl_val *v);

  267. +__isl_overload

  268.  __isl_give isl_union_pw_aff *isl_union_pw_aff_scale_down_val(

  269.  	__isl_take isl_union_pw_aff *upa, __isl_take isl_val *v);

  270. +__isl_overload

  271.  __isl_give isl_union_pw_aff *isl_union_pw_aff_mod_val(

  272.  	__isl_take isl_union_pw_aff *upa, __isl_take isl_val *f);

  273.  

  274. @@ -1114,6 +1162,7 @@ __isl_give isl_union_pw_aff *isl_union_p

  275.  	__isl_take isl_union_pw_aff *upa,

  276.  	enum isl_dim_type type, unsigned pos, const char *s);

  277.  

  278. +__isl_export

  279.  __isl_give isl_union_set *isl_union_pw_aff_zero_union_set(

  280.  	__isl_take isl_union_pw_aff *upa);

  281.  

  282. @@ -1148,14 +1197,17 @@ __isl_give isl_multi_union_pw_aff *isl_m

  283.  __isl_constructor

  284.  __isl_give isl_multi_union_pw_aff *isl_multi_union_pw_aff_from_multi_pw_aff(

  285.  	__isl_take isl_multi_pw_aff *mpa);

  286. +__isl_constructor

  287.  __isl_give isl_multi_union_pw_aff *isl_multi_union_pw_aff_multi_val_on_domain(

  288.  	__isl_take isl_union_set *domain, __isl_take isl_multi_val *mv);

  289. +__isl_constructor

  290.  __isl_give isl_multi_union_pw_aff *isl_multi_union_pw_aff_multi_aff_on_domain(

  291.  	__isl_take isl_union_set *domain, __isl_take isl_multi_aff *ma);

  292.  __isl_give isl_multi_union_pw_aff *

  293.  isl_multi_union_pw_aff_pw_multi_aff_on_domain(__isl_take isl_union_set *domain,

  294.  	__isl_take isl_pw_multi_aff *pma);

  295.  

  296. +__isl_export

  297.  __isl_give isl_multi_union_pw_aff *isl_multi_union_pw_aff_floor(

  298.  	__isl_take isl_multi_union_pw_aff *mupa);

  299.  

  300. @@ -1184,10 +1236,12 @@ __isl_give isl_multi_union_pw_aff *isl_m

  301.  

  302.  __isl_give isl_union_pw_aff *isl_multi_union_pw_aff_apply_aff(

  303.  	__isl_take isl_multi_union_pw_aff *mupa, __isl_take isl_aff *aff);

  304. +__isl_overload

  305.  __isl_give isl_multi_union_pw_aff *isl_multi_union_pw_aff_apply_multi_aff(

  306.  	__isl_take isl_multi_union_pw_aff *mupa, __isl_take isl_multi_aff *ma);

  307.  __isl_give isl_union_pw_aff *isl_multi_union_pw_aff_apply_pw_aff(

  308.  	__isl_take isl_multi_union_pw_aff *mupa, __isl_take isl_pw_aff *pa);

  309. +__isl_overload

  310.  __isl_give isl_multi_union_pw_aff *isl_multi_union_pw_aff_apply_pw_multi_aff(

  311.  	__isl_take isl_multi_union_pw_aff *mupa,

  312.  	__isl_take isl_pw_multi_aff *pma);

  313. @@ -1211,6 +1265,7 @@ __isl_give isl_multi_union_pw_aff *

  314.  isl_multi_union_pw_aff_from_union_pw_multi_aff(

  315.  	__isl_take isl_union_pw_multi_aff *upma);

  316.  

  317. +__isl_export

  318.  __isl_give isl_multi_union_pw_aff *isl_multi_union_pw_aff_from_union_map(

  319.  	__isl_take isl_union_map *umap);

  320.  __isl_overload

  321. diff -Npur isl_0.22/include/isl/aff_type.h isl/include/isl/aff_type.h

  322. --- isl_0.22/include/isl/aff_type.h	2020-04-17 16:49:36.266477000 +0800

  323. +++ isl/include/isl/aff_type.h	2020-04-29 18:14:39.941681000 +0800

  324. @@ -10,13 +10,13 @@ extern "C" {

  325.  struct __isl_subclass(isl_multi_aff) __isl_subclass(isl_pw_aff) isl_aff;

  326.  typedef struct isl_aff isl_aff;

  327.  

  328. -ISL_DECLARE_EXPORTED_LIST_TYPE(aff)

  329. +ISL_DECLARE_EXPORTED_LIST(aff)

  330.  

  331.  struct __isl_subclass(isl_multi_pw_aff) __isl_subclass(isl_pw_multi_aff)

  332.  	__isl_subclass(isl_union_pw_aff) isl_pw_aff;

  333.  typedef struct isl_pw_aff isl_pw_aff;

  334.  

  335. -ISL_DECLARE_EXPORTED_LIST_TYPE(pw_aff)

  336. +ISL_DECLARE_EXPORTED_LIST(pw_aff)

  337.  

  338.  struct __isl_subclass(isl_multi_union_pw_aff)

  339.  	__isl_subclass(isl_union_pw_multi_aff) isl_union_pw_aff;

  340. diff -Npur isl_0.22/include/isl/ast_build.h isl/include/isl/ast_build.h

  341. --- isl_0.22/include/isl/ast_build.h	2020-04-17 16:49:36.266477000 +0800

  342. +++ isl/include/isl/ast_build.h	2020-04-29 18:14:39.941681000 +0800

  343. @@ -67,6 +67,7 @@ __isl_null isl_ast_build *isl_ast_build_

  344.  __isl_give isl_ast_build *isl_ast_build_set_options(

  345.  	__isl_take isl_ast_build *build,

  346.  	__isl_take isl_union_map *options);

  347. +__isl_export

  348.  __isl_give isl_ast_build *isl_ast_build_set_iterators(

  349.  	__isl_take isl_ast_build *build,

  350.  	__isl_take isl_id_list *iterators);

  351. diff -Npur isl_0.22/include/isl/ast.h isl/include/isl/ast.h

  352. --- isl_0.22/include/isl/ast.h	2020-04-17 16:49:36.266477000 +0800

  353. +++ isl/include/isl/ast.h	2020-04-29 18:14:39.941681000 +0800

  354. @@ -84,9 +84,11 @@ __isl_give isl_ast_expr *isl_ast_expr_op

  355.  	int pos);

  356.  __isl_give isl_ast_expr *isl_ast_expr_get_op_arg(__isl_keep isl_ast_expr *expr,

  357.  	int pos);

  358. +__isl_export

  359.  __isl_give isl_ast_expr *isl_ast_expr_set_op_arg(__isl_take isl_ast_expr *expr,

  360.  	int pos, __isl_take isl_ast_expr *arg);

  361.  

  362. +__isl_export

  363.  isl_bool isl_ast_expr_is_equal(__isl_keep isl_ast_expr *expr1,

  364.  	__isl_keep isl_ast_expr *expr2);

  365.  

  366. @@ -104,12 +106,18 @@ __isl_give isl_ast_node *isl_ast_node_al

  367.  __isl_give isl_ast_node *isl_ast_node_copy(__isl_keep isl_ast_node *node);

  368.  __isl_null isl_ast_node *isl_ast_node_free(__isl_take isl_ast_node *node);

  369.  

  370. +__isl_export

  371. +__isl_give isl_ast_node *isl_ast_node_from_ast_node_list(

  372. +    __isl_take isl_ast_node_list *list);

  373. +

  374.  isl_ctx *isl_ast_node_get_ctx(__isl_keep isl_ast_node *node);

  375.  __isl_subclass(isl_ast_node)

  376.  enum isl_ast_node_type isl_ast_node_get_type(__isl_keep isl_ast_node *node);

  377.  

  378. +__isl_export

  379.  __isl_give isl_ast_node *isl_ast_node_set_annotation(

  380.  	__isl_take isl_ast_node *node, __isl_take isl_id *annotation);

  381. +__isl_export

  382.  __isl_give isl_id *isl_ast_node_get_annotation(__isl_keep isl_ast_node *node);

  383.  

  384.  __isl_export

  385. diff -Npur isl_0.22/include/isl/constraint.h isl/include/isl/constraint.h

  386. --- isl_0.22/include/isl/constraint.h	2020-04-17 16:49:36.266477000 +0800

  387. +++ isl/include/isl/constraint.h	2020-04-29 18:14:39.941681000 +0800

  388. @@ -37,6 +37,7 @@ __isl_give isl_constraint *isl_equality_

  389.  __isl_give isl_constraint *isl_inequality_alloc(__isl_take isl_local_space *ls);

  390.  

  391.  struct isl_constraint *isl_constraint_copy(struct isl_constraint *c);

  392. +__isl_constructor

  393.  __isl_null isl_constraint *isl_constraint_free(__isl_take isl_constraint *c);

  394.  

  395.  isl_size isl_basic_map_n_constraint(__isl_keep isl_basic_map *bmap);

  396. @@ -45,6 +46,7 @@ isl_stat isl_basic_map_foreach_constrain

  397.  	isl_stat (*fn)(__isl_take isl_constraint *c, void *user), void *user);

  398.  isl_stat isl_basic_set_foreach_constraint(__isl_keep isl_basic_set *bset,

  399.  	isl_stat (*fn)(__isl_take isl_constraint *c, void *user), void *user);

  400. +__isl_export

  401.  __isl_give isl_constraint_list *isl_basic_map_get_constraint_list(

  402.  	__isl_keep isl_basic_map *bmap);

  403.  __isl_give isl_constraint_list *isl_basic_set_get_constraint_list(

  404. @@ -62,6 +64,7 @@ __isl_give isl_basic_map *isl_basic_map_

  405.  	__isl_take isl_basic_map *bmap, __isl_take isl_constraint *constraint);

  406.  __isl_give isl_basic_set *isl_basic_set_add_constraint(

  407.  	__isl_take isl_basic_set *bset, __isl_take isl_constraint *constraint);

  408. +__isl_export

  409.  __isl_give isl_map *isl_map_add_constraint(__isl_take isl_map *map,

  410.  	__isl_take isl_constraint *constraint);

  411.  __isl_give isl_set *isl_set_add_constraint(__isl_take isl_set *set,

  412. @@ -82,9 +85,11 @@ __isl_give isl_space *isl_constraint_get

  413.  	__isl_keep isl_constraint *constraint);

  414.  __isl_give isl_local_space *isl_constraint_get_local_space(

  415.  	__isl_keep isl_constraint *constraint);

  416. +__isl_export

  417.  isl_size isl_constraint_dim(__isl_keep isl_constraint *constraint,

  418.  	enum isl_dim_type type);

  419.  

  420. +__isl_export

  421.  isl_bool isl_constraint_involves_dims(__isl_keep isl_constraint *constraint,

  422.  	enum isl_dim_type type, unsigned first, unsigned n);

  423.  

  424. @@ -110,6 +115,7 @@ __isl_give isl_aff *isl_constraint_get_d

  425.  

  426.  struct isl_constraint *isl_constraint_negate(struct isl_constraint *constraint);

  427.  

  428. +__isl_export

  429.  isl_bool isl_constraint_is_equality(__isl_keep isl_constraint *constraint);

  430.  isl_bool isl_constraint_is_div_constraint(

  431.  	__isl_keep isl_constraint *constraint);

  432. @@ -138,6 +144,7 @@ int isl_constraint_cmp_last_non_zero(__i

  433.  

  434.  __isl_give isl_printer *isl_printer_print_constraint(__isl_take isl_printer *p,

  435.  	__isl_keep isl_constraint *c);

  436. +__isl_export

  437.  void isl_constraint_dump(__isl_keep isl_constraint *c);

  438.  

  439.  #if defined(__cplusplus)

  440. diff -Npur isl_0.22/include/isl/id.h isl/include/isl/id.h

  441. --- isl_0.22/include/isl/id.h	2020-04-17 16:49:36.266477000 +0800

  442. +++ isl/include/isl/id.h	2020-04-29 18:14:39.941681000 +0800

  443. @@ -17,6 +17,7 @@ ISL_DECLARE_EXPORTED_LIST_FN(id)

  444.  ISL_DECLARE_MULTI(id)

  445.  

  446.  isl_ctx *isl_id_get_ctx(__isl_keep isl_id *id);

  447. +__isl_export

  448.  uint32_t isl_id_get_hash(__isl_keep isl_id *id);

  449.  

  450.  __isl_give isl_id *isl_id_alloc(isl_ctx *ctx,

  451. diff -Npur isl_0.22/include/isl/ilp.h isl/include/isl/ilp.h

  452. --- isl_0.22/include/isl/ilp.h	2020-04-17 16:49:36.266477000 +0800

  453. +++ isl/include/isl/ilp.h	2020-04-29 18:14:39.941681000 +0800

  454. @@ -31,11 +31,15 @@ __isl_give isl_val *isl_set_max_val(__is

  455.  __isl_give isl_multi_val *isl_union_set_min_multi_union_pw_aff(

  456.  	__isl_keep isl_union_set *uset, __isl_keep isl_multi_union_pw_aff *obj);

  457.  

  458. +__isl_export

  459.  __isl_give isl_val *isl_union_pw_aff_min_val(__isl_take isl_union_pw_aff *upa);

  460. +__isl_export

  461.  __isl_give isl_val *isl_union_pw_aff_max_val(__isl_take isl_union_pw_aff *upa);

  462.  

  463. +__isl_export

  464.  __isl_give isl_multi_val *isl_multi_union_pw_aff_min_multi_val(

  465.  	__isl_take isl_multi_union_pw_aff *mupa);

  466. +__isl_export

  467.  __isl_give isl_multi_val *isl_multi_union_pw_aff_max_multi_val(

  468.  	__isl_take isl_multi_union_pw_aff *mupa);

  469.  

  470. diff -Npur isl_0.22/include/isl/list.h isl/include/isl/list.h

  471. --- isl_0.22/include/isl/list.h	2020-04-17 16:49:36.270477000 +0800

  472. +++ isl/include/isl/list.h	2020-04-29 18:14:39.945681000 +0800

  473. @@ -43,6 +43,7 @@ __isl_give isl_##EL##_list *isl_##EL##_l

  474.  __isl_give isl_##EL##_list *isl_##EL##_list_insert(			\

  475.  	__isl_take isl_##EL##_list *list, unsigned pos,			\

  476.  	__isl_take struct isl_##EL *el);				\

  477. +EXPORT									\

  478.  __isl_give isl_##EL##_list *isl_##EL##_list_drop(			\

  479.  	__isl_take isl_##EL##_list *list, unsigned first, unsigned n);	\

  480.  EXPORT									\

  481. @@ -51,6 +52,7 @@ __isl_give isl_##EL##_list *isl_##EL##_l

  482.  __isl_give isl_##EL##_list *isl_##EL##_list_swap(			\

  483.  	__isl_take isl_##EL##_list *list, unsigned pos1,		\

  484.  	unsigned pos2);							\

  485. +EXPORT									\

  486.  __isl_give isl_##EL##_list *isl_##EL##_list_reverse(			\

  487.  	__isl_take isl_##EL##_list *list);				\

  488.  EXPORT									\

  489. diff -Npur isl_0.22/include/isl/local_space.h isl/include/isl/local_space.h

  490. --- isl_0.22/include/isl/local_space.h	2020-04-17 16:49:36.270477000 +0800

  491. +++ isl/include/isl/local_space.h	2020-04-29 18:14:39.945681000 +0800

  492. @@ -10,11 +10,12 @@

  493.  extern "C" {

  494.  #endif

  495.  

  496. -struct isl_local_space;

  497. +struct __isl_export isl_local_space;

  498.  typedef struct isl_local_space isl_local_space;

  499.  

  500.  isl_ctx *isl_local_space_get_ctx(__isl_keep isl_local_space *ls);

  501.  

  502. +__isl_constructor

  503.  __isl_give isl_local_space *isl_local_space_from_space(__isl_take isl_space *dim);

  504.  

  505.  __isl_give isl_local_space *isl_local_space_copy(

  506. @@ -75,6 +76,7 @@ __isl_give isl_local_space *isl_local_sp

  507.  __isl_give isl_local_space *isl_local_space_wrap(

  508.  	__isl_take isl_local_space *ls);

  509.  

  510. +__isl_export

  511.  isl_bool isl_local_space_is_equal(__isl_keep isl_local_space *ls1,

  512.  	__isl_keep isl_local_space *ls2);

  513.  

  514. diff -Npur isl_0.22/include/isl/map.h isl/include/isl/map.h

  515. --- isl_0.22/include/isl/map.h	2020-04-17 16:49:36.270477000 +0800

  516. +++ isl/include/isl/map.h	2020-04-29 18:14:39.945681000 +0800

  517. @@ -34,6 +34,7 @@ isl_size isl_basic_map_total_dim(__isl_k

  518.  isl_size isl_basic_map_dim(__isl_keep isl_basic_map *bmap,

  519.  				enum isl_dim_type type);

  520.  

  521. +__isl_export

  522.  isl_size isl_map_dim(__isl_keep isl_map *map, enum isl_dim_type type);

  523.  

  524.  isl_ctx *isl_basic_map_get_ctx(__isl_keep isl_basic_map *bmap);

  525. @@ -56,6 +57,7 @@ isl_bool isl_map_has_tuple_name(__isl_ke

  526.  	enum isl_dim_type type);

  527.  const char *isl_map_get_tuple_name(__isl_keep isl_map *map,

  528.  	enum isl_dim_type type);

  529. +__isl_export

  530.  __isl_give isl_map *isl_map_set_tuple_name(__isl_take isl_map *map,

  531.  	enum isl_dim_type type, const char *s);

  532.  const char *isl_basic_map_get_dim_name(__isl_keep isl_basic_map *bmap,

  533. @@ -67,6 +69,7 @@ const char *isl_map_get_dim_name(__isl_k

  534.  __isl_give isl_basic_map *isl_basic_map_set_dim_name(

  535.  	__isl_take isl_basic_map *bmap,

  536.  	enum isl_dim_type type, unsigned pos, const char *s);

  537. +__isl_export

  538.  __isl_give isl_map *isl_map_set_dim_name(__isl_take isl_map *map,

  539.  	enum isl_dim_type type, unsigned pos, const char *s);

  540.  

  541. @@ -81,11 +84,13 @@ isl_bool isl_map_has_dim_id(__isl_keep i

  542.  	enum isl_dim_type type, unsigned pos);

  543.  __isl_give isl_id *isl_map_get_dim_id(__isl_keep isl_map *map,

  544.  	enum isl_dim_type type, unsigned pos);

  545. +__isl_export

  546.  __isl_give isl_map *isl_map_set_tuple_id(__isl_take isl_map *map,

  547.  	enum isl_dim_type type, __isl_take isl_id *id);

  548.  __isl_give isl_map *isl_map_reset_tuple_id(__isl_take isl_map *map,

  549.  	enum isl_dim_type type);

  550.  isl_bool isl_map_has_tuple_id(__isl_keep isl_map *map, enum isl_dim_type type);

  551. +__isl_export

  552.  __isl_give isl_id *isl_map_get_tuple_id(__isl_keep isl_map *map,

  553.  	enum isl_dim_type type);

  554.  __isl_give isl_map *isl_map_reset_user(__isl_take isl_map *map);

  555. @@ -207,6 +212,7 @@ __isl_give isl_basic_map *isl_basic_map_

  556.  	__isl_take isl_basic_map *bmap2);

  557.  __isl_give isl_basic_map *isl_basic_map_neg(__isl_take isl_basic_map *bmap);

  558.  

  559. +__isl_export

  560.  __isl_give isl_map *isl_map_sum(__isl_take isl_map *map1,

  561.  	__isl_take isl_map *map2);

  562.  __isl_give isl_map *isl_map_neg(__isl_take isl_map *map);

  563. @@ -257,6 +263,9 @@ __isl_give isl_pw_multi_aff *isl_map_lex

  564.  void isl_basic_map_print_internal(__isl_keep isl_basic_map *bmap,

  565.  	FILE *out, int indent);

  566.  

  567. +__isl_give isl_map *isl_map_plain_update_val_if_fixed(__isl_take isl_map *map,

  568. +	enum isl_dim_type type, unsigned pos);

  569. +

  570.  __isl_give isl_val *isl_basic_map_plain_get_val_if_fixed(

  571.  	__isl_keep isl_basic_map *bmap,

  572.  	enum isl_dim_type type, unsigned pos);

  573. @@ -416,6 +425,7 @@ __isl_export

  574.  __isl_give isl_basic_map *isl_map_polyhedral_hull(__isl_take isl_map *map);

  575.  __isl_give isl_basic_map *isl_basic_map_add_dims(__isl_take isl_basic_map *bmap,

  576.  		enum isl_dim_type type, unsigned n);

  577. +__isl_export

  578.  __isl_give isl_map *isl_map_add_dims(__isl_take isl_map *map,

  579.  		enum isl_dim_type type, unsigned n);

  580.  __isl_give isl_basic_map *isl_basic_map_insert_dims(

  581. @@ -433,6 +443,7 @@ __isl_give isl_map *isl_map_move_dims(__

  582.  __isl_give isl_basic_map *isl_basic_map_project_out(

  583.  		__isl_take isl_basic_map *bmap,

  584.  		enum isl_dim_type type, unsigned first, unsigned n);

  585. +__isl_export

  586.  __isl_give isl_map *isl_map_project_out(__isl_take isl_map *map,

  587.  		enum isl_dim_type type, unsigned first, unsigned n);

  588.  __isl_export

  589. @@ -520,8 +531,10 @@ __isl_give isl_basic_map *isl_basic_map_

  590.  __isl_give isl_basic_map *isl_basic_map_from_range(

  591.  	__isl_take isl_basic_set *bset);

  592.  __isl_give isl_map *isl_map_from_range(__isl_take isl_set *set);

  593. +__isl_constructor

  594.  __isl_give isl_basic_map *isl_basic_map_from_domain_and_range(

  595.  	__isl_take isl_basic_set *domain, __isl_take isl_basic_set *range);

  596. +__isl_constructor

  597.  __isl_give isl_map *isl_map_from_domain_and_range(__isl_take isl_set *domain,

  598.  	__isl_take isl_set *range);

  599.  __isl_export

  600. @@ -565,6 +578,7 @@ isl_bool isl_map_has_equal_space(__isl_k

  601.  isl_bool isl_basic_map_can_zip(__isl_keep isl_basic_map *bmap);

  602.  isl_bool isl_map_can_zip(__isl_keep isl_map *map);

  603.  __isl_give isl_basic_map *isl_basic_map_zip(__isl_take isl_basic_map *bmap);

  604. +__isl_export

  605.  __isl_give isl_map *isl_map_zip(__isl_take isl_map *map);

  606.  

  607.  isl_bool isl_basic_map_can_curry(__isl_keep isl_basic_map *bmap);

  608. @@ -587,7 +601,7 @@ __isl_give isl_map *isl_basic_map_comput

  609.  __isl_give isl_map *isl_map_compute_divs(__isl_take isl_map *map);

  610.  ISL_DEPRECATED

  611.  __isl_give isl_map *isl_map_align_divs(__isl_take isl_map *map);

  612. -

  613. +__isl_export

  614.  __isl_give isl_basic_map *isl_basic_map_drop_constraints_involving_dims(

  615.  	__isl_take isl_basic_map *bmap,

  616.  	enum isl_dim_type type, unsigned first, unsigned n);

  617. @@ -600,6 +614,8 @@ __isl_give isl_map *isl_map_drop_constra

  618.  __isl_give isl_map *isl_map_drop_constraints_not_involving_dims(

  619.  	__isl_take isl_map *map,

  620.  	enum isl_dim_type type, unsigned first, unsigned n);

  621. +__isl_give isl_map *isl_map_drop_special_constraints(

  622. +	__isl_take isl_map *bmap, unsigned first, unsigned n);

  623.  

  624.  isl_bool isl_basic_map_involves_dims(__isl_keep isl_basic_map *bmap,

  625.  	enum isl_dim_type type, unsigned first, unsigned n);

  626. @@ -629,6 +645,7 @@ __isl_give isl_map *isl_map_gist_params(

  627.  __isl_give isl_map *isl_map_gist_basic_map(__isl_take isl_map *map,

  628.  	__isl_take isl_basic_map *context);

  629.  

  630. +__isl_export

  631.  __isl_give isl_stride_info *isl_map_get_range_stride_info(

  632.  	__isl_keep isl_map *map, int pos);

  633.  __isl_export

  634. @@ -642,7 +659,7 @@ isl_bool isl_map_plain_is_equal(__isl_ke

  635.  	__isl_keep isl_map *map2);

  636.  

  637.  uint32_t isl_map_get_hash(__isl_keep isl_map *map);

  638. -

  639. +__isl_export

  640.  isl_size isl_map_n_basic_map(__isl_keep isl_map *map);

  641.  __isl_export

  642.  isl_stat isl_map_foreach_basic_map(__isl_keep isl_map *map,

  643. @@ -689,20 +706,24 @@ __isl_give isl_basic_map *isl_basic_map_

  644.  	enum isl_dim_type c2, enum isl_dim_type c3,

  645.  	enum isl_dim_type c4, enum isl_dim_type c5);

  646.  

  647. +__isl_constructor

  648.  __isl_give isl_basic_map *isl_basic_map_from_aff(__isl_take isl_aff *aff);

  649. +__isl_constructor

  650.  __isl_give isl_basic_map *isl_basic_map_from_multi_aff(

  651.  	__isl_take isl_multi_aff *maff);

  652.  __isl_give isl_basic_map *isl_basic_map_from_aff_list(

  653.  	__isl_take isl_space *domain_space, __isl_take isl_aff_list *list);

  654.  

  655. +__isl_constructor

  656.  __isl_give isl_map *isl_map_from_aff(__isl_take isl_aff *aff);

  657. +__isl_constructor

  658.  __isl_give isl_map *isl_map_from_multi_aff(__isl_take isl_multi_aff *maff);

  659.  

  660.  __isl_give isl_pw_aff *isl_map_dim_min(__isl_take isl_map *map, int pos);

  661.  __isl_give isl_pw_aff *isl_map_dim_max(__isl_take isl_map *map, int pos);

  662.  

  663.  ISL_DECLARE_LIST_FN(basic_map)

  664. -ISL_DECLARE_LIST_FN(map)

  665. +ISL_DECLARE_EXPORTED_LIST_FN(map)

  666.  

  667.  #if defined(__cplusplus)

  668.  }

  669. diff -Npur isl_0.22/include/isl/map_type.h isl/include/isl/map_type.h

  670. --- isl_0.22/include/isl/map_type.h	2020-04-17 16:49:36.270477000 +0800

  671. +++ isl/include/isl/map_type.h	2020-04-29 18:14:39.945681000 +0800

  672. @@ -13,7 +13,7 @@ typedef struct isl_basic_map isl_basic_m

  673.  ISL_DECLARE_LIST_TYPE(basic_map)

  674.  struct __isl_subclass(isl_union_map) isl_map;

  675.  typedef struct isl_map isl_map;

  676. -ISL_DECLARE_LIST_TYPE(map)

  677. +ISL_DECLARE_EXPORTED_LIST_TYPE(map)

  678.  

  679.  #ifndef isl_basic_set

  680.  struct __isl_subclass(isl_set) isl_basic_set;

  681. @@ -24,11 +24,11 @@ ISL_DECLARE_LIST_TYPE(basic_set)

  682.  #ifndef isl_set

  683.  struct __isl_subclass(isl_union_set) isl_set;

  684.  typedef struct isl_set isl_set;

  685. -ISL_DECLARE_LIST_TYPE(set)

  686. +ISL_DECLARE_EXPORTED_LIST_TYPE(set)

  687.  #endif

  688.  

  689.  ISL_DECLARE_LIST_FN(basic_set)

  690. -ISL_DECLARE_LIST_FN(set)

  691. +ISL_DECLARE_EXPORTED_LIST_FN(set)

  692.  

  693.  #if defined(__cplusplus)

  694.  }

  695. diff -Npur isl_0.22/include/isl/multi.h isl/include/isl/multi.h

  696. --- isl_0.22/include/isl/multi.h	2020-04-17 16:49:36.270477000 +0800

  697. +++ isl/include/isl/multi.h	2020-04-29 18:14:39.945681000 +0800

  698. @@ -36,12 +36,17 @@ isl_size isl_multi_##BASE##_size(__isl_k

  699.  __isl_export								\

  700.  __isl_give isl_##BASE *isl_multi_##BASE##_get_at(			\

  701.  	__isl_keep isl_multi_##BASE *multi, int pos);			\

  702. +__isl_export                                                            \

  703.  __isl_give isl_##BASE *isl_multi_##BASE##_get_##BASE(			\

  704.  	__isl_keep isl_multi_##BASE *multi, int pos);			\

  705.  __isl_export								\

  706.  __isl_give isl_multi_##BASE *isl_multi_##BASE##_set_at(			\

  707.  	__isl_take isl_multi_##BASE *multi, int pos,			\

  708.  	__isl_take isl_##BASE *el);					\

  709. +__isl_export                                                            \

  710. +__isl_give isl_##BASE##_list *isl_multi_##BASE##_get_##BASE##_list(	\

  711. +	__isl_keep isl_multi_##BASE *multi);				\

  712. +__isl_export								\

  713.  __isl_give isl_multi_##BASE *isl_multi_##BASE##_set_##BASE(		\

  714.  	__isl_take isl_multi_##BASE *multi, int pos,			\

  715.  	__isl_take isl_##BASE *el);					\

  716. @@ -102,6 +107,7 @@ __isl_overload								\

  717.  __isl_give isl_multi_##BASE *isl_multi_##BASE##_scale_down_multi_val(	\

  718.  	__isl_take isl_multi_##BASE *multi,				\

  719.  	__isl_take isl_multi_val *mv);					\

  720. +__isl_overload								\

  721.  __isl_give isl_multi_##BASE *isl_multi_##BASE##_mod_multi_val(		\

  722.  	__isl_take isl_multi_##BASE *multi,				\

  723.  	__isl_take isl_multi_val *mv);					\

  724. @@ -174,11 +180,13 @@ const char *isl_multi_##BASE##_get_tuple

  725.  	__isl_keep isl_multi_##BASE *multi, enum isl_dim_type type);	\

  726.  isl_bool isl_multi_##BASE##_has_tuple_id(				\

  727.  	__isl_keep isl_multi_##BASE *multi, enum isl_dim_type type);	\

  728. +__isl_export												\

  729.  __isl_give isl_id *isl_multi_##BASE##_get_tuple_id(			\

  730.  	__isl_keep isl_multi_##BASE *multi, enum isl_dim_type type);	\

  731.  __isl_give isl_multi_##BASE *isl_multi_##BASE##_set_tuple_name(		\

  732.  	__isl_take isl_multi_##BASE *multi,				\

  733.  	enum isl_dim_type type, const char *s);				\

  734. +__isl_export                                                        \

  735.  __isl_give isl_multi_##BASE *isl_multi_##BASE##_set_tuple_id(		\

  736.  	__isl_take isl_multi_##BASE *multi,				\

  737.  	enum isl_dim_type type, __isl_take isl_id *id);			\

  738. diff -Npur isl_0.22/include/isl/schedule.h isl/include/isl/schedule.h

  739. --- isl_0.22/include/isl/schedule.h	2020-04-17 16:49:36.270477000 +0800

  740. +++ isl/include/isl/schedule.h	2020-04-29 18:14:39.945681000 +0800

  741. @@ -17,9 +17,16 @@ extern "C" {

  742.  struct __isl_export isl_schedule_constraints;

  743.  typedef struct isl_schedule_constraints isl_schedule_constraints;

  744.  

  745. +isl_stat isl_options_set_schedule_nonneg_var_coefficient(isl_ctx *ctx, int val);

  746. +int isl_options_get_schedule_nonneg_var_coefficient(isl_ctx *ctx);

  747. +

  748.  isl_stat isl_options_set_schedule_max_coefficient(isl_ctx *ctx, int val);

  749.  int isl_options_get_schedule_max_coefficient(isl_ctx *ctx);

  750.  

  751. +isl_stat isl_options_set_schedule_unit_max_var_coefficient_sum(isl_ctx *ctx,

  752. +	int val);

  753. +int isl_options_get_schedule_unit_max_var_coefficient_sum(isl_ctx *ctx);

  754. +

  755.  isl_stat isl_options_set_schedule_max_constant_term(isl_ctx *ctx, int val);

  756.  int isl_options_get_schedule_max_constant_term(isl_ctx *ctx);

  757.  

  758. @@ -104,6 +111,10 @@ __isl_give isl_union_map *

  759.  isl_schedule_constraints_get_conditional_validity_condition(

  760.  	__isl_keep isl_schedule_constraints *sc);

  761.  

  762. +__isl_export

  763. +__isl_give isl_schedule_constraints *isl_schedule_constraints_intersect_domain(

  764. +	__isl_take isl_schedule_constraints *sc,

  765. +	__isl_take isl_union_set *domain);

  766.  __isl_give isl_schedule_constraints *isl_schedule_constraints_apply(

  767.  	__isl_take isl_schedule_constraints *sc,

  768.  	__isl_take isl_union_map *umap);

  769. @@ -138,12 +149,14 @@ __isl_export

  770.  __isl_give isl_union_map *isl_schedule_get_map(__isl_keep isl_schedule *sched);

  771.  

  772.  isl_ctx *isl_schedule_get_ctx(__isl_keep isl_schedule *sched);

  773. +__isl_export

  774.  isl_bool isl_schedule_plain_is_equal(__isl_keep isl_schedule *schedule1,

  775.  	__isl_keep isl_schedule *schedule2);

  776.  

  777.  __isl_export

  778.  __isl_give isl_schedule_node *isl_schedule_get_root(

  779.  	__isl_keep isl_schedule *schedule);

  780. +__isl_export

  781.  __isl_give isl_union_set *isl_schedule_get_domain(

  782.  	__isl_keep isl_schedule *schedule);

  783.  

  784. @@ -158,13 +171,16 @@ __isl_give isl_schedule *isl_schedule_ma

  785.  

  786.  __isl_give isl_schedule *isl_schedule_insert_context(

  787.  	__isl_take isl_schedule *schedule, __isl_take isl_set *context);

  788. +__isl_export

  789.  __isl_give isl_schedule *isl_schedule_insert_partial_schedule(

  790.  	__isl_take isl_schedule *schedule,

  791.  	__isl_take isl_multi_union_pw_aff *partial);

  792.  __isl_give isl_schedule *isl_schedule_insert_guard(

  793.  	__isl_take isl_schedule *schedule, __isl_take isl_set *guard);

  794. +__isl_export

  795.  __isl_give isl_schedule *isl_schedule_sequence(

  796.  	__isl_take isl_schedule *schedule1, __isl_take isl_schedule *schedule2);

  797. +__isl_export

  798.  __isl_give isl_schedule *isl_schedule_set(

  799.  	__isl_take isl_schedule *schedule1, __isl_take isl_schedule *schedule2);

  800.  __isl_give isl_schedule *isl_schedule_intersect_domain(

  801. diff -Npur isl_0.22/include/isl/schedule_node.h isl/include/isl/schedule_node.h

  802. --- isl_0.22/include/isl/schedule_node.h	2020-04-17 16:49:36.270477000 +0800

  803. +++ isl/include/isl/schedule_node.h	2020-04-29 18:14:39.945681000 +0800

  804. @@ -78,6 +78,7 @@ __isl_export

  805.  isl_size isl_schedule_node_get_ancestor_child_position(

  806.  	__isl_keep isl_schedule_node *node,

  807.  	__isl_keep isl_schedule_node *ancestor);

  808. +__isl_export

  809.  __isl_give isl_schedule_node *isl_schedule_node_get_child(

  810.  	__isl_keep isl_schedule_node *node, int pos);

  811.  __isl_export

  812. @@ -94,7 +95,7 @@ __isl_give isl_schedule_node *isl_schedu

  813.  __isl_export

  814.  __isl_give isl_schedule_node *isl_schedule_node_ancestor(

  815.  	__isl_take isl_schedule_node *node, int generation);

  816. -__isl_export

  817. +

  818.  __isl_give isl_schedule_node *isl_schedule_node_child(

  819.  	__isl_take isl_schedule_node *node, int pos);

  820.  __isl_export

  821. @@ -110,20 +111,23 @@ __isl_give isl_schedule_node *isl_schedu

  822.  __isl_export

  823.  isl_bool isl_schedule_node_is_subtree_anchored(

  824.  	__isl_keep isl_schedule_node *node);

  825. -

  826. +__isl_export

  827.  __isl_give isl_schedule_node *isl_schedule_node_group(

  828.  	__isl_take isl_schedule_node *node, __isl_take isl_id *group_id);

  829.  

  830.  __isl_give isl_schedule_node *isl_schedule_node_sequence_splice_child(

  831.  	__isl_take isl_schedule_node *node, int pos);

  832.  

  833. +__isl_export

  834.  __isl_give isl_space *isl_schedule_node_band_get_space(

  835.  	__isl_keep isl_schedule_node *node);

  836.  __isl_export

  837.  __isl_give isl_multi_union_pw_aff *isl_schedule_node_band_get_partial_schedule(

  838.  	__isl_keep isl_schedule_node *node);

  839. +__isl_export

  840.  __isl_give isl_union_map *isl_schedule_node_band_get_partial_schedule_union_map(

  841.  	__isl_keep isl_schedule_node *node);

  842. +__isl_export

  843.  enum isl_ast_loop_type isl_schedule_node_band_member_get_ast_loop_type(

  844.  	__isl_keep isl_schedule_node *node, int pos);

  845.  __isl_export

  846. @@ -133,6 +137,7 @@ __isl_give isl_schedule_node *isl_schedu

  847.  enum isl_ast_loop_type isl_schedule_node_band_member_get_isolate_ast_loop_type(

  848.  	__isl_keep isl_schedule_node *node, int pos);

  849.  __isl_give isl_schedule_node *

  850. +__isl_export

  851.  isl_schedule_node_band_member_set_isolate_ast_loop_type(

  852.  	__isl_take isl_schedule_node *node, int pos,

  853.  	enum isl_ast_loop_type type);

  854. @@ -181,6 +186,7 @@ __isl_give isl_schedule_node *isl_schedu

  855.  __isl_export

  856.  __isl_give isl_schedule_node *isl_schedule_node_band_tile(

  857.  	__isl_take isl_schedule_node *node, __isl_take isl_multi_val *sizes);

  858. +__isl_export

  859.  __isl_give isl_schedule_node *isl_schedule_node_band_sink(

  860.  	__isl_take isl_schedule_node *node);

  861.  __isl_export

  862. @@ -205,16 +211,22 @@ __isl_give isl_union_map *isl_schedule_n

  863.  __isl_export

  864.  __isl_give isl_union_set *isl_schedule_node_filter_get_filter(

  865.  	__isl_keep isl_schedule_node *node);

  866. +__isl_give isl_schedule_node *isl_schedule_node_filter_set_filter(

  867. +    __isl_take isl_schedule_node *node, __isl_take isl_union_set *filter);

  868.  __isl_export

  869.  __isl_give isl_set *isl_schedule_node_guard_get_guard(

  870.  	__isl_keep isl_schedule_node *node);

  871. +__isl_export

  872.  __isl_give isl_id *isl_schedule_node_mark_get_id(

  873.  	__isl_keep isl_schedule_node *node);

  874.  

  875. +__isl_export

  876.  isl_size isl_schedule_node_get_schedule_depth(

  877.  	__isl_keep isl_schedule_node *node);

  878. +__isl_export

  879.  __isl_give isl_union_set *isl_schedule_node_get_domain(

  880.  	__isl_keep isl_schedule_node *node);

  881. +__isl_export

  882.  __isl_give isl_union_set *isl_schedule_node_get_universe_domain(

  883.  	__isl_keep isl_schedule_node *node);

  884.  __isl_export

  885. @@ -234,6 +246,7 @@ __isl_give isl_union_map *isl_schedule_n

  886.  	__isl_keep isl_schedule_node *node);

  887.  __isl_give isl_union_map *isl_schedule_node_get_subtree_expansion(

  888.  	__isl_keep isl_schedule_node *node);

  889. +__isl_export

  890.  __isl_give isl_union_pw_multi_aff *isl_schedule_node_get_subtree_contraction(

  891.  	__isl_keep isl_schedule_node *node);

  892.  

  893. @@ -264,6 +277,7 @@ __isl_give isl_schedule_node *isl_schedu

  894.  

  895.  __isl_give isl_schedule_node *isl_schedule_node_cut(

  896.  	__isl_take isl_schedule_node *node);

  897. +__isl_export

  898.  __isl_give isl_schedule_node *isl_schedule_node_delete(

  899.  	__isl_take isl_schedule_node *node);

  900.  

  901. @@ -293,6 +307,27 @@ __isl_give isl_printer *isl_printer_prin

  902.  void isl_schedule_node_dump(__isl_keep isl_schedule_node *node);

  903.  __isl_give char *isl_schedule_node_to_str(__isl_keep isl_schedule_node *node);

  904.  

  905. +struct isl_schedule_tree;

  906. +typedef struct isl_schedule_tree isl_schedule_tree;

  907. +

  908. +__isl_export

  909. +__isl_give isl_schedule_tree *isl_schedule_node_get_tree(

  910. +	__isl_keep isl_schedule_node *node);

  911. +__isl_export

  912. +__isl_give isl_schedule_node *isl_schedule_node_graft_tree(

  913. +	__isl_take isl_schedule_node *pos, __isl_take isl_schedule_tree *tree);

  914. +

  915. +__isl_export

  916. +__isl_give isl_schedule_tree *isl_schedule_tree_get_child(

  917. +	__isl_keep isl_schedule_tree *tree, int pos);

  918. +__isl_export

  919. +__isl_give isl_schedule_tree *isl_schedule_tree_replace_child(

  920. +	__isl_take isl_schedule_tree *tree, int pos,

  921. +	__isl_take isl_schedule_tree *new_child);

  922. +__isl_export

  923. +__isl_null isl_schedule_tree *isl_schedule_tree_free(

  924. +	__isl_take isl_schedule_tree *tree);

  925. +

  926.  #if defined(__cplusplus)

  927.  }

  928.  #endif

  929. diff -Npur isl_0.22/include/isl/set.h isl/include/isl/set.h

  930. --- isl_0.22/include/isl/set.h	2020-04-17 16:49:36.270477000 +0800

  931. +++ isl/include/isl/set.h	2020-04-29 18:14:39.945681000 +0800

  932. @@ -31,6 +31,7 @@ isl_size isl_basic_set_total_dim(__isl_k

  933.  isl_size isl_basic_set_dim(__isl_keep isl_basic_set *bset,

  934.  				enum isl_dim_type type);

  935.  

  936. +__isl_export

  937.  isl_size isl_set_n_dim(__isl_keep isl_set *set);

  938.  isl_size isl_set_n_param(__isl_keep isl_set *set);

  939.  isl_size isl_set_dim(__isl_keep isl_set *set, enum isl_dim_type type);

  940. @@ -50,10 +51,13 @@ __isl_give isl_local_space *isl_basic_se

  941.  	__isl_keep isl_basic_set *bset);

  942.  

  943.  const char *isl_basic_set_get_tuple_name(__isl_keep isl_basic_set *bset);

  944. +__isl_export

  945.  isl_bool isl_set_has_tuple_name(__isl_keep isl_set *set);

  946. +__isl_export

  947.  const char *isl_set_get_tuple_name(__isl_keep isl_set *set);

  948.  __isl_give isl_basic_set *isl_basic_set_set_tuple_name(

  949.  	__isl_take isl_basic_set *set, const char *s);

  950. +__isl_export

  951.  __isl_give isl_set *isl_set_set_tuple_name(__isl_take isl_set *set,

  952.  	const char *s);

  953.  const char *isl_basic_set_get_dim_name(__isl_keep isl_basic_set *bset,

  954. @@ -78,10 +82,12 @@ isl_bool isl_set_has_dim_id(__isl_keep i

  955.  	enum isl_dim_type type, unsigned pos);

  956.  __isl_give isl_id *isl_set_get_dim_id(__isl_keep isl_set *set,

  957.  	enum isl_dim_type type, unsigned pos);

  958. +__isl_export

  959.  __isl_give isl_set *isl_set_set_tuple_id(__isl_take isl_set *set,

  960.  	__isl_take isl_id *id);

  961.  __isl_give isl_set *isl_set_reset_tuple_id(__isl_take isl_set *set);

  962.  isl_bool isl_set_has_tuple_id(__isl_keep isl_set *set);

  963. +__isl_export

  964.  __isl_give isl_id *isl_set_get_tuple_id(__isl_keep isl_set *set);

  965.  __isl_give isl_set *isl_set_reset_user(__isl_take isl_set *set);

  966.  

  967. @@ -154,6 +160,7 @@ __isl_give isl_basic_set *isl_basic_set_

  968.  	enum isl_dim_type type, unsigned pos, __isl_take isl_val *v);

  969.  __isl_give isl_set *isl_set_fix_si(__isl_take isl_set *set,

  970.  		enum isl_dim_type type, unsigned pos, int value);

  971. +__isl_export

  972.  __isl_give isl_set *isl_set_lower_bound_si(__isl_take isl_set *set,

  973.  		enum isl_dim_type type, unsigned pos, int value);

  974.  __isl_give isl_basic_set *isl_basic_set_lower_bound_val(

  975. @@ -161,6 +168,7 @@ __isl_give isl_basic_set *isl_basic_set_

  976.  	__isl_take isl_val *value);

  977.  __isl_give isl_set *isl_set_lower_bound_val(__isl_take isl_set *set,

  978.  	enum isl_dim_type type, unsigned pos, __isl_take isl_val *value);

  979. +__isl_export

  980.  __isl_give isl_set *isl_set_upper_bound_si(__isl_take isl_set *set,

  981.  	enum isl_dim_type type, unsigned pos, int value);

  982.  __isl_give isl_basic_set *isl_basic_set_upper_bound_val(

  983. @@ -227,6 +235,7 @@ __isl_give isl_basic_set *isl_basic_set_

  984.  	__isl_take isl_basic_set *bset);

  985.  __isl_export

  986.  __isl_give isl_set *isl_set_params(__isl_take isl_set *set);

  987. +__isl_export

  988.  __isl_give isl_set *isl_set_from_params(__isl_take isl_set *set);

  989.  

  990.  __isl_export

  991. @@ -258,6 +267,7 @@ __isl_export

  992.  __isl_give isl_set *isl_set_empty(__isl_take isl_space *space);

  993.  __isl_export

  994.  __isl_give isl_set *isl_set_universe(__isl_take isl_space *space);

  995. +__isl_export

  996.  __isl_give isl_set *isl_set_nat_universe(__isl_take isl_space *dim);

  997.  __isl_give isl_set *isl_set_copy(__isl_keep isl_set *set);

  998.  __isl_null isl_set *isl_set_free(__isl_take isl_set *set);

  999. @@ -276,6 +286,7 @@ __isl_give isl_basic_set *isl_set_affine

  1000.  __isl_give isl_basic_set *isl_set_convex_hull(__isl_take isl_set *set);

  1001.  __isl_export

  1002.  __isl_give isl_basic_set *isl_set_polyhedral_hull(__isl_take isl_set *set);

  1003. +__isl_export

  1004.  __isl_give isl_basic_set *isl_set_simple_hull(__isl_take isl_set *set);

  1005.  __isl_export

  1006.  __isl_give isl_basic_set *isl_set_unshifted_simple_hull(

  1007. @@ -370,6 +381,7 @@ __isl_give isl_basic_set *isl_basic_set_

  1008.  	enum isl_dim_type type, unsigned first, unsigned n);

  1009.  __isl_give isl_set *isl_set_eliminate(__isl_take isl_set *set,

  1010.  	enum isl_dim_type type, unsigned first, unsigned n);

  1011. +__isl_export

  1012.  __isl_give isl_set *isl_set_eliminate_dims(__isl_take isl_set *set,

  1013.  		unsigned first, unsigned n);

  1014.  __isl_give isl_set *isl_set_remove_dims(__isl_take isl_set *bset,

  1015. @@ -406,6 +418,7 @@ isl_bool isl_set_involves_dims(__isl_kee

  1016.  

  1017.  void isl_set_print_internal(__isl_keep isl_set *set, FILE *out, int indent);

  1018.  isl_bool isl_set_plain_is_empty(__isl_keep isl_set *set);

  1019. +__isl_export

  1020.  isl_bool isl_set_plain_is_universe(__isl_keep isl_set *set);

  1021.  isl_bool isl_set_is_params(__isl_keep isl_set *set);

  1022.  __isl_export

  1023. @@ -480,6 +493,7 @@ isl_bool isl_set_plain_is_disjoint(__isl

  1024.  

  1025.  uint32_t isl_set_get_hash(struct isl_set *set);

  1026.  

  1027. +__isl_export

  1028.  isl_size isl_set_n_basic_set(__isl_keep isl_set *set);

  1029.  __isl_export

  1030.  isl_stat isl_set_foreach_basic_set(__isl_keep isl_set *set,

  1031. @@ -537,6 +551,7 @@ __isl_give isl_basic_set *isl_basic_set_

  1032.  __isl_give isl_basic_set *isl_basic_set_from_multi_aff(

  1033.  	__isl_take isl_multi_aff *ma);

  1034.  

  1035. +__isl_overload

  1036.  __isl_give isl_set *isl_set_from_multi_aff(__isl_take isl_multi_aff *ma);

  1037.  

  1038.  __isl_give isl_mat *isl_basic_set_reduced_basis(__isl_keep isl_basic_set *bset);

  1039. @@ -550,7 +565,9 @@ __isl_give isl_basic_set *isl_basic_set_

  1040.  	__isl_take isl_basic_set *bset);

  1041.  __isl_give isl_basic_set *isl_set_solutions(__isl_take isl_set *set);

  1042.  

  1043. +__isl_export

  1044.  __isl_give isl_pw_aff *isl_set_dim_max(__isl_take isl_set *set, int pos);

  1045. +__isl_export

  1046.  __isl_give isl_pw_aff *isl_set_dim_min(__isl_take isl_set *set, int pos);

  1047.  

  1048.  __isl_give char *isl_basic_set_to_str(__isl_keep isl_basic_set *bset);

  1049. diff -Npur isl_0.22/include/isl/space.h isl/include/isl/space.h

  1050. --- isl_0.22/include/isl/space.h	2020-04-17 16:49:36.270477000 +0800

  1051. +++ isl/include/isl/space.h	2020-04-29 18:14:39.945681000 +0800

  1052. @@ -26,6 +26,7 @@ __isl_give isl_space *isl_space_alloc(is

  1053.  			unsigned nparam, unsigned n_in, unsigned n_out);

  1054.  __isl_give isl_space *isl_space_set_alloc(isl_ctx *ctx,

  1055.  			unsigned nparam, unsigned dim);

  1056. +__isl_constructor

  1057.  __isl_give isl_space *isl_space_params_alloc(isl_ctx *ctx, unsigned nparam);

  1058.  __isl_give isl_space *isl_space_copy(__isl_keep isl_space *dim);

  1059.  __isl_null isl_space *isl_space_free(__isl_take isl_space *space);

  1060. @@ -34,6 +35,10 @@ isl_bool isl_space_is_params(__isl_keep

  1061.  isl_bool isl_space_is_set(__isl_keep isl_space *space);

  1062.  isl_bool isl_space_is_map(__isl_keep isl_space *space);

  1063.  

  1064. +__isl_overload

  1065. +isl_bool isl_space_has_param_id(__isl_keep isl_space *space,

  1066. +	__isl_keep isl_id *id);

  1067. +__isl_overload

  1068.  __isl_give isl_space *isl_space_add_param_id(__isl_take isl_space *space,

  1069.  	__isl_take isl_id *id);

  1070.  

  1071. @@ -43,12 +48,16 @@ isl_bool isl_space_has_tuple_name(__isl_

  1072.  	enum isl_dim_type type);

  1073.  __isl_keep const char *isl_space_get_tuple_name(__isl_keep isl_space *space,

  1074.  				 enum isl_dim_type type);

  1075. +__isl_export

  1076. +__isl_give isl_space *isl_space_set_set_tuple_id(__isl_take isl_space *space,

  1077. +	__isl_take isl_id *id);

  1078.  __isl_give isl_space *isl_space_set_tuple_id(__isl_take isl_space *space,

  1079.  	enum isl_dim_type type, __isl_take isl_id *id);

  1080.  __isl_give isl_space *isl_space_reset_tuple_id(__isl_take isl_space *space,

  1081.  	enum isl_dim_type type);

  1082.  isl_bool isl_space_has_tuple_id(__isl_keep isl_space *space,

  1083.  	enum isl_dim_type type);

  1084. +__isl_export

  1085.  __isl_give isl_id *isl_space_get_tuple_id(__isl_keep isl_space *space,

  1086.  	enum isl_dim_type type);

  1087.  __isl_give isl_space *isl_space_reset_user(__isl_take isl_space *space);

  1088. @@ -76,6 +85,7 @@ __isl_keep const char *isl_space_get_dim

  1089.  ISL_DEPRECATED

  1090.  __isl_give isl_space *isl_space_extend(__isl_take isl_space *dim,

  1091.  			unsigned nparam, unsigned n_in, unsigned n_out);

  1092. +__isl_export

  1093.  __isl_give isl_space *isl_space_add_dims(__isl_take isl_space *space,

  1094.  	enum isl_dim_type type, unsigned n);

  1095.  __isl_give isl_space *isl_space_move_dims(__isl_take isl_space *space,

  1096. @@ -85,6 +95,7 @@ __isl_give isl_space *isl_space_insert_d

  1097.  	enum isl_dim_type type, unsigned pos, unsigned n);

  1098.  __isl_give isl_space *isl_space_join(__isl_take isl_space *left,

  1099.  	__isl_take isl_space *right);

  1100. +__isl_export

  1101.  __isl_give isl_space *isl_space_product(__isl_take isl_space *left,

  1102.  	__isl_take isl_space *right);

  1103.  __isl_give isl_space *isl_space_domain_product(__isl_take isl_space *left,

  1104. @@ -103,6 +114,7 @@ __isl_give isl_space *isl_space_range_fa

  1105.  	__isl_take isl_space *space);

  1106.  __isl_export

  1107.  __isl_give isl_space *isl_space_map_from_set(__isl_take isl_space *space);

  1108. +__isl_export

  1109.  __isl_give isl_space *isl_space_map_from_domain_and_range(

  1110.  	__isl_take isl_space *domain, __isl_take isl_space *range);

  1111.  __isl_give isl_space *isl_space_reverse(__isl_take isl_space *space);

  1112. @@ -126,12 +138,13 @@ __isl_give isl_space *isl_space_domain_m

  1113.  __isl_give isl_space *isl_space_range_map(__isl_take isl_space *space);

  1114.  __isl_export

  1115.  __isl_give isl_space *isl_space_params(__isl_take isl_space *space);

  1116. -__isl_overload

  1117. +__isl_export

  1118.  __isl_give isl_space *isl_space_add_unnamed_tuple_ui(

  1119.  	__isl_take isl_space *space, unsigned dim);

  1120. -__isl_overload

  1121. +__isl_export

  1122.  __isl_give isl_space *isl_space_add_named_tuple_id_ui(

  1123.  	__isl_take isl_space *space, __isl_take isl_id *tuple_id, unsigned dim);

  1124. +__isl_export

  1125.  __isl_give isl_space *isl_space_set_from_params(__isl_take isl_space *space);

  1126.  

  1127.  __isl_give isl_space *isl_space_align_params(__isl_take isl_space *dim1,

  1128. @@ -150,13 +163,17 @@ __isl_give isl_space *isl_space_unwrap(_

  1129.  isl_bool isl_space_can_zip(__isl_keep isl_space *space);

  1130.  __isl_give isl_space *isl_space_zip(__isl_take isl_space *space);

  1131.  

  1132. +__isl_export

  1133.  isl_bool isl_space_can_curry(__isl_keep isl_space *space);

  1134. +__isl_export

  1135.  __isl_give isl_space *isl_space_curry(__isl_take isl_space *space);

  1136.  

  1137.  isl_bool isl_space_can_range_curry(__isl_keep isl_space *space);

  1138.  __isl_give isl_space *isl_space_range_curry(__isl_take isl_space *space);

  1139.  

  1140. +__isl_export

  1141.  isl_bool isl_space_can_uncurry(__isl_keep isl_space *space);

  1142. +__isl_export

  1143.  __isl_give isl_space *isl_space_uncurry(__isl_take isl_space *space);

  1144.  

  1145.  isl_bool isl_space_is_domain(__isl_keep isl_space *space1,

  1146. @@ -168,6 +185,7 @@ isl_bool isl_space_is_equal(__isl_keep i

  1147.  	__isl_keep isl_space *space2);

  1148.  isl_bool isl_space_has_equal_params(__isl_keep isl_space *space1,

  1149.  	__isl_keep isl_space *space2);

  1150. +__isl_export

  1151.  isl_bool isl_space_has_equal_tuples(__isl_keep isl_space *space1,

  1152.  	__isl_keep isl_space *space2);

  1153.  isl_bool isl_space_tuple_is_equal(__isl_keep isl_space *space1,

  1154. @@ -176,6 +194,7 @@ isl_bool isl_space_tuple_is_equal(__isl_

  1155.  ISL_DEPRECATED

  1156.  isl_bool isl_space_match(__isl_keep isl_space *space1, enum isl_dim_type type1,

  1157.  	__isl_keep isl_space *space2, enum isl_dim_type type2);

  1158. +__isl_export

  1159.  isl_size isl_space_dim(__isl_keep isl_space *space, enum isl_dim_type type);

  1160.  

  1161.  __isl_export

  1162. diff -Npur isl_0.22/include/isl/stride_info.h isl/include/isl/stride_info.h

  1163. --- isl_0.22/include/isl/stride_info.h	2020-04-17 16:49:36.270477000 +0800

  1164. +++ isl/include/isl/stride_info.h	2020-04-29 18:14:39.945681000 +0800

  1165. @@ -12,11 +12,13 @@

  1166.  extern "C" {

  1167.  #endif

  1168.  

  1169. -struct isl_stride_info;

  1170. +struct __isl_export isl_stride_info;

  1171.  typedef struct isl_stride_info isl_stride_info;

  1172.  

  1173.  isl_ctx *isl_stride_info_get_ctx(__isl_keep isl_stride_info *si);

  1174. +__isl_export

  1175.  __isl_give isl_val *isl_stride_info_get_stride(__isl_keep isl_stride_info *si);

  1176. +__isl_export

  1177.  __isl_give isl_aff *isl_stride_info_get_offset(__isl_keep isl_stride_info *si);

  1178.  __isl_null isl_stride_info *isl_stride_info_free(

  1179.  	__isl_take isl_stride_info *si);

  1180. diff -Npur isl_0.22/include/isl/union_map.h isl/include/isl/union_map.h

  1181. --- isl_0.22/include/isl/union_map.h	2020-04-17 16:49:36.270477000 +0800

  1182. +++ isl/include/isl/union_map.h	2020-04-29 18:14:39.945681000 +0800

  1183. @@ -29,6 +29,7 @@ __isl_overload

  1184.  __isl_give isl_union_map *isl_union_map_empty_ctx(isl_ctx *ctx);

  1185.  __isl_give isl_union_map *isl_union_map_empty_space(

  1186.  	__isl_take isl_space *space);

  1187. +__isl_export

  1188.  __isl_give isl_union_map *isl_union_map_empty(__isl_take isl_space *space);

  1189.  __isl_give isl_union_map *isl_union_map_copy(__isl_keep isl_union_map *umap);

  1190.  __isl_null isl_union_map *isl_union_map_free(__isl_take isl_union_map *umap);

  1191. @@ -90,6 +91,7 @@ __isl_give isl_union_map *isl_union_map_

  1192.  __isl_export

  1193.  __isl_give isl_union_map *isl_union_map_lexmax(__isl_take isl_union_map *umap);

  1194.  

  1195. +__isl_export

  1196.  __isl_give isl_union_map *isl_union_map_add_map(__isl_take isl_union_map *umap,

  1197.  	__isl_take isl_map *map);

  1198.  __isl_export

  1199. @@ -115,6 +117,7 @@ __isl_give isl_union_map *isl_union_map_

  1200.  __isl_export

  1201.  __isl_give isl_union_map *isl_union_map_range_product(

  1202.  	__isl_take isl_union_map *umap1, __isl_take isl_union_map *umap2);

  1203. +__isl_export

  1204.  __isl_give isl_union_map *isl_union_map_flat_range_product(

  1205.  	__isl_take isl_union_map *umap1, __isl_take isl_union_map *umap2);

  1206.  __isl_export

  1207. @@ -255,10 +258,12 @@ isl_bool isl_union_map_is_strict_subset(

  1208.  

  1209.  uint32_t isl_union_map_get_hash(__isl_keep isl_union_map *umap);

  1210.  

  1211. +__isl_export

  1212.  isl_size isl_union_map_n_map(__isl_keep isl_union_map *umap);

  1213.  __isl_export

  1214.  isl_stat isl_union_map_foreach_map(__isl_keep isl_union_map *umap,

  1215.  	isl_stat (*fn)(__isl_take isl_map *map, void *user), void *user);

  1216. +__isl_export

  1217.  __isl_give isl_map_list *isl_union_map_get_map_list(

  1218.  	__isl_keep isl_union_map *umap);

  1219.  __isl_export

  1220. @@ -274,6 +279,7 @@ __isl_give isl_map *isl_union_map_extrac

  1221.  	__isl_take isl_space *dim);

  1222.  __isl_export

  1223.  isl_bool isl_union_map_isa_map(__isl_keep isl_union_map *umap);

  1224. +__isl_overload

  1225.  __isl_give isl_map *isl_map_from_union_map(__isl_take isl_union_map *umap);

  1226.  

  1227.  __isl_give isl_basic_map *isl_union_map_sample(__isl_take isl_union_map *umap);

  1228. @@ -299,9 +305,11 @@ __isl_overload

  1229.  __isl_give isl_union_map *isl_union_map_eq_at_multi_union_pw_aff(

  1230.  	__isl_take isl_union_map *umap,

  1231.  	__isl_take isl_multi_union_pw_aff *mupa);

  1232. +__isl_overload

  1233.  __isl_give isl_union_map *isl_union_map_lex_lt_at_multi_union_pw_aff(

  1234.  	__isl_take isl_union_map *umap,

  1235.  	__isl_take isl_multi_union_pw_aff *mupa);

  1236. +__isl_overload

  1237.  __isl_give isl_union_map *isl_union_map_lex_gt_at_multi_union_pw_aff(

  1238.  	__isl_take isl_union_map *umap,

  1239.  	__isl_take isl_multi_union_pw_aff *mupa);

  1240. diff -Npur isl_0.22/include/isl/union_set.h isl/include/isl/union_set.h

  1241. --- isl_0.22/include/isl/union_set.h	2020-04-17 16:49:36.270477000 +0800

  1242. +++ isl/include/isl/union_set.h	2020-04-29 18:14:39.945681000 +0800

  1243. @@ -20,6 +20,7 @@ __isl_overload

  1244.  __isl_give isl_union_set *isl_union_set_empty_ctx(isl_ctx *ctx);

  1245.  __isl_give isl_union_set *isl_union_set_empty_space(

  1246.  	__isl_take isl_space *space);

  1247. +__isl_export

  1248.  __isl_give isl_union_set *isl_union_set_empty(__isl_take isl_space *space);

  1249.  __isl_give isl_union_set *isl_union_set_copy(__isl_keep isl_union_set *uset);

  1250.  __isl_null isl_union_set *isl_union_set_free(__isl_take isl_union_set *uset);

  1251. @@ -59,7 +60,7 @@ __isl_export

  1252.  __isl_give isl_union_set *isl_union_set_lexmin(__isl_take isl_union_set *uset);

  1253.  __isl_export

  1254.  __isl_give isl_union_set *isl_union_set_lexmax(__isl_take isl_union_set *uset);

  1255. -

  1256. +__isl_export

  1257.  __isl_give isl_union_set *isl_union_set_add_set(__isl_take isl_union_set *uset,

  1258.  	__isl_take isl_set *set);

  1259.  __isl_export

  1260. @@ -124,6 +125,7 @@ isl_bool isl_union_set_is_strict_subset(

  1261.  

  1262.  uint32_t isl_union_set_get_hash(__isl_keep isl_union_set *uset);

  1263.  

  1264. +__isl_export

  1265.  isl_size isl_union_set_n_set(__isl_keep isl_union_set *uset);

  1266.  __isl_export

  1267.  isl_stat isl_union_set_foreach_set(__isl_keep isl_union_set *uset,

  1268. @@ -133,6 +135,7 @@ isl_bool isl_union_set_every_set(__isl_k

  1269.  	isl_bool (*test)(__isl_keep isl_set *set, void *user), void *user);

  1270.  __isl_give isl_basic_set_list *isl_union_set_get_basic_set_list(

  1271.  	__isl_keep isl_union_set *uset);

  1272. +__isl_export

  1273.  __isl_give isl_set_list *isl_union_set_get_set_list(

  1274.  	__isl_keep isl_union_set *uset);

  1275.  isl_bool isl_union_set_contains(__isl_keep isl_union_set *uset,

  1276. @@ -142,6 +145,7 @@ __isl_give isl_set *isl_union_set_extrac

  1277.  	__isl_take isl_space *dim);

  1278.  __isl_export

  1279.  isl_bool isl_union_set_isa_set(__isl_keep isl_union_set *uset);

  1280. +__isl_export

  1281.  __isl_give isl_set *isl_set_from_union_set(__isl_take isl_union_set *uset);

  1282.  __isl_export

  1283.  isl_stat isl_union_set_foreach_point(__isl_keep isl_union_set *uset,

  1284. diff -Npur isl_0.22/interface/cpp.cc isl/interface/cpp.cc

  1285. --- isl_0.22/interface/cpp.cc	2020-04-17 16:49:36.270477000 +0800

  1286. +++ isl/interface/cpp.cc	2020-04-29 18:14:39.945681000 +0800

  1287. @@ -253,6 +253,7 @@ void cpp_generator::print_class(ostream

  1288.  	print_ptr_decl(os, clazz);

  1289.  	print_downcast_decl(os, clazz);

  1290.  	print_ctx_decl(os);

  1291. +	print_str_decl(os, clazz);

  1292.  	osprintf(os, "\n");

  1293.  	print_persistent_callbacks_decl(os, clazz);

  1294.  	print_methods_decl(os, clazz);

  1295. @@ -467,6 +468,11 @@ void cpp_generator::print_destructor_dec

  1296.   *

  1297.   * 	  Check if the current object is a null pointer.

  1298.   *

  1299. + * 	4) explicit operator bool()

  1300. + *

  1301. + * 	  Check if the current object represents a valid isl object,

  1302. + *	  i.e., if it is not a null pointer.

  1303. + *

  1304.   * The functions get() and release() model the value_ptr proposed in

  1305.   * http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2012/n3339.pdf.

  1306.   * The copy() function is an extension to allow the user to explicitly

  1307. @@ -487,6 +493,7 @@ void cpp_generator::print_ptr_decl(ostre

  1308.  	osprintf(os, "  inline __isl_keep %s *get() const;\n", name);

  1309.  	osprintf(os, "  inline __isl_give %s *release();\n", name);

  1310.  	osprintf(os, "  inline bool is_null() const;\n");

  1311. +	osprintf(os, "  inline explicit operator bool() const;\n");

  1312.  }

  1313.  

  1314.  /* Print a template declaration with given indentation

  1315. @@ -548,6 +555,14 @@ void cpp_generator::print_ctx_decl(ostre

  1316.  	osprintf(os, "  inline %sctx ctx() const;\n", ns.c_str());

  1317.  }

  1318.  

  1319. +void cpp_generator::print_str_decl(ostream &os, const isl_class &clazz)

  1320. +{

  1321. +	if (!clazz.fn_to_str)

  1322. +		return;

  1323. +

  1324. +	osprintf(os, "  inline std::string to_str() const;\n");

  1325. +}

  1326. +

  1327.  /* Add a space to the return type "type" if needed,

  1328.   * i.e., if it is not the type of a pointer.

  1329.   */

  1330. @@ -835,6 +850,7 @@ void cpp_generator::print_class_impl(ost

  1331.  	print_copy_assignment_impl(os, clazz);

  1332.  	print_destructor_impl(os, clazz);

  1333.  	print_ptr_impl(os, clazz);

  1334. +	print_str_impl(os, clazz);

  1335.  	print_downcast_impl(os, clazz);

  1336.  	print_ctx_impl(os, clazz);

  1337.  	print_persistent_callbacks_impl(os, clazz);

  1338. @@ -1328,6 +1344,10 @@ void cpp_generator::print_ptr_impl(ostre

  1339.  	osprintf(os, "bool %s::is_null() const {\n", cppname);

  1340.  	osprintf(os, "  return ptr == nullptr;\n");

  1341.  	osprintf(os, "}\n");

  1342. +	osprintf(os, "%s::operator bool() const\n", cppname);

  1343. +	osprintf(os, "{\n");

  1344. +	osprintf(os, "  return !is_null();\n");

  1345. +	osprintf(os, "}\n");

  1346.  }

  1347.  

  1348.  /* Print implementations for the "as" and "isa" methods, if "clazz"

  1349. @@ -1379,10 +1399,7 @@ void cpp_generator::print_downcast_impl(

  1350.  	if (checked)

  1351.  		osprintf(os, " if (isa<T>().is_false())\n");

  1352.  	else

  1353. -		osprintf(os, " if (!isa<T>())\n");

  1354. -	print_invalid(os, 4, "not an object of the requested subtype",

  1355. -		    "return T()");

  1356. -	osprintf(os, "  return T(copy());\n");

  1357. +		osprintf(os, "  return isa<T>() ? T(copy()) : T();\n");

  1358.  	osprintf(os, "}\n");

  1359.  }

  1360.  

  1361. @@ -1401,6 +1418,25 @@ void cpp_generator::print_ctx_impl(ostre

  1362.  	osprintf(os, "}\n");

  1363.  }

  1364.  

  1365. +void cpp_generator::print_str_impl(ostream &os, const isl_class &clazz)

  1366. +{

  1367. +	if (!clazz.fn_to_str)

  1368. +		return;

  1369. +

  1370. +	const char *name = clazz.name.c_str();

  1371. +	std::string cppstring = type2cpp(clazz);

  1372. +	const char *cppname = cppstring.c_str();

  1373. +	osprintf(os, "\n");

  1374. +	osprintf(os, "std::string %s::to_str() const {\n", cppname);

  1375. +	osprintf(os, "  char *Tmp = %s_to_str(get());\n", name, name);

  1376. +	osprintf(os, "  if (!Tmp)\n");

  1377. +	osprintf(os, "    return \"\";\n");

  1378. +	osprintf(os, "  std::string S(Tmp);\n");

  1379. +	osprintf(os, "  free(Tmp);\n");

  1380. +	osprintf(os, "  return S;\n");

  1381. +	osprintf(os, "}\n");

  1382. +}

  1383. +

  1384.  /* Print the implementations of the methods needed for the persistent callbacks

  1385.   * of "clazz".

  1386.   */

  1387. @@ -2439,6 +2475,7 @@ void cpp_generator::print_callback_local

  1388.   */

  1389.  static const char *rename_map[][2] = {

  1390.  	{ "union", "unite" },

  1391. +	{ "delete", "del" },

  1392.  };

  1393.  

  1394.  /* Rename method "name" in case the method name in the C++ bindings should not

  1395. diff -Npur isl_0.22/interface/cpp.h isl/interface/cpp.h

  1396. --- isl_0.22/interface/cpp.h	2020-04-17 16:49:36.270477000 +0800

  1397. +++ isl/interface/cpp.h	2020-04-29 18:14:39.945681000 +0800

  1398. @@ -50,6 +50,7 @@ private:

  1399.  		const isl_class &super);

  1400.  	void print_downcast_decl(ostream &os, const isl_class &clazz);

  1401.  	void print_ctx_decl(ostream &os);

  1402. +	void print_str_decl(ostream &os, const isl_class &clazz);

  1403.  	void print_persistent_callback_prototype(ostream &os,

  1404.  		const isl_class &clazz, FunctionDecl *method,

  1405.  		bool is_declaration);

  1406. @@ -101,6 +102,7 @@ private:

  1407.  	void print_ptr_impl(ostream &os, const isl_class &clazz);

  1408.  	void print_downcast_impl(ostream &os, const isl_class &clazz);

  1409.  	void print_ctx_impl(ostream &os, const isl_class &clazz);

  1410. +	void print_str_impl(ostream &os, const isl_class &clazz);

  1411.  	void print_persistent_callbacks_impl(ostream &os,

  1412.  		const isl_class &clazz);

  1413.  	void print_methods_impl(ostream &os, const isl_class &clazz);

  1414. diff -Npur isl_0.22/isl_aff.c isl/isl_aff.c

  1415. --- isl_0.22/isl_aff.c	2020-04-17 16:49:36.242477000 +0800

  1416. +++ isl/isl_aff.c	2020-04-29 18:14:39.945681000 +0800

  1417. @@ -57,6 +57,21 @@

  1418.  

  1419.  #include <isl_list_templ.c>

  1420.  

  1421. +/* Check that "space" is a set space.

  1422. + */

  1423. +static isl_stat check_space_is_set(__isl_keep isl_space *space)

  1424. +{

  1425. +	isl_bool is_set;

  1426. +

  1427. +	is_set = isl_space_is_set(space);

  1428. +	if (is_set < 0)

  1429. +		return isl_stat_error;

  1430. +	if (!is_set)

  1431. +		isl_die(isl_space_get_ctx(space), isl_error_invalid,

  1432. +			"expecting set space", return isl_stat_error);

  1433. +	return isl_stat_ok;

  1434. +}

  1435. +

  1436.  __isl_give isl_aff *isl_aff_alloc_vec(__isl_take isl_local_space *ls,

  1437.  	__isl_take isl_vec *v)

  1438.  {

  1439. @@ -4135,6 +4150,34 @@ __isl_give isl_multi_aff *isl_multi_aff_

  1440.  	return ma;

  1441.  error:

  1442.  	isl_space_free(space);

  1443. +	return NULL;

  1444. +}

  1445. +

  1446. +/* Given the space of a wrapped map of the form A[B -> C],

  1447. + * return the map A[B -> C] -> C.

  1448. + */

  1449. +__isl_give isl_multi_aff *isl_multi_aff_wrapped_range_map(

  1450. +	__isl_take isl_space *space)

  1451. +{

  1452. +	isl_bool has_id;

  1453. +	isl_id *id;

  1454. +	isl_multi_aff *ma;

  1455. +

  1456. +	if (check_space_is_set(space) < 0)

  1457. +		goto error;

  1458. +	has_id = isl_space_has_tuple_id(space, isl_dim_set);

  1459. +	if (has_id < 0)

  1460. +		goto error;

  1461. +	if (!has_id)

  1462. +		return isl_multi_aff_range_map(isl_space_unwrap(space));

  1463. +

  1464. +	id = isl_space_get_tuple_id(space, isl_dim_set);

  1465. +	ma = isl_multi_aff_range_map(isl_space_unwrap(space));

  1466. +	ma = isl_multi_aff_set_tuple_id(ma, isl_dim_in, id);

  1467. +

  1468. +	return ma;

  1469. +error:

  1470. +	isl_space_free(space);

  1471.  	return NULL;

  1472.  }

  1473.  

  1474. diff -Npur isl_0.22/isl_ast_codegen.c isl/isl_ast_codegen.c

  1475. --- isl_0.22/isl_ast_codegen.c	2020-04-17 16:49:36.242477000 +0800

  1476. +++ isl/isl_ast_codegen.c	2020-04-29 18:14:39.933681000 +0800

  1477. @@ -3644,8 +3644,20 @@ static __isl_give isl_ast_graft_list *ge

  1478.  	domain = isl_set_from_union_set(schedule_domain);

  1479.  

  1480.  	isolated = isl_ast_build_get_isolated(build);

  1481. +	if (build->depth - build->outer_pos) {

  1482. +		// eliminate the constraint and isolate the piece on the corner

  1483. +		isolated = isl_set_eliminate(isolated, isl_dim_set, build->outer_pos, (build->depth - build->outer_pos));

  1484. +		if (NULL != build->node) {

  1485. +			isl_size n = isl_schedule_node_band_n_member(build->node);

  1486. +			if (build->outer_pos >= n) {

  1487. +				// eliminate the parent band's constraint

  1488. +				isolated = isl_set_eliminate(isolated, isl_dim_set, (build->outer_pos - n), (build->depth - build->outer_pos));

  1489. +			}

  1490. +		}

  1491. +	}

  1492.  	isolated = isl_set_intersect(isolated, isl_set_copy(domain));

  1493.  	test = isl_ast_build_specialize(build, isl_set_copy(isolated));

  1494. +	isolated = isl_set_intersect(isolated, isl_set_copy(test));

  1495.  	empty = isl_set_is_empty(test);

  1496.  	isl_set_free(test);

  1497.  	if (empty < 0)

  1498. diff -Npur isl_0.22/isl_box.c isl/isl_box.c

  1499. --- isl_0.22/isl_box.c	2020-04-17 16:49:36.242477000 +0800

  1500. +++ isl/isl_box.c	2020-05-17 20:34:22.000000000 +0800

  1501. @@ -302,6 +302,13 @@ static isl_stat compute_size_in_directio

  1502.   * Initialize the size with infinity and if no better size is found

  1503.   * then invalidate the box.  Otherwise, set the offset and size

  1504.   * in the given direction by those that correspond to the smallest size.

  1505. + * 

  1506. + * Note that while evaluating the size corresponding to a lower bound,

  1507. + * an affine expression is constructed from the lower bound.

  1508. + * This lower bound may therefore not have any unknown local variables.

  1509. + * Eliminate any unknown local variables up front.

  1510. + * No such restriction needs to be imposed on the set over which

  1511. + * the size is computed.

  1512.   */

  1513.  static __isl_give isl_fixed_box *set_dim_extent(__isl_take isl_fixed_box *box,

  1514.  	__isl_keep isl_map *map, int pos)

  1515. @@ -309,6 +316,7 @@ static __isl_give isl_fixed_box *set_dim

  1516.  	struct isl_size_info info;

  1517.  	isl_bool valid;

  1518.  	isl_ctx *ctx;

  1519. +	isl_basic_set *bset;

  1520.  

  1521.  	if (!box || !map)

  1522.  		return isl_fixed_box_free(box);

  1523. @@ -316,16 +324,18 @@ static __isl_give isl_fixed_box *set_dim

  1524.  	ctx = isl_map_get_ctx(map);

  1525.  	map = isl_map_copy(map);

  1526.  	map = isl_map_project_onto(map, isl_dim_out, pos, 1);

  1527. -	map = isl_map_compute_divs(map);

  1528.  	info.size = isl_val_infty(ctx);

  1529.  	info.offset = NULL;

  1530.  	info.pos = isl_map_dim(map, isl_dim_in);

  1531.  	info.bset = isl_basic_map_wrap(isl_map_simple_hull(map));

  1532. +	bset = isl_basic_set_copy(info.bset);

  1533. +	bset = isl_basic_set_remove_unknown_divs(bset);

  1534.  	if (info.pos < 0)

  1535. -		info.bset = isl_basic_set_free(info.bset);

  1536. -	if (isl_basic_set_foreach_constraint(info.bset,

  1537. +		bset = isl_basic_set_free(bset);

  1538. +	if (isl_basic_set_foreach_constraint(bset,

  1539.  					&compute_size_in_direction, &info) < 0)

  1540.  		box = isl_fixed_box_free(box);

  1541. +	isl_basic_set_free(bset);

  1542.  	valid = isl_val_is_int(info.size);

  1543.  	if (valid < 0)

  1544.  		box = isl_fixed_box_free(box);

  1545. diff -Npur isl_0.22/isl_factorization.c isl/isl_factorization.c

  1546. --- isl_0.22/isl_factorization.c	2020-04-17 16:49:36.246477000 +0800

  1547. +++ isl/isl_factorization.c	2020-04-29 18:14:39.961680000 +0800

  1548. @@ -18,8 +18,18 @@

  1549.  #include <isl_space_private.h>

  1550.  #include <isl_mat_private.h>

  1551.  

  1552. +/* Return the isl_ctx to which "f" belongs.

  1553. + */

  1554. +isl_ctx *isl_factorizer_get_ctx(__isl_keep isl_factorizer *f)

  1555. +{

  1556. +	if (!f)

  1557. +		return NULL;

  1558. +	return isl_basic_set_get_ctx(f->bset);

  1559. +}

  1560. +

  1561.  static __isl_give isl_factorizer *isl_factorizer_alloc(

  1562. -	__isl_take isl_morph *morph, int n_group)

  1563. +	__isl_keep isl_basic_set *bset, __isl_take isl_morph *morph,

  1564. +	int n_group)

  1565.  {

  1566.  	isl_factorizer *f = NULL;

  1567.  	int *len = NULL;

  1568. @@ -37,6 +47,7 @@ static __isl_give isl_factorizer *isl_fa

  1569.  	if (!f)

  1570.  		goto error;

  1571.  

  1572. +	f->bset = isl_basic_set_copy(bset);

  1573.  	f->morph = morph;

  1574.  	f->n_group = n_group;

  1575.  	f->len = len;

  1576. @@ -48,14 +59,16 @@ error:

  1577.  	return NULL;

  1578.  }

  1579.  

  1580. -void isl_factorizer_free(__isl_take isl_factorizer *f)

  1581. +__isl_null isl_factorizer *isl_factorizer_free(__isl_take isl_factorizer *f)

  1582.  {

  1583.  	if (!f)

  1584. -		return;

  1585. +		return NULL;

  1586.  

  1587. +	isl_basic_set_free(f->bset);

  1588.  	isl_morph_free(f->morph);

  1589.  	free(f->len);

  1590.  	free(f);

  1591. +	return NULL;

  1592.  }

  1593.  

  1594.  void isl_factorizer_dump(__isl_take isl_factorizer *f)

  1595. @@ -77,7 +90,7 @@ void isl_factorizer_dump(__isl_take isl_

  1596.  

  1597.  __isl_give isl_factorizer *isl_factorizer_identity(__isl_keep isl_basic_set *bset)

  1598.  {

  1599. -	return isl_factorizer_alloc(isl_morph_identity(bset), 0);

  1600. +	return isl_factorizer_alloc(bset, isl_morph_identity(bset), 0);

  1601.  }

  1602.  

  1603.  __isl_give isl_factorizer *isl_factorizer_groups(__isl_keep isl_basic_set *bset,

  1604. @@ -108,7 +121,7 @@ __isl_give isl_factorizer *isl_factorize

  1605.  	space = isl_space_add_dims(space, isl_dim_set, nvar);

  1606.  	ran = isl_basic_set_universe(space);

  1607.  	morph = isl_morph_alloc(dom, ran, Q, U);

  1608. -	f = isl_factorizer_alloc(morph, n);

  1609. +	f = isl_factorizer_alloc(bset, morph, n);

  1610.  	if (!f)

  1611.  		return NULL;

  1612.  	for (i = 0; i < n; ++i)

  1613. @@ -326,3 +339,51 @@ error:

  1614.  	clear_groups(&g);

  1615.  	return NULL;

  1616.  }

  1617. +

  1618. +/* Given the factorizer "f" of a basic set,

  1619. + * call "test" on each resulting factor as long as each call succeeds.

  1620. + */

  1621. +__isl_give isl_bool isl_factorizer_every_factor_basic_set(

  1622. +	__isl_keep isl_factorizer *f,

  1623. +	isl_bool (*test)(__isl_keep isl_basic_set *bset, void *user),

  1624. +	void *user)

  1625. +{

  1626. +	int i, n;

  1627. +	isl_bool every = isl_bool_true;

  1628. +	isl_size nparam, nvar;

  1629. +	isl_basic_set *bset;

  1630. +

  1631. +	if (!f)

  1632. +		return isl_bool_error;

  1633. +	nparam = isl_basic_set_dim(f->bset, isl_dim_param);

  1634. +	nvar = isl_basic_set_dim(f->bset, isl_dim_set);

  1635. +	if (nparam < 0 || nvar < 0)

  1636. +		return isl_bool_error;

  1637. +

  1638. +	bset = isl_basic_set_copy(f->bset);

  1639. +	bset = isl_morph_basic_set(isl_morph_copy(f->morph), bset);

  1640. +

  1641. +	for (i = 0, n = 0; i < f->n_group; ++i) {

  1642. +		isl_basic_set *factor;

  1643. +

  1644. +		factor = isl_basic_set_copy(bset);

  1645. +		factor = isl_basic_set_drop_constraints_involving(factor,

  1646. +			    nparam + n + f->len[i], nvar - n - f->len[i]);

  1647. +		factor = isl_basic_set_drop_constraints_involving(factor,

  1648. +			    nparam, n);

  1649. +		factor = isl_basic_set_drop(factor, isl_dim_set,

  1650. +			    n + f->len[i], nvar - n - f->len[i]);

  1651. +		factor = isl_basic_set_drop(factor, isl_dim_set, 0, n);

  1652. +		every = test(factor, user);

  1653. +		isl_basic_set_free(factor);

  1654. +

  1655. +		if (every < 0 || !every)

  1656. +			break;

  1657. +

  1658. +		n += f->len[i];

  1659. +	}

  1660. +

  1661. +	isl_basic_set_free(bset);

  1662. +

  1663. +	return every;

  1664. +}

  1665. diff -Npur isl_0.22/isl_factorization.h isl/isl_factorization.h

  1666. --- isl_0.22/isl_factorization.h	2020-04-17 16:49:36.246477000 +0800

  1667. +++ isl/isl_factorization.h	2020-04-29 18:14:39.937681000 +0800

  1668. @@ -8,13 +8,14 @@

  1669.  extern "C" {

  1670.  #endif

  1671.  

  1672. -/* Data for factorizing a particular basic set.

  1673. +/* Data for factorizing the basic set "bset".

  1674.   * After applying "morph" to the basic set, there are "n_group"

  1675.   * groups of consecutive set variables, each of length "len[i]",

  1676.   * with 0 <= i < n_group.

  1677.   * If no factorization is possible, then "n_group" is set to 0.

  1678.   */

  1679.  struct isl_factorizer {

  1680. +	isl_basic_set	*bset;

  1681.  	isl_morph	*morph;

  1682.  	int		n_group;

  1683.  	int		*len;

  1684. @@ -24,9 +25,16 @@ typedef struct isl_factorizer isl_factor

  1685.  __isl_give isl_factorizer *isl_basic_set_factorizer(

  1686.  	__isl_keep isl_basic_set *bset);

  1687.  

  1688. -void isl_factorizer_free(__isl_take isl_factorizer *f);

  1689. +isl_ctx *isl_factorizer_get_ctx(__isl_keep isl_factorizer *f);

  1690. +

  1691. +__isl_null isl_factorizer *isl_factorizer_free(__isl_take isl_factorizer *f);

  1692.  void isl_factorizer_dump(__isl_take isl_factorizer *f);

  1693.  

  1694. +__isl_give isl_bool isl_factorizer_every_factor_basic_set(

  1695. +	__isl_keep isl_factorizer *f,

  1696. +	isl_bool (*test)(__isl_keep isl_basic_set *bset, void *user),

  1697. +	void *user);

  1698. +

  1699.  #if defined(__cplusplus)

  1700.  }

  1701.  #endif

  1702. diff -Npur isl_0.22/isl_farkas.c isl/isl_farkas.c

  1703. --- isl_0.22/isl_farkas.c	2020-04-17 16:49:36.246477000 +0800

  1704. +++ isl/isl_farkas.c	2020-04-29 18:14:39.937681000 +0800

  1705. @@ -12,6 +12,9 @@

  1706.  #include <isl/set.h>

  1707.  #include <isl_space_private.h>

  1708.  #include <isl_seq.h>

  1709. +#include <isl_aff_private.h>

  1710. +#include <isl_mat_private.h>

  1711. +#include <isl_factorization.h>

  1712.  

  1713.  /*

  1714.   * Let C be a cone and define

  1715. @@ -222,30 +225,35 @@ static __isl_give isl_basic_set *rationa

  1716.   * As explained above, we add an extra dimension to represent

  1717.   * the coefficient of the constant term when going from solutions

  1718.   * to coefficients (shift == 1) and we drop the extra dimension when going

  1719. - * in the opposite direction (shift == -1).  "space" is the space in which

  1720. - * the dual should be created.

  1721. + * in the opposite direction (shift == -1).

  1722. + * The dual can be created in an arbitrary space.

  1723. + * The caller is responsible for putting the result in the appropriate space.

  1724.   *

  1725.   * If "bset" is (obviously) empty, then the way this emptiness

  1726.   * is represented by the constraints does not allow for the application

  1727.   * of the standard farkas algorithm.  We therefore handle this case

  1728.   * specifically and return the universe basic set.

  1729.   */

  1730. -static __isl_give isl_basic_set *farkas(__isl_take isl_space *space,

  1731. -	__isl_take isl_basic_set *bset, int shift)

  1732. +static __isl_give isl_basic_set *farkas(__isl_take isl_basic_set *bset,

  1733. +	int shift)

  1734.  {

  1735.  	int i, j, k;

  1736. +	isl_ctx *ctx;

  1737. +	isl_space *space;

  1738.  	isl_basic_set *dual = NULL;

  1739.  	isl_size total;

  1740.  

  1741. +	total = isl_basic_set_dim(bset, isl_dim_all);

  1742. +	if (total < 0)

  1743. +		return isl_basic_set_free(bset);

  1744. +

  1745. +	ctx = isl_basic_set_get_ctx(bset);

  1746. +	space = isl_space_set_alloc(ctx, 0, total + shift);

  1747.  	if (isl_basic_set_plain_is_empty(bset)) {

  1748.  		isl_basic_set_free(bset);

  1749.  		return rational_universe(space);

  1750.  	}

  1751.  

  1752. -	total = isl_basic_set_dim(bset, isl_dim_all);

  1753. -	if (total < 0)

  1754. -		space = isl_space_free(space);

  1755. -

  1756.  	dual = isl_basic_set_alloc_space(space, bset->n_eq + bset->n_ineq,

  1757.  					total, bset->n_ineq + (shift > 0));

  1758.  	dual = isl_basic_set_set_rational(dual);

  1759. @@ -307,6 +315,525 @@ error:

  1760.  }

  1761.  

  1762.  /* Construct a basic set containing the tuples of coefficients of all

  1763. + * valid affine constraints on the given basic set, ignoring

  1764. + * the space of input and output and without any further decomposition.

  1765. + */

  1766. +static __isl_give isl_basic_set *isl_basic_set_coefficients_base(

  1767. +	__isl_take isl_basic_set *bset)

  1768. +{

  1769. +	return farkas(bset, 1);

  1770. +}

  1771. +

  1772. +/* Return the inverse mapping of "morph".

  1773. + */

  1774. +static __isl_give isl_mat *peek_inv(__isl_keep isl_morph *morph)

  1775. +{

  1776. +	return morph ? morph->inv : NULL;

  1777. +}

  1778. +

  1779. +/* Return a copy of the inverse mapping of "morph".

  1780. + */

  1781. +static __isl_give isl_mat *get_inv(__isl_keep isl_morph *morph)

  1782. +{

  1783. +	return isl_mat_copy(peek_inv(morph));

  1784. +}

  1785. +

  1786. +/* Information about a single factor within isl_basic_set_coefficients_product.

  1787. + *

  1788. + * "start" is the position of the first coefficient (beyond

  1789. + * the one corresponding to the constant term) in this factor.

  1790. + * "dim" is the number of coefficients (other than

  1791. + * the one corresponding to the constant term) in this factor.

  1792. + * "n_line" is the number of lines in "coeff".

  1793. + * "n_ray" is the number of rays (other than lines) in "coeff".

  1794. + * "n_vertex" is the number of vertices in "coeff".

  1795. + *

  1796. + * While iterating over the vertices,

  1797. + * "pos" represents the inequality constraint corresponding

  1798. + * to the current vertex.

  1799. + */

  1800. +struct isl_coefficients_factor_data {

  1801. +	isl_basic_set *coeff;

  1802. +	int start;

  1803. +	int dim;

  1804. +	int n_line;

  1805. +	int n_ray;

  1806. +	int n_vertex;

  1807. +	int pos;

  1808. +};

  1809. +

  1810. +/* Internal data structure for isl_basic_set_coefficients_product.

  1811. + * "n" is the number of factors in the factorization.

  1812. + * "pos" is the next factor that will be considered.

  1813. + * "start_next" is the position of the first coefficient (beyond

  1814. + * the one corresponding to the constant term) in the next factor.

  1815. + * "factors" contains information about the individual "n" factors.

  1816. + */

  1817. +struct isl_coefficients_product_data {

  1818. +	int n;

  1819. +	int pos;

  1820. +	int start_next;

  1821. +	struct isl_coefficients_factor_data *factors;

  1822. +};

  1823. +

  1824. +/* Initialize the internal data structure for

  1825. + * isl_basic_set_coefficients_product.

  1826. + */

  1827. +static isl_stat isl_coefficients_product_data_init(isl_ctx *ctx,

  1828. +	struct isl_coefficients_product_data *data, int n)

  1829. +{

  1830. +	data->n = n;

  1831. +	data->pos = 0;

  1832. +	data->start_next = 0;

  1833. +	data->factors = isl_calloc_array(ctx,

  1834. +					struct isl_coefficients_factor_data, n);

  1835. +	if (!data->factors)

  1836. +		return isl_stat_error;

  1837. +	return isl_stat_ok;

  1838. +}

  1839. +

  1840. +/* Free all memory allocated in "data".

  1841. + */

  1842. +static void isl_coefficients_product_data_clear(

  1843. +	struct isl_coefficients_product_data *data)

  1844. +{

  1845. +	int i;

  1846. +

  1847. +	if (data->factors) {

  1848. +		for (i = 0; i < data->n; ++i) {

  1849. +			isl_basic_set_free(data->factors[i].coeff);

  1850. +		}

  1851. +	}

  1852. +	free(data->factors);

  1853. +}

  1854. +

  1855. +/* Does inequality "ineq" in the (dual) basic set "bset" represent a ray?

  1856. + * In particular, does it have a zero denominator

  1857. + * (i.e., a zero coefficient for the constant term)?

  1858. + */

  1859. +static int is_ray(__isl_keep isl_basic_set *bset, int ineq)

  1860. +{

  1861. +	return isl_int_is_zero(bset->ineq[ineq][1]);

  1862. +}

  1863. +

  1864. +/* isl_factorizer_every_factor_basic_set callback that

  1865. + * constructs a basic set containing the tuples of coefficients of all

  1866. + * valid affine constraints on the factor "bset" and

  1867. + * extracts further information that will be used

  1868. + * when combining the results over the different factors.

  1869. + */

  1870. +static isl_bool isl_basic_set_coefficients_factor(

  1871. +	__isl_keep isl_basic_set *bset, void *user)

  1872. +{

  1873. +	struct isl_coefficients_product_data *data = user;

  1874. +	isl_basic_set *coeff;

  1875. +	isl_size n_eq, n_ineq, dim;

  1876. +	int i, n_ray, n_vertex;

  1877. +

  1878. +	coeff = isl_basic_set_coefficients_base(isl_basic_set_copy(bset));

  1879. +	data->factors[data->pos].coeff = coeff;

  1880. +	if (!coeff)

  1881. +		return isl_bool_error;

  1882. +

  1883. +	dim = isl_basic_set_dim(bset, isl_dim_set);

  1884. +	n_eq = isl_basic_set_n_equality(coeff);

  1885. +	n_ineq = isl_basic_set_n_inequality(coeff);

  1886. +	if (dim < 0 || n_eq < 0 || n_ineq < 0)

  1887. +		return isl_bool_error;

  1888. +	n_ray = n_vertex = 0;

  1889. +	for (i = 0; i < n_ineq; ++i) {

  1890. +		if (is_ray(coeff, i))

  1891. +			n_ray++;

  1892. +		else

  1893. +			n_vertex++;

  1894. +	}

  1895. +	data->factors[data->pos].start = data->start_next;

  1896. +	data->factors[data->pos].dim = dim;

  1897. +	data->factors[data->pos].n_line = n_eq;

  1898. +	data->factors[data->pos].n_ray = n_ray;

  1899. +	data->factors[data->pos].n_vertex = n_vertex;

  1900. +	data->pos++;

  1901. +	data->start_next += dim;

  1902. +

  1903. +	return isl_bool_true;

  1904. +}

  1905. +

  1906. +/* Clear an entry in the product, given that there is a "total" number

  1907. + * of coefficients (other than that of the constant term).

  1908. + */

  1909. +static void clear_entry(isl_int *entry, int total)

  1910. +{

  1911. +	isl_seq_clr(entry, 1 + 1 + total);

  1912. +}

  1913. +

  1914. +/* Set the part of the entry corresponding to factor "data",

  1915. + * from the factor coefficients in "src".

  1916. + */

  1917. +static void set_factor(isl_int *entry, isl_int *src,

  1918. +	struct isl_coefficients_factor_data *data)

  1919. +{

  1920. +	isl_seq_cpy(entry + 1 + 1 + data->start, src + 1 + 1, data->dim);

  1921. +}

  1922. +

  1923. +/* Set the part of the entry corresponding to factor "data",

  1924. + * from the factor coefficients in "src" multiplied by "f".

  1925. + */

  1926. +static void scale_factor(isl_int *entry, isl_int *src, isl_int f,

  1927. +	struct isl_coefficients_factor_data *data)

  1928. +{

  1929. +	isl_seq_scale(entry + 1 + 1 + data->start, src + 1 + 1, f, data->dim);

  1930. +}

  1931. +

  1932. +/* Add all lines from the given factor to "bset",

  1933. + * given that there is a "total" number of coefficients

  1934. + * (other than that of the constant term).

  1935. + */

  1936. +static __isl_give isl_basic_set *add_lines(__isl_take isl_basic_set *bset,

  1937. +	struct isl_coefficients_factor_data *factor, int total)

  1938. +{

  1939. +	int i;

  1940. +

  1941. +	for (i = 0; i < factor->n_line; ++i) {

  1942. +		int k;

  1943. +

  1944. +		k = isl_basic_set_alloc_equality(bset);

  1945. +		if (k < 0)

  1946. +			return isl_basic_set_free(bset);

  1947. +		clear_entry(bset->eq[k], total);

  1948. +		set_factor(bset->eq[k], factor->coeff->eq[i], factor);

  1949. +	}

  1950. +

  1951. +	return bset;

  1952. +}

  1953. +

  1954. +/* Add all rays (other than lines) from the given factor to "bset",

  1955. + * given that there is a "total" number of coefficients

  1956. + * (other than that of the constant term).

  1957. + */

  1958. +static __isl_give isl_basic_set *add_rays(__isl_take isl_basic_set *bset,

  1959. +	struct isl_coefficients_factor_data *data, int total)

  1960. +{

  1961. +	int i;

  1962. +	int n_ineq = data->n_ray + data->n_vertex;

  1963. +

  1964. +	for (i = 0; i < n_ineq; ++i) {

  1965. +		int k;

  1966. +

  1967. +		if (!is_ray(data->coeff, i))

  1968. +			continue;

  1969. +

  1970. +		k = isl_basic_set_alloc_inequality(bset);

  1971. +		if (k < 0)

  1972. +			return isl_basic_set_free(bset);

  1973. +		clear_entry(bset->ineq[k], total);

  1974. +		set_factor(bset->ineq[k], data->coeff->ineq[i], data);

  1975. +	}

  1976. +

  1977. +	return bset;

  1978. +}

  1979. +

  1980. +/* Move to the first vertex of the given factor starting

  1981. + * at inequality constraint "start", setting factor->pos and

  1982. + * returning 1 if a vertex is found.

  1983. + */

  1984. +static int factor_first_vertex(struct isl_coefficients_factor_data *factor,

  1985. +	int start)

  1986. +{

  1987. +	int j;

  1988. +	int n = factor->n_ray + factor->n_vertex;

  1989. +

  1990. +	for (j = start; j < n; ++j) {

  1991. +		if (is_ray(factor->coeff, j))

  1992. +			continue;

  1993. +		factor->pos = j;

  1994. +		return 1;

  1995. +	}

  1996. +

  1997. +	return 0;

  1998. +}

  1999. +

  2000. +/* Move to the first constraint in each factor starting at "first"

  2001. + * that represents a vertex.

  2002. + * In particular, skip the initial constraints that correspond to rays.

  2003. + */

  2004. +static void first_vertex(struct isl_coefficients_product_data *data, int first)

  2005. +{

  2006. +	int i;

  2007. +

  2008. +	for (i = first; i < data->n; ++i)

  2009. +		factor_first_vertex(&data->factors[i], 0);

  2010. +}

  2011. +

  2012. +/* Move to the next vertex in the product.

  2013. + * In particular, move to the next vertex of the last factor.

  2014. + * If all vertices of this last factor have already been considered,

  2015. + * then move to the next vertex of the previous factor(s)

  2016. + * until a factor is found that still has a next vertex.

  2017. + * Once such a next vertex has been found, the subsequent

  2018. + * factors are reset to the first vertex.

  2019. + * Return 1 if any next vertex was found.

  2020. + */

  2021. +static int next_vertex(struct isl_coefficients_product_data *data)

  2022. +{

  2023. +	int i;

  2024. +

  2025. +	for (i = data->n - 1; i >= 0; --i) {

  2026. +		struct isl_coefficients_factor_data *factor = &data->factors[i];

  2027. +

  2028. +		if (!factor_first_vertex(factor, factor->pos + 1))

  2029. +			continue;

  2030. +		first_vertex(data, i + 1);

  2031. +		return 1;

  2032. +	}

  2033. +

  2034. +	return 0;

  2035. +}

  2036. +

  2037. +/* Add a vertex to the product "bset" combining the currently selected

  2038. + * vertices of the factors.

  2039. + *

  2040. + * In the dual representation, the constant term is always zero.

  2041. + * The vertex itself is the sum of the contributions of the factors

  2042. + * with a shared denominator in position 1.

  2043. + *

  2044. + * First compute the shared denominator (lcm) and

  2045. + * then scale the numerators to this shared denominator.

  2046. + */

  2047. +static __isl_give isl_basic_set *add_vertex(__isl_take isl_basic_set *bset,

  2048. +	struct isl_coefficients_product_data *data)

  2049. +{

  2050. +	int i;

  2051. +	int k;

  2052. +	isl_int lcm, f;

  2053. +

  2054. +	k = isl_basic_set_alloc_inequality(bset);

  2055. +	if (k < 0)

  2056. +		return isl_basic_set_free(bset);

  2057. +

  2058. +	isl_int_init(lcm);

  2059. +	isl_int_init(f);

  2060. +	isl_int_set_si(lcm, 1);

  2061. +	for (i = 0; i < data->n; ++i) {

  2062. +		struct isl_coefficients_factor_data *factor = &data->factors[i];

  2063. +		isl_basic_set *coeff = factor->coeff;

  2064. +		int pos = factor->pos;

  2065. +		isl_int_lcm(lcm, lcm, coeff->ineq[pos][1]);

  2066. +	}

  2067. +	isl_int_set_si(bset->ineq[k][0], 0);

  2068. +	isl_int_set(bset->ineq[k][1], lcm);

  2069. +

  2070. +	for (i = 0; i < data->n; ++i) {

  2071. +		struct isl_coefficients_factor_data *factor = &data->factors[i];

  2072. +		isl_basic_set *coeff = factor->coeff;

  2073. +		int pos = factor->pos;

  2074. +		isl_int_divexact(f, lcm, coeff->ineq[pos][1]);

  2075. +		scale_factor(bset->ineq[k], coeff->ineq[pos], f, factor);

  2076. +	}

  2077. +

  2078. +	isl_int_clear(f);

  2079. +	isl_int_clear(lcm);

  2080. +

  2081. +	return bset;

  2082. +}

  2083. +

  2084. +/* Combine the duals of the factors in the factorization of a basic set

  2085. + * to form the dual of the entire basic set.

  2086. + * The dual share the coefficient of the constant term.

  2087. + * All other coefficients are specific to a factor.

  2088. + * Any constraint not involving the coefficient of the constant term

  2089. + * can therefor simply be copied into the appropriate position.

  2090. + * This includes all equality constraints since the coefficient

  2091. + * of the constant term can always be increased and therefore

  2092. + * never appears in an equality constraint.

  2093. + * The inequality constraints involving the coefficient of

  2094. + * the constant term need to be combined across factors.

  2095. + * In particular, if this coefficient needs to be greater than or equal

  2096. + * to some linear combination of the other coefficients in each factor,

  2097. + * then it needs to be greater than or equal to the sum of

  2098. + * these linear combinations across the factors.

  2099. + *

  2100. + * Alternatively, the constraints of the dual can be seen

  2101. + * as the vertices, rays and lines of the original basic set.

  2102. + * Clearly, rays and lines can simply be copied,

  2103. + * while vertices needs to be combined across factors.

  2104. + * This means that the number of rays and lines in the product

  2105. + * is equal to the sum of the numbers in the factors,

  2106. + * while the number of vertices is the product

  2107. + * of the number of vertices in the factors.  Note that each

  2108. + * factor has at least one vertex.

  2109. + * The only exception is when the factor is the dual of an obviously empty set,

  2110. + * in which case a universe dual is created.

  2111. + * In this case, return a universe dual for the product as well.

  2112. + *

  2113. + * While constructing the vertices, look for the first combination

  2114. + * of inequality constraints that represent a vertex,

  2115. + * construct the corresponding vertex and then move on

  2116. + * to the next combination of inequality constraints until

  2117. + * all combinations have been considered.

  2118. + */

  2119. +static __isl_give isl_basic_set *construct_product(isl_ctx *ctx,

  2120. +	struct isl_coefficients_product_data *data)

  2121. +{

  2122. +	int i;

  2123. +	int n_line, n_ray, n_vertex;

  2124. +	int total;

  2125. +	isl_space *space;

  2126. +	isl_basic_set *product;

  2127. +

  2128. +	if (!data->factors)

  2129. +		return NULL;

  2130. +

  2131. +	total = data->start_next;

  2132. +

  2133. +	n_line = 0;

  2134. +	n_ray = 0;

  2135. +	n_vertex = 1;

  2136. +	for (i = 0; i < data->n; ++i) {

  2137. +		n_line += data->factors[i].n_line;

  2138. +		n_ray += data->factors[i].n_ray;

  2139. +		n_vertex *= data->factors[i].n_vertex;

  2140. +	}

  2141. +

  2142. +	space = isl_space_set_alloc(ctx, 0, 1 + total);

  2143. +	if (n_vertex == 0)

  2144. +		return rational_universe(space);

  2145. +	product = isl_basic_set_alloc_space(space, 0, n_line, n_ray + n_vertex);

  2146. +	product = isl_basic_set_set_rational(product);

  2147. +

  2148. +	for (i = 0; i < data->n; ++i)

  2149. +		product = add_lines(product, &data->factors[i], total);

  2150. +	for (i = 0; i < data->n; ++i)

  2151. +		product = add_rays(product, &data->factors[i], total);

  2152. +

  2153. +	first_vertex(data, 0);

  2154. +	do {

  2155. +		product = add_vertex(product, data);

  2156. +	} while (next_vertex(data));

  2157. +

  2158. +	return product;

  2159. +}

  2160. +

  2161. +/* Given a factorization "f" of a basic set,

  2162. + * construct a basic set containing the tuples of coefficients of all

  2163. + * valid affine constraints on the product of the factors, ignoring

  2164. + * the space of input and output.

  2165. + * Note that this product may not be equal to the original basic set,

  2166. + * if a non-trivial transformation is involved.

  2167. + * This is handled by the caller.

  2168. + *

  2169. + * Compute the tuples of coefficients for each factor separately and

  2170. + * then combine the results.

  2171. + */

  2172. +static __isl_give isl_basic_set *isl_basic_set_coefficients_product(

  2173. +	__isl_take isl_factorizer *f)

  2174. +{

  2175. +	struct isl_coefficients_product_data data;

  2176. +	isl_ctx *ctx;

  2177. +	isl_basic_set *coeff;

  2178. +	isl_bool every;

  2179. +

  2180. +	ctx = isl_factorizer_get_ctx(f);

  2181. +	if (isl_coefficients_product_data_init(ctx, &data, f->n_group) < 0)

  2182. +		f = isl_factorizer_free(f);

  2183. +	every = isl_factorizer_every_factor_basic_set(f,

  2184. +			&isl_basic_set_coefficients_factor, &data);

  2185. +	isl_factorizer_free(f);

  2186. +	if (every >= 0)

  2187. +		coeff = construct_product(ctx, &data);

  2188. +	else

  2189. +		coeff = NULL;

  2190. +	isl_coefficients_product_data_clear(&data);

  2191. +

  2192. +	return coeff;

  2193. +}

  2194. +

  2195. +/* Given a factorization "f" of a basic set,

  2196. + * construct a basic set containing the tuples of coefficients of all

  2197. + * valid affine constraints on the basic set, ignoring

  2198. + * the space of input and output.

  2199. + *

  2200. + * The factorization may involve a linear transformation of the basic set.

  2201. + * In particular, the transformed basic set is formulated

  2202. + * in terms of x' = U x, i.e., x = V x', with V = U^{-1}.

  2203. + * The dual is then computed in terms of y' with y'^t [z; x'] >= 0.

  2204. + * Plugging in y' = [1 0; 0 V^t] y yields

  2205. + * y^t [1 0; 0 V] [z; x'] >= 0, i.e., y^t [z; x] >= 0, which is

  2206. + * the desired set of coefficients y.

  2207. + * Note that this transformation to y' only needs to be applied

  2208. + * if U is not the identity matrix.

  2209. + */

  2210. +static __isl_give isl_basic_set *isl_basic_set_coefficients_morphed_product(

  2211. +	__isl_take isl_factorizer *f)

  2212. +{

  2213. +	isl_bool is_identity;

  2214. +	isl_space *space;

  2215. +	isl_mat *inv;

  2216. +	isl_multi_aff *ma;

  2217. +	isl_basic_set *coeff;

  2218. +

  2219. +	if (!f)

  2220. +		goto error;

  2221. +	is_identity = isl_mat_is_scaled_identity(peek_inv(f->morph));

  2222. +	if (is_identity < 0)

  2223. +		goto error;

  2224. +	if (is_identity)

  2225. +		return isl_basic_set_coefficients_product(f);

  2226. +

  2227. +	inv = get_inv(f->morph);

  2228. +	inv = isl_mat_transpose(inv);

  2229. +	inv = isl_mat_lin_to_aff(inv);

  2230. +

  2231. +	coeff = isl_basic_set_coefficients_product(f);

  2232. +	space = isl_space_map_from_set(isl_basic_set_get_space(coeff));

  2233. +	ma = isl_multi_aff_from_aff_mat(space, inv);

  2234. +	coeff = isl_basic_set_preimage_multi_aff(coeff, ma);

  2235. +

  2236. +	return coeff;

  2237. +error:

  2238. +	isl_factorizer_free(f);

  2239. +	return NULL;

  2240. +}

  2241. +

  2242. +/* Construct a basic set containing the tuples of coefficients of all

  2243. + * valid affine constraints on the given basic set, ignoring

  2244. + * the space of input and output.

  2245. + *

  2246. + * The caller has already checked that "bset" does not involve

  2247. + * any local variables.  It may have parameters, though.

  2248. + * Treat them as regular variables internally.

  2249. + * This is especially important for the factorization,

  2250. + * since the (original) parameters should be taken into account

  2251. + * explicitly in this factorization.

  2252. + *

  2253. + * Check if the basic set can be factorized.

  2254. + * If so, compute constraints on the coefficients of the factors

  2255. + * separately and combine the results.

  2256. + * Otherwise, compute the results for the input basic set as a whole.

  2257. + */

  2258. +static __isl_give isl_basic_set *basic_set_coefficients(

  2259. +	__isl_take isl_basic_set *bset)

  2260. +{

  2261. +	isl_factorizer *f;

  2262. +	isl_size nparam;

  2263. +

  2264. +	nparam = isl_basic_set_dim(bset, isl_dim_param);

  2265. +	if (nparam < 0)

  2266. +		return isl_basic_set_free(bset);

  2267. +	bset = isl_basic_set_move_dims(bset, isl_dim_set, 0,

  2268. +					    isl_dim_param, 0, nparam);

  2269. +

  2270. +	f = isl_basic_set_factorizer(bset);

  2271. +	if (!f)

  2272. +		return isl_basic_set_free(bset);

  2273. +	if (f->n_group > 0) {

  2274. +		isl_basic_set_free(bset);

  2275. +		return isl_basic_set_coefficients_morphed_product(f);

  2276. +	}

  2277. +	isl_factorizer_free(f);

  2278. +	return isl_basic_set_coefficients_base(bset);

  2279. +}

  2280. +

  2281. +/* Construct a basic set containing the tuples of coefficients of all

  2282.   * valid affine constraints on the given basic set.

  2283.   */

  2284.  __isl_give isl_basic_set *isl_basic_set_coefficients(

  2285. @@ -324,7 +851,9 @@ __isl_give isl_basic_set *isl_basic_set_

  2286.  	space = isl_basic_set_get_space(bset);

  2287.  	space = isl_space_coefficients(space);

  2288.  

  2289. -	return farkas(space, bset, 1);

  2290. +	bset = basic_set_coefficients(bset);

  2291. +	bset = isl_basic_set_reset_space(bset, space);

  2292. +	return bset;

  2293.  error:

  2294.  	isl_basic_set_free(bset);

  2295.  	return NULL;

  2296. @@ -349,7 +878,9 @@ __isl_give isl_basic_set *isl_basic_set_

  2297.  	space = isl_basic_set_get_space(bset);

  2298.  	space = isl_space_solutions(space);

  2299.  

  2300. -	return farkas(space, bset, -1);

  2301. +	bset = farkas(bset, -1);

  2302. +	bset = isl_basic_set_reset_space(bset, space);

  2303. +	return bset;

  2304.  error:

  2305.  	isl_basic_set_free(bset);

  2306.  	return NULL;

  2307. diff -Npur isl_0.22/isl_map.c isl/isl_map.c

  2308. --- isl_0.22/isl_map.c	2020-04-17 16:49:36.250477000 +0800

  2309. +++ isl/isl_map.c	2020-04-29 18:14:39.933681000 +0800

  2310. @@ -3162,6 +3162,133 @@ __isl_give isl_set *isl_set_drop_constra

  2311.  	return isl_map_drop_constraints_not_involving_dims(set, type, first, n);

  2312.  }

  2313.  

  2314. +

  2315. +/* Drop all constraints in bmap that do not involve any of the dimensions

  2316. + * first to first + n - 1 of the given type.

  2317. + */

  2318. +__isl_give isl_basic_map *isl_basic_map_drop_special_constraints(

  2319. +	__isl_take isl_basic_map *bmap,

  2320. +	enum isl_dim_type type, unsigned pos)

  2321. +{

  2322. +	int i, j;

  2323. +	unsigned begin, num;

  2324. +	isl_size n_in, n_out, total;

  2325. +	long int min = 0;

  2326. +	long int max = 0;

  2327. +	long int val = 0;

  2328. +

  2329. +	if (!bmap)

  2330. +		return NULL;

  2331. +

  2332. +	if (bmap->n_div)

  2333. +        return bmap;

  2334. +

  2335. +	if (isl_basic_map_check_range(bmap, type, pos, 1) < 0)

  2336. +		return bmap;

  2337. +

  2338. +	n_in = isl_basic_map_dim(bmap, isl_dim_in);

  2339. +	n_out = isl_basic_map_dim(bmap, isl_dim_out);

  2340. +	if (n_in < n_out)

  2341. +        return bmap;

  2342. +

  2343. +	bmap = isl_basic_map_cow(bmap);

  2344. +	pos += isl_basic_map_offset(bmap, type);

  2345. +	total = isl_basic_map_dim(bmap, isl_dim_all);

  2346. +	if (total <= 0)

  2347. +		return bmap;

  2348. +	for (i = bmap->n_eq - 1; i >= 0; --i) {

  2349. +		if (isl_int_is_zero(bmap->eq[i][pos]))

  2350. +			continue;

  2351. +

  2352. +		if (isl_seq_first_non_zero(bmap->eq[i] + 1, pos - 1) != -1)

  2353. +			continue;

  2354. +

  2355. +		if (isl_seq_first_non_zero(bmap->eq[i] + pos + 1, total - pos) != -1)

  2356. +			continue;

  2357. +

  2358. +		if (isl_int_is_one(bmap->eq[i][pos])) {

  2359. +			min = max = -isl_int_get_si(bmap->eq[i][0]);

  2360. +			break;

  2361. +		}

  2362. +	}

  2363. +

  2364. +	for (i = bmap->n_ineq - 1; i >= 0; --i) {

  2365. +		if (isl_int_is_zero(bmap->ineq[i][pos]))

  2366. +			continue;

  2367. +

  2368. +		if (isl_seq_first_non_zero(bmap->ineq[i] + 1, pos - 1) != -1)

  2369. +			continue;

  2370. +

  2371. +		if (isl_seq_first_non_zero(bmap->ineq[i] + pos + 1, total - pos) != -1)

  2372. +			continue;

  2373. +

  2374. +		if (isl_int_is_one(bmap->ineq[i][pos]))

  2375. +			min = -isl_int_get_si(bmap->ineq[i][0]);

  2376. +

  2377. +		if (isl_int_is_negone(bmap->ineq[i][pos]))

  2378. +			max = isl_int_get_si(bmap->ineq[i][0]);

  2379. +	}

  2380. +

  2381. +	begin = isl_basic_map_offset(bmap, isl_dim_out) - n_out;

  2382. +	num = n_out * 2;

  2383. +

  2384. +	for (i = bmap->n_eq - 1; i >= 0; --i) {

  2385. +		if (isl_int_is_zero(bmap->eq[i][pos]))

  2386. +			continue;

  2387. +

  2388. +		if (isl_seq_first_non_zero(bmap->eq[i] + begin, num) == -1)

  2389. +			continue;

  2390. +

  2391. +		isl_int_set_si(bmap->eq[i][pos], 0);

  2392. +	}

  2393. +

  2394. +	for (i = bmap->n_ineq - 1; i >= 0; --i) {

  2395. +		if (isl_int_is_zero(bmap->ineq[i][pos]))

  2396. +			continue;

  2397. +

  2398. +		j = isl_seq_first_non_zero(bmap->ineq[i] + begin, num);

  2399. +		if (j == -1)

  2400. +			continue;

  2401. +

  2402. +		val = 0;

  2403. +		int sgn = isl_int_sgn(bmap->ineq[i][begin + j]);

  2404. +		if (sgn > 0) {

  2405. +			val = isl_int_get_si(bmap->ineq[i][pos]) * min;

  2406. +		}

  2407. +		if (sgn < 0) {

  2408. +			val = isl_int_get_si(bmap->ineq[i][pos]) * max;

  2409. +		}

  2410. +		isl_int_set_si(bmap->ineq[i][pos], 0);

  2411. +		if (val != 0) {

  2412. +			val += isl_int_get_si(bmap->ineq[i][0]);

  2413. +			isl_int_set_si(bmap->ineq[i][0], val);

  2414. +		}

  2415. +	}

  2416. +	return bmap;

  2417. +}

  2418. +

  2419. +__isl_give isl_map *isl_map_drop_special_constraints(

  2420. +	__isl_take isl_map *map, unsigned first, unsigned n)

  2421. +{

  2422. +	int i;

  2423. +	unsigned j;

  2424. +

  2425. +	if (isl_map_check_range(map, isl_dim_in, first, n) < 0)

  2426. +		return isl_map_free(map);

  2427. +

  2428. +	map = isl_map_cow(map);

  2429. +	if (!map)

  2430. +		return NULL;

  2431. +

  2432. +	for (i = 0; i < map->n; ++i) {

  2433. +		for (j = first; j < first + n; ++j) {

  2434. +			isl_basic_map *bmap = map->p[i];

  2435. +			map->p[i] = isl_basic_map_drop_special_constraints(bmap, isl_dim_in, j);

  2436. +		}

  2437. +	}

  2438. +	return map;

  2439. +}

  2440. +

  2441.  /* Does local variable "div" of "bmap" have a complete explicit representation?

  2442.   * Having a complete explicit representation requires not only

  2443.   * an explicit representation, but also that all local variables

  2444. @@ -9695,6 +9822,66 @@ isl_bool isl_basic_map_plain_is_fixed(__

  2445.  		isl_basic_map_offset(bmap, type) - 1 + pos, val);

  2446.  }

  2447.  

  2448. +__isl_give isl_basic_map *isl_basic_map_plain_update_fixed_var(

  2449. +	__isl_take isl_basic_map *bmap, unsigned pos)

  2450. +{

  2451. +	int i;

  2452. +	int d;

  2453. +	isl_size total;

  2454. +

  2455. +	total = isl_basic_map_dim(bmap, isl_dim_all);

  2456. +	if (total < 0)

  2457. +		return bmap;

  2458. +	for (i = 0, d = total-1; i < bmap->n_eq && d+1 > pos; ++i) {

  2459. +		for (; d+1 > pos; --d)

  2460. +			if (!isl_int_is_zero(bmap->eq[i][1+d]))

  2461. +				break;

  2462. +		if (d != pos)

  2463. +			continue;

  2464. +		if (isl_seq_first_non_zero(bmap->eq[i]+1, d) != -1)

  2465. +			break;

  2466. +		if (isl_seq_first_non_zero(bmap->eq[i]+1+d+1, total-d-1) != -1)

  2467. +			break;

  2468. +		if (!isl_int_is_one(bmap->eq[i][1+d]))

  2469. +			break;

  2470. +		if (!isl_int_is_zero(bmap->eq[i][0])) {

  2471. +			isl_int_sub_ui(bmap->eq[i][0], bmap->eq[i][0], 1);

  2472. +		}

  2473. +		break;

  2474. +	}

  2475. +	return bmap;

  2476. +}

  2477. +

  2478. +

  2479. +__isl_give isl_basic_map *isl_basic_map_plain_update_val_if_fixed(__isl_take isl_basic_map *bmap,

  2480. +	enum isl_dim_type type, unsigned pos)

  2481. +{

  2482. +	if (isl_basic_map_check_range(bmap, type, pos, 1) < 0)

  2483. +		return bmap;

  2484. +	return isl_basic_map_plain_update_fixed_var(bmap,

  2485. +		isl_basic_map_offset(bmap, type) - 1 + pos);

  2486. +}

  2487. +

  2488. +/* If "map" obviously lies on a hyperplane where the given dimension

  2489. + * has a fixed value, then update the fixed value use (value + 1).

  2490. + */

  2491. +__isl_give isl_map *isl_map_plain_update_val_if_fixed(__isl_take isl_map *map,

  2492. +	enum isl_dim_type type, unsigned pos)

  2493. +{

  2494. +	int i;

  2495. +	if (!map)

  2496. +		return map;

  2497. +	if (map->n == 0)

  2498. +		return map;

  2499. +	if (isl_map_check_range(map, type, pos, 1) < 0)

  2500. +		return map;

  2501. +

  2502. +	for (i = 0; i < map->n; ++i) {

  2503. +		map->p[i] = isl_basic_map_plain_update_val_if_fixed(map->p[i], type, pos);

  2504. +	}

  2505. +	return map;

  2506. +}

  2507. +

  2508.  /* If "bmap" obviously lies on a hyperplane where the given dimension

  2509.   * has a fixed value, then return that value.

  2510.   * Otherwise return NaN.

  2511. diff -Npur isl_0.22/isl_multi_templ.c isl/isl_multi_templ.c

  2512. --- isl_0.22/isl_multi_templ.c	2020-04-17 16:49:36.254477000 +0800

  2513. +++ isl/isl_multi_templ.c	2020-04-29 18:14:39.937681000 +0800

  2514. @@ -258,6 +258,25 @@ __isl_give MULTI(BASE) *FN(FN(MULTI(BASE

  2515.  	return FN(MULTI(BASE),set_at)(multi, pos, el);

  2516.  }

  2517.  

  2518. +/* Return the base expressions of "multi" as a list.

  2519. + */

  2520. +__isl_give LIST(EL) *FN(FN(MULTI(BASE),get),LIST(BASE))(

  2521. +	__isl_keep MULTI(BASE) *multi)

  2522. +{

  2523. +	int i;

  2524. +	LIST(EL) *list;

  2525. +

  2526. +	if (!multi)

  2527. +		return NULL;

  2528. +	list = FN(LIST(EL),alloc)(FN(MULTI(BASE),get_ctx(multi)), multi->n);

  2529. +	for (i = 0; i < multi->n; ++i) {

  2530. +		EL *el = FN(FN(MULTI(BASE),get),BASE)(multi, i);

  2531. +		list = FN(LIST(EL),add)(list, el);

  2532. +	}

  2533. +

  2534. +	return list;

  2535. +}

  2536. +

  2537.  /* Reset the space of "multi".  This function is called from isl_pw_templ.c

  2538.   * and doesn't know if the space of an element object is represented

  2539.   * directly or through its domain.  It therefore passes along both,

  2540. diff -Npur isl_0.22/isl_options.c isl/isl_options.c

  2541. --- isl_0.22/isl_options.c	2020-04-17 16:49:36.254477000 +0800

  2542. +++ isl/isl_options.c	2020-04-29 18:14:39.937681000 +0800

  2543. @@ -137,10 +137,19 @@ ISL_ARG_BOOL(struct isl_options, coalesc

  2544.  ISL_ARG_BOOL(struct isl_options, coalesce_preserve_locals, 0,

  2545.  	"coalesce-preserve-locals", 0,

  2546.  	"preserve local variables during coalescing")

  2547. +

  2548. +ISL_ARG_BOOL(struct isl_options, schedule_nonneg_var_coefficient, 0,

  2549. +	"schedule-nonneg-var-coefficient", 0, "Only consider schedules "

  2550. +	"where the coefficients of the variable dimensions "

  2551. +        "are non-negative.")

  2552.  ISL_ARG_INT(struct isl_options, schedule_max_coefficient, 0,

  2553.  	"schedule-max-coefficient", "limit", -1, "Only consider schedules "

  2554.  	"where the coefficients of the variable and parameter dimensions "

  2555.          "do not exceed <limit>. A value of -1 allows arbitrary coefficients.")

  2556. +ISL_ARG_BOOL(struct isl_options, schedule_unit_max_var_coefficient_sum, 0,

  2557. +	"schedule-unit-max-var-coefficient-sum", 0,

  2558. +	"bound the sum of the coefficients of the variables by one "

  2559. +	"for each statement")

  2560.  ISL_ARG_INT(struct isl_options, schedule_max_constant_term, 0,

  2561.  	"schedule-max-constant-term", "limit", -1, "Only consider schedules "

  2562.  	"where the coefficients of the constant dimension do not exceed "

  2563. @@ -167,7 +176,7 @@ ISL_ARG_BOOL(struct isl_options, schedul

  2564.  	"schedule-separate-components", 1,

  2565.  	"separate components in dependence graph")

  2566.  ISL_ARG_BOOL(struct isl_options, schedule_whole_component, 0,

  2567. -	"schedule-whole-component", 0,

  2568. +	"schedule-whole-component", 1,

  2569.  	"try and compute schedule for entire component first")

  2570.  ISL_ARG_CHOICE(struct isl_options, schedule_algorithm, 0,

  2571.  	"schedule-algorithm", isl_schedule_algorithm_choice,

  2572. @@ -255,10 +264,20 @@ ISL_CTX_GET_BOOL_DEF(isl_options, struct

  2573.  	gbr_only_first)

  2574.  

  2575.  ISL_CTX_SET_INT_DEF(isl_options, struct isl_options, isl_options_args,

  2576. +	schedule_nonneg_var_coefficient)

  2577. +ISL_CTX_GET_INT_DEF(isl_options, struct isl_options, isl_options_args,

  2578. +	schedule_nonneg_var_coefficient)

  2579. +

  2580. +ISL_CTX_SET_INT_DEF(isl_options, struct isl_options, isl_options_args,

  2581.  	schedule_max_coefficient)

  2582.  ISL_CTX_GET_INT_DEF(isl_options, struct isl_options, isl_options_args,

  2583.  	schedule_max_coefficient)

  2584.  

  2585. +ISL_CTX_SET_BOOL_DEF(isl_options, struct isl_options, isl_options_args,

  2586. +	schedule_unit_max_var_coefficient_sum)

  2587. +ISL_CTX_GET_BOOL_DEF(isl_options, struct isl_options, isl_options_args,

  2588. +	schedule_unit_max_var_coefficient_sum)

  2589. +

  2590.  ISL_CTX_SET_INT_DEF(isl_options, struct isl_options, isl_options_args,

  2591.  	schedule_max_constant_term)

  2592.  ISL_CTX_GET_INT_DEF(isl_options, struct isl_options, isl_options_args,

  2593. diff -Npur isl_0.22/isl_options_private.h isl/isl_options_private.h

  2594. --- isl_0.22/isl_options_private.h	2020-04-17 16:49:36.254477000 +0800

  2595. +++ isl/isl_options_private.h	2020-04-29 18:14:39.937681000 +0800

  2596. @@ -34,9 +34,11 @@ struct isl_options {

  2597.  	int			convex;

  2598.  

  2599.  	int			coalesce_bounded_wrapping;

  2600. +	int			schedule_nonneg_var_coefficient;

  2601.  	int			coalesce_preserve_locals;

  2602.  

  2603.  	int			schedule_max_coefficient;

  2604. +	int			schedule_unit_max_var_coefficient_sum;

  2605.  	int			schedule_max_constant_term;

  2606.  	int			schedule_parametric;

  2607.  	int			schedule_outer_coincidence;

  2608. diff -Npur isl_0.22/isl_polynomial.c isl/isl_polynomial.c

  2609. --- isl_0.22/isl_polynomial.c	2020-04-17 16:49:36.254477000 +0800

  2610. +++ isl/isl_polynomial.c	2020-04-29 18:14:39.937681000 +0800

  2611. @@ -4756,6 +4756,32 @@ static __isl_give isl_pw_qpolynomial *co

  2612.  	return isl_pw_qpolynomial_alloc(isl_set_from_basic_set(bset), qp);

  2613.  }

  2614.  

  2615. +/* Internal data structure for multiplicative_call_factor_pw_qpolynomial.

  2616. + * "fn" is the function that is called on each factor.

  2617. + * "pwpq" collects the results.

  2618. + */

  2619. +struct isl_multiplicative_call_data_pw_qpolynomial {

  2620. +	__isl_give isl_pw_qpolynomial *(*fn)(__isl_take isl_basic_set *bset);

  2621. +	isl_pw_qpolynomial *pwqp;

  2622. +};

  2623. +

  2624. +/* isl_factorizer_every_factor_basic_set callback that applies

  2625. + * data->fn to the factor "bset" and multiplies in the result

  2626. + * in data->pwqp.

  2627. + */

  2628. +static isl_bool multiplicative_call_factor_pw_qpolynomial(

  2629. +	__isl_keep isl_basic_set *bset, void *user)

  2630. +{

  2631. +	struct isl_multiplicative_call_data_pw_qpolynomial *data = user;

  2632. +

  2633. +	bset = isl_basic_set_copy(bset);

  2634. +	data->pwqp = isl_pw_qpolynomial_mul(data->pwqp, data->fn(bset));

  2635. +	if (!data->pwqp)

  2636. +		return isl_bool_error;

  2637. +

  2638. +	return isl_bool_true;

  2639. +}

  2640. +

  2641.  /* Factor bset, call fn on each of the factors and return the product.

  2642.   *

  2643.   * If no factors can be found, simply call fn on the input.

  2644. @@ -4766,14 +4792,12 @@ static __isl_give isl_pw_qpolynomial *co

  2645.  	__isl_take isl_basic_set *bset,

  2646.  	__isl_give isl_pw_qpolynomial *(*fn)(__isl_take isl_basic_set *bset))

  2647.  {

  2648. -	int i, n;

  2649. +	struct isl_multiplicative_call_data_pw_qpolynomial data = { fn };

  2650.  	isl_space *space;

  2651.  	isl_set *set;

  2652.  	isl_factorizer *f;

  2653.  	isl_qpolynomial *qp;

  2654. -	isl_pw_qpolynomial *pwqp;

  2655. -	isl_size nparam;

  2656. -	isl_size nvar;

  2657. +	isl_bool every;

  2658.  

  2659.  	f = isl_basic_set_factorizer(bset);

  2660.  	if (!f)

  2661. @@ -4783,42 +4807,21 @@ static __isl_give isl_pw_qpolynomial *co

  2662.  		return fn(bset);

  2663.  	}

  2664.  

  2665. -	nparam = isl_basic_set_dim(bset, isl_dim_param);

  2666. -	nvar = isl_basic_set_dim(bset, isl_dim_set);

  2667. -	if (nparam < 0 || nvar < 0)

  2668. -		bset = isl_basic_set_free(bset);

  2669. -

  2670.  	space = isl_basic_set_get_space(bset);

  2671.  	space = isl_space_params(space);

  2672.  	set = isl_set_universe(isl_space_copy(space));

  2673.  	qp = isl_qpolynomial_one_on_domain(space);

  2674. -	pwqp = isl_pw_qpolynomial_alloc(set, qp);

  2675. -

  2676. -	bset = isl_morph_basic_set(isl_morph_copy(f->morph), bset);

  2677. +	data.pwqp = isl_pw_qpolynomial_alloc(set, qp);

  2678.  

  2679. -	for (i = 0, n = 0; i < f->n_group; ++i) {

  2680. -		isl_basic_set *bset_i;

  2681. -		isl_pw_qpolynomial *pwqp_i;

  2682. -

  2683. -		bset_i = isl_basic_set_copy(bset);

  2684. -		bset_i = isl_basic_set_drop_constraints_involving(bset_i,

  2685. -			    nparam + n + f->len[i], nvar - n - f->len[i]);

  2686. -		bset_i = isl_basic_set_drop_constraints_involving(bset_i,

  2687. -			    nparam, n);

  2688. -		bset_i = isl_basic_set_drop(bset_i, isl_dim_set,

  2689. -			    n + f->len[i], nvar - n - f->len[i]);

  2690. -		bset_i = isl_basic_set_drop(bset_i, isl_dim_set, 0, n);

  2691. -

  2692. -		pwqp_i = fn(bset_i);

  2693. -		pwqp = isl_pw_qpolynomial_mul(pwqp, pwqp_i);

  2694. -

  2695. -		n += f->len[i];

  2696. -	}

  2697. +	every = isl_factorizer_every_factor_basic_set(f,

  2698. +			&multiplicative_call_factor_pw_qpolynomial, &data);

  2699. +	if (every < 0)

  2700. +		data.pwqp = isl_pw_qpolynomial_free(data.pwqp);

  2701.  

  2702.  	isl_basic_set_free(bset);

  2703.  	isl_factorizer_free(f);

  2704.  

  2705. -	return pwqp;

  2706. +	return data.pwqp;

  2707.  error:

  2708.  	isl_basic_set_free(bset);

  2709.  	return NULL;

  2710. diff -Npur isl_0.22/isl_schedule_constraints.c isl/isl_schedule_constraints.c

  2711. --- isl_0.22/isl_schedule_constraints.c	2020-04-17 16:49:36.258477000 +0800

  2712. +++ isl/isl_schedule_constraints.c	2020-04-29 18:14:39.937681000 +0800

  2713. @@ -157,6 +157,19 @@ error:

  2714.  	return NULL;

  2715.  }

  2716.  

  2717. +/* Intersect the domain of "sc" with "domain".

  2718. + */

  2719. +__isl_give isl_schedule_constraints *isl_schedule_constraints_intersect_domain(

  2720. +	__isl_take isl_schedule_constraints *sc,

  2721. +	__isl_take isl_union_set *domain)

  2722. +{

  2723. +	isl_union_set *sc_domain;

  2724. +

  2725. +	sc_domain = isl_schedule_constraints_get_domain(sc);

  2726. +	sc_domain = isl_union_set_intersect(sc_domain, domain);

  2727. +	return isl_schedule_constraints_set_domain(sc, sc_domain);

  2728. +}

  2729. +

  2730.  /* Replace the context of "sc" by "context".

  2731.   */

  2732.  __isl_give isl_schedule_constraints *isl_schedule_constraints_set_context(

  2733. diff -Npur isl_0.22/isl_scheduler.c isl/isl_scheduler.c

  2734. --- isl_0.22/isl_scheduler.c	2020-04-17 16:49:36.258477000 +0800

  2735. +++ isl/isl_scheduler.c	2020-04-29 18:14:39.937681000 +0800

  2736. @@ -73,6 +73,7 @@

  2737.   * nvar is the dimension of the (compressed) domain

  2738.   * nparam is the number of parameters or 0 if we are not constructing

  2739.   *	a parametric schedule

  2740. + * nonneg is set if the coefficients of the variables should be non-negative

  2741.   *

  2742.   * If compressed is set, then hull represents the constraints

  2743.   * that were used to derive the compression, while compress and

  2744. @@ -115,6 +116,7 @@ struct isl_sched_node {

  2745.  	int	 start;

  2746.  	int	 nvar;

  2747.  	int	 nparam;

  2748. +	int	 nonneg;

  2749.  

  2750.  	int	 scc;

  2751.  	int	 cluster;

  2752. @@ -1928,30 +1930,53 @@ static isl_size coef_var_offset(__isl_ke

  2753.  	return offset;

  2754.  }

  2755.  

  2756. +/* Return the number of variables needed in the (I)LP

  2757. + * for encoding a single variable coefficient of "node".

  2758. + * Each coefficient is encoded as a difference between two non-negative

  2759. + * variables (if the coefficients of "node" are allowed to take on

  2760. + * negative values) or directly as a single non-negative variable.

  2761. + */

  2762. +static int coef_per_var(struct isl_sched_node *node)

  2763. +{

  2764. +	return node->nonneg ? 1 : 2;

  2765. +}

  2766. +

  2767. +/* Return the number of variables needed for "node" within the (I)LP.

  2768. + *

  2769. + * Within each node, the coefficients have the following order:

  2770. + *	- c_i_x

  2771. + *	- c_i_n (if parametric)

  2772. + *	- c_i_0

  2773. + */

  2774. +static int node_coef_size(struct isl_sched_node *node)

  2775. +{

  2776. +	return coef_per_var(node) * node->nvar + node->nparam + 1;

  2777. +}

  2778. +

  2779.  /* Return the offset of the coefficient of the constant term of "node"

  2780.   * within the (I)LP.

  2781.   *

  2782.   * Within each node, the coefficients have the following order:

  2783. - *	- positive and negative parts of c_i_x

  2784. + *	- c_i_x

  2785.   *	- c_i_n (if parametric)

  2786.   *	- c_i_0

  2787.   */

  2788.  static int node_cst_coef_offset(struct isl_sched_node *node)

  2789.  {

  2790. -	return node->start + 2 * node->nvar + node->nparam;

  2791. +	return node->start + coef_per_var(node) * node->nvar + node->nparam;

  2792.  }

  2793.  

  2794.  /* Return the offset of the coefficients of the parameters of "node"

  2795.   * within the (I)LP.

  2796.   *

  2797.   * Within each node, the coefficients have the following order:

  2798. - *	- positive and negative parts of c_i_x

  2799. + *	- c_i_x

  2800.   *	- c_i_n (if parametric)

  2801.   *	- c_i_0

  2802.   */

  2803.  static int node_par_coef_offset(struct isl_sched_node *node)

  2804.  {

  2805. -	return node->start + 2 * node->nvar;

  2806. +	return node->start + coef_per_var(node) * node->nvar;

  2807.  }

  2808.  

  2809.  /* Return the offset of the coefficients of the variables of "node"

  2810. @@ -1968,14 +1993,57 @@ static int node_var_coef_offset(struct i

  2811.  }

  2812.  

  2813.  /* Return the position of the pair of variables encoding

  2814. - * coefficient "i" of "node".

  2815. + * coefficient "i" of "node", within the sequence of coefficients

  2816. + * of the variables of "node".

  2817.   *

  2818.   * The order of these variable pairs is the opposite of

  2819.   * that of the coefficients, with 2 variables per coefficient.

  2820.   */

  2821. +static int node_local_var_coef_pos(struct isl_sched_node *node, int i)

  2822. +{

  2823. +	return coef_per_var(node) * (node->nvar - 1 - i);

  2824. +}

  2825. +

  2826. +/* Return the position of the pair of variables encoding

  2827. + * coefficient "i" of "node".

  2828. + */

  2829.  static int node_var_coef_pos(struct isl_sched_node *node, int i)

  2830.  {

  2831. -	return node_var_coef_offset(node) + 2 * (node->nvar - 1 - i);

  2832. +	return node_var_coef_offset(node) + node_local_var_coef_pos(node, i);

  2833. +}

  2834. +

  2835. +/* Update "dim_map" for mapping the coefficients of the variables in "node"

  2836. + * to the corresponding positions in the LP.

  2837. + * "offset" is the offset of the coefficients for the variables

  2838. + * in the input constraints.

  2839. + * "s" is the sign of the mapping.

  2840. + *

  2841. + * This part of the mapping essentially plugs in

  2842. + * (c_i_x^+ - c_i_x^-) if s = 1 and

  2843. + * (-c_i_x^+ + c_i_x^-) if s = -1

  2844. + * for the variable coefficients c_x.

  2845. + * In the LP, the c_i_x^- appear before their c_i_x^+ counterpart.

  2846. + * Furthermore, the order of these pairs is the opposite of that

  2847. + * of the corresponding coefficients.

  2848. + *

  2849. + * If the coefficients are expected to be non-negative, then

  2850. + * only a single variable is used in the encoding (c_i_x^- = 0 is omitted).

  2851. + */

  2852. +static __isl_give isl_dim_map *node_var_dim_map(struct isl_sched_node *node,

  2853. +	int offset, int s, __isl_take isl_dim_map *dim_map)

  2854. +{

  2855. +	int pos;

  2856. +

  2857. +	pos = node_var_coef_pos(node, 0);

  2858. +	if (node->nonneg) {

  2859. +		isl_dim_map_range(dim_map, pos, -1, offset, 1, node->nvar, s);

  2860. +	} else {

  2861. +		isl_dim_map_range(dim_map, pos, -2, offset, 1, node->nvar, -s);

  2862. +		isl_dim_map_range(dim_map, pos + 1, -2,

  2863. +					offset, 1, node->nvar, s);

  2864. +	}

  2865. +

  2866. +	return dim_map;

  2867.  }

  2868.  

  2869.  /* Construct an isl_dim_map for mapping constraints on coefficients

  2870. @@ -1991,9 +2059,6 @@ static int node_var_coef_pos(struct isl_

  2871.   * (0, -c_i_x^+ + c_i_x^-) if s = -1 or

  2872.   * (0, 0, c_i_x^+ - c_i_x^-) if s = 1 and

  2873.   * (0, 0, -c_i_x^+ + c_i_x^-) if s = -1.

  2874. - * In graph->lp, the c_i_x^- appear before their c_i_x^+ counterpart.

  2875. - * Furthermore, the order of these pairs is the opposite of that

  2876. - * of the corresponding coefficients.

  2877.   *

  2878.   * The caller can extend the mapping to also map the other coefficients

  2879.   * (and therefore not plug in 0).

  2880. @@ -2002,7 +2067,6 @@ static __isl_give isl_dim_map *intra_dim

  2881.  	struct isl_sched_graph *graph, struct isl_sched_node *node,

  2882.  	int offset, int s)

  2883.  {

  2884. -	int pos;

  2885.  	isl_size total;

  2886.  	isl_dim_map *dim_map;

  2887.  

  2888. @@ -2010,10 +2074,8 @@ static __isl_give isl_dim_map *intra_dim

  2889.  	if (!node || total < 0)

  2890.  		return NULL;

  2891.  

  2892. -	pos = node_var_coef_pos(node, 0);

  2893.  	dim_map = isl_dim_map_alloc(ctx, total);

  2894. -	isl_dim_map_range(dim_map, pos, -2, offset, 1, node->nvar, -s);

  2895. -	isl_dim_map_range(dim_map, pos + 1, -2, offset, 1, node->nvar, s);

  2896. +	dim_map = node_var_dim_map(node, offset, s, dim_map);

  2897.  

  2898.  	return dim_map;

  2899.  }

  2900. @@ -2032,9 +2094,6 @@ static __isl_give isl_dim_map *intra_dim

  2901.   *  -(c_i_x^+ - c_i_x^-), c_j_x^+ - c_j_x^-) if s = 1 and

  2902.   * (-c_j_0 + c_i_0, -c_j_n + c_i_n,

  2903.   *  c_i_x^+ - c_i_x^-, -(c_j_x^+ - c_j_x^-)) if s = -1.

  2904. - * In graph->lp, the c_*^- appear before their c_*^+ counterpart.

  2905. - * Furthermore, the order of these pairs is the opposite of that

  2906. - * of the corresponding coefficients.

  2907.   *

  2908.   * The caller can further extend the mapping.

  2909.   */

  2910. @@ -2056,19 +2115,13 @@ static __isl_give isl_dim_map *inter_dim

  2911.  	isl_dim_map_range(dim_map, pos, 0, 0, 0, 1, s);

  2912.  	pos = node_par_coef_offset(dst);

  2913.  	isl_dim_map_range(dim_map, pos, 1, 1, 1, dst->nparam, s);

  2914. -	pos = node_var_coef_pos(dst, 0);

  2915. -	isl_dim_map_range(dim_map, pos, -2, offset + src->nvar, 1,

  2916. -			  dst->nvar, -s);

  2917. -	isl_dim_map_range(dim_map, pos + 1, -2, offset + src->nvar, 1,

  2918. -			  dst->nvar, s);

  2919. +	dim_map = node_var_dim_map(dst, offset + src->nvar, s, dim_map);

  2920.  

  2921.  	pos = node_cst_coef_offset(src);

  2922.  	isl_dim_map_range(dim_map, pos, 0, 0, 0, 1, -s);

  2923.  	pos = node_par_coef_offset(src);

  2924.  	isl_dim_map_range(dim_map, pos, 1, 1, 1, src->nparam, -s);

  2925. -	pos = node_var_coef_pos(src, 0);

  2926. -	isl_dim_map_range(dim_map, pos, -2, offset, 1, src->nvar, s);

  2927. -	isl_dim_map_range(dim_map, pos + 1, -2, offset, 1, src->nvar, -s);

  2928. +	dim_map = node_var_dim_map(src, offset, -s, dim_map);

  2929.  

  2930.  	return dim_map;

  2931.  }

  2932. @@ -2842,6 +2895,63 @@ static isl_stat add_bound_coefficient_co

  2933.  	return isl_stat_ok;

  2934.  }

  2935.  

  2936. +/* Count the number of constraints that will be added by

  2937. + * add_bound_coefficient_sum_constraints and increment *n_eq and *n_ineq

  2938. + * accordingly.

  2939. + *

  2940. + * In practice, add_bound_coefficient_sum_constraints only adds

  2941. + * inequality constraints.

  2942. + */

  2943. +static isl_stat count_bound_coefficient_sum_constraints(isl_ctx *ctx,

  2944. +	struct isl_sched_graph *graph, int *n_eq, int *n_ineq)

  2945. +{

  2946. +	if (!isl_options_get_schedule_unit_max_var_coefficient_sum(ctx))

  2947. +		return isl_stat_ok;

  2948. +

  2949. +	*n_ineq += graph->n;

  2950. +

  2951. +	return isl_stat_ok;

  2952. +}

  2953. +

  2954. +/* If the schedule_unit_max_var_coefficient_sum option is set,

  2955. + * then add a constraint for each node that ensures that

  2956. + * the sum of the variables used in the encoding of the coefficients of

  2957. + * the variables of the node is bounded by one.

  2958. + * When a coefficient is encoded as a difference between two non-negative

  2959. + * variables, this means that the absolute values of the coefficients

  2960. + * are bounded by one.

  2961. + * A non-negative coefficient is encoded as itself, in which case

  2962. + * it is the coefficient itself that is bounded by one.

  2963. + */

  2964. +static isl_stat add_bound_coefficient_sum_constraints(isl_ctx *ctx,

  2965. +	struct isl_sched_graph *graph)

  2966. +{

  2967. +	int i;

  2968. +	int total;

  2969. +

  2970. +	if (!isl_options_get_schedule_unit_max_var_coefficient_sum(ctx))

  2971. +		return isl_stat_ok;

  2972. +

  2973. +	total = isl_basic_set_dim(graph->lp, isl_dim_set);

  2974. +

  2975. +	for (i = 0; i < graph->n; ++i) {

  2976. +		int j, k;

  2977. +		int pos;

  2978. +		struct isl_sched_node *node = &graph->node[i];

  2979. +

  2980. +		k = isl_basic_set_alloc_inequality(graph->lp);

  2981. +		if (k < 0)

  2982. +			return isl_stat_error;

  2983. +		isl_seq_clr(graph->lp->ineq[k], 1 + total);

  2984. +		pos = 1 + node_var_coef_offset(node);

  2985. +		for (j = 0; j < coef_per_var(node) * node->nvar; ++j)

  2986. +			isl_int_set_si(graph->lp->ineq[k][pos + j], -1);

  2987. +		isl_int_set_si(graph->lp->ineq[k][0], 1);

  2988. +	}

  2989. +

  2990. +	return isl_stat_ok;

  2991. +}

  2992. +

  2993.  /* Add a constraint to graph->lp that equates the value at position

  2994.   * "sum_pos" to the sum of the "n" values starting at "first".

  2995.   */

  2996. @@ -2916,7 +3026,7 @@ static isl_stat add_var_sum_constraint(s

  2997.  		struct isl_sched_node *node = &graph->node[i];

  2998.  		int pos = 1 + node_var_coef_offset(node);

  2999.  

  3000. -		for (j = 0; j < 2 * node->nvar; ++j)

  3001. +		for (j = 0; j < coef_per_var(node) * node->nvar; ++j)

  3002.  			isl_int_set_si(graph->lp->eq[k][pos + j], 1);

  3003.  	}

  3004.  

  3005. @@ -2975,7 +3085,7 @@ static isl_stat setup_lp(isl_ctx *ctx, s

  3006.  		if (node_update_vmap(node) < 0)

  3007.  			return isl_stat_error;

  3008.  		node->start = total;

  3009. -		total += 1 + node->nparam + 2 * node->nvar;

  3010. +		total += node_coef_size(node);

  3011.  	}

  3012.  

  3013.  	if (count_constraints(graph, &n_eq, &n_ineq, use_coincidence) < 0)

  3014. @@ -2984,6 +3094,9 @@ static isl_stat setup_lp(isl_ctx *ctx, s

  3015.  		return isl_stat_error;

  3016.  	if (count_bound_coefficient_constraints(ctx, graph, &n_eq, &n_ineq) < 0)

  3017.  		return isl_stat_error;

  3018. +	if (count_bound_coefficient_sum_constraints(ctx, graph,

  3019. +							    &n_eq, &n_ineq) < 0)

  3020. +		return isl_stat_error;

  3021.  

  3022.  	space = isl_space_set_alloc(ctx, 0, total);

  3023.  	isl_basic_set_free(graph->lp);

  3024. @@ -3001,6 +3114,8 @@ static isl_stat setup_lp(isl_ctx *ctx, s

  3025.  		return isl_stat_error;

  3026.  	if (add_bound_coefficient_constraints(ctx, graph) < 0)

  3027.  		return isl_stat_error;

  3028. +	if (add_bound_coefficient_sum_constraints(ctx, graph) < 0)

  3029. +		return isl_stat_error;

  3030.  	if (add_all_validity_constraints(graph, use_coincidence) < 0)

  3031.  		return isl_stat_error;

  3032.  	if (add_all_proximity_constraints(graph, use_coincidence) < 0)

  3033. @@ -3059,14 +3174,16 @@ static int needs_row(struct isl_sched_gr

  3034.  

  3035.  /* Construct a non-triviality region with triviality directions

  3036.   * corresponding to the rows of "indep".

  3037. - * The rows of "indep" are expressed in terms of the schedule coefficients c_i,

  3038. + * The rows of "indep" are expressed in terms of the schedule coefficients c_i

  3039. + * of "node",

  3040.   * while the triviality directions are expressed in terms of

  3041.   * pairs of non-negative variables c^+_i - c^-_i, with c^-_i appearing

  3042. - * before c^+_i.  Furthermore,

  3043. - * the pairs of non-negative variables representing the coefficients

  3044. - * are stored in the opposite order.

  3045. + * before c^+_i.

  3046. + * If the coefficients are forced to be non-negative,

  3047. + * then c^-_i = 0 is omitted from the encoding.

  3048.   */

  3049. -static __isl_give isl_mat *construct_trivial(__isl_keep isl_mat *indep)

  3050. +static __isl_give isl_mat *construct_trivial(struct isl_sched_node *node,

  3051. +	__isl_keep isl_mat *indep)

  3052.  {

  3053.  	isl_ctx *ctx;

  3054.  	isl_mat *mat;

  3055. @@ -3079,14 +3196,19 @@ static __isl_give isl_mat *construct_tri

  3056.  		return NULL;

  3057.  

  3058.  	ctx = isl_mat_get_ctx(indep);

  3059. -	mat = isl_mat_alloc(ctx, n, 2 * n_var);

  3060. +	mat = isl_mat_alloc(ctx, n, coef_per_var(node) * n_var);

  3061.  	if (!mat)

  3062.  		return NULL;

  3063.  	for (i = 0; i < n; ++i) {

  3064.  		for (j = 0; j < n_var; ++j) {

  3065. -			int nj = n_var - 1 - j;

  3066. -			isl_int_neg(mat->row[i][2 * nj], indep->row[i][j]);

  3067. -			isl_int_set(mat->row[i][2 * nj + 1], indep->row[i][j]);

  3068. +			int pos = node_local_var_coef_pos(node, j);

  3069. +			if (node->nonneg) {

  3070. +				isl_int_set(mat->row[i][pos], indep->row[i][j]);

  3071. +			} else {

  3072. +				isl_int_neg(mat->row[i][pos], indep->row[i][j]);

  3073. +				isl_int_set(mat->row[i][pos + 1],

  3074. +					    indep->row[i][j]);

  3075. +			}

  3076.  		}

  3077.  	}

  3078.  

  3079. @@ -3112,7 +3234,7 @@ static __isl_give isl_vec *solve_lp(isl_

  3080.  

  3081.  		graph->region[i].pos = node_var_coef_offset(node);

  3082.  		if (needs_row(graph, node))

  3083. -			trivial = construct_trivial(node->indep);

  3084. +			trivial = construct_trivial(node, node->indep);

  3085.  		else

  3086.  			trivial = isl_mat_zero(ctx, 0, 0);

  3087.  		graph->region[i].trivial = trivial;

  3088. @@ -3130,8 +3252,9 @@ static __isl_give isl_vec *solve_lp(isl_

  3089.   * Each schedule coefficient c_i_x is represented as the difference

  3090.   * between two non-negative variables c_i_x^+ - c_i_x^-.

  3091.   * The c_i_x^- appear before their c_i_x^+ counterpart.

  3092. - * Furthermore, the order of these pairs is the opposite of that

  3093. - * of the corresponding coefficients.

  3094. + *

  3095. + * If the coefficients are forced to be non-negative,

  3096. + * then the c_i_x^- = 0 are omitted from the encoding.

  3097.   *

  3098.   * Return c_i_x = c_i_x^+ - c_i_x^-

  3099.   */

  3100. @@ -3148,10 +3271,14 @@ static __isl_give isl_vec *extract_var_c

  3101.  	if (!csol)

  3102.  		return NULL;

  3103.  

  3104. -	pos = 1 + node_var_coef_offset(node);

  3105. -	for (i = 0; i < node->nvar; ++i)

  3106. -		isl_int_sub(csol->el[node->nvar - 1 - i],

  3107. -			    sol->el[pos + 2 * i + 1], sol->el[pos + 2 * i]);

  3108. +	for (i = 0; i < node->nvar; ++i) {

  3109. +		pos = 1 + node_var_coef_pos(node, i);

  3110. +		if (node->nonneg)

  3111. +			isl_int_set(csol->el[i], sol->el[pos]);

  3112. +		else

  3113. +			isl_int_sub(csol->el[i],

  3114. +				    sol->el[pos + 1], sol->el[pos]);

  3115. +	}

  3116.  

  3117.  	return csol;

  3118.  }

  3119. @@ -4412,7 +4539,7 @@ static isl_stat setup_carry_lp(isl_ctx *

  3120.  	for (i = 0; i < graph->n; ++i) {

  3121.  		struct isl_sched_node *node = &graph->node[graph->sorted[i]];

  3122.  		node->start = total;

  3123. -		total += 1 + node->nparam + 2 * node->nvar;

  3124. +		total += node_coef_size(node);

  3125.  	}

  3126.  

  3127.  	if (count_all_constraints(intra, inter, &n_eq, &n_ineq) < 0)

  3128. @@ -5806,6 +5933,17 @@ static __isl_give isl_schedule_node *com

  3129.  			return isl_schedule_node_free(node);

  3130.  		if (isl_options_get_schedule_outer_coincidence(ctx))

  3131.  			return carry_coincidence(node, graph);

  3132. +		//fix isl scheduling bug for l2_loss

  3133. +		isl_vec *sol;

  3134. +		sol = compute_carrying_sol(ctx, graph, 1, 0);

  3135. +		if (!sol)

  3136. +			return isl_schedule_node_free(node);

  3137. +		if (sol->size == 0) {

  3138. +			isl_vec_free(sol);

  3139. +			if (graph->scc > 1)

  3140. +				return compute_component_schedule(node, graph, 1);

  3141. +			return sort_statements(node, graph, initialized);

  3142. +		}

  3143.  		return carry_dependences(node, graph);

  3144.  	}

  3145.  

  3146. @@ -5846,7 +5984,7 @@ static __isl_give isl_schedule_node *com

  3147.   * Since there are only a finite number of dependences,

  3148.   * there will only be a finite number of iterations.

  3149.   */

  3150. -static isl_stat compute_schedule_wcc_band(isl_ctx *ctx,

  3151. +static isl_stat compute_schedule_wcc_band_core(isl_ctx *ctx,

  3152.  	struct isl_sched_graph *graph)

  3153.  {

  3154.  	int has_coincidence;

  3155. @@ -5907,6 +6045,67 @@ static isl_stat compute_schedule_wcc_ban

  3156.  	return isl_stat_ok;

  3157.  }

  3158.  

  3159. +

  3160. +/* Set the nonneg fields of the nodes in "graph".

  3161. + *

  3162. + * If the "schedule_nonneg_var_coefficient" option is set,

  3163. + * then all nodes have their nonneg fields set.

  3164. + * Otherwise, it is set based on the additional constraints

  3165. + * on the coefficients of the variables, if any.

  3166. + */

  3167. +static isl_stat graph_set_nonneg(isl_ctx *ctx, struct isl_sched_graph *graph)

  3168. +{

  3169. +	int i;

  3170. +	int nonneg;

  3171. +

  3172. +	nonneg = isl_options_get_schedule_nonneg_var_coefficient(ctx);

  3173. +	for (i = 0; i < graph->n; ++i) {

  3174. +		struct isl_sched_node *node = &graph->node[i];

  3175. +

  3176. +		if (nonneg)

  3177. +			node->nonneg = 1;

  3178. +	}

  3179. +

  3180. +	return isl_stat_ok;

  3181. +}

  3182. +

  3183. +/* Clear the nonneg fields of the nodes in "graph".

  3184. + */

  3185. +static isl_stat graph_clear_nonneg(isl_ctx *ctx, struct isl_sched_graph *graph)

  3186. +{

  3187. +	int i;

  3188. +

  3189. +	for (i = 0; i < graph->n; ++i) {

  3190. +		struct isl_sched_node *node = &graph->node[i];

  3191. +

  3192. +		node->nonneg = 0;

  3193. +	}

  3194. +

  3195. +	return isl_stat_ok;

  3196. +}

  3197. +

  3198. +/* Construct a band of schedule rows for a connected dependence graph.

  3199. + * The caller is responsible for determining the strongly connected

  3200. + * components and calling compute_maxvar first.

  3201. + *

  3202. + * Locally set the nonneg fields of the nodes for use in the LP encoding.

  3203. + * The markings are cleared afterwards in case the graph is reused

  3204. + * to carry dependences.

  3205. + */

  3206. +static isl_stat compute_schedule_wcc_band(isl_ctx *ctx,

  3207. +	struct isl_sched_graph *graph)

  3208. +{

  3209. +	isl_stat r;

  3210. +

  3211. +	r = graph_set_nonneg(ctx, graph);

  3212. +	if (r >= 0)

  3213. +		r = compute_schedule_wcc_band_core(ctx, graph);

  3214. +	if (r >= 0)

  3215. +		r = graph_clear_nonneg(ctx, graph);

  3216. +

  3217. +	return r;

  3218. +}

  3219. +

  3220.  /* Compute a schedule for a connected dependence graph by considering

  3221.   * the graph as a whole and return the updated schedule node.

  3222.   *

  3223. diff -Npur isl_0.22/isl_space.c isl/isl_space.c

  3224. --- isl_0.22/isl_space.c	2020-04-17 16:49:36.258477000 +0800

  3225. +++ isl/isl_space.c	2020-04-29 18:14:39.941681000 +0800

  3226. @@ -599,6 +599,20 @@ error:

  3227.  	return NULL;

  3228.  }

  3229.  

  3230. +/* Replace the tuple identifier of the set space "space" by "id".

  3231. + */

  3232. +__isl_give isl_space *isl_space_set_set_tuple_id(__isl_take isl_space *space,

  3233. +	__isl_take isl_id *id)

  3234. +{

  3235. +	if (isl_space_check_is_set(space) < 0)

  3236. +		goto error;

  3237. +	return isl_space_set_tuple_id(space, isl_dim_set, id);

  3238. +error:

  3239. +	isl_space_free(space);

  3240. +	isl_id_free(id);

  3241. +	return NULL;

  3242. +}

  3243. +

  3244.  __isl_give isl_space *isl_space_reset_tuple_id(__isl_take isl_space *space,

  3245.  	enum isl_dim_type type)

  3246.  {

  3247. @@ -1140,6 +1154,17 @@ error:

  3248.  	return NULL;

  3249.  }

  3250.  

  3251. +/* Does "id" appear as a parameter in "space"?

  3252. + */

  3253. +isl_bool isl_space_has_param_id(__isl_keep isl_space *space,

  3254. +	__isl_keep isl_id *id)

  3255. +{

  3256. +	if (!space || !id)

  3257. +		return isl_bool_error;

  3258. +

  3259. +	return isl_space_find_dim_by_id(space, isl_dim_param, id) >= 0;

  3260. +}

  3261. +

  3262.  /* Add a parameter with identifier "id" to "space", provided

  3263.   * it does not already appear in "space".

  3264.   */