From patchwork Mon Oct 14 02:22:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 1996667 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=oNusVf4/; 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 4XRh4n3Qj6z1xv6 for ; Mon, 14 Oct 2024 13:29:13 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5CEEA385B51F for ; Mon, 14 Oct 2024 02:29:11 +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 5B98F3858C56 for ; Mon, 14 Oct 2024 02:22:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5B98F3858C56 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 5B98F3858C56 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=1728872571; cv=none; b=f9P4NfLUOSRI3s5wbSY9X83TCaceNCxio0FVnDNC/kjwV6zf3+ulNi5JJSZuhOVuTFrk9BkuqyKhYPfITuZ9npoQwqBwnXWlixCkT3UpydWRxu3rMRYqwXvQ18c6N6mKJbeTS3ZdwefcQ+MZVyhTy5Ay9kCcqh0WWv3QP11q9/Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728872571; c=relaxed/simple; bh=owACRkoAzlSVX/9Z8EjVTt8mhgZK4vRevPIAAQ9wLIY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=istAalCGxbr5FFYO8UjTV28E2C5gzI4ubz+vs4XWiiJj9K7X4kqnR41Lo1HNH8XZ1gKB0W2WXJYHRyIBfPwdC3mDQyZjIL5jSnqeHfNiTy2AjyQXy0j14YSKLUGLWFewpLOxQDuaw26e57d/Rr7axoA9Czs8KTsj/pCP6BDOK04= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49DMvg0m015046 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= 7GrVAZuRA45sMCFRoXOx8OAwr/jEtyrePEaZYE5dFAg=; b=oNusVf4/BraoDuGb rwxPMQSv290pXmuaAJVSrtwqbduVK++nNMrv+yk0gtTzZ5GKJtOJ7gVr2b1k/zUH wMQ2gg3aA+m7pXjPpAZFDBBrsf/s/X11kPhQMlGk5GCpH3tsdA9TMGIpW7U8X8Wn 1kIyd1feQrMrdF0d3w7V0W9Ywr2IJSnVPXH99yCEJogZQFCLHaQJOZX/F7kYZdZW 6mtRPD1JOCfrBrloJusjTpDd5BugkvuvAMIHetzTA9I5F6m2HP+80v35FAVbcM0E hzk3aMKVy2qjwKw6R8NFZESyf+9SQpjMeTPClNX3XY0AaqpkBobaklAc+Qy3uL74 A3/D7g== Received: from nasanppmta05.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 427hvftx05-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 14 Oct 2024 02:22:15 +0000 (GMT) Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA05.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 49E2MEJp012514 (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:14 -0700 From: Andrew Pinski To: CC: Andrew Pinski Subject: [PATCH 4/5] dce: Use a base common base class for pass_cd_dce and pass_dce Date: Sun, 13 Oct 2024 19:22:00 -0700 Message-ID: <20241014022201.1011677-4-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-GUID: Ldz6VrxWh7QC3gm0tNfkp0EaVLAmoAPw X-Proofpoint-ORIG-GUID: Ldz6VrxWh7QC3gm0tNfkp0EaVLAmoAPw 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 phishscore=0 bulkscore=0 mlxlogscore=985 malwarescore=0 mlxscore=0 clxscore=1015 adultscore=0 spamscore=0 suspectscore=0 lowpriorityscore=0 impostorscore=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, 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 The classes pass_dce and pass_cd_dce share the same mechansim for their params and almost the same execute functionality so let's create a new base class which will be used for these two classes and move the common code into the same one. Note update_address_taken_p was updated to be a NSDMI instead of initializing it explicitly in the constructor. Bootstrapped and tested on x86_64-linux-gnu. gcc/ChangeLog: * tree-ssa-dce.cc (tree_ssa_dce): Remove. (tree_ssa_cd_dce): Remove. (class pass_dce_base): New class. (class pass_dce): Use pass_dce_base as the base class. (class pass_cd_dce): Likewise. Signed-off-by: Andrew Pinski --- gcc/tree-ssa-dce.cc | 72 +++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 41 deletions(-) diff --git a/gcc/tree-ssa-dce.cc b/gcc/tree-ssa-dce.cc index 66612b5d575..3075459e25f 100644 --- a/gcc/tree-ssa-dce.cc +++ b/gcc/tree-ssa-dce.cc @@ -2057,19 +2057,6 @@ perform_tree_ssa_dce (bool aggressive) return todo; } -/* Pass entry points. */ -static unsigned int -tree_ssa_dce (void) -{ - return perform_tree_ssa_dce (/*aggressive=*/false); -} - -static unsigned int -tree_ssa_cd_dce (void) -{ - return perform_tree_ssa_dce (/*aggressive=*/optimize >= 2); -} - namespace { const pass_data pass_data_dce = @@ -2085,15 +2072,11 @@ const pass_data pass_data_dce = 0, /* todo_flags_finish */ }; -class pass_dce : public gimple_opt_pass +class pass_dce_base : public gimple_opt_pass { public: - pass_dce (gcc::context *ctxt) - : gimple_opt_pass (pass_data_dce, ctxt), update_address_taken_p (false) - {} - /* opt_pass methods: */ - opt_pass * clone () final override { return new pass_dce (m_ctxt); } + bool gate (function *) final override { return flag_tree_dce != 0; } void set_pass_param (unsigned n, bool param) final override { gcc_assert (n == 0 || n == 1); @@ -2102,17 +2085,38 @@ public: 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 + +protected: + pass_dce_base (const pass_data &data, gcc::context *ctxt) + : gimple_opt_pass (data, ctxt) + {} + unsigned int execute_dce (function *, bool aggressive) { - return (tree_ssa_dce () + return (perform_tree_ssa_dce (aggressive) | (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 update_address_taken_p = false; bool remove_unused_locals_p = false; +}; // class pass_dce_base + + +class pass_dce : public pass_dce_base +{ +public: + pass_dce (gcc::context *ctxt) + : pass_dce_base (pass_data_dce, ctxt) + {} + + /* opt_pass methods: */ + opt_pass * clone () final override { return new pass_dce (m_ctxt); } + unsigned int execute (function *func) final override + { + return execute_dce (func, /*aggressive=*/false); + } + }; // class pass_dce } // anon namespace @@ -2138,34 +2142,20 @@ const pass_data pass_data_cd_dce = 0, /* todo_flags_finish */ }; -class pass_cd_dce : public gimple_opt_pass +class pass_cd_dce : public pass_dce_base { public: pass_cd_dce (gcc::context *ctxt) - : gimple_opt_pass (pass_data_cd_dce, ctxt), update_address_taken_p (false) + : pass_dce_base (pass_data_cd_dce, ctxt) {} /* opt_pass methods: */ 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 || 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 + unsigned int execute (function *func) 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)); + return execute_dce (func, /*aggressive=*/optimize >= 2); } -private: - bool update_address_taken_p; - bool remove_unused_locals_p = false; }; // class pass_cd_dce } // anon namespace