From 8dc1160073717d936e2046f3fbdd854677aceace Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Fri, 11 Nov 2011 21:26:21 +0100 Subject: [PATCH] update isl for introduction of isl_args Signed-off-by: Sven Verdoolaege --- cuda.c | 2 +- isl | 2 +- pet | 2 +- ppcg.c | 13 ++++++------- ppcg_options.c | 5 ++--- ppcg_options.h | 4 +--- 6 files changed, 12 insertions(+), 16 deletions(-) diff --git a/cuda.c b/cuda.c index c2778e9..2606e88 100644 --- a/cuda.c +++ b/cuda.c @@ -4171,7 +4171,7 @@ static void compute_schedule(struct cuda_gen *gen, dep = isl_union_map_coalesce(dep); domain = extract_domain(gen); - options = isl_ctx_peek_options(ctx, isl_options_arg); + options = isl_ctx_peek_options(ctx, &isl_options_args); options->schedule_outer_zero_distance = 1; schedule = isl_union_set_compute_schedule(isl_union_set_copy(domain), isl_union_map_copy(dep), dep); diff --git a/isl b/isl index 5186370..c1e5c89 160000 --- a/isl +++ b/isl @@ -1 +1 @@ -Subproject commit 518637043dd40811cce0b0803cb303698e2a9062 +Subproject commit c1e5c89824b26b40ce10a78c1f61bd1b853ec0f0 diff --git a/pet b/pet index 044484d..e7bb5ad 160000 --- a/pet +++ b/pet @@ -1 +1 @@ -Subproject commit 044484d389819cbaefd8b12b12ff71227206e4e6 +Subproject commit e7bb5ada84cf5c301b99b24c56e6ee119d717e57 diff --git a/ppcg.c b/ppcg.c index 6ec582f..4a3dd06 100644 --- a/ppcg.c +++ b/ppcg.c @@ -22,14 +22,13 @@ struct options { char *input; }; -struct isl_arg options_arg[] = { -ISL_ARG_CHILD(struct options, isl, "isl", isl_options_arg, "isl options") -ISL_ARG_CHILD(struct options, ppcg, NULL, ppcg_options_arg, NULL) +ISL_ARGS_START(struct options, options_args) +ISL_ARG_CHILD(struct options, isl, "isl", &isl_options_args, "isl options") +ISL_ARG_CHILD(struct options, ppcg, NULL, &ppcg_options_args, NULL) ISL_ARG_ARG(struct options, input, "input", NULL) -ISL_ARG_END -}; +ISL_ARGS_END -ISL_ARG_DEF(options, struct options, options_arg) +ISL_ARG_DEF(options, struct options, options_args) int main(int argc, char **argv) { @@ -43,7 +42,7 @@ int main(int argc, char **argv) assert(options); argc = options_parse(options, argc, argv, ISL_ARG_ALL); - ctx = isl_ctx_alloc_with_options(options_arg, options); + ctx = isl_ctx_alloc_with_options(&options_args, options); scop = pet_scop_extract_from_C_source(ctx, options->input, NULL, 0); r = cuda_pet(ctx, scop, options->ppcg, options->input); diff --git a/ppcg_options.c b/ppcg_options.c index aca3c6b..0c54b90 100644 --- a/ppcg_options.c +++ b/ppcg_options.c @@ -10,7 +10,7 @@ #include "ppcg_options.h" -struct isl_arg ppcg_options_arg[] = { +ISL_ARGS_START(struct ppcg_options, ppcg_options_args) ISL_ARG_BOOL(struct ppcg_options, scale_tile_loops, 0, "scale-tile-loops", 1, NULL) ISL_ARG_BOOL(struct ppcg_options, wrap, 0, "wrap", 1, NULL) @@ -21,5 +21,4 @@ ISL_ARG_BOOL(struct ppcg_options, use_private_memory, 0, "private-memory", 1, ISL_ARG_STR(struct ppcg_options, ctx, 0, "ctx", "context", NULL, "Constraints on parameters") ISL_ARG_INT(struct ppcg_options, tile_size, 'S', "tile-size", "size", 32, NULL) -ISL_ARG_END -}; +ISL_ARGS_END diff --git a/ppcg_options.h b/ppcg_options.h index 608c96d..d5b9588 100644 --- a/ppcg_options.h +++ b/ppcg_options.h @@ -18,8 +18,6 @@ struct ppcg_options { int use_shared_memory; }; -ISL_ARG_DECL(ppcg_options, struct ppcg_options, ppcg_options_arg) - -extern struct isl_arg ppcg_options_arg[]; +ISL_ARG_DECL(ppcg_options, struct ppcg_options, ppcg_options_args) #endif -- 2.11.4.GIT