summaryloggraphiclog1graphiclog2commitcommitdifftreerefseditfork
rawpatchinlineside by side (parent: 70199e5)
rawpatchinlineside by side (parent: 70199e5)
| author | Sven Verdoolaege <sven@cerebras.net> | |
| Fri, 5 Jul 2019 08:32:39 +0000 (5 10:32 +0200) | ||
| committer | Sven Verdoolaege <sven@cerebras.net> | |
| Tue, 30 Jul 2019 16:06:21 +0000 (30 18:06 +0200) |
This was arguably missing from isl-0.14.1-479-g370a8b7d0 (introduce
isl_bool and isl_stat return types, Mon May 4 09:45:16 2015 +0200).
Signed-off-by: Sven Verdoolaege <sven@cerebras.net>
isl_bool and isl_stat return types, Mon May 4 09:45:16 2015 +0200).
Signed-off-by: Sven Verdoolaege <sven@cerebras.net>
15 files changed:
diff --git a/include/isl/hash.h b/include/isl/hash.h
--- a/include/isl/hash.h
+++ b/include/isl/hash.h
void isl_hash_table_clear(struct isl_hash_table *table);
extern struct isl_hash_table_entry *isl_hash_table_entry_none;
struct isl_hash_table_entry *isl_hash_table_find(struct isl_ctx *ctx,
- struct isl_hash_table *table,
- uint32_t key_hash,
- int (*eq)(const void *entry, const void *val),
- const void *val, int reserve);
+ struct isl_hash_table *table,
+ uint32_t key_hash,
+ isl_bool (*eq)(const void *entry, const void *val),
+ const void *val, int reserve);
isl_stat isl_hash_table_foreach(isl_ctx *ctx, struct isl_hash_table *table,
isl_stat (*fn)(void **entry, void *user), void *user);
void isl_hash_table_remove(struct isl_ctx *ctx,
--- a/include/isl/hmap_templ.c
+++ b/include/isl/hmap_templ.c
return hmap;
}
-static int has_key(const void *entry, const void *c_key)
+static isl_bool has_key(const void *entry, const void *c_key)
{
const ISL_S(pair) *pair = entry;
ISL_KEY *key = (ISL_KEY *) c_key;
diff --git a/isl_convex_hull.c b/isl_convex_hull.c
--- a/isl_convex_hull.c
+++ b/isl_convex_hull.c
int ineq;
};
-static int max_constraint_equal(const void *entry, const void *val)
+static isl_bool max_constraint_equal(const void *entry, const void *val)
{
struct max_constraint *a = (struct max_constraint *)entry;
isl_int *b = (isl_int *)val;
- return isl_seq_eq(a->c->row[0] + 1, b, a->c->n_col - 1);
+ return isl_bool_ok(isl_seq_eq(a->c->row[0] + 1, b, a->c->n_col - 1));
}
static isl_stat update_constraint(struct isl_ctx *ctx,
isl_int *p;
};
-static int has_ineq(const void *entry, const void *val)
+static isl_bool has_ineq(const void *entry, const void *val)
{
isl_int *row = (isl_int *)entry;
struct ineq_cmp_data *v = (struct ineq_cmp_data *)val;
- return isl_seq_eq(row + 1, v->p + 1, v->len) ||
- isl_seq_is_neg(row + 1, v->p + 1, v->len);
+ return isl_bool_ok(isl_seq_eq(row + 1, v->p + 1, v->len) ||
+ isl_seq_is_neg(row + 1, v->p + 1, v->len));
}
static int hash_ineq(struct isl_ctx *ctx, struct isl_hash_table *table,
diff --git a/isl_hash.c b/isl_hash.c
--- a/isl_hash.c
+++ b/isl_hash.c
/* Dummy comparison function that always returns false.
*/
-static int no(const void *entry, const void *val)
+static isl_bool no(const void *entry, const void *val)
{
- return 0;
+ return isl_bool_false;
}
/* Extend "table" to twice its size.
struct isl_hash_table_entry *isl_hash_table_entry_none = &none;
struct isl_hash_table_entry *isl_hash_table_find(struct isl_ctx *ctx,
- struct isl_hash_table *table,
- uint32_t key_hash,
- int (*eq)(const void *entry, const void *val),
- const void *val, int reserve)
+ struct isl_hash_table *table,
+ uint32_t key_hash,
+ isl_bool (*eq)(const void *entry, const void *val),
+ const void *val, int reserve)
{
size_t size;
uint32_t h, key_bits;
key_bits = isl_hash_bits(key_hash, table->bits);
size = 1 << table->bits;
- for (h = key_bits; table->entries[h].data; h = (h+1) % size)
- if (table->entries[h].hash == key_hash &&
- eq(table->entries[h].data, val))
+ for (h = key_bits; table->entries[h].data; h = (h+1) % size) {
+ isl_bool equal;
+
+ if (table->entries[h].hash != key_hash)
+ continue;
+ equal = eq(table->entries[h].data, val);
+ if (equal < 0)
+ return NULL;
+ if (equal)
return &table->entries[h];
+ }
if (!reserve)
return isl_hash_table_entry_none;
diff --git a/isl_id.c b/isl_id.c
--- a/isl_id.c
+++ b/isl_id.c
void *user;
};
-static int isl_id_has_name_and_user(const void *entry, const void *val)
+static isl_bool isl_id_has_name_and_user(const void *entry, const void *val)
{
isl_id *id = (isl_id *)entry;
struct isl_name_and_user *nu = (struct isl_name_and_user *) val;
if (id->user != nu->user)
- return 0;
+ return isl_bool_false;
if (id->name == nu->name)
- return 1;
+ return isl_bool_true;
if (!id->name || !nu->name)
- return 0;
+ return isl_bool_false;
- return !strcmp(id->name, nu->name);
+ return isl_bool_ok(!strcmp(id->name, nu->name));
}
__isl_give isl_id *isl_id_alloc(isl_ctx *ctx, const char *name, void *user)
return 1;
}
-static int isl_id_eq(const void *entry, const void *name)
+static isl_bool isl_id_eq(const void *entry, const void *name)
{
- return entry == name;
+ return isl_bool_ok(entry == name);
}
uint32_t isl_hash_id(uint32_t hash, __isl_keep isl_id *id)
diff --git a/isl_id_to_ast_expr.c b/isl_id_to_ast_expr.c
--- a/isl_id_to_ast_expr.c
+++ b/isl_id_to_ast_expr.c
#include <isl/id.h>
#include <isl/ast.h>
-#define isl_id_is_equal(id1,id2) id1 == id2
+#define isl_id_is_equal(id1,id2) isl_bool_ok(id1 == id2)
#define ISL_KEY isl_id
#define ISL_VAL isl_ast_expr
diff --git a/isl_id_to_pw_aff.c b/isl_id_to_pw_aff.c
--- a/isl_id_to_pw_aff.c
+++ b/isl_id_to_pw_aff.c
#include <isl/id.h>
#include <isl/aff.h>
-#define isl_id_is_equal(id1,id2) id1 == id2
+#define isl_id_is_equal(id1,id2) isl_bool_ok(id1 == id2)
#define ISL_KEY isl_id
#define ISL_VAL isl_pw_aff
diff --git a/isl_scheduler.c b/isl_scheduler.c
--- a/isl_scheduler.c
+++ b/isl_scheduler.c
isl_vec *max;
};
-static int node_has_tuples(const void *entry, const void *val)
+static isl_bool node_has_tuples(const void *entry, const void *val)
{
struct isl_sched_node *node = (struct isl_sched_node *)entry;
isl_space *space = (isl_space *) val;
return node && node >= &graph->node[0] && node < &graph->node[graph->n];
}
-static int edge_has_src_and_dst(const void *entry, const void *val)
+static isl_bool edge_has_src_and_dst(const void *entry, const void *val)
{
const struct isl_sched_edge *edge = entry;
const struct isl_sched_edge *temp = val;
- return edge->src == temp->src && edge->dst == temp->dst;
+ return isl_bool_ok(edge->src == temp->src && edge->dst == temp->dst);
}
/* Add the given edge to graph->edge_table[type].
diff --git a/isl_stream.c b/isl_stream.c
--- a/isl_stream.c
+++ b/isl_stream.c
enum isl_token_type type;
};
-static int same_name(const void *entry, const void *val)
+static isl_bool same_name(const void *entry, const void *val)
{
const struct isl_keyword *keyword = (const struct isl_keyword *)entry;
- return !strcmp(keyword->name, val);
+ return isl_bool_ok(!strcmp(keyword->name, val));
}
enum isl_token_type isl_stream_register_keyword(__isl_keep isl_stream *s,
diff --git a/isl_tab_pip.c b/isl_tab_pip.c
--- a/isl_tab_pip.c
+++ b/isl_tab_pip.c
/* Check whether the coefficients of the output variables
* of the constraint in "entry" are equal to info->val.
*/
-static int constraint_equal(const void *entry, const void *val)
+static isl_bool constraint_equal(const void *entry, const void *val)
{
isl_int **row = (isl_int **)entry;
const struct isl_constraint_equal_info *info = val;
+ int eq;
- return isl_seq_eq((*row) + 1 + info->n_in, info->val, info->n_out);
+ eq = isl_seq_eq((*row) + 1 + info->n_in, info->val, info->n_out);
+ return isl_bool_ok(eq);
}
/* Check whether "bmap" has a pair of constraints that have
diff --git a/isl_union_eval.c b/isl_union_eval.c
--- a/isl_union_eval.c
+++ b/isl_union_eval.c
/* Is the domain space of "entry" equal to "space"?
*/
-static int FN(UNION,has_domain_space)(const void *entry, const void *val)
+static isl_bool FN(UNION,has_domain_space)(const void *entry, const void *val)
{
PART *part = (PART *)entry;
isl_space *space = (isl_space *) val;
diff --git a/isl_union_map.c b/isl_union_map.c
--- a/isl_union_map.c
+++ b/isl_union_map.c
return isl_union_map_space_has_equal_params(uset_to_umap(uset), space);
}
-static int has_space(const void *entry, const void *val)
+static isl_bool has_space(const void *entry, const void *val)
{
isl_map *map = (isl_map *)entry;
isl_space *space = (isl_space *) val;
diff --git a/isl_union_multi.c b/isl_union_multi.c
--- a/isl_union_multi.c
+++ b/isl_union_multi.c
/* Is the space of "entry" equal to "space"?
*/
-static int FN(UNION,has_space)(const void *entry, const void *val)
+static isl_bool FN(UNION,has_space)(const void *entry, const void *val)
{
PART *part = (PART *) entry;
isl_space *space = (isl_space *) val;
/* Is the domain space of the group of expressions at "entry"
* equal to that of "space"?
*/
-static int FN(UNION,group_has_same_domain_space)(const void *entry,
+static isl_bool FN(UNION,group_has_same_domain_space)(const void *entry,
const void *val)
{
S(UNION,group) *group = (S(UNION,group) *) entry;
diff --git a/isl_union_single.c b/isl_union_single.c
--- a/isl_union_single.c
+++ b/isl_union_single.c
/* Is the domain space of "entry" equal to the domain of "space"?
*/
-static int FN(UNION,has_same_domain_space)(const void *entry, const void *val)
+static isl_bool FN(UNION,has_same_domain_space)(const void *entry,
+ const void *val)
{
PART *part = (PART *)entry;
isl_space *space = (isl_space *) val;
diff --git a/isl_union_templ.c b/isl_union_templ.c
--- a/isl_union_templ.c
+++ b/isl_union_templ.c
__isl_give PW *(*fn)(__isl_take PW*, __isl_take isl_set*);
};
-static int FN(UNION,set_has_space)(const void *entry, const void *val)
+static isl_bool FN(UNION,set_has_space)(const void *entry, const void *val)
{
isl_set *set = (isl_set *)entry;
isl_space *space = (isl_space *)val;