From patchwork Thu Apr 19 17:40:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Makarov X-Patchwork-Id: 153844 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 C270FB6FD1 for ; Fri, 20 Apr 2012 03:41:49 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1335462110; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:Subject: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=OBhTBRu BZ1YdwmNOQ8NZjSXFWHE=; b=THc4BUC7GS10JYfMuqB7rogOfdoGKlkL4iuUBCd woACw8S/yMFPuV7wj0tXzeTMvIo88GYL0iK6jHyIp2EdJqaKXjnDpo8S2Dcm8K88 GjtgEEBGJQZ/zzCzJgl283v22i9qZsooJjIGdXppa5aDF0Ms26dvdZ+WascJLKWF hgQY= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=psXbiGHu7bWOMzNiDpITNWlxfIbEBgsW9bkZWnTfLL+QMgxndnhfV0K4Pa6UhF ihN3ynXawJBy2BrbyhDOyQCVxijVM/GoYIGdyR3Nnle1CRiL13AI1uMh8PfATVlU 3z9kig2xlzeezn8+GMs4h2227pJFdiY4a3rvYOOwdZ88o=; Received: (qmail 5556 invoked by alias); 19 Apr 2012 17:41:44 -0000 Received: (qmail 5434 invoked by uid 22791); 19 Apr 2012 17:41:42 -0000 X-SWARE-Spam-Status: No, hits=-5.9 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, MAY_BE_FORGED, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_W, SPF_HELO_PASS, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 19 Apr 2012 17:41:29 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q3JHfSND020099 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 19 Apr 2012 13:41:29 -0400 Received: from toll.usersys.redhat.com (unused [10.15.16.165] (may be forged)) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q3JHfS1Q001829 for ; Thu, 19 Apr 2012 13:41:28 -0400 Message-ID: <4F904E20.3040909@redhat.com> Date: Thu, 19 Apr 2012 13:40:48 -0400 From: Vladimir Makarov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:11.0) Gecko/20120329 Thunderbird/11.0.1 MIME-Version: 1.0 To: gcc-patches Subject: [lra] patch to fix most mips testsuite regressions 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 The following patch fixes most GCC testsuite regressions of LRA on mips64. Committed as rev. 186598. 2012-04-19 Vladimir Makarov * config/mips/mips.c (mips_expand_fcc_reload): Remove code for LRA. Add an assertion. (mips_secondary_reload): New function. (TARGET_SECONDARY_RELOAD): Redefine. Index: config/mips/mips.c =================================================================== --- config/mips/mips.c (revision 186357) +++ config/mips/mips.c (working copy) @@ -6661,30 +6661,15 @@ mips_expand_fcc_reload (rtx dest, rtx sr { rtx fp1, fp2; + gcc_assert (! flag_lra); /* Change the source to SFmode. */ if (MEM_P (src)) src = adjust_address (src, SFmode, 0); else if (REG_P (src) || GET_CODE (src) == SUBREG) - { - if (! flag_lra) - src = gen_rtx_REG (SFmode, true_regnum (src)); - else if (GET_MODE (src) != SFmode) - src = gen_rtx_SUBREG (SFmode, - GET_CODE (src) == SUBREG ? SUBREG_REG (src) : src, - 0); - } + src = gen_rtx_REG (SFmode, true_regnum (src)); - if (flag_lra) - { - enum reg_class rclass = lra_get_allocno_class (REGNO (scratch)); - fp1 = lra_create_new_reg (SFmode, NULL_RTX, rclass, "new scratch"); - fp2 = lra_create_new_reg (SFmode, NULL_RTX, rclass, "zero"); - } - else - { - fp1 = gen_rtx_REG (SFmode, REGNO (scratch)); - fp2 = gen_rtx_REG (SFmode, REGNO (scratch) + MAX_FPRS_PER_FMT); - } + fp1 = gen_rtx_REG (SFmode, REGNO (scratch)); + fp2 = gen_rtx_REG (SFmode, REGNO (scratch) + MAX_FPRS_PER_FMT); mips_emit_move (copy_rtx (fp1), src); mips_emit_move (copy_rtx (fp2), CONST0_RTX (SFmode)); emit_insn (gen_slt_sf (dest, fp2, fp1)); @@ -11156,6 +11141,18 @@ mips_preferred_reload_class (rtx x, reg_ return rclass; } +/* Implement TARGET_SECONDARY_RELOAD. */ + +static reg_class_t +mips_secondary_reload (bool in_p, rtx x, reg_class_t reload_class_i, + enum machine_mode reload_mode, + secondary_reload_info *sri) +{ + if (flag_lra) + return NO_REGS; + return default_secondary_reload (in_p, x, reload_class_i, reload_mode, sri); +} + /* RCLASS is a class involved in a REGISTER_MOVE_COST calculation. Return a "canonical" class to represent it in later calculations. */ @@ -17354,6 +17351,9 @@ mips_expand_vec_minmax (rtx target, rtx #undef TARGET_PREFERRED_RELOAD_CLASS #define TARGET_PREFERRED_RELOAD_CLASS mips_preferred_reload_class +#undef TARGET_SECONDARY_RELOAD +#define TARGET_SECONDARY_RELOAD mips_secondary_reload + #undef TARGET_ASM_FILE_START #define TARGET_ASM_FILE_START mips_file_start #undef TARGET_ASM_FILE_START_FILE_DIRECTIVE