From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by sourceware.org (Postfix) with ESMTPS id 53E053858423 for ; Mon, 26 Jun 2023 12:45:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 53E053858423 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linux.ibm.com Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35QCafS7003728; Mon, 26 Jun 2023 12:45:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=oaUowt33YMV0F7lxe/436a3s0l6gXyV+eXhXT+v8ZtM=; b=c0Xa7GOkI8AsIMRuz+wwNZ9uIPeECWxHsmmMFhqA3IztnCLk+QgEvzlnP91whpCJx9U3 Xvef0LeRsoJ8hbUcLgoxIeq6NRp1Ghm3aIWd/XWvUBIA4dhlreB7yNahaZa5dFGnOGer 6s8oS9mG0Ip4vCG51j0mGODRc6REr8PVFQj0cH+xXgJPaTiqdyoKqj4rECNLnUhz94FA CQmYRXp1NhPjlxIw+GB3eQy/xZLpsqO0zJ40U3s5rcM3gm70zqiKIT/LnVeOiQzz/VgR 42mvFD/NTWoBYoljPDaGM0+c2LNzDaoIvFzKqOXEkl7FESxurUMtkd6zbiLamGpD9xdC pA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rfam9gh45-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 Jun 2023 12:45:30 +0000 Received: from m0356517.ppops.net (m0356517.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 35QCagqD003833; Mon, 26 Jun 2023 12:45:30 GMT Received: from ppma01dal.us.ibm.com (83.d6.3fa9.ip4.static.sl-reverse.com [169.63.214.131]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rfam9gh3s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 Jun 2023 12:45:29 +0000 Received: from pps.filterd (ppma01dal.us.ibm.com [127.0.0.1]) by ppma01dal.us.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 35QAVJrk011033; Mon, 26 Jun 2023 12:45:29 GMT Received: from smtprelay03.wdc07v.mail.ibm.com ([9.208.129.113]) by ppma01dal.us.ibm.com (PPS) with ESMTPS id 3rdr46h36c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 Jun 2023 12:45:28 +0000 Received: from smtpav05.wdc07v.mail.ibm.com (smtpav05.wdc07v.mail.ibm.com [10.39.53.232]) by smtprelay03.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 35QCjRwm3736190 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 26 Jun 2023 12:45:27 GMT Received: from smtpav05.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5805158059; Mon, 26 Jun 2023 12:45:27 +0000 (GMT) Received: from smtpav05.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9782C58071; Mon, 26 Jun 2023 12:45:24 +0000 (GMT) Received: from [9.43.27.64] (unknown [9.43.27.64]) by smtpav05.wdc07v.mail.ibm.com (Postfix) with ESMTP; Mon, 26 Jun 2023 12:45:24 +0000 (GMT) Message-ID: <1d8d7d5f-ef60-38e5-d8ed-ec540391aaed@linux.ibm.com> Date: Mon, 26 Jun 2023 18:15:22 +0530 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.11.2 Subject: [PING] PATCH v5 4/4] ree: Improve ree pass for rs6000 target using defined ABI interfaces. Content-Language: en-US To: gcc-patches Cc: Jeff Law , Segher Boessenkool , Peter Bergner , Richard Biener References: <94db15dc-2ce3-bfc1-6483-fce5687bd991@linux.ibm.com> From: Ajit Agarwal In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: m8QyuJvh7XYxl09raVeBlftIvYgoH4Q4 X-Proofpoint-ORIG-GUID: reSh2JH6dXT1XPC6DVAZLshokXp2hpgQ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-06-26_09,2023-06-26_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 spamscore=0 priorityscore=1501 phishscore=0 adultscore=0 clxscore=1015 bulkscore=0 lowpriorityscore=0 malwarescore=0 suspectscore=0 impostorscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306260113 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: All: Ok for trunk. Please review. Thanks & Regards Ajit On 26/06/23 6:12 pm, Ajit Agarwal via Gcc-patches wrote: > All: > > Ok for trunk. Please review. > > Thanks & Regards > Ajit > > On 01/06/23 10:53 am, Ajit Agarwal via Gcc-patches wrote: >> Hello All: >> >> This new version of patch 4 use improve ree pass for rs6000 target using defined ABI interfaces. >> Bootstrapped and regtested on power64-linux-gnu. >> >> Review comments incorporated. >> >> Thanks & Regards >> Ajit >> >> Improve ree pass for rs6000 target using defined abi interfaces >> >> For rs6000 target we see redundant zero and sign >> extension and done to improve ree pass to eliminate >> such redundant zero and sign extension using defined >> ABI interfaces. >> >> 2023-06-01 Ajit Kumar Agarwal >> >> gcc/ChangeLog: >> >> * ree.cc (combine_reaching_defs): Use of zero_extend and sign_extend >> defined abi interfaces. >> (add_removable_extension): Use of defined abi interfaces for no >> reaching defs. >> (abi_extension_candidate_return_reg_p): New function. >> (abi_extension_candidate_p): New function. >> (abi_extension_candidate_argno_p): New function. >> (abi_handle_regs_without_defs_p): New function. >> (abi_target_promote_function_mode): New function. >> >> gcc/testsuite/ChangeLog: >> >> * g++.target/powerpc/zext-elim-3.C >> --- >> gcc/ree.cc | 199 +++++++++++++++--- >> .../g++.target/powerpc/zext-elim-3.C | 13 ++ >> 2 files changed, 183 insertions(+), 29 deletions(-) >> create mode 100644 gcc/testsuite/g++.target/powerpc/zext-elim-3.C >> >> diff --git a/gcc/ree.cc b/gcc/ree.cc >> index fc04249fa84..2025a7c43da 100644 >> --- a/gcc/ree.cc >> +++ b/gcc/ree.cc >> @@ -514,7 +514,8 @@ get_uses (rtx_insn *insn, rtx reg) >> if (REGNO (DF_REF_REG (def)) == REGNO (reg)) >> break; >> >> - gcc_assert (def != NULL); >> + if (def == NULL) >> + return NULL; >> >> ref_chain = DF_REF_CHAIN (def); >> >> @@ -750,6 +751,120 @@ get_extended_src_reg (rtx src) >> return src; >> } >> >> +/* Return TRUE if target mode is equal to source mode of zero_extend >> + or sign_extend otherwise false. */ >> + >> +static bool >> +abi_target_promote_function_mode (machine_mode mode) >> +{ >> + int unsignedp; >> + machine_mode tgt_mode = >> + targetm.calls.promote_function_mode (NULL_TREE, mode, &unsignedp, >> + NULL_TREE, 1); >> + >> + if (tgt_mode == mode) >> + return true; >> + else >> + return false; >> +} >> + >> +/* Return TRUE if the candidate insn is zero extend and regno is >> + an return registers. */ >> + >> +static bool >> +abi_extension_candidate_return_reg_p (rtx_insn *insn, int regno) >> +{ >> + rtx set = single_set (insn); >> + >> + if (GET_CODE (SET_SRC (set)) != ZERO_EXTEND) >> + return false; >> + >> + if (FUNCTION_VALUE_REGNO_P (regno)) >> + return true; >> + >> + return false; >> +} >> + >> +/* Return TRUE if reg source operand of zero_extend is argument registers >> + and not return registers and source and destination operand are same >> + and mode of source and destination operand are not same. */ >> + >> +static bool >> +abi_extension_candidate_p (rtx_insn *insn) >> +{ >> + rtx set = single_set (insn); >> + >> + if (GET_CODE (SET_SRC (set)) != ZERO_EXTEND) >> + return false; >> + >> + machine_mode ext_dst_mode = GET_MODE (SET_DEST (set)); >> + rtx orig_src = XEXP (SET_SRC (set),0); >> + >> + bool copy_needed >> + = (REGNO (SET_DEST (set)) != REGNO (XEXP (SET_SRC (set), 0))); >> + >> + if (!copy_needed && ext_dst_mode != GET_MODE (orig_src) >> + && FUNCTION_ARG_REGNO_P (REGNO (orig_src)) >> + && !abi_extension_candidate_return_reg_p (insn, REGNO (orig_src))) >> + return true; >> + >> + return false; >> +} >> + >> +/* Return TRUE if the candidate insn is zero extend and regno is >> + an argument registers. */ >> + >> +static bool >> +abi_extension_candidate_argno_p (rtx_code code, int regno) >> +{ >> + if (code != ZERO_EXTEND) >> + return false; >> + >> + if (FUNCTION_ARG_REGNO_P (regno)) >> + return true; >> + >> + return false; >> +} >> + >> +/* Return TRUE if the candidate insn doesn't have defs and have >> + * uses without RTX_BIN_ARITH/RTX_COMM_ARITH/RTX_UNARY rtx class. */ >> + >> +static bool >> +abi_handle_regs_without_defs_p (rtx_insn *insn) >> +{ >> + if (side_effects_p (PATTERN (insn))) >> + return false; >> + >> + struct df_link *uses >> + = get_uses (insn, SET_DEST (PATTERN (insn))); >> + >> + if (!uses) >> + return false; >> + >> + for (df_link *use = uses; use; use = use->next) >> + { >> + if (!use->ref) >> + return false; >> + >> + if (BLOCK_FOR_INSN (insn) >> + != BLOCK_FOR_INSN (DF_REF_INSN (use->ref))) >> + return false; >> + >> + rtx_insn *use_insn = DF_REF_INSN (use->ref); >> + >> + if (GET_CODE (PATTERN (use_insn)) == SET) >> + { >> + rtx_code code = GET_CODE (SET_SRC (PATTERN (use_insn))); >> + >> + if (GET_RTX_CLASS (code) == RTX_BIN_ARITH >> + || GET_RTX_CLASS (code) == RTX_COMM_ARITH >> + || GET_RTX_CLASS (code) == RTX_UNARY) >> + return false; >> + } >> + } >> + return true; >> +} >> + >> /* This function goes through all reaching defs of the source >> of the candidate for elimination (CAND) and tries to combine >> the extension with the definition instruction. The changes >> @@ -770,6 +885,11 @@ combine_reaching_defs (ext_cand *cand, const_rtx set_pat, ext_state *state) >> >> state->defs_list.truncate (0); >> state->copies_list.truncate (0); >> + rtx orig_src = XEXP (SET_SRC (cand->expr),0); >> + >> + if (abi_extension_candidate_p (cand->insn) >> + && (!get_defs (cand->insn, orig_src, NULL))) >> + return abi_handle_regs_without_defs_p (cand->insn); >> >> outcome = make_defs_and_copies_lists (cand->insn, set_pat, state); >> >> @@ -1036,6 +1156,15 @@ combine_reaching_defs (ext_cand *cand, const_rtx set_pat, ext_state *state) >> } >> } >> >> + rtx insn_set = single_set (cand->insn); >> + >> + machine_mode mode = (GET_MODE (XEXP (SET_SRC (insn_set), 0))); >> + >> + bool promote_p = abi_target_promote_function_mode (mode); >> + >> + if (promote_p) >> + return true; >> + >> if (merge_successful) >> { >> /* Commit the changes here if possible >> @@ -1112,26 +1241,34 @@ add_removable_extension (const_rtx expr, rtx_insn *insn, >> rtx reg = XEXP (src, 0); >> struct df_link *defs, *def; >> ext_cand *cand; >> + defs = get_defs (insn, reg, NULL); >> >> /* Zero-extension of an undefined value is partly defined (it's >> completely undefined for sign-extension, though). So if there exists >> a path from the entry to this zero-extension that leaves this register >> uninitialized, removing the extension could change the behavior of >> correct programs. So first, check it is not the case. */ >> - if (code == ZERO_EXTEND && !bitmap_bit_p (init_regs, REGNO (reg))) >> + if (!defs && abi_extension_candidate_argno_p (code, REGNO (reg))) >> { >> - if (dump_file) >> - { >> - fprintf (dump_file, "Cannot eliminate extension:\n"); >> - print_rtl_single (dump_file, insn); >> - fprintf (dump_file, " because it can operate on uninitialized" >> - " data\n"); >> - } >> + ext_cand e = {expr, code, mode, insn}; >> + insn_list->safe_push (e); >> return; >> } >> >> + if ((code == ZERO_EXTEND >> + && !bitmap_bit_p (init_regs, REGNO (reg)))) >> + { >> + if (dump_file) >> + { >> + fprintf (dump_file, "Cannot eliminate extension:\n"); >> + print_rtl_single (dump_file, insn); >> + fprintf (dump_file, " because it can operate on uninitialized" >> + " data\n"); >> + } >> + return; >> + } >> + >> /* Second, make sure we can get all the reaching definitions. */ >> - defs = get_defs (insn, reg, NULL); >> if (!defs) >> { >> if (dump_file) >> @@ -1321,7 +1458,8 @@ find_and_remove_re (void) >> && (REGNO (SET_DEST (set)) != REGNO (XEXP (SET_SRC (set), 0)))) >> { >> reinsn_copy_list.safe_push (curr_cand->insn); >> - reinsn_copy_list.safe_push (state.defs_list[0]); >> + if (state.defs_list.length() != 0) >> + reinsn_copy_list.safe_push (state.defs_list[0]); >> } >> reinsn_del_list.safe_push (curr_cand->insn); >> state.modified[INSN_UID (curr_cand->insn)].deleted = 1; >> @@ -1342,24 +1480,27 @@ find_and_remove_re (void) >> Remember that the memory reference will be changed to refer to the >> destination of the extention. So we're actually emitting a copy >> from the new destination to the old destination. */ >> - for (unsigned int i = 0; i < reinsn_copy_list.length (); i += 2) >> - { >> - rtx_insn *curr_insn = reinsn_copy_list[i]; >> - rtx_insn *def_insn = reinsn_copy_list[i + 1]; >> - >> - /* Use the mode of the destination of the defining insn >> - for the mode of the copy. This is necessary if the >> - defining insn was used to eliminate a second extension >> - that was wider than the first. */ >> - rtx sub_rtx = *get_sub_rtx (def_insn); >> - rtx set = single_set (curr_insn); >> - rtx new_dst = gen_rtx_REG (GET_MODE (SET_DEST (sub_rtx)), >> - REGNO (XEXP (SET_SRC (set), 0))); >> - rtx new_src = gen_rtx_REG (GET_MODE (SET_DEST (sub_rtx)), >> - REGNO (SET_DEST (set))); >> - rtx new_set = gen_rtx_SET (new_dst, new_src); >> - emit_insn_after (new_set, def_insn); >> - } >> + for (unsigned int i = 0; i < reinsn_copy_list.length (); i += 2) >> + { >> + rtx_insn *curr_insn = reinsn_copy_list[i]; >> + >> + if ((i+1) < reinsn_copy_list.length()) >> + { >> + rtx_insn *def_insn = reinsn_copy_list[i + 1]; >> + /* Use the mode of the destination of the defining insn >> + for the mode of the copy. This is necessary if the >> + defining insn was used to eliminate a second extension >> + that was wider than the first. */ >> + rtx sub_rtx = *get_sub_rtx (def_insn); >> + rtx set = single_set (curr_insn); >> + rtx new_dst = gen_rtx_REG (GET_MODE (SET_DEST (sub_rtx)), >> + REGNO (XEXP (SET_SRC (set), 0))); >> + rtx new_src = gen_rtx_REG (GET_MODE (SET_DEST (sub_rtx)), >> + REGNO (SET_DEST (set))); >> + rtx new_set = gen_rtx_SET (new_dst, new_src); >> + emit_insn_after (new_set, def_insn); >> + } >> + } >> >> /* Delete all useless extensions here in one sweep. */ >> FOR_EACH_VEC_ELT (reinsn_del_list, i, curr_insn) >> diff --git a/gcc/testsuite/g++.target/powerpc/zext-elim-3.C b/gcc/testsuite/g++.target/powerpc/zext-elim-3.C >> new file mode 100644 >> index 00000000000..5a050df06ff >> --- /dev/null >> +++ b/gcc/testsuite/g++.target/powerpc/zext-elim-3.C >> @@ -0,0 +1,13 @@ >> +/* { dg-options "-mcpu=power9 -O2" } */ >> + >> +void *memset(void *b, int c, unsigned long len) >> +{ >> + unsigned long i; >> + >> + for (i = 0; i < len; i++) >> + ((unsigned char *)b)[i] = c; >> + >> + return b; >> +} >> + >> +/* { dg-final { scan-assembler-not "\mrlwinm\M" } } */