From patchwork Mon Oct 14 02:21:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 1996665 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=quicinc.com header.i=@quicinc.com header.a=rsa-sha256 header.s=qcppdkim1 header.b=f0pCqVJ7; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XRgzf4Hb1z1xsc for ; Mon, 14 Oct 2024 13:24:46 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9F0E5385B51A for ; Mon, 14 Oct 2024 02:24:44 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by sourceware.org (Postfix) with ESMTPS id D3354385B517 for ; Mon, 14 Oct 2024 02:22:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D3354385B517 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=quicinc.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D3354385B517 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728872567; cv=none; b=kBl7nFnra55OSt1+o8Ehc805npiujfobTpb17YeGaPBi6pSvdLZOB5v6XlFOEi4P2dO7zLGHmfUnGmEYznCkwVuzXQJ6zUE52Z6525i8Dcx9KKpSJL8McEvl0hIyWLwe+Y5aOGFb6K4BO6m8zOrkMHRErGgWyOxDnLOES+4/ayI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728872567; c=relaxed/simple; bh=eW76mOpFRhKtF1DCGcKOOBv3phUwPhwpCKWQoDpJsMY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=aDiKc+Khfzhh+poDmz6KLbpWvHmh85+miE1yBS9sMcspvPcIVxRkvXfFrBSJzprgFU6eDLAzo0WrInvpUq9aEY5eQUr11WJ7icF6MQfVAOgXOIaZI3nOa0uduFBv7nEtaC9nBPIjTT9R8IcN2fk6avFK0waZPoID8nNsVkw5mq4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49DN52l6032568 for ; Mon, 14 Oct 2024 02:22:15 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= m0m9h8E+rU8AeNfgHWfZdgwUETUVicRkmMaHvO8R0J0=; b=f0pCqVJ7jH4MkJq3 x+Ag9IRUXfdeaRdjsSKbQJz3XhpdwiU8cHY0Fz4xe64Kh8PMnjxB3z3Lv4HXHbcR iyn7EZepKE47O96dH2egBgFDVHQKwLaCsEswfKIQ2oewqBeoGhI15kw+tGIpCi7U Teqb23wc07vzUZAolQ2eO89picP+P1/8C1I97Zd5xYS0TLqax0C08A00UPPmE0bp vLmtaWf3hmdm/A0N9HRjjH5k7VaAZ8K+zDUg8ZmgXCnjbf/LLJWBrvAGXoRweye4 LKx/GOmaMQrm2N+wpQm3JbB29FYFUHYEjPMh0Qgv+vJQJgKStlXEmJdFklHJxOw3 5vRVQw== Received: from nasanppmta04.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 427g2rk2ua-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 14 Oct 2024 02:22:14 +0000 (GMT) Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA04.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 49E2ME67014218 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 14 Oct 2024 02:22:14 GMT Received: from hu-apinski-lv.qualcomm.com (10.49.16.6) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Sun, 13 Oct 2024 19:22:13 -0700 From: Andrew Pinski To: CC: Andrew Pinski Subject: [PATCH 3/5] dce: add remove_unused_locals conditionally to the todos [PR117096] Date: Sun, 13 Oct 2024 19:21:59 -0700 Message-ID: <20241014022201.1011677-3-quic_apinski@quicinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241014022201.1011677-1-quic_apinski@quicinc.com> References: <20241014022201.1011677-1-quic_apinski@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.49.16.6] X-ClientProxiedBy: nalasex01b.na.qualcomm.com (10.47.209.197) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: k8jh6nVGMV7tNfCLjmGJAQ0ggQRfZK-u X-Proofpoint-GUID: k8jh6nVGMV7tNfCLjmGJAQ0ggQRfZK-u X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-06_09,2024-09-06_01,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 lowpriorityscore=0 suspectscore=0 phishscore=0 malwarescore=0 clxscore=1015 spamscore=0 adultscore=0 mlxlogscore=999 impostorscore=0 mlxscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2410140016 X-Spam-Status: No, score=-14.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, 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~incoming=patchwork.ozlabs.org@gcc.gnu.org This is the updated patch with the suggestion from: https://gcc.gnu.org/pipermail/gcc-patches/2024-October/665217.html Where we use a second arg/param to set which passes we want to have the remove_unused_locals on the dce. Bootstrapped and tested on x86_64-linux-gnu. gcc/ChangeLog: PR tree-optimize/117096 * passes.def: Update some of the dce/cd-cde passes setting the 2nd arg to true. Also remove comment about stdarg since dce does it. * tree-ssa-dce.cc (pass_dce): Add remove_unused_locals_p field. Update set_pass_param to allow for 2nd param. Use remove_unused_locals_p in execute to return TODO_remove_unused_locals. (pass_cd_dce): Likewise. * tree-stdarg.cc (pass_data_stdarg): Remove TODO_remove_unused_locals. Signed-off-by: Andrew Pinski --- gcc/passes.def | 11 ++++------- gcc/tree-ssa-dce.cc | 18 ++++++++++++++---- gcc/tree-stdarg.cc | 2 +- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/gcc/passes.def b/gcc/passes.def index 40162ac20a0..7d01227eed1 100644 --- a/gcc/passes.def +++ b/gcc/passes.def @@ -92,7 +92,7 @@ along with GCC; see the file COPYING3. If not see NEXT_PASS (pass_early_vrp); NEXT_PASS (pass_merge_phi); NEXT_PASS (pass_dse); - NEXT_PASS (pass_cd_dce, false /* update_address_taken_p */); + NEXT_PASS (pass_cd_dce, false /* update_address_taken_p */, true /* remove_unused_locals */); NEXT_PASS (pass_phiopt, true /* early_p */); NEXT_PASS (pass_tail_recursion); NEXT_PASS (pass_if_to_switch); @@ -225,10 +225,7 @@ along with GCC; see the file COPYING3. If not see NEXT_PASS (pass_vrp, false /* final_p*/); NEXT_PASS (pass_array_bounds); NEXT_PASS (pass_dse); - NEXT_PASS (pass_dce); - /* pass_stdarg is always run and at this point we execute - TODO_remove_unused_locals to prune CLOBBERs of dead - variables which are otherwise a churn on alias walkings. */ + NEXT_PASS (pass_dce, false /* update_address_taken_p */, true /* remove_unused_locals */); NEXT_PASS (pass_stdarg); NEXT_PASS (pass_call_cdce); NEXT_PASS (pass_cselim); @@ -273,7 +270,7 @@ along with GCC; see the file COPYING3. If not see NEXT_PASS (pass_asan); NEXT_PASS (pass_tsan); NEXT_PASS (pass_dse, true /* use DR analysis */); - NEXT_PASS (pass_dce); + NEXT_PASS (pass_dce, false /* update_address_taken_p */, false /* remove_unused_locals */); /* Pass group that runs when 1) enabled, 2) there are loops in the function. Make sure to run pass_fix_loops before to discover/remove loops before running the gate function @@ -355,7 +352,7 @@ along with GCC; see the file COPYING3. If not see NEXT_PASS (pass_ccp, true /* nonzero_p */); NEXT_PASS (pass_warn_restrict); NEXT_PASS (pass_dse); - NEXT_PASS (pass_dce, true /* update_address_taken_p */); + NEXT_PASS (pass_dce, true /* update_address_taken_p */, true /* remove_unused_locals */); /* After late DCE we rewrite no longer addressed locals into SSA form if possible. */ NEXT_PASS (pass_forwprop); diff --git a/gcc/tree-ssa-dce.cc b/gcc/tree-ssa-dce.cc index 69249c73013..66612b5d575 100644 --- a/gcc/tree-ssa-dce.cc +++ b/gcc/tree-ssa-dce.cc @@ -2096,18 +2096,23 @@ public: opt_pass * clone () final override { return new pass_dce (m_ctxt); } void set_pass_param (unsigned n, bool param) final override { - gcc_assert (n == 0); - update_address_taken_p = param; + gcc_assert (n == 0 || n == 1); + if (n == 0) + update_address_taken_p = param; + else if (n == 1) + remove_unused_locals_p = param; } bool gate (function *) final override { return flag_tree_dce != 0; } unsigned int execute (function *) final override { return (tree_ssa_dce () + | (remove_unused_locals_p ? TODO_remove_unused_locals : 0) | (update_address_taken_p ? TODO_update_address_taken : 0)); } private: bool update_address_taken_p; + bool remove_unused_locals_p = false; }; // class pass_dce } // anon namespace @@ -2144,18 +2149,23 @@ public: opt_pass * clone () final override { return new pass_cd_dce (m_ctxt); } void set_pass_param (unsigned n, bool param) final override { - gcc_assert (n == 0); - update_address_taken_p = param; + gcc_assert (n == 0 || n == 1); + if (n == 0) + update_address_taken_p = param; + else if (n == 1) + remove_unused_locals_p = param; } bool gate (function *) final override { return flag_tree_dce != 0; } unsigned int execute (function *) final override { return (tree_ssa_cd_dce () + | (remove_unused_locals_p ? TODO_remove_unused_locals : 0) | (update_address_taken_p ? TODO_update_address_taken : 0)); } private: bool update_address_taken_p; + bool remove_unused_locals_p = false; }; // class pass_cd_dce } // anon namespace diff --git a/gcc/tree-stdarg.cc b/gcc/tree-stdarg.cc index 1167fd9f224..33763cd3d11 100644 --- a/gcc/tree-stdarg.cc +++ b/gcc/tree-stdarg.cc @@ -1114,7 +1114,7 @@ const pass_data pass_data_stdarg = ( PROP_cfg | PROP_ssa ), /* properties_required */ PROP_gimple_lva, /* properties_provided */ 0, /* properties_destroyed */ - TODO_remove_unused_locals, /* todo_flags_start */ + 0, /* todo_flags_start */ 0, /* todo_flags_finish */ };