From patchwork Tue Oct 24 09:31:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Agarwal X-Patchwork-Id: 157340 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1821137vqx; Tue, 24 Oct 2023 02:32:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEhiYGv5bmN381yNK0dLoAluUg+jEtCoj/5uvqPgauChGwKxAiOM5TVXVH+ySXLKm5dC8ST X-Received: by 2002:a05:620a:3949:b0:767:f1e8:d38c with SMTP id qs9-20020a05620a394900b00767f1e8d38cmr14034435qkn.15.1698139923632; Tue, 24 Oct 2023 02:32:03 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1698139923; cv=pass; d=google.com; s=arc-20160816; b=qd2sZ02j75rX8b5xOMnnzudOxxQV+F43SeEE5LLIt3Kqd7yOwJFN/tQiFxRwNH8m98 C/5hOs13hw8KciG2yWYnpqT07xmg5FpTkzbJFerJTlQi2QkKatAnndHhK0EQ+XMeV8xW wSlNGsHlkjhbg131dioxy53DOwzuXI8MDaPy0kYI5DaXijUAq9+ykxCZJz3WsUOcd2fl AuFuNNZ8CUlL6yTDZdxnYPM2EdNGtM98GXn/sbWORn+VN9W89ktjOjzcA8w6NpHl4bL5 ff/QfSiMVUThUkn86uHEe7M/D7EJ1eErIFAONPfUMh1vcvsWHRN3qn2+Uns7nt5L8qhb lA1Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=2W/yEln0GU4M3QBesc3YLy4V9Kd/HpRnnaY7LUH0wVg=; fh=O+jouWt0gs1o3SZ2nqwY6WWiQ3LBHJw1DFkCYFvL4fU=; b=ohsnGzSRZaGHE2NqVh235uU/GjAXBp3GpbPW0WgS0/Yq7PfGVpgkkDj/WnuHzyVK2P VMX0zh7W+iVMAj/pAAxpe5V73xS7kOWbBRmtNzq+MUkS8zNkMNMhTTHc7QUmxEXQ5KVW 6YE2VUEu9PlUMlKyxohvJxQFK1rfrHotdpwbJRNT8hgi7DteMMjQt/xTdCBQxfgb9vow l+Wj9dse7RsdTa5ehRjHgfFE1W2S73Gk+Nl51VzlEEzmHJKSi4O5sY8asFle4qDVWWV+ eOcUdQHzuoiKIV5YU0IPTljqf8p28m5T2OnAgaN5D7KOOO5x1bUcKfDxcMU57i0KHiSC 6WTQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=IPpeMAIE; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id e23-20020a37ac17000000b0077428feaff6si6529601qkm.206.2023.10.24.02.32.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 02:32:03 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=IPpeMAIE; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 651453858418 for ; Tue, 24 Oct 2023 09:32:03 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by sourceware.org (Postfix) with ESMTPS id 69BA43858C60 for ; Tue, 24 Oct 2023 09:31:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 69BA43858C60 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 ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 69BA43858C60 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698139882; cv=none; b=VYIG4nWrkIKOyNzpoHBQBCfLDpJ5ef9o6DpuBmw++nqrrsgxOirk5cGiMU52p1w+dhVF7KHnaxHJsh+WS6a4pNGQ/1wO0SshFdPc8Z1LgsAE/USQ/tMeIW1RgRZUXCOJTMWEH6kthPtldSiAJnsomFLZGDqlR83VCG7aXNMhRr0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698139882; c=relaxed/simple; bh=6vMmqv6HgtczUDK2EDXLQgQpibUPSU5O6iog1fArolI=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=Z2BNF0qRJ1b/q3n/m7AMx86H4UsIXxYL4Bav053KCx3Xuh3TR82d/AUBtdarIaIUPngGqFaMiJGkoT+L56ph7/V+83sbPF9KJvHUDaIDvbhPWFrMheLlT3OWavtRk3c3Ue6GUrTxiRo1JJvjBJ5VP9Mzzsx6YnOney5eDiR15sk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39O9QbZ9005410; Tue, 24 Oct 2023 09:31:19 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : mime-version : to : cc : from : subject : content-type : content-transfer-encoding; s=pp1; bh=2W/yEln0GU4M3QBesc3YLy4V9Kd/HpRnnaY7LUH0wVg=; b=IPpeMAIEgTtFfCfoqh63vPFaelYLIZUbOIkG0H6BcRdw+bSbHhgGvedbwqpVB3QeWBIo Fc+fyMvhv7DVDxcAFi4BH+G5uG2yJN/vAzrn09f3Feg6LjX4r5pyfGKdOJuBg5h5vwDM 9MdgyA+UOwik0STemGP7q9De86e7rjE8yHM930EDyy4xt/cz7HHjzAhkpLC0MNEBsiol yxgPnOENBzPRGksVW0PBw06QtagQCHgkkalYBgoC1XZAFVhc6CvSaUTErauSpjk7S8h9 2CJquaXlngNx6KahcblN03hiXAhl6qjrsSc0NOVwA74vT5YW/Wzkk347mhoQNiBxjK7B 0w== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3txb3a0m60-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 24 Oct 2023 09:31:18 +0000 Received: from m0360083.ppops.net (m0360083.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 39O9QfhU006027; Tue, 24 Oct 2023 09:31:18 GMT Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3txb3a0m53-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 24 Oct 2023 09:31:17 +0000 Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 39O73BOI012363; Tue, 24 Oct 2023 09:31:17 GMT Received: from smtprelay07.dal12v.mail.ibm.com ([172.16.1.9]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 3tvup1p1mb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 24 Oct 2023 09:31:17 +0000 Received: from smtpav01.wdc07v.mail.ibm.com (smtpav01.wdc07v.mail.ibm.com [10.39.53.228]) by smtprelay07.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 39O9VGqM36110596 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 24 Oct 2023 09:31:16 GMT Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 55C7058055; Tue, 24 Oct 2023 09:31:16 +0000 (GMT) Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B6C695804B; Tue, 24 Oct 2023 09:31:13 +0000 (GMT) Received: from [9.43.52.246] (unknown [9.43.52.246]) by smtpav01.wdc07v.mail.ibm.com (Postfix) with ESMTP; Tue, 24 Oct 2023 09:31:13 +0000 (GMT) Message-ID: Date: Tue, 24 Oct 2023 15:01:11 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: gcc-patches , Vineet Gupta , Jeff Law Cc: Bernhard Reutner-Fischer , Segher Boessenkool , Peter Bergner From: Ajit Agarwal Subject: [PATCH V13] ree: Improve ree pass using defined abi interfaces X-TM-AS-GCONF: 00 X-Proofpoint-GUID: ETVLvjUoppIcltFL2Ij4LUvzCSuH-le_ X-Proofpoint-ORIG-GUID: 5o-73rv1wQqS-8WMAXvhulfa3haaLugN X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-24_07,2023-10-19_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 suspectscore=0 clxscore=1015 malwarescore=0 adultscore=0 mlxlogscore=999 lowpriorityscore=0 phishscore=0 mlxscore=0 impostorscore=0 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310170001 definitions=main-2310240081 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780628768618121080 X-GMAIL-MSGID: 1780628768618121080 Hello Vineet, Jeff and Bernhard: This version 13 of the patch uses abi interfaces to remove zero and sign extension elimination. Bootstrapped and regtested on powerpc-linux-gnu. In this version (version 13) of the patch following review comments are incorporated. a) Removal of hard code zero_extend and sign_extend in abi interfaces. b) Source and destination with different registers are considered. c) Further enhancements. d) Added sign extension elimination using abi interfaces. d) Addressed remaining review comments from Vineet. e) Addressed review comments from Bernhard. f) Fix aarch64 regressions failure. Please let me know if there is anything missing in this patch. Ok for trunk? Thanks & Regards Ajit ree: Improve ree pass using defined abi interfaces For rs6000 target we see zero and sign extend with missing definitions. Improved to eliminate such zero and sign extension using defined ABI interfaces. 2023-10-24 Ajit Kumar Agarwal gcc/ChangeLog: * ree.cc (combine_reaching_defs): Eliminate zero_extend and sign_extend using 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): New function. (abi_target_promote_function_mode): New function. gcc/testsuite/ChangeLog: * g++.target/powerpc/zext-elim-3.C --- changes since v6: - Added missing abi interfaces. - Rearranging and restructuring the code. - Removal of hard coded zero extend and sign extend in abi interfaces. - Relaxed different registers with source and destination in abi interfaces. - Using CSE in abi interfaces. - Fix aarch64 regressions. - Add Sign extension removal in abi interfaces. - Modified comments as per coding convention. - Modified code as per coding convention. - Fix bug bootstrapping RISCV failures. --- gcc/ree.cc | 144 +++++++++++++++++- .../g++.target/powerpc/zext-elim-3.C | 13 ++ 2 files changed, 151 insertions(+), 6 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..72e3b625a18 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,117 @@ get_extended_src_reg (rtx src) return src; } +/* Return TRUE if target mode is equal to source mode, false otherwise. */ + +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); + + return tgt_mode == mode; +} + +/* Return TRUE if regno is a return register. */ + +static inline bool +abi_extension_candidate_return_reg_p (int regno) +{ + if (targetm.calls.function_value_regno_p (regno)) + return true; + + return false; +} + +/* Return TRUE if the following conditions are satisfied. + + a) reg source operand is argument register and not return register. + b) mode of source and destination operand are different. + c) if not promoted REGNO of source and destination operand are same. */ + +static bool +abi_extension_candidate_p (rtx_insn *insn) +{ + rtx set = single_set (insn); + machine_mode dst_mode = GET_MODE (SET_DEST (set)); + rtx orig_src = XEXP (SET_SRC (set), 0); + + if (!FUNCTION_ARG_REGNO_P (REGNO (orig_src)) + || abi_extension_candidate_return_reg_p (REGNO (orig_src))) + return false; + + /* Return FALSE if mode of destination and source is same. */ + if (dst_mode == GET_MODE (orig_src)) + return false; + + machine_mode mode = GET_MODE (XEXP (SET_SRC (set), 0)); + bool promote_p = abi_target_promote_function_mode (mode); + + /* Return FALSE if promote is false and REGNO of source and destination + is different. */ + if (!promote_p && REGNO (SET_DEST (set)) != REGNO (orig_src)) + return false; + + return true; +} + +/* Return TRUE if regno is an argument register. */ + +static inline bool +abi_extension_candidate_argno_p (int regno) +{ + return FUNCTION_ARG_REGNO_P (regno); +} + +/* 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 (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; + } + } + + rtx set = single_set (insn); + + if (GET_CODE (SET_SRC (set)) == SIGN_EXTEND) + { + machine_mode mode = GET_MODE (XEXP (SET_SRC (set), 0)); + bool promote_p = abi_target_promote_function_mode (mode); + + return promote_p; + } + 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 +882,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 (cand->insn); outcome = make_defs_and_copies_lists (cand->insn, set_pat, state); @@ -1116,9 +1233,12 @@ add_removable_extension (const_rtx expr, rtx_insn *insn, /* 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))) + uninitialized and not argument register, 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)) + && !abi_extension_candidate_argno_p (REGNO (reg))) { if (dump_file) { @@ -1130,10 +1250,17 @@ add_removable_extension (const_rtx expr, rtx_insn *insn, return; } - /* Second, make sure we can get all the reaching definitions. */ + /* Second, make sure we can get all the reaching definitions or reg is + argument register. */ defs = get_defs (insn, reg, NULL); if (!defs) { + if (abi_extension_candidate_argno_p (REGNO (reg))) + { + ext_cand e = {expr, code, mode, insn}; + insn_list->safe_push (e); + return; + } if (dump_file) { fprintf (dump_file, "Cannot eliminate extension:\n"); @@ -1321,7 +1448,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; @@ -1345,6 +1473,10 @@ find_and_remove_re (void) 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 ()) + continue; + rtx_insn *def_insn = reinsn_copy_list[i + 1]; /* Use the mode of the destination of the defining 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" } } */