From patchwork Tue Jul 27 22:22:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Pop X-Patchwork-Id: 60055 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 B5AE9B70AB for ; Wed, 28 Jul 2010 08:23:56 +1000 (EST) Received: (qmail 7625 invoked by alias); 27 Jul 2010 22:23:48 -0000 Received: (qmail 7475 invoked by uid 22791); 27 Jul 2010 22:23:47 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: sourceware.org Received: from mail-vw0-f47.google.com (HELO mail-vw0-f47.google.com) (209.85.212.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 27 Jul 2010 22:23:41 +0000 Received: by mail-vw0-f47.google.com with SMTP id 13so4158590vws.20 for ; Tue, 27 Jul 2010 15:23:41 -0700 (PDT) Received: by 10.220.168.10 with SMTP id s10mr5617182vcy.50.1280269420873; Tue, 27 Jul 2010 15:23:40 -0700 (PDT) Received: from napoca ([163.181.251.115]) by mx.google.com with ESMTPS id s20sm1661675vcr.28.2010.07.27.15.23.38 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 27 Jul 2010 15:23:40 -0700 (PDT) Received: by napoca (sSMTP sendmail emulation); Tue, 27 Jul 2010 17:23:37 -0500 From: Sebastian Pop To: gcc-patches@gcc.gnu.org Cc: gcc-graphite@googlegroups.com, simbuerg@fim.uni-passau.de, Sebastian Pop Subject: [PATCH 6/7] Remove cloog_initialize and cloog_finalize when using official CLooG releases. Date: Tue, 27 Jul 2010 17:22:57 -0500 Message-Id: <1280269378-27054-7-git-send-email-sebpop@gmail.com> In-Reply-To: <1280269378-27054-1-git-send-email-sebpop@gmail.com> References: <1280269378-27054-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 This requires to initialize the Parma Polyhedra Library by graphite, as newer CLooG versions are not bound to a PPL backend. 2010-07-27 Andreas Simbuerger * graphite.c (graphite_initialize): Do not initialize CLooG and initialize the Parma Polyhedra Library manually when using CLOOG_ORG. (graphite_finalize): Do not finalize CLooG and finalize the Parma Polyhedra Library manually when using CLOOG_ORG. * graphite-cloog-compat.h (cloog_initialize): Hide function when using CLOOG_ORG. (cloog_finalize): Same. --- gcc/ChangeLog.graphite | 11 +++++++++++ gcc/graphite-cloog-compat.h | 5 +++++ gcc/graphite.c | 8 ++++++++ 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite index b2937ab..87d67a1 100644 --- a/gcc/ChangeLog.graphite +++ b/gcc/ChangeLog.graphite @@ -1,5 +1,16 @@ 2010-07-27 Andreas Simbuerger + * graphite.c (graphite_initialize): Do not initialize + CLooG and initialize the Parma Polyhedra Library + manually when using CLOOG_ORG. + (graphite_finalize): Do not finalize CLooG and finalize + the Parma Polyhedra Library manually when using CLOOG_ORG. + * graphite-cloog-compat.h (cloog_initialize): Hide function + when using CLOOG_ORG. + (cloog_finalize): Same. + +2010-07-18 Andreas Simbuerger + * graphite-clast-to-gimple.c (free_scattering): Change CloogDomainList/CloogDomain to CloogScatteringList/CloogScattering (CLOOG_ORG). diff --git a/gcc/graphite-cloog-compat.h b/gcc/graphite-cloog-compat.h index 56b6bb3..c39b18e 100644 --- a/gcc/graphite-cloog-compat.h +++ b/gcc/graphite-cloog-compat.h @@ -29,6 +29,11 @@ typedef const struct clast_expr *clast_name_p; typedef const char *clast_name_p; #endif +#ifdef CLOOG_ORG +#define cloog_initialize() +#define cloog_finalize() +#endif + #ifndef CLOOG_ORG /* CloogOptions compatibility. */ diff --git a/gcc/graphite.c b/gcc/graphite.c index 4bb4344..12dbd0c 100644 --- a/gcc/graphite.c +++ b/gcc/graphite.c @@ -61,6 +61,7 @@ along with GCC; see the file COPYING3. If not see #include "cloog/cloog.h" #include "ppl_c.h" +#include "graphite-cloog-compat.h" #include "graphite-ppl.h" #include "graphite.h" #include "graphite-poly.h" @@ -200,6 +201,8 @@ print_graphite_statistics (FILE* file, VEC (scop_p, heap) *scops) static bool graphite_initialize (void) { + int ppl_initialized; + if (number_of_loops () <= 1 /* FIXME: This limit on the number of basic blocks of a function should be removed when the SCOP detection is faster. */ @@ -213,6 +216,10 @@ graphite_initialize (void) recompute_all_dominators (); initialize_original_copy_tables (); + + ppl_initialized = ppl_initialize (); + gcc_assert (ppl_initialized == 0); + cloog_initialize (); if (dump_file && dump_flags) @@ -237,6 +244,7 @@ graphite_finalize (bool need_cfg_cleanup_p) } cloog_finalize (); + ppl_finalize (); free_original_copy_tables (); if (dump_file && dump_flags)