From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 93051 invoked by alias); 11 Sep 2019 19:09:08 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 93042 invoked by uid 89); 11 Sep 2019 19:09:07 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-9.2 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.1 spammy=quantity, tick X-HELO: foss.arm.com Received: from foss.arm.com (HELO foss.arm.com) (217.140.110.172) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 11 Sep 2019 19:09:06 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1D84C28 for ; Wed, 11 Sep 2019 12:09:05 -0700 (PDT) Received: from localhost (e121540-lin.manchester.arm.com [10.32.99.62]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BA0903F59C for ; Wed, 11 Sep 2019 12:09:04 -0700 (PDT) From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, richard.sandiford@arm.com Subject: [11/32] Remove global call sets: cse.c References: Date: Wed, 11 Sep 2019 19:09:00 -0000 In-Reply-To: (Richard Sandiford's message of "Wed, 11 Sep 2019 20:02:26 +0100") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes X-SW-Source: 2019-09/txt/msg00790.txt.bz2 Like with the combine.c patch, this one keeps things simple by invalidating values in partially-clobbered registers, rather than trying to tell whether the value in a partially-clobbered register is actually clobbered or not. Again, this is in principle a bug fix, but probably never matters in practice. 2019-09-11 Richard Sandiford gcc/ * cse.c: Include regs.h and function-abi.h. (invalidate_for_call): Take the call insn as an argument. Use call_insn_abi to get the ABI of the call and invalidate partially clobbered registers as well as fully clobbered ones. (cse_insn): Update call accordingly. Index: gcc/cse.c =================================================================== --- gcc/cse.c 2019-09-09 18:58:51.468270740 +0100 +++ gcc/cse.c 2019-09-11 19:48:00.966005128 +0100 @@ -42,6 +42,8 @@ Software Foundation; either version 3, o #include "tree-pass.h" #include "dbgcnt.h" #include "rtl-iter.h" +#include "regs.h" +#include "function-abi.h" /* The basic idea of common subexpression elimination is to go through the code, keeping a record of expressions that would @@ -566,7 +568,6 @@ static void remove_invalid_subreg_refs ( machine_mode); static void rehash_using_reg (rtx); static void invalidate_memory (void); -static void invalidate_for_call (void); static rtx use_related_value (rtx, struct table_elt *); static inline unsigned canon_hash (rtx, machine_mode); @@ -2091,23 +2092,29 @@ rehash_using_reg (rtx x) } /* Remove from the hash table any expression that is a call-clobbered - register. Also update their TICK values. */ + register in INSN. Also update their TICK values. */ static void -invalidate_for_call (void) +invalidate_for_call (rtx_insn *insn) { - unsigned int regno, endregno; - unsigned int i; + unsigned int regno; unsigned hash; struct table_elt *p, *next; int in_table = 0; hard_reg_set_iterator hrsi; - /* Go through all the hard registers. For each that is clobbered in - a CALL_INSN, remove the register from quantity chains and update + /* Go through all the hard registers. For each that might be clobbered + in call insn INSN, remove the register from quantity chains and update reg_tick if defined. Also see if any of these registers is currently - in the table. */ - EXECUTE_IF_SET_IN_HARD_REG_SET (regs_invalidated_by_call, 0, regno, hrsi) + in the table. + + ??? We could be more precise for partially-clobbered registers, + and only invalidate values that actually occupy the clobbered part + of the registers. It doesn't seem worth the effort though, since + we shouldn't see this situation much before RA. */ + function_abi abi = call_insn_abi (insn); + EXECUTE_IF_SET_IN_HARD_REG_SET (abi.full_and_partial_reg_clobbers (), + 0, regno, hrsi) { delete_reg_equiv (regno); if (REG_TICK (regno) >= 0) @@ -2132,15 +2139,11 @@ invalidate_for_call (void) || REGNO (p->exp) >= FIRST_PSEUDO_REGISTER) continue; - regno = REGNO (p->exp); - endregno = END_REGNO (p->exp); - - for (i = regno; i < endregno; i++) - if (TEST_HARD_REG_BIT (regs_invalidated_by_call, i)) - { - remove_from_table (p, hash); - break; - } + /* This must use the same test as above rather than the + more accurate clobbers_reg_p. */ + if (overlaps_hard_reg_set_p (abi.full_and_partial_reg_clobbers (), + GET_MODE (p->exp), REGNO (p->exp))) + remove_from_table (p, hash); } } @@ -5834,7 +5837,7 @@ cse_insn (rtx_insn *insn) if (GET_CODE (XEXP (tem, 0)) == USE && MEM_P (XEXP (XEXP (tem, 0), 0))) invalidate (XEXP (XEXP (tem, 0), 0), VOIDmode); - invalidate_for_call (); + invalidate_for_call (insn); } /* Now invalidate everything set by this instruction.