From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21020 invoked by alias); 15 Dec 2004 20:07:44 -0000 Mailing-List: contact gcc-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Archive: List-Post: List-Help: Sender: gcc-owner@gcc.gnu.org Received: (qmail 20642 invoked from network); 15 Dec 2004 20:07:28 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org with SMTP; 15 Dec 2004 20:07:28 -0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id iBFK7SjF004340; Wed, 15 Dec 2004 15:07:28 -0500 Received: from pobox.corp.redhat.com (pobox.corp.redhat.com [172.16.52.156]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id iBFK7Rr19571; Wed, 15 Dec 2004 15:07:27 -0500 Received: from livre.redhat.lsd.ic.unicamp.br (vpn50-66.rdu.redhat.com [172.16.50.66]) by pobox.corp.redhat.com (8.12.8/8.12.8) with ESMTP id iBFK7Qbo031832; Wed, 15 Dec 2004 15:07:26 -0500 Received: from livre.redhat.lsd.ic.unicamp.br (livre.redhat.lsd.ic.unicamp.br [127.0.0.1]) by livre.redhat.lsd.ic.unicamp.br (8.13.1/8.13.1) with ESMTP id iBFK7Okg003187; Wed, 15 Dec 2004 18:07:25 -0200 Received: (from aoliva@localhost) by livre.redhat.lsd.ic.unicamp.br (8.13.1/8.13.1/Submit) id iBFK7Obp003183; Wed, 15 Dec 2004 18:07:24 -0200 To: Richard Henderson Cc: Bernd Schmidt , gcc@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: Re: [RFC] avoiding too narrow register classes in reload References: <20041214020635.GA16249@redhat.com> <20041214223127.GE19197@redhat.com> <20041215080932.GB20219@redhat.com> From: Alexandre Oliva Organization: Red Hat Global Engineering Services Compiler Team Date: Wed, 15 Dec 2004 20:07:00 -0000 In-Reply-To: <20041215080932.GB20219@redhat.com> Message-ID: User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-SW-Source: 2004-12/txt/msg00615.txt.bz2 --=-=-= Content-length: 849 On Dec 15, 2004, Richard Henderson wrote: > On Wed, Dec 15, 2004 at 04:56:08AM -0200, Alexandre Oliva wrote: >> * reload.c (SMALL_REGISTER_CLASS_P): New. >> (push_secondary_reload, find_reusable_reload, find_reloads): Use >> it instead of testing only the class size. > Ok, except, > We no longer have to cater to broken K&R compilers that refuse to > index arrays by enums. Kill the casts. Ok >> - if (reg_class_size[this_alternative[i]] == 1 >> + if (reg_class_size[this_alternative[i]] > 0 >> + && SMALL_REGISTER_CLASS_P (this_alternative[i]) > reg_class_size check redundant with SMALL_REGISTER_CLASS_P. I thought I'd leave it in for, like, documentation purposes, just in case someone reworks SMALL_REGISTER_CLASS_P such that it can match even for 0-sized classes, but fine. Here's what I'm checking in. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=reload-small-regclass-likely-spilled-take3.patch Content-length: 3821 Index: gcc/ChangeLog from Alexandre Oliva * reload.c (SMALL_REGISTER_CLASS_P): New. (push_secondary_reload, find_reusable_reload, find_reloads): Use it instead of testing only the class size. Index: gcc/reload.c =================================================================== RCS file: /cvs/gcc/gcc/gcc/reload.c,v retrieving revision 1.260 diff -u -p -r1.260 reload.c --- gcc/reload.c 7 Dec 2004 01:14:40 -0000 1.260 +++ gcc/reload.c 15 Dec 2004 20:05:08 -0000 @@ -113,6 +113,13 @@ a register with any other reload. */ (CONSTANT_P (X) \ && GET_CODE (X) != HIGH \ && !targetm.cannot_force_const_mem (X)) + +/* True if C is a non-empty register class that has too few registers + to be safely used as a reload target class. */ +#define SMALL_REGISTER_CLASS_P(C) \ + (reg_class_size [(C)] == 1 \ + || (reg_class_size [(C)] >= 1 && CLASS_LIKELY_SPILLED_P (C))) + /* All reloads of the current insn are recorded here. See reload.h for comments. */ @@ -443,7 +450,7 @@ push_secondary_reload (int in_p, rtx x, == CODE_FOR_nothing)) || (! in_p &&(rld[t_reload].secondary_out_icode == CODE_FOR_nothing))) - && (reg_class_size[(int) t_class] == 1 || SMALL_REGISTER_CLASSES) + && (SMALL_REGISTER_CLASS_P (t_class) || SMALL_REGISTER_CLASSES) && MERGABLE_RELOADS (secondary_type, rld[t_reload].when_needed, opnum, rld[t_reload].opnum)) @@ -501,7 +508,7 @@ push_secondary_reload (int in_p, rtx x, || (! in_p && rld[s_reload].secondary_out_reload == t_reload)) && ((in_p && rld[s_reload].secondary_in_icode == t_icode) || (! in_p && rld[s_reload].secondary_out_icode == t_icode)) - && (reg_class_size[(int) class] == 1 || SMALL_REGISTER_CLASSES) + && (SMALL_REGISTER_CLASS_P (class) || SMALL_REGISTER_CLASSES) && MERGABLE_RELOADS (secondary_type, rld[s_reload].when_needed, opnum, rld[s_reload].opnum)) { @@ -755,7 +762,7 @@ find_reusable_reload (rtx *p_in, rtx out || (out != 0 && MATCHES (rld[i].out, out) && (in == 0 || rld[i].in == 0 || MATCHES (rld[i].in, in)))) && (rld[i].out == 0 || ! earlyclobber_operand_p (rld[i].out)) - && (reg_class_size[(int) class] == 1 || SMALL_REGISTER_CLASSES) + && (SMALL_REGISTER_CLASS_P (class) || SMALL_REGISTER_CLASSES) && MERGABLE_RELOADS (type, rld[i].when_needed, opnum, rld[i].opnum)) return i; @@ -780,7 +787,7 @@ find_reusable_reload (rtx *p_in, rtx out && GET_RTX_CLASS (GET_CODE (in)) == RTX_AUTOINC && MATCHES (XEXP (in, 0), rld[i].in))) && (rld[i].out == 0 || ! earlyclobber_operand_p (rld[i].out)) - && (reg_class_size[(int) class] == 1 || SMALL_REGISTER_CLASSES) + && (SMALL_REGISTER_CLASS_P (class) || SMALL_REGISTER_CLASSES) && MERGABLE_RELOADS (type, rld[i].when_needed, opnum, rld[i].opnum)) { @@ -3484,7 +3491,8 @@ find_reloads (rtx insn, int replace, int if (! win && ! did_match && this_alternative[i] != (int) NO_REGS && GET_MODE_SIZE (operand_mode[i]) <= UNITS_PER_WORD - && reg_class_size[(int) preferred_class[i]] > 1) + && reg_class_size [(int) preferred_class[i]] > 0 + && ! SMALL_REGISTER_CLASS_P (preferred_class[i])) { if (! reg_class_subset_p (this_alternative[i], preferred_class[i])) @@ -3540,9 +3548,9 @@ find_reloads (rtx insn, int replace, int && !immune_p (recog_data.operand[j], recog_data.operand[i], early_data)) { - /* If the output is in a single-reg class, + /* If the output is in a non-empty few-regs class, it's costly to reload it, so reload the input instead. */ - if (reg_class_size[this_alternative[i]] == 1 + if (SMALL_REGISTER_CLASS_P (this_alternative[i]) && (REG_P (recog_data.operand[j]) || GET_CODE (recog_data.operand[j]) == SUBREG)) { --=-=-= Content-length: 188 -- Alexandre Oliva http://www.ic.unicamp.br/~oliva/ Red Hat Compiler Engineer aoliva@{redhat.com, gcc.gnu.org} Free Software Evangelist oliva@{lsd.ic.unicamp.br, gnu.org} --=-=-=--