From 0deada9e5b187a9b7bd39e35b3043c5e8242d982 Mon Sep 17 00:00:00 2001 From: Sebastian Pop Date: Tue, 25 Jan 2011 06:46:19 +0000 Subject: [PATCH] Expect at least the version 0.11 of PPL. 2011-01-25 Sebastian Pop toplev/ * configure: Regenerated. * configure.ac: Check for version 0.11 (or later revision) of PPL. toplev/gcc/ * doc/install.texi: Update the expected version number of PPL to 0.11. * graphite-ppl.c (ppl_powerset_is_empty): Remove now dead code under #if PPL_VERSION_MINOR < 11. From-SVN: r169207 --- ChangeLog | 5 +++++ configure | 6 +++--- configure.ac | 4 ++-- gcc/ChangeLog | 6 ++++++ gcc/ChangeLog.graphite | 6 ++++++ gcc/doc/install.texi | 2 +- gcc/graphite-ppl.c | 10 ---------- 7 files changed, 23 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index aca4c571263..fbaeadda932 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-01-25 Sebastian Pop + + * configure: Regenerated. + * configure.ac: Check for version 0.11 (or later revision) of PPL. + 2011-01-25 Tobias Grosser * configure: Regenerated. diff --git a/configure b/configure index ca3d53461bb..257888b072a 100755 --- a/configure +++ b/configure @@ -5716,8 +5716,8 @@ fi if test "x$with_ppl" != "xno" -a "${ENABLE_PPL_CHECK}" = "yes"; then saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $pplinc $gmpinc" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.10 (or later revision) of PPL" >&5 -$as_echo_n "checking for version 0.10 (or later revision) of PPL... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.11 (or later revision) of PPL" >&5 +$as_echo_n "checking for version 0.11 (or later revision) of PPL... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "ppl_c.h" @@ -5725,7 +5725,7 @@ int main () { - #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10 + #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11 choke me #endif diff --git a/configure.ac b/configure.ac index bbb82c33804..a497efee030 100644 --- a/configure.ac +++ b/configure.ac @@ -1668,9 +1668,9 @@ ENABLE_PPL_CHECK=yes) if test "x$with_ppl" != "xno" -a "${ENABLE_PPL_CHECK}" = "yes"; then saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $pplinc $gmpinc" - AC_MSG_CHECKING([for version 0.10 (or later revision) of PPL]) + AC_MSG_CHECKING([for version 0.11 (or later revision) of PPL]) AC_TRY_COMPILE([#include "ppl_c.h"],[ - #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10 + #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11 choke me #endif ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ; with_ppl=no ]) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ff43b8ee0b5..5885aa7b35b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2011-01-25 Sebastian Pop + + * doc/install.texi: Update the expected version number of PPL to 0.11. + * graphite-ppl.c (ppl_powerset_is_empty): Remove now dead code under + #if PPL_VERSION_MINOR < 11. + 2011-01-25 Sebastian Pop * graphite-dependences.c: Include graphite-cloog-util.h. diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite index 93c4c4ee38e..62b5999add2 100644 --- a/gcc/ChangeLog.graphite +++ b/gcc/ChangeLog.graphite @@ -1,3 +1,9 @@ +2011-01-15 Sebastian Pop + + * doc/install.texi: Update the expected version number of PPL to 0.11. + * graphite-ppl.c (ppl_powerset_is_empty): Remove now dead code under + #if PPL_VERSION_MINOR < 11. + 2011-01-15 Sebastian Pop * graphite-dependences.c (new_poly_ddr): Inlined into diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index 7797fcbe02d..e4511195415 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -332,7 +332,7 @@ and @option{--with-mpc-include}. Alternatively, if an MPC source distribution is found in a subdirectory of your GCC sources named @file{mpc}, it will be built together with GCC@. -@item Parma Polyhedra Library (PPL) version 0.10 +@item Parma Polyhedra Library (PPL) version 0.11 Necessary to build GCC with the Graphite loop optimizations. It can be downloaded from @uref{http://www.cs.unipr.it/ppl/Download/}. diff --git a/gcc/graphite-ppl.c b/gcc/graphite-ppl.c index d879d788738..1a083627ea6 100644 --- a/gcc/graphite-ppl.c +++ b/gcc/graphite-ppl.c @@ -525,15 +525,6 @@ bool ppl_powerset_is_empty (ppl_Pointset_Powerset_C_Polyhedron_t ps, int nb_params ATTRIBUTE_UNUSED) { -#if PPL_VERSION_MAJOR == 0 && PPL_VERSION_MINOR < 11 - /* On PPL 0.10, - ppl_Pointset_Powerset_C_Polyhedron_contains_integer_point (ps) - takes too long on some cases and so we call _is_empty instead. */ - return ppl_Pointset_Powerset_C_Polyhedron_is_empty (ps); - -#else - /* On PPL 0.11 or later, we can check for integer feasibility using - the PIP solver. */ ppl_PIP_Problem_t pip; ppl_dimension_type d; ppl_const_Constraint_System_t pcs; @@ -585,7 +576,6 @@ ppl_powerset_is_empty (ppl_Pointset_Powerset_C_Polyhedron_t ps, free (ds); return !has_integer_solutions; -#endif } #endif