From patchwork Tue Jul 7 13:45:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew MacLeod X-Patchwork-Id: 492270 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 B0A611402C2 for ; Tue, 7 Jul 2015 23:45:25 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=lG8vs/Jd; 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 :message-id:date:from:mime-version:to:subject:references :in-reply-to:content-type; q=dns; s=default; b=HD2lDx+vTGOv3TMda DUgNqXlbuhse22tA4FNXKT57S/h/bQI0bWZdhfebqkgXCM9U7OZ8tzt90YmtqbsL e1cJgw7umJ7Qqwm2lXMbVVYUnX9k7Bz2G0XsEfA3y0j6zCdPzNOfjy3n5+7sdjMk vZRhyS3/0Sk7dxMklX4aEaVVmI= 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 :message-id:date:from:mime-version:to:subject:references :in-reply-to:content-type; s=default; bh=pk2Juvh7yLEsrCK184lcg1Y 22v4=; b=lG8vs/JdC8nDKvjsz04Lg2FO+dLXWg3PchuqzxI/p+xPRpw5+mB8KFl C92G615AsdwGlblfIXiCrbg0sbTvX+NjcHmNvkDd9YUAmeLsmyJr1R2DEZShyT4l qDzsNdZczGQxbufEbGhyE8KRtuSp4nVgoqgHYE2sPpzCmUSgoevg= Received: (qmail 71680 invoked by alias); 7 Jul 2015 13:45:19 -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 71665 invoked by uid 89); 7 Jul 2015 13:45:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.8 required=5.0 tests=AWL, BAYES_50, KAM_ASCII_DIVIDERS, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=no version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 07 Jul 2015 13:45:17 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 7BFBCB0CE7 for ; Tue, 7 Jul 2015 13:45:16 +0000 (UTC) Received: from [10.10.63.37] (vpn-63-37.rdu2.redhat.com [10.10.63.37]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t67DjFbf030529 for ; Tue, 7 Jul 2015 09:45:15 -0400 Message-ID: <559BD7EB.5040405@redhat.com> Date: Tue, 07 Jul 2015 09:45:15 -0400 From: Andrew MacLeod User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: gcc-patches@gcc.gnu.org Subject: [patch 3/9] Flatten lra-int.h References: <559BD6B3.2080207@redhat.com> In-Reply-To: <559BD6B3.2080207@redhat.com> X-IsSubscribed: yes This patch flattens lra-int.h. It currently clumps 7 includes, which no file needs more than 4. Flatten it here and find a better aggregator for rtl related files later. Bootstraps from scratch on x86_64-unknown-linux-gnu with no new regressions. Also compiles all the files in config-list.mk. * lra-int.h: Flatten completely. * lra-assigns.c: Adjust includes. * lra-coalesce.c: Likewise. * lra-constraints.c: Likewise. * lra-eliminations.c: Likewise. * lra-lives.c: Likewise. * lra-remat.c: Likewise. * lra-spills.c: Likewise. * lra.c: Likewise. Index: lra-int.h =================================================================== *** lra-int.h (revision 225452) --- lra-int.h (working copy) *************** along with GCC; see the file COPYING3. I *** 21,34 **** #ifndef GCC_LRA_INT_H #define GCC_LRA_INT_H - #include "lra.h" - #include "bitmap.h" - #include "recog.h" - #include "insn-attr.h" - #include "insn-codes.h" - #include "insn-config.h" - #include "regs.h" - #define lra_assert(c) gcc_checking_assert (c) /* The parameter used to prevent infinite reloading for an insn. Each --- 21,26 ---- Index: lra-assigns.c =================================================================== *** lra-assigns.c (revision 225452) --- lra-assigns.c (working copy) *************** along with GCC; see the file COPYING3. I *** 109,114 **** --- 109,118 ---- #include "ira.h" #include "sparseset.h" #include "params.h" + #include "lra.h" + #include "bitmap.h" + #include "insn-attr.h" + #include "insn-codes.h" #include "lra-int.h" /* Current iteration number of the pass and current iteration number Index: lra-coalesce.c =================================================================== *** lra-coalesce.c (revision 225452) --- lra-coalesce.c (working copy) *************** along with GCC; see the file COPYING3. I *** 74,79 **** --- 74,83 ---- #include "timevar.h" #include "ira.h" #include "alloc-pool.h" + #include "lra.h" + #include "bitmap.h" + #include "insn-attr.h" + #include "insn-codes.h" #include "lra-int.h" #include "df.h" Index: lra-constraints.c =================================================================== *** lra-constraints.c (revision 225452) --- lra-constraints.c (working copy) *************** *** 144,149 **** --- 144,152 ---- #include "ira.h" #include "rtl-error.h" #include "params.h" + #include "lra.h" + #include "bitmap.h" + #include "insn-attr.h" #include "lra-int.h" /* Value of LRA_CURR_RELOAD_NUM at the beginning of BB of the current Index: lra-eliminations.c =================================================================== *** lra-eliminations.c (revision 225452) --- lra-eliminations.c (working copy) *************** along with GCC; see the file COPYING3. I *** 87,92 **** --- 87,95 ---- #include "df.h" #include "ira.h" #include "rtl-error.h" + #include "lra.h" + #include "bitmap.h" + #include "insn-attr.h" #include "lra-int.h" /* This structure is used to record information about hard register Index: lra-lives.c =================================================================== *** lra-lives.c (revision 225452) --- lra-lives.c (working copy) *************** along with GCC; see the file COPYING3. I *** 58,63 **** --- 58,67 ---- #include "df.h" #include "ira.h" #include "sparseset.h" + #include "lra.h" + #include "bitmap.h" + #include "insn-attr.h" + #include "insn-codes.h" #include "lra-int.h" /* Program points are enumerated by numbers from range Index: lra-remat.c =================================================================== *** lra-remat.c (revision 225452) --- lra-remat.c (working copy) *************** along with GCC; see the file COPYING3. I *** 87,92 **** --- 87,96 ---- #include "ira.h" #include "sparseset.h" #include "params.h" + #include "lra.h" + #include "bitmap.h" + #include "insn-attr.h" + #include "insn-codes.h" #include "lra-int.h" /* Number of candidates for rematerialization. */ Index: lra-spills.c =================================================================== *** lra-spills.c (revision 225452) --- lra-spills.c (working copy) *************** along with GCC; see the file COPYING3. I *** 88,93 **** --- 88,97 ---- #include "timevar.h" #include "target.h" #include "alloc-pool.h" + #include "lra.h" + #include "bitmap.h" + #include "insn-attr.h" + #include "insn-codes.h" #include "lra-int.h" #include "ira.h" #include "df.h" Index: lra.c =================================================================== *** lra.c (revision 225452) --- lra.c (working copy) *************** along with GCC; see the file COPYING3. I *** 139,144 **** --- 139,147 ---- #include "target.h" #include "ira.h" #include "alloc-pool.h" + #include "lra.h" + #include "bitmap.h" + #include "insn-attr.h" #include "lra-int.h" #include "df.h"