aboutsummaryrefslogtreecommitdiff
path: root/gcc/graphite-clast-to-gimple.c
diff options
context:
space:
mode:
authorAndreas Simbuerger <simbuerg@fim.uni-passau.de>2010-08-11 20:30:26 +0000
committerSebastian Pop <sebastian.pop@amd.com>2010-08-11 20:30:26 +0000
commit5d4b71b973c452f61294bf22f1cf644d9e486f98 (patch)
tree0ddec1bbf4f5d279106ff4ee7cf82bf50c7289f1 /gcc/graphite-clast-to-gimple.c
parent60f1258441ca58531eb9b4532ee21fdc36ca225f (diff)
Make CLooG options compatible to newer CLooG releases and pass options to build_cloog_prog (CLOOG_ORG).
2010-07-27 Andreas Simbuerger <simbuerg@fim.uni-passau.de> * graphite-clast-to-gimple.c (set_cloog_options): Make CLooG options compatible to newer CLooG releases (CLOOG_ORG). (build_cloog_prog): Pass CloogOptions to more functions (CLOOG_ORG). (scop_to_clast): Pass CloogOptions to build_cloog_prog (CLOOG_ORG). * graphite-cloog-compat.h: Add compatibility macros for CLooG Legacy. (build_cloog_prog) : New. (cloog_program_extract_scalars): New. (cloog_program_scatter): New. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@163162 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/graphite-clast-to-gimple.c')
-rw-r--r--gcc/graphite-clast-to-gimple.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/gcc/graphite-clast-to-gimple.c b/gcc/graphite-clast-to-gimple.c
index 89a182c00ac..a611ca782e5 100644
--- a/gcc/graphite-clast-to-gimple.c
+++ b/gcc/graphite-clast-to-gimple.c
@@ -1198,7 +1198,7 @@ initialize_cloog_names (scop_p scop, CloogProgram *prog)
/* Build cloog program for SCoP. */
static void
-build_cloog_prog (scop_p scop, CloogProgram *prog)
+build_cloog_prog (scop_p scop, CloogProgram *prog, CloogOptions *options)
{
int i;
int max_nb_loops = scop_max_loop_depth (scop);
@@ -1277,10 +1277,10 @@ build_cloog_prog (scop_p scop, CloogProgram *prog)
cloog_program_set_scaldims (prog, scaldims);
/* Extract scalar dimensions to simplify the code generation problem. */
- cloog_program_extract_scalars (prog, scattering);
+ cloog_program_extract_scalars (prog, scattering, options);
/* Apply scattering. */
- cloog_program_scatter (prog, scattering);
+ cloog_program_scatter (prog, scattering, options);
free_scattering (scattering);
/* Iterators corresponding to scalar dimensions have to be extracted. */
@@ -1321,9 +1321,14 @@ set_cloog_options (void)
GLooG. */
options->esp = 1;
+#ifdef CLOOG_ORG
+ /* Silence CLooG to avoid failing tests due to debug output to stderr. */
+ options->quiet = 1;
+#else
/* Enable C pretty-printing mode: normalizes the substitution
equations for statements. */
options->cpp = 1;
+#endif
/* Allow cloog to build strides with a stride width different to one.
This example has stride = 4:
@@ -1378,7 +1383,7 @@ scop_to_clast (scop_p scop)
/* Connect new cloog prog generation to graphite. */
pc.prog = cloog_program_malloc ();
- build_cloog_prog (scop, pc.prog);
+ build_cloog_prog (scop, pc.prog, options);
pc.prog = cloog_program_generate (pc.prog, options);
pc.stmt = cloog_clast_create (pc.prog, options);