From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1005) id A00133858D37; Thu, 27 Apr 2023 19:32:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A00133858D37 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1682623922; bh=aFCW5BgwXY0fzlQvJvCf88KmWbJRdQH7fxLuybNhC38=; h=From:To:Subject:Date:From; b=pOrLxcGlPYnKOF4oIFcKPzuKpikzlMJsfNVHWpM0Zq/+rXkxKxUA4k1oe6OWazr1W LBMynX3XI9xCOrczWz8iwEzFz2L0xetIdZ2LrAzsyiow7W1AMajRY40hrWVKJY3zEd BHBFjPz2Qh4VcLOg163TqcaO+omuoxE4LKjzPYYc= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Michael Meissner To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/meissner/heads/work119)] Allow vec_extract from memory support functions before reload X-Act-Checkin: gcc X-Git-Author: Michael Meissner X-Git-Refname: refs/users/meissner/heads/work119 X-Git-Oldrev: b88b631d6981f177487212d322bdb832c2fa8cbd X-Git-Newrev: b2f2c793eb6bf3619d40a876efa97be6c005d291 Message-Id: <20230427193202.A00133858D37@sourceware.org> Date: Thu, 27 Apr 2023 19:32:02 +0000 (GMT) List-Id: https://gcc.gnu.org/g:b2f2c793eb6bf3619d40a876efa97be6c005d291 commit b2f2c793eb6bf3619d40a876efa97be6c005d291 Author: Michael Meissner Date: Thu Apr 27 15:31:34 2023 -0400 Allow vec_extract from memory support functions before reload In the succeeding patches, I will be modifying the various vec_extract insns to allow the split to occur before register allocation. This patch goes through the support function rs6000_adjust_vec_address and the functions it calls to allow them to be called before register allocation. The places that take a scratch register will allocate a new pseudo register if they are passed a SCRATCH register. 2023-04-27 Michael Meissner gcc/ * config/rs6000/rs6000.cc (get_vector_offset): Allow function to be called before register allocation. (adjust_vec_address_pcrel): Likewise. (rs6000_adjust_vec_address): Likewise. Diff: --- gcc/config/rs6000/rs6000.cc | 56 +++++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc index 3be5860dd9b..65295dbaf81 100644 --- a/gcc/config/rs6000/rs6000.cc +++ b/gcc/config/rs6000/rs6000.cc @@ -7686,9 +7686,13 @@ get_vector_offset (rtx mem, rtx element, rtx base_tmp, unsigned scalar_size) if (CONST_INT_P (element)) return GEN_INT (INTVAL (element) * scalar_size); - /* All insns should use the 'Q' constraint (address is a single register) if - the element number is not a constant. */ - gcc_assert (satisfies_constraint_Q (mem)); + if (GET_CODE (base_tmp) == SCRATCH) + base_tmp = gen_reg_rtx (Pmode); + + /* After register allocation, all insns should use the 'Q' constraint + (address is a single register) if the element number is not a + constant. */ + gcc_assert (can_create_pseudo_p () || satisfies_constraint_Q (mem)); /* Mask the element to make sure the element number is between 0 and the maximum number of elements - 1 so that we don't generate an address @@ -7704,6 +7708,9 @@ get_vector_offset (rtx mem, rtx element, rtx base_tmp, unsigned scalar_size) if (shift > 0) { rtx shift_op = gen_rtx_ASHIFT (Pmode, base_tmp, GEN_INT (shift)); + if (can_create_pseudo_p ()) + base_tmp = gen_reg_rtx (Pmode); + emit_insn (gen_rtx_SET (base_tmp, shift_op)); } @@ -7747,6 +7754,9 @@ adjust_vec_address_pcrel (rtx addr, rtx element_offset, rtx base_tmp) else { + if (GET_CODE (base_tmp) == SCRATCH) + base_tmp = gen_reg_rtx (Pmode); + emit_move_insn (base_tmp, addr); new_addr = gen_rtx_PLUS (Pmode, base_tmp, element_offset); } @@ -7769,9 +7779,8 @@ adjust_vec_address_pcrel (rtx addr, rtx element_offset, rtx base_tmp) temporary (BASE_TMP) to fixup the address. Return the new memory address that is valid for reads or writes to a given register (SCALAR_REG). - This function is expected to be called after reload is completed when we are - splitting insns. The temporary BASE_TMP might be set multiple times with - this code. */ + The temporary BASE_TMP might be set multiple times with this code if this is + called after register allocation. */ rtx rs6000_adjust_vec_address (rtx scalar_reg, @@ -7784,8 +7793,11 @@ rs6000_adjust_vec_address (rtx scalar_reg, rtx addr = XEXP (mem, 0); rtx new_addr; - gcc_assert (!reg_mentioned_p (base_tmp, addr)); - gcc_assert (!reg_mentioned_p (base_tmp, element)); + if (GET_CODE (base_tmp) != SCRATCH) + { + gcc_assert (!reg_mentioned_p (base_tmp, addr)); + gcc_assert (!reg_mentioned_p (base_tmp, element)); + } /* Vector addresses should not have PRE_INC, PRE_DEC, or PRE_MODIFY. */ gcc_assert (GET_RTX_CLASS (GET_CODE (addr)) != RTX_AUTOINC); @@ -7841,6 +7853,9 @@ rs6000_adjust_vec_address (rtx scalar_reg, offset, it has the benefit that if D-FORM instructions are allowed, the offset is part of the memory access to the vector element. */ + if (GET_CODE (base_tmp) == SCRATCH) + base_tmp = gen_reg_rtx (Pmode); + emit_insn (gen_rtx_SET (base_tmp, gen_rtx_PLUS (Pmode, op0, op1))); new_addr = gen_rtx_PLUS (Pmode, base_tmp, element_offset); } @@ -7848,26 +7863,33 @@ rs6000_adjust_vec_address (rtx scalar_reg, else { + if (GET_CODE (base_tmp) == SCRATCH) + base_tmp = gen_reg_rtx (Pmode); + emit_move_insn (base_tmp, addr); new_addr = gen_rtx_PLUS (Pmode, base_tmp, element_offset); } - /* If the address isn't valid, move the address into the temporary base - register. Some reasons it could not be valid include: + /* If register allocation has been done and the address isn't valid, move + the address into the temporary base register. Some reasons it could not + be valid include: The address offset overflowed the 16 or 34 bit offset size; We need to use a DS-FORM load, and the bottom 2 bits are non-zero; We need to use a DQ-FORM load, and the bottom 4 bits are non-zero; Only X_FORM loads can be done, and the address is D_FORM. */ - enum insn_form iform - = address_to_insn_form (new_addr, scalar_mode, - reg_to_non_prefixed (scalar_reg, scalar_mode)); - - if (iform == INSN_FORM_BAD) + if (!can_create_pseudo_p ()) { - emit_move_insn (base_tmp, new_addr); - new_addr = base_tmp; + enum insn_form iform + = address_to_insn_form (new_addr, scalar_mode, + reg_to_non_prefixed (scalar_reg, scalar_mode)); + + if (iform == INSN_FORM_BAD) + { + emit_move_insn (base_tmp, new_addr); + new_addr = base_tmp; + } } return change_address (mem, scalar_mode, new_addr);