diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | Makefile.tpl | 2 | ||||
| -rw-r--r-- | config/ChangeLog | 5 | ||||
| -rw-r--r-- | config/cloog.m4 | 2 | ||||
| -rw-r--r-- | config/isl.m4 | 3 | ||||
| -rwxr-xr-x | configure | 30 | ||||
| -rw-r--r-- | configure.ac | 26 | ||||
| -rw-r--r-- | gcc/ChangeLog | 18 | ||||
| -rw-r--r-- | gcc/Makefile.in | 3 | ||||
| -rw-r--r-- | gcc/config.in | 5 | ||||
| -rwxr-xr-x | gcc/configure | 5 | ||||
| -rw-r--r-- | gcc/configure.ac | 3 | ||||
| -rw-r--r-- | gcc/graphite-blocking.c | 6 | ||||
| -rw-r--r-- | gcc/graphite-dependences.c | 9 | ||||
| -rw-r--r-- | gcc/graphite-interchange.c | 6 | ||||
| -rw-r--r-- | gcc/graphite-isl-ast-to-gimple.c | 4 | ||||
| -rw-r--r-- | gcc/graphite-optimize-isl.c | 4 | ||||
| -rw-r--r-- | gcc/graphite-poly.c | 6 | ||||
| -rw-r--r-- | gcc/graphite-scop-detection.c | 6 | ||||
| -rw-r--r-- | gcc/graphite-sese-to-poly.c | 6 | ||||
| -rw-r--r-- | gcc/graphite.c | 37 | ||||
| -rw-r--r-- | gcc/toplev.c | 6 |
23 files changed, 154 insertions, 47 deletions
diff --git a/ChangeLog b/ChangeLog index 7475adcbc08..04e92bc1ccb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-08-18 Roman Gareev <gareevroman@gmail.com> + + * configure.ac: Eliminate ClooG installation dependency. + * configure: Regenerate. + * Makefile.tpl: Add definition of ISLLIBS and HOST_ISLLIBS. + * Makefile.in: Regenerate. + 2014-08-15 Ilya Verbin <iverbin@gmail.com> * MAINTAINERS (Write After Approval): Add myself. diff --git a/Makefile.in b/Makefile.in index 329af7fb6f4..add8cf6b379 100644 --- a/Makefile.in +++ b/Makefile.in @@ -219,6 +219,7 @@ HOST_EXPORTS = \ HOST_LIBS="$(STAGE1_LIBS)"; export HOST_LIBS; \ GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \ GMPINC="$(HOST_GMPINC)"; export GMPINC; \ + ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \ ISLINC="$(HOST_ISLINC)"; export ISLINC; \ CLOOGLIBS="$(HOST_CLOOGLIBS)"; export CLOOGLIBS; \ CLOOGINC="$(HOST_CLOOGINC)"; export CLOOGINC; \ @@ -310,6 +311,7 @@ HOST_GMPLIBS = @gmplibs@ HOST_GMPINC = @gmpinc@ # Where to find ISL +HOST_ISLLIBS = @isllibs@ HOST_ISLINC = @islinc@ # Where to find CLOOG diff --git a/Makefile.tpl b/Makefile.tpl index 4822c3203bf..00dba363a9d 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -222,6 +222,7 @@ HOST_EXPORTS = \ HOST_LIBS="$(STAGE1_LIBS)"; export HOST_LIBS; \ GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \ GMPINC="$(HOST_GMPINC)"; export GMPINC; \ + ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \ ISLINC="$(HOST_ISLINC)"; export ISLINC; \ CLOOGLIBS="$(HOST_CLOOGLIBS)"; export CLOOGLIBS; \ CLOOGINC="$(HOST_CLOOGINC)"; export CLOOGINC; \ @@ -313,6 +314,7 @@ HOST_GMPLIBS = @gmplibs@ HOST_GMPINC = @gmpinc@ # Where to find ISL +HOST_ISLLIBS = @isllibs@ HOST_ISLINC = @islinc@ # Where to find CLOOG diff --git a/config/ChangeLog b/config/ChangeLog index 34fe7a664ee..3a0d438cd51 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2014-08-18 Roman Gareev <gareevroman@gmail.com> + + * cloog.m4: Remove the path to isllibs from clooglibs. + * isl.m4: Add paths to islinc, isllibs. + 2014-07-26 Uros Bizjak <ubizjak@gmail.com> PR target/47230 diff --git a/config/cloog.m4 b/config/cloog.m4 index d67465c3f22..b80ac2742aa 100644 --- a/config/cloog.m4 +++ b/config/cloog.m4 @@ -69,7 +69,7 @@ AC_DEFUN([CLOOG_INIT_FLAGS], fi clooginc="-DCLOOG_INT_GMP ${clooginc}" - clooglibs="${clooglibs} -lcloog-isl ${isllibs} -lisl" + clooglibs="${clooglibs} -lcloog-isl" ] ) diff --git a/config/isl.m4 b/config/isl.m4 index f45854d222b..9743aee0e13 100644 --- a/config/isl.m4 +++ b/config/isl.m4 @@ -68,6 +68,9 @@ AC_DEFUN([ISL_INIT_FLAGS], ENABLE_ISL_CHECK=no AC_MSG_WARN([using in-tree ISL, disabling version check]) fi + + islinc="-DCLOOG_INT_GMP ${islinc}" + isllibs="${isllibs} -lisl" ] ) diff --git a/configure b/configure index c8b20b617ae..6e24b556d85 100755 --- a/configure +++ b/configure @@ -649,6 +649,7 @@ extra_linker_plugin_configure_flags clooginc clooglibs islinc +isllibs poststage1_ldflags poststage1_libs stage1_ldflags @@ -2760,7 +2761,7 @@ build_libs="build-libiberty" build_tools="build-texinfo build-flex build-bison build-m4 build-fixincludes" # these libraries are used by various programs built for the host environment -# +#f host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktrace libcpp libdecnumber gmp mpfr mpc isl cloog libelf libiconv" # these tools are built for the host environment @@ -5835,10 +5836,9 @@ if test "${with_isl+set}" = set; then : fi -# Treat either --without-cloog or --without-isl as a request to disable +# Treat --without-isl as a request to disable # GRAPHITE support and skip all following checks. -if test "x$with_isl" != "xno" && - test "x$with_cloog" != "xno"; then +if test "x$with_isl" != "xno"; then # Check for ISL @@ -5890,6 +5890,9 @@ fi $as_echo "$as_me: WARNING: using in-tree ISL, disabling version check" >&2;} fi + islinc="-DCLOOG_INT_GMP ${islinc}" + isllibs="${isllibs} -lisl" + if test "${ENABLE_ISL_CHECK}" = yes ; then @@ -6021,7 +6024,7 @@ $as_echo "$as_me: WARNING: using in-tree CLooG, disabling version check" >&2;} fi clooginc="-DCLOOG_INT_GMP ${clooginc}" - clooglibs="${clooglibs} -lcloog-isl ${isllibs} -lisl" + clooglibs="${clooglibs} -lcloog-isl" @@ -6098,11 +6101,9 @@ $as_echo "$gcc_cv_cloog" >&6; } fi fi -# If either the ISL or the CLooG check failed, disable builds of in-tree -# variants of both +# If the ISL check failed, disable builds of in-tree +# variants of both ISL and CLooG if test "x$with_isl" = xno || - test "x$with_cloog" = xno || - test "x$gcc_cv_cloog" = xno || test "x$gcc_cv_isl" = xno; then noconfigdirs="$noconfigdirs cloog isl" islinc= @@ -6110,6 +6111,15 @@ if test "x$with_isl" = xno || clooglibs= fi +# If the CLooG check failed, disable builds of in-tree +# variants of CLooG +if test "x$with_cloog" = xno || + test "x$gcc_cv_cloog" = xno; then + noconfigdirs="$noconfigdirs cloog isl" + clooginc= + clooglibs= +fi + @@ -7325,7 +7335,7 @@ do case $lib in - mpc | mpfr | gmp | cloog) + mpc | mpfr | gmp | isl | cloog) # If we're processing --with-$lib, --with-$lib-include or # --with-$lib-lib, for one of the libs above, and target is # different from host, don't pass the current argument to any diff --git a/configure.ac b/configure.ac index 163de5f7220..8f747d62c72 100644 --- a/configure.ac +++ b/configure.ac @@ -132,7 +132,7 @@ build_libs="build-libiberty" build_tools="build-texinfo build-flex build-bison build-m4 build-fixincludes" # these libraries are used by various programs built for the host environment -# +#f host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktrace libcpp libdecnumber gmp mpfr mpc isl cloog libelf libiconv" # these tools are built for the host environment @@ -1644,10 +1644,9 @@ AC_ARG_WITH(isl, Equivalent to --with-isl-include=PATH/include plus --with-isl-lib=PATH/lib])]) -# Treat either --without-cloog or --without-isl as a request to disable +# Treat --without-isl as a request to disable # GRAPHITE support and skip all following checks. -if test "x$with_isl" != "xno" && - test "x$with_cloog" != "xno"; then +if test "x$with_isl" != "xno"; then # Check for ISL dnl Provide configure switches and initialize islinc & isllibs dnl with user input. @@ -1672,11 +1671,9 @@ if test "x$with_isl" != "xno" && fi fi -# If either the ISL or the CLooG check failed, disable builds of in-tree -# variants of both +# If the ISL check failed, disable builds of in-tree +# variants of both ISL and CLooG if test "x$with_isl" = xno || - test "x$with_cloog" = xno || - test "x$gcc_cv_cloog" = xno || test "x$gcc_cv_isl" = xno; then noconfigdirs="$noconfigdirs cloog isl" islinc= @@ -1684,11 +1681,20 @@ if test "x$with_isl" = xno || clooglibs= fi +# If the CLooG check failed, disable builds of in-tree +# variants of CLooG +if test "x$with_cloog" = xno || + test "x$gcc_cv_cloog" = xno; then + noconfigdirs="$noconfigdirs cloog isl" + clooginc= + clooglibs= +fi + +AC_SUBST(isllibs) AC_SUBST(islinc) AC_SUBST(clooglibs) AC_SUBST(clooginc) - # Check for LTO support. AC_ARG_ENABLE(lto, [AS_HELP_STRING([--enable-lto], [enable link time optimization support])], @@ -2812,7 +2818,7 @@ changequote(,) changequote([,]) case $lib in - mpc | mpfr | gmp | cloog) + mpc | mpfr | gmp | isl | cloog) # If we're processing --with-$lib, --with-$lib-include or # --with-$lib-lib, for one of the libs above, and target is # different from host, don't pass the current argument to any diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 75591f450d7..7f7a3bfff15 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,21 @@ +2014-08-18 Roman Gareev <gareevroman@gmail.com> + + * Makefile.in: Add definition of ISLLIBS, HOST_ISLLIBS. + * config.in: Add undef of HAVE_isl. + * configure: Regenerate. + * configure.ac: Add definition of HAVE_isl. + * graphite-blocking.c: Add checking of HAVE_isl. + * graphite-dependences.c: Likewise. + * graphite-interchange.c: Likewise. + * graphite-isl-ast-to-gimple.c: Likewise. + * graphite-optimize-isl.c: Likewise. + * graphite-poly.c: Likewise. + * graphite-scop-detection.c: Likewise. + * graphite-sese-to-poly.c: Likewise. + * graphite.c: Likewise. + * toplev.c: Replace the checking of HAVE_cloog with the checking + of HAVE_isl. + 2014-08-18 Richard Biener <rguenther@suse.de> PR tree-optimization/62090 diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 76ceca89f8b..1b3820b4b34 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -335,6 +335,7 @@ GMPLIBS = @GMPLIBS@ GMPINC = @GMPINC@ # How to find ISL +ISLLIBS = @ISLLIBS@ ISLINC = @ISLINC@ # How to find CLOOG @@ -1011,7 +1012,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY) # and the system's installed libraries. LIBS = @LIBS@ libcommon.a $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBBACKTRACE) \ $(LIBIBERTY) $(LIBDECNUMBER) $(HOST_LIBS) -BACKENDLIBS = $(CLOOGLIBS) $(GMPLIBS) $(PLUGINLIBS) $(HOST_LIBS) \ +BACKENDLIBS = $(CLOOGLIBS) $(ISLLIBS) $(GMPLIBS) $(PLUGINLIBS) $(HOST_LIBS) \ $(ZLIB) # Any system libraries needed just for GNAT. SYSLIBS = @GNAT_LIBEXC@ diff --git a/gcc/config.in b/gcc/config.in index a1bda76290d..90809e37466 100644 --- a/gcc/config.in +++ b/gcc/config.in @@ -1699,13 +1699,16 @@ #undef HAVE_WORKING_VFORK #endif +/* Define if isl is in use. */ +#ifndef USED_FOR_TARGET +#undef HAVE_isl +#endif /* Define if cloog is in use. */ #ifndef USED_FOR_TARGET #undef HAVE_cloog #endif - /* Define if F_SETLKW supported by fcntl. */ #ifndef USED_FOR_TARGET #undef HOST_HAS_F_SETLKW diff --git a/gcc/configure b/gcc/configure index fe2e6470acc..5e0dcfbfe16 100755 --- a/gcc/configure +++ b/gcc/configure @@ -27888,6 +27888,11 @@ fi +if test "x${ISLLIBS}" != "x" ; then + +$as_echo "#define HAVE_isl 1" >>confdefs.h + +fi diff --git a/gcc/configure.ac b/gcc/configure.ac index ea8eca4d769..cdd5ed7baef 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -5514,6 +5514,9 @@ AC_ARG_VAR(GMPINC,[How to find GMP include files]) AC_ARG_VAR(ISLLIBS,[How to link ISL]) AC_ARG_VAR(ISLINC,[How to find ISL include files]) +if test "x${ISLLIBS}" != "x" ; then + AC_DEFINE(HAVE_isl, 1, [Define if isl is in use.]) +fi AC_ARG_VAR(CLOOGLIBS,[How to link CLOOG]) AC_ARG_VAR(CLOOGINC,[How to find CLOOG include files]) diff --git a/gcc/graphite-blocking.c b/gcc/graphite-blocking.c index 20a24eb2cf3..2e83fea4c7b 100644 --- a/gcc/graphite-blocking.c +++ b/gcc/graphite-blocking.c @@ -23,14 +23,16 @@ along with GCC; see the file COPYING3. If not see #include "config.h" -#ifdef HAVE_cloog +#ifdef HAVE_isl #include <isl/set.h> #include <isl/map.h> #include <isl/union_map.h> #include <isl/constraint.h> +#ifdef HAVE_cloog #include <cloog/cloog.h> #include <cloog/isl/domain.h> #endif +#endif #include "system.h" #include "coretypes.h" @@ -49,7 +51,7 @@ along with GCC; see the file COPYING3. If not see #include "tree-data-ref.h" #include "sese.h" -#ifdef HAVE_cloog +#ifdef HAVE_isl #include "graphite-poly.h" diff --git a/gcc/graphite-dependences.c b/gcc/graphite-dependences.c index a02bc23b6ee..cab63478dff 100644 --- a/gcc/graphite-dependences.c +++ b/gcc/graphite-dependences.c @@ -21,15 +21,17 @@ along with GCC; see the file COPYING3. If not see #include "config.h" -#ifdef HAVE_cloog +#ifdef HAVE_isl #include <isl/set.h> #include <isl/map.h> #include <isl/union_map.h> #include <isl/flow.h> #include <isl/constraint.h> +#ifdef HAVE_cloog #include <cloog/cloog.h> #include <cloog/isl/domain.h> #endif +#endif #include "system.h" #include "coretypes.h" @@ -49,7 +51,7 @@ along with GCC; see the file COPYING3. If not see #include "tree-scalar-evolution.h" #include "sese.h" -#ifdef HAVE_cloog +#ifdef HAVE_isl #include "graphite-poly.h" #include "graphite-htab.h" @@ -630,6 +632,8 @@ graphite_legal_transform (scop_p scop) return res; } +#ifdef HAVE_cloog + /* Return true when the loop at DEPTH carries dependences. BODY is the body of the loop. */ @@ -685,3 +689,4 @@ loop_is_parallel_p (loop_p loop, bb_pbb_htab_type *bb_pbb_mapping, int depth) } #endif +#endif diff --git a/gcc/graphite-interchange.c b/gcc/graphite-interchange.c index 45db539f420..8d691dbc7d5 100644 --- a/gcc/graphite-interchange.c +++ b/gcc/graphite-interchange.c @@ -23,7 +23,7 @@ along with GCC; see the file COPYING3. If not see #include "config.h" -#ifdef HAVE_cloog +#ifdef HAVE_isl #include <isl/aff.h> #include <isl/set.h> #include <isl/map.h> @@ -37,9 +37,11 @@ extern "C" { #if defined(__cplusplus) } #endif +#ifdef HAVE_cloog #include <cloog/cloog.h> #include <cloog/isl/domain.h> #endif +#endif #include "system.h" #include "coretypes.h" @@ -59,7 +61,7 @@ extern "C" { #include "tree-scalar-evolution.h" #include "sese.h" -#ifdef HAVE_cloog +#ifdef HAVE_isl #include "graphite-poly.h" /* XXX isl rewrite following comment */ diff --git a/gcc/graphite-isl-ast-to-gimple.c b/gcc/graphite-isl-ast-to-gimple.c index 44357dc823f..5cb0919a61e 100644 --- a/gcc/graphite-isl-ast-to-gimple.c +++ b/gcc/graphite-isl-ast-to-gimple.c @@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see #include "config.h" -#ifdef HAVE_cloog +#ifdef HAVE_isl #include <isl/set.h> #include <isl/map.h> #include <isl/union_map.h> @@ -55,7 +55,7 @@ extern "C" { #include "tree-into-ssa.h" #include <map> -#ifdef HAVE_cloog +#ifdef HAVE_isl #include "graphite-poly.h" #include "graphite-isl-ast-to-gimple.h" diff --git a/gcc/graphite-optimize-isl.c b/gcc/graphite-optimize-isl.c index 31f30185cec..ce372e6e499 100644 --- a/gcc/graphite-optimize-isl.c +++ b/gcc/graphite-optimize-isl.c @@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see #include "config.h" -#ifdef HAVE_cloog +#ifdef HAVE_isl #include <isl/set.h> #include <isl/map.h> #include <isl/union_map.h> @@ -48,7 +48,7 @@ along with GCC; see the file COPYING3. If not see #include "tree-scalar-evolution.h" #include "sese.h" -#ifdef HAVE_cloog +#ifdef HAVE_isl #include "graphite-poly.h" static isl_union_set * diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c index 28ab4df9f16..57f62cd2ba1 100644 --- a/gcc/graphite-poly.c +++ b/gcc/graphite-poly.c @@ -21,7 +21,7 @@ along with GCC; see the file COPYING3. If not see #include "config.h" -#ifdef HAVE_cloog +#ifdef HAVE_isl #include <isl/set.h> #include <isl/map.h> #include <isl/union_map.h> @@ -36,9 +36,11 @@ extern "C" { #if defined(__cplusplus) } #endif +#ifdef HAVE_cloog #include <cloog/cloog.h> #include <cloog/isl/domain.h> #endif +#endif #include "system.h" #include "coretypes.h" @@ -60,7 +62,7 @@ extern "C" { #include "tree-scalar-evolution.h" #include "sese.h" -#ifdef HAVE_cloog +#ifdef HAVE_isl #include "graphite-poly.h" #define OPENSCOP_MAX_STRING 256 diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c index 4158368917c..53823b86787 100644 --- a/gcc/graphite-scop-detection.c +++ b/gcc/graphite-scop-detection.c @@ -21,13 +21,15 @@ along with GCC; see the file COPYING3. If not see #include "config.h" -#ifdef HAVE_cloog +#ifdef HAVE_isl #include <isl/set.h> #include <isl/map.h> #include <isl/union_map.h> +#ifdef HAVE_cloog #include <cloog/cloog.h> #include <cloog/isl/domain.h> #endif +#endif #include "system.h" #include "coretypes.h" @@ -56,7 +58,7 @@ along with GCC; see the file COPYING3. If not see #include "tree-ssa-propagate.h" #include "cp/cp-tree.h" -#ifdef HAVE_cloog +#ifdef HAVE_isl #include "graphite-poly.h" #include "graphite-scop-detection.h" diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c index c36420a2b78..c3adfe13e9e 100644 --- a/gcc/graphite-sese-to-poly.c +++ b/gcc/graphite-sese-to-poly.c @@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see #include "config.h" -#ifdef HAVE_cloog +#ifdef HAVE_isl #include <isl/set.h> #include <isl/map.h> #include <isl/union_map.h> @@ -38,10 +38,12 @@ extern "C" { #if defined(__cplusplus) } #endif +#ifdef HAVE_cloog #include <cloog/cloog.h> #include <cloog/cloog.h> #include <cloog/isl/domain.h> #endif +#endif #include "system.h" #include "coretypes.h" @@ -74,7 +76,7 @@ extern "C" { #include "sese.h" #include "tree-ssa-propagate.h" -#ifdef HAVE_cloog +#ifdef HAVE_isl #include "expr.h" #include "graphite-poly.h" #include "graphite-sese-to-poly.h" diff --git a/gcc/graphite.c b/gcc/graphite.c index aa5b8d8aa49..650432d2552 100644 --- a/gcc/graphite.c +++ b/gcc/graphite.c @@ -34,15 +34,17 @@ along with GCC; see the file COPYING3. If not see #include "config.h" -#ifdef HAVE_cloog +#ifdef HAVE_isl #include <isl/set.h> #include <isl/map.h> #include <isl/options.h> #include <isl/union_map.h> +#ifdef HAVE_cloog #include <cloog/cloog.h> #include <cloog/isl/domain.h> #include <cloog/isl/cloog.h> #endif +#endif #include "system.h" #include "coretypes.h" @@ -68,16 +70,19 @@ along with GCC; see the file COPYING3. If not see #include "tree-pass.h" #include "tree-cfgcleanup.h" -#ifdef HAVE_cloog +#ifdef HAVE_isl #include "graphite-poly.h" #include "graphite-scop-detection.h" -#include "graphite-clast-to-gimple.h" #include "graphite-isl-ast-to-gimple.h" #include "graphite-sese-to-poly.h" #include "graphite-htab.h" +#ifdef HAVE_cloog +#include "graphite-clast-to-gimple.h" + CloogState *cloog_state; +#endif /* Print global statistics to FILE. */ @@ -228,7 +233,9 @@ graphite_initialize (isl_ctx *ctx) recompute_all_dominators (); initialize_original_copy_tables (); +#ifdef HAVE_cloog cloog_state = cloog_isl_state_malloc (ctx); +#endif if (dump_file && dump_flags) dump_function_to_file (current_function_decl, dump_file, dump_flags); @@ -251,7 +258,9 @@ graphite_finalize (bool need_cfg_cleanup_p) tree_estimate_probability (); } +#ifdef HAVE_cloog cloog_state_free (cloog_state); +#endif free_original_copy_tables (); if (dump_file && dump_flags) @@ -292,12 +301,23 @@ graphite_transform_loops (void) } bb_pbb_htab_type bb_pbb_mapping (10); + +#ifndef HAVE_cloog + if(flag_graphite_code_gen == FGRAPHITE_CODE_GEN_CLOOG) + { + flag_graphite_code_gen = FGRAPHITE_CODE_GEN_ISL; + printf ("The CLooG code generator cannot be used (CLooG is not " + "available). The ISL code generator was chosen.\n"); + } +#endif + FOR_EACH_VEC_ELT (scops, i, scop) if (dbg_cnt (graphite_scop)) { scop->ctx = ctx; build_poly_scop (scop); +#ifdef HAVE_cloog if (POLY_SCOP_P (scop) && apply_poly_transforms (scop) && (((flag_graphite_code_gen == FGRAPHITE_CODE_GEN_ISL) @@ -305,6 +325,13 @@ graphite_transform_loops (void) || ((flag_graphite_code_gen == FGRAPHITE_CODE_GEN_CLOOG) && graphite_regenerate_ast_cloog (scop, &bb_pbb_mapping)))) need_cfg_cleanup_p = true; +#else + if (POLY_SCOP_P (scop) + && apply_poly_transforms (scop) + && graphite_regenerate_ast_isl (scop)) + need_cfg_cleanup_p = true; +#endif + } free_scops (scops); @@ -313,12 +340,12 @@ graphite_transform_loops (void) isl_ctx_free (ctx); } -#else /* If Cloog is not available: #ifndef HAVE_cloog. */ +#else /* If ISL is not available: #ifndef HAVE_isl. */ static void graphite_transform_loops (void) { - sorry ("Graphite loop optimizations cannot be used"); + sorry ("Graphite loop optimizations cannot be used (ISL is not available)."); } #endif diff --git a/gcc/toplev.c b/gcc/toplev.c index 88d48c2d688..aaad68816e4 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -1275,15 +1275,15 @@ process_options (void) else aux_base_name = "gccaux"; -#ifndef HAVE_cloog +#ifndef HAVE_isl if (flag_graphite || flag_graphite_identity || flag_loop_block || flag_loop_interchange || flag_loop_strip_mine || flag_loop_parallelize_all) - sorry ("Graphite loop optimizations cannot be used (-fgraphite, " - "-fgraphite-identity, -floop-block, " + sorry ("Graphite loop optimizations cannot be used (ISL is not available)" + "(-fgraphite, -fgraphite-identity, -floop-block, " "-floop-interchange, -floop-strip-mine, -floop-parallelize-all, " "and -ftree-loop-linear)"); #endif |