From patchwork Wed Dec 16 23:45:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Pop X-Patchwork-Id: 557826 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 980551402C4 for ; Thu, 17 Dec 2015 10:45:42 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=Jv+I837C; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id; q=dns; s=default; b=A9xHGpXjocNH K4jk7L07qozOo9ohvO3/QmLJVXZXJ09Ge6KA27YuzqU1vxAcBFDlvIv+U2VBGyJH N7VXgAXmPgCaVPEzNDBTwruJa/p1E/cG3kgaNviNGRFYfBino3iaHyRkwTKBQWoV tamm9OQ+vD0WoEDpO9/nxIRyAM2Dx8I= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id; s=default; bh=iyt2KFuZJd+SdDrmTr +75jui5hQ=; b=Jv+I837CWeI9TslJ8cQHYHh4AVU8hgedzzFlEm8TRzzCEjGXVv Q26hPnFRn0rXZQaeZVF99kk+CitUfj8q0KyXvYvIUCECqs+tmBFSqc4B5MEM8awE Sq36GJ24qoEGOSiM70efPUDU6W35ieDj0ppJIlmmvLT0edzFSVtQn6WZg= Received: (qmail 68562 invoked by alias); 16 Dec 2015 23:45:35 -0000 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 Received: (qmail 68537 invoked by uid 89); 16 Dec 2015 23:45:34 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.6 required=5.0 tests=AWL, BAYES_50, KAM_LAZY_DOMAIN_SECURITY, NO_DNS_FOR_FROM, TVD_RCVD_IP autolearn=no version=3.3.2 spammy=013, 5318, 014, 0.14 X-HELO: mailhost.sarc.sas Received: from 72-48-121-251.static.grandenetworks.net (HELO mailhost.sarc.sas) (72.48.121.251) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 16 Dec 2015 23:45:33 +0000 Received: from xspop.spa.sarc.sas (xspop.spa.sarc.sas [172.31.201.16]) by mailhost.sarc.sas (Postfix) with ESMTP id 14B652E19E; Wed, 16 Dec 2015 17:45:32 -0600 (CST) Received: by xspop.spa.sarc.sas (Postfix, from userid 1000) id BC0E16A1C86; Wed, 16 Dec 2015 17:45:36 -0600 (CST) From: Sebastian Pop To: sebpop@gmail.com Cc: richard.guenther@gmail.com, gcc-patches@gcc.gnu.org, hiraditya@msn.com, Sebastian Pop Subject: [PATCH] [graphite] move all isl include files to graphite.h Date: Wed, 16 Dec 2015 17:45:28 -0600 Message-Id: <1450309528-16605-1-git-send-email-s.pop@samsung.com> * graphite-dependences.c: Move all isl include files to... * graphite-isl-ast-to-gimple.c: Same. * graphite-optimize-isl.c: Same. * graphite-poly.c: Same. * graphite-scop-detection.c: Same. * graphite.c: Same. * graphite.h: ... here. --- gcc/graphite-dependences.c | 9 --------- gcc/graphite-isl-ast-to-gimple.c | 12 ------------ gcc/graphite-optimize-isl.c | 17 ----------------- gcc/graphite-poly.c | 14 -------------- gcc/graphite-scop-detection.c | 6 ------ gcc/graphite.c | 7 ------- gcc/graphite.h | 20 ++++++++++++++++++-- 7 files changed, 18 insertions(+), 67 deletions(-) diff --git a/gcc/graphite-dependences.c b/gcc/graphite-dependences.c index 407a11e..46869d7 100644 --- a/gcc/graphite-dependences.c +++ b/gcc/graphite-dependences.c @@ -37,17 +37,8 @@ along with GCC; see the file COPYING3. If not see #include "tree-pass.h" #include "cfgloop.h" #include "tree-data-ref.h" - -#include -#include -#include -#include -#include -#include - #include "graphite.h" - /* Add the constraints from the set S to the domain of MAP. */ static isl_map * diff --git a/gcc/graphite-isl-ast-to-gimple.c b/gcc/graphite-isl-ast-to-gimple.c index 66c4c5a..795232a 100644 --- a/gcc/graphite-isl-ast-to-gimple.c +++ b/gcc/graphite-isl-ast-to-gimple.c @@ -53,18 +53,6 @@ along with GCC; see the file COPYING3. If not see #include "gimple-pretty-print.h" #include "cfganal.h" #include "value-prof.h" - -#include -#include -#include -#include -#include -#include -#include -#ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS -#include -#endif - #include "graphite.h" #include diff --git a/gcc/graphite-optimize-isl.c b/gcc/graphite-optimize-isl.c index cb45bfe..c546edc 100644 --- a/gcc/graphite-optimize-isl.c +++ b/gcc/graphite-optimize-isl.c @@ -37,23 +37,6 @@ along with GCC; see the file COPYING3. If not see #include "tree-data-ref.h" #include "params.h" #include "dumpfile.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS -/* isl 0.15 or later. */ -#include -#include -#endif - #include "graphite.h" #ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c index 1f50ff8..d188341 100644 --- a/gcc/graphite-poly.c +++ b/gcc/graphite-poly.c @@ -40,22 +40,8 @@ along with GCC; see the file COPYING3. If not see #include "pretty-print.h" #include "gimple-pretty-print.h" #include "tree-dump.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "graphite.h" -#define OPENSCOP_MAX_STRING 256 - - /* Print to STDERR the GMP value VAL. */ DEBUG_FUNCTION void diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c index 0d5dc2b..dd506b5 100644 --- a/gcc/graphite-scop-detection.c +++ b/gcc/graphite-scop-detection.c @@ -48,12 +48,6 @@ along with GCC; see the file COPYING3. If not see #include "tree-pass.h" #include "tree-ssa-propagate.h" #include "gimple-pretty-print.h" - -#include -#include -#include -#include - #include "graphite.h" class debug_printer diff --git a/gcc/graphite.c b/gcc/graphite.c index f156c5e..8d0d24c 100644 --- a/gcc/graphite.c +++ b/gcc/graphite.c @@ -52,13 +52,6 @@ along with GCC; see the file COPYING3. If not see #include "dbgcnt.h" #include "tree-parloops.h" #include "tree-cfgcleanup.h" - -#include -#include -#include -#include -#include - #include "graphite.h" /* Print global statistics to FILE. */ diff --git a/gcc/graphite.h b/gcc/graphite.h index 01da3db..83f8191 100644 --- a/gcc/graphite.h +++ b/gcc/graphite.h @@ -23,10 +23,26 @@ along with GCC; see the file COPYING3. If not see #define GCC_GRAPHITE_POLY_H #include "sese.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include -#ifndef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS - /* isl 0.14. */ +#ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS +/* isl 0.15 or later. */ +#include + +#else +/* isl 0.14 or 0.13. */ # define isl_stat int # define isl_stat_ok 0 #endif