From patchwork Sat Jan 15 09:05:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Pop X-Patchwork-Id: 79039 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 578F9B6EEB for ; Sat, 15 Jan 2011 20:09:24 +1100 (EST) Received: (qmail 31949 invoked by alias); 15 Jan 2011 09:09:00 -0000 Received: (qmail 31814 invoked by uid 22791); 15 Jan 2011 09:08:56 -0000 X-SWARE-Spam-Status: No, hits=-2.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: sourceware.org Received: from mail-gx0-f175.google.com (HELO mail-gx0-f175.google.com) (209.85.161.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 15 Jan 2011 09:08:51 +0000 Received: by mail-gx0-f175.google.com with SMTP id 20so1501643gxk.20 for ; Sat, 15 Jan 2011 01:08:51 -0800 (PST) Received: by 10.100.10.13 with SMTP id 13mr1186975anj.116.1295082530305; Sat, 15 Jan 2011 01:08:50 -0800 (PST) Received: from napoca (adsl-76-250-118-52.dsl.austtx.sbcglobal.net [76.250.118.52]) by mx.google.com with ESMTPS id c28sm2548080ana.1.2011.01.15.01.08.48 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 15 Jan 2011 01:08:49 -0800 (PST) Received: by napoca (sSMTP sendmail emulation); Sat, 15 Jan 2011 03:08:47 -0600 From: Sebastian Pop To: gcc-patches@gcc.gnu.org Cc: rguenther@suse.de, gcc-graphite@googlegroups.com, Sebastian Pop Subject: [PATCH 09/10] Expect at least the version 0.11 of PPL. Date: Sat, 15 Jan 2011 03:05:14 -0600 Message-Id: <1295082315-32242-10-git-send-email-sebpop@gmail.com> In-Reply-To: <1295082315-32242-1-git-send-email-sebpop@gmail.com> References: <1295082315-32242-1-git-send-email-sebpop@gmail.com> X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org 2011-01-15 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. --- ChangeLog.graphite | 5 +++++ configure | 6 +++--- configure.ac | 4 ++-- gcc/ChangeLog.graphite | 6 ++++++ gcc/doc/install.texi | 2 +- gcc/graphite-ppl.c | 10 ---------- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/ChangeLog.graphite b/ChangeLog.graphite index e0e5725..987aefa 100644 --- a/ChangeLog.graphite +++ b/ChangeLog.graphite @@ -1,3 +1,8 @@ +2011-01-15 Sebastian Pop + + * configure: Regenerated. + * configure.ac: Check for version 0.11 (or later revision) of PPL. + 2011-01-13 Tobias Grosser * configure: Regenerated. diff --git a/configure b/configure index e1ed49f..ac55cfb 100755 --- a/configure +++ b/configure @@ -5709,8 +5709,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" @@ -5718,7 +5718,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 1ff3047..877b3b7 100644 --- a/configure.ac +++ b/configure.ac @@ -1637,9 +1637,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.graphite b/gcc/ChangeLog.graphite index 51a5407..8328af3 100644 --- a/gcc/ChangeLog.graphite +++ b/gcc/ChangeLog.graphite @@ -1,5 +1,11 @@ 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 dependence_polyhedron. (free_poly_ddr): Moved close by new_poly_ddr. diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index 650754e..b47049b 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 d879d78..1a08362 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