From patchwork Wed Jul 7 21:30:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 58191 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 85D02B6EF2 for ; Thu, 8 Jul 2010 07:31:07 +1000 (EST) Received: (qmail 27769 invoked by alias); 7 Jul 2010 21:31:06 -0000 Received: (qmail 27755 invoked by uid 22791); 7 Jul 2010 21:31:05 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: sourceware.org Received: from mail-wy0-f175.google.com (HELO mail-wy0-f175.google.com) (74.125.82.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 07 Jul 2010 21:31:00 +0000 Received: by wye20 with SMTP id 20so106784wye.20 for ; Wed, 07 Jul 2010 14:30:57 -0700 (PDT) Received: by 10.227.27.75 with SMTP id h11mr62077wbc.90.1278538257577; Wed, 07 Jul 2010 14:30:57 -0700 (PDT) Received: from localhost (rsandifo.gotadsl.co.uk [82.133.89.107]) by mx.google.com with ESMTPS id a27sm45741135wbe.6.2010.07.07.14.30.56 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 07 Jul 2010 14:30:56 -0700 (PDT) From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, rdsandiford@googlemail.com Subject: [24/27] Put gcse's can_copy hash into target structures References: <87d3v2oqyt.fsf@firetop.home> Date: Wed, 07 Jul 2010 22:30:55 +0100 In-Reply-To: <87d3v2oqyt.fsf@firetop.home> (Richard Sandiford's message of "Sun, 04 Jul 2010 22:51:54 +0100") Message-ID: <877hl7rncg.fsf@firetop.home> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 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 GCSE caches whether it it can copy values in a particular mode. This property is target-dependent. Richard gcc/ * Makefile.in (gcse.o, target-globals.o): Depend on gcse.h.. * gcse.h: New file. * gcse.c: Include gcse.h. (default_target_gcse): New variable. (this_target_gcse): New conditional variable. (can_copy): Redefine as a macro. (can_copy_init_p): New macro. (can_copy_p): Remove can_copy_init_p. * target-globals.h (this_target_gcse): Declare. (target_globals): Add a gcse field. (restore_target_globals): Copy the gcse field to this_target_gcse. * target-globals.c: Include gcse.h. (default_target_globals): Initialize the gcse field. (save_target_globals): Likewise. Index: gcc/Makefile.in =================================================================== --- gcc/Makefile.in 2010-07-07 22:21:40.000000000 +0100 +++ gcc/Makefile.in 2010-07-07 22:29:12.000000000 +0100 @@ -3094,7 +3094,7 @@ gcse.o : gcse.c $(CONFIG_H) $(SYSTEM_H) $(RECOG_H) $(EXPR_H) $(BASIC_BLOCK_H) $(FUNCTION_H) output.h $(TOPLEV_H) \ $(TM_P_H) $(PARAMS_H) cselib.h $(EXCEPT_H) gt-gcse.h $(TREE_H) $(TIMEVAR_H) \ intl.h $(OBSTACK_H) $(TREE_PASS_H) $(DF_H) $(DBGCNT_H) $(TARGET_H) \ - $(DF_H) + $(DF_H) gcse.h store-motion.o : store-motion.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \ $(REGS_H) hard-reg-set.h $(FLAGS_H) insn-config.h $(GGC_H) \ $(RECOG_H) $(EXPR_H) $(BASIC_BLOCK_H) $(FUNCTION_H) output.h $(TOPLEV_H) \ @@ -3479,7 +3479,7 @@ lower-subreg.o : lower-subreg.c $(CONFIG target-globals.o : target-globals.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TM_H) insn-config.h $(MACHMODE_H) $(GGC_H) $(TOPLEV_H) target-globals.h \ $(FLAGS_H) $(REGS_H) $(RTL_H) reload.h expmed.h $(EXPR_H) $(OPTABS_H) \ - $(LIBFUNCS_H) $(CFGLOOP_H) $(IRA_INT_H) builtins.h + $(LIBFUNCS_H) $(CFGLOOP_H) $(IRA_INT_H) builtins.h gcse.h $(out_object_file): $(out_file) $(CONFIG_H) coretypes.h $(TM_H) $(TREE_H) \ $(RTL_H) $(REGS_H) hard-reg-set.h insn-config.h conditions.h \ Index: gcc/gcse.h =================================================================== --- /dev/null 2010-07-07 22:25:18.139280603 +0100 +++ gcc/gcse.h 2010-07-07 22:29:12.000000000 +0100 @@ -0,0 +1,43 @@ +/* Global common subexpression elimination/Partial redundancy elimination + and global constant/copy propagation for GNU compiler. + Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, + 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 3, or (at your option) any later +version. + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING3. If not see +. */ + +#ifndef GCC_GCSE_H +#define GCC_GCSE_H + +/* Target-dependent globals. */ +struct target_gcse { + /* Nonzero for each mode that supports (set (reg) (reg)). + This is trivially true for integer and floating point values. + It may or may not be true for condition codes. */ + int x_can_copy[(int) NUM_MACHINE_MODES]; + + /* True if the previous field has been initialized. */ + bool x_can_copy_init_p; +}; + +extern GTY(()) struct target_gcse default_target_gcse; +#if SWITCHABLE_TARGET +extern struct target_gcse *this_target_gcse; +#else +#define this_target_gcse (&default_target_gcse) +#endif + +#endif Index: gcc/gcse.c =================================================================== --- gcc/gcse.c 2010-07-04 22:48:28.000000000 +0100 +++ gcc/gcse.c 2010-07-07 22:29:12.000000000 +0100 @@ -169,6 +169,7 @@ Software Foundation; either version 3, o #include "df.h" #include "dbgcnt.h" #include "target.h" +#include "gcse.h" /* We support GCSE via Partial Redundancy Elimination. PRE optimizations are a superset of those done by classic GCSE. @@ -262,6 +263,11 @@ Software Foundation; either version 3, o /* GCSE global vars. */ +struct target_gcse default_target_gcse; +#if SWITCHABLE_TARGET +struct target_gcse *this_target_gcse = &default_target_gcse; +#endif + /* Set to non-zero if CSE should run after all GCSE optimizations are done. */ int flag_rerun_cse_after_global_opts; @@ -538,10 +544,10 @@ #define GOBNEWVAR(T, S) ((T *) gcse_all /* Misc. utilities. */ -/* Nonzero for each mode that supports (set (reg) (reg)). - This is trivially true for integer and floating point values. - It may or may not be true for condition codes. */ -static char can_copy[(int) NUM_MACHINE_MODES]; +#define can_copy \ + (this_target_gcse->x_can_copy) +#define can_copy_init_p \ + (this_target_gcse->x_can_copy_init_p) /* Compute which modes support reg/reg copy operations. */ @@ -578,8 +584,6 @@ compute_can_copy (void) bool can_copy_p (enum machine_mode mode) { - static bool can_copy_init_p = false; - if (! can_copy_init_p) { compute_can_copy (); Index: gcc/target-globals.h =================================================================== --- gcc/target-globals.h 2010-07-07 22:21:40.000000000 +0100 +++ gcc/target-globals.h 2010-07-07 22:29:12.000000000 +0100 @@ -33,6 +33,7 @@ #define TARGET_GLOBALS_H 1 extern struct target_ira *this_target_ira; extern struct target_ira_int *this_target_ira_int; extern struct target_builtins *this_target_builtins; +extern struct target_gcse *this_target_gcse; struct GTY(()) target_globals { struct target_flag_state *GTY((skip)) flag_state; @@ -47,6 +48,7 @@ struct GTY(()) target_globals { struct target_ira *GTY((skip)) ira; struct target_ira_int *GTY((skip)) ira_int; struct target_builtins *GTY((skip)) builtins; + struct target_gcse *GTY((skip)) gcse; }; extern struct target_globals default_target_globals; @@ -68,6 +70,7 @@ restore_target_globals (struct target_gl this_target_ira = g->ira; this_target_ira_int = g->ira_int; this_target_builtins = g->builtins; + this_target_gcse = g->gcse; } #endif Index: gcc/target-globals.c =================================================================== --- gcc/target-globals.c 2010-07-07 22:21:40.000000000 +0100 +++ gcc/target-globals.c 2010-07-07 22:29:12.000000000 +0100 @@ -38,6 +38,7 @@ Software Foundation; either version 3, o #include "cfgloop.h" #include "ira-int.h" #include "builtins.h" +#include "gcse.h" #if SWITCHABLE_TARGET struct target_globals default_target_globals = { @@ -52,7 +53,8 @@ struct target_globals default_target_glo &default_target_cfgloop, &default_target_ira, &default_target_ira_int, - &default_target_builtins + &default_target_builtins, + &default_target_gcse }; struct target_globals * @@ -73,6 +75,7 @@ save_target_globals (void) g->ira = XCNEW (struct target_ira); g->ira_int = XCNEW (struct target_ira_int); g->builtins = XCNEW (struct target_builtins); + g->gcse = XCNEW (struct target_gcse); restore_target_globals (g); target_reinit (); return g;