From patchwork Mon Oct 14 02:21:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 1996662 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=LAyK83SX; 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 4XRgzH03bbz1xsc for ; Mon, 14 Oct 2024 13:24:25 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A71B2385B517 for ; Mon, 14 Oct 2024 02:24:22 +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 8BC63385696F for ; Mon, 14 Oct 2024 02:22:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8BC63385696F 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 8BC63385696F 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=1728872551; cv=none; b=UdU1B05n3ivD8+vDaYR4WBeZW+2AlegTsCKM8qpTGT8+mmpOvNKzkJaBfKHozhNiRdjkxK2xBin1Qu4Yli86qhRixHF6dvZ1mVGyoDqKI9Gi6yYieddF9UVf1qaTvtUCOI0jFtuWhTNK/2nycxcdokIS+x2rxuehDuxGlRYdx28= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728872551; c=relaxed/simple; bh=duWdE15hvMTXl8YzX6jgE3rRAf7we9Lsqv8SKX0BmBI=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Ud27hHQIxLAy4h9vtIOotDFB43EX+tpHEiK2LpsHGIT5bxog52OKF2SsfUnNw2d+WMAlwwg4uDUrQEHeBheOb4/lXRChey1OESVo2j3Ou5MKh3ks/0I+d2Vnqhobe3tZ5oFe7dA2tyG1jQHgd8zxIZa353ZkG1rlh9QU673bBcw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49E0DE1b010683 for ; Mon, 14 Oct 2024 02:22:14 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=qcppdkim1; bh=FWAtEixqdofvZuVtDIXlRe Y/OboVr6by9t4jfMBoEU0=; b=LAyK83SXQRLW0bAMOFqnLIcpWS6oxHlenfVwTD GWaosElqHzGrQthiV/fa4JfcnzafXgdES2tJKtbay5mZU1YG973uL+YK/0zFLsH/ 9IKXfxFQLgj8YvAk8zqjClpgQXlWzFHZtPphwE1r/G0TFACYSVoKyeZ+I2Lm0XFG Z4RDlzathtyHyS5oBXCEIFNbw54/2dADApVTwtjRTCtkjyRyZPaixHrdr3RJQG53 jfx6emGF76Qj8RvtGr37fvP1EyGA/zXOQewt6TO9WuIXg5DpLX5hvaLGKMpVOw/9 EjFz3DffMFr56pBbJGzPYgb0WMNS205gqe50y8iKUOeN8hng== Received: from nasanppmta04.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 427eteb64h-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 49E2MDwc014212 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 14 Oct 2024 02:22:13 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 1/5] passes: Move #undef to pass-instances.def Date: Sun, 13 Oct 2024 19:21:57 -0700 Message-ID: <20241014022201.1011677-1-quic_apinski@quicinc.com> X-Mailer: git-send-email 2.34.1 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: w-J_fWZLmWDc1X2_enSoqknXms_M7E4d X-Proofpoint-GUID: w-J_fWZLmWDc1X2_enSoqknXms_M7E4d 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 suspectscore=0 lowpriorityscore=0 adultscore=0 phishscore=0 spamscore=0 malwarescore=0 impostorscore=0 clxscore=1015 priorityscore=1501 mlxscore=0 mlxlogscore=999 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, 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 Like what was done r6-4608-g0aad01985747ab for builtins.def/DEF_BUILTIN, the same should be done for the defines that are used for pass-instances.def. Bootstrapped and tested on x86_64-linux-gnu. gcc/ChangeLog: * gen-pass-instances.awk: Print out the #undefs. * pass_manager.h Don't #undef INSERT_PASSES_AFTER, PUSH_INSERT_PASSES_WITHIN, POP_INSERT_PASSES, NEXT_PASS, NEXT_PASS_WITH_ARG, and TERMINATE_PASS_LIST. * passes.cc: Likewise. Signed-off-by: Andrew Pinski --- gcc/gen-pass-instances.awk | 7 +++++++ gcc/pass_manager.h | 7 ------- gcc/passes.cc | 13 ------------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/gcc/gen-pass-instances.awk b/gcc/gen-pass-instances.awk index 871ac0cdb52..f56b8072ed5 100644 --- a/gcc/gen-pass-instances.awk +++ b/gcc/gen-pass-instances.awk @@ -248,6 +248,13 @@ END { print lines[i]; } + # print out the #undefs + print "#undef INSERT_PASSES_AFTER" + print "#undef PUSH_INSERT_PASSES_WITHIN" + print "#undef POP_INSERT_PASSES" + print "#undef NEXT_PASS" + print "#undef NEXT_PASS_WITH_ARG" + print "#undef TERMINATE_PASS_LIST" } # Local Variables: diff --git a/gcc/pass_manager.h b/gcc/pass_manager.h index edd775e9a9c..5a78d3fe56b 100644 --- a/gcc/pass_manager.h +++ b/gcc/pass_manager.h @@ -134,13 +134,6 @@ private: #include "pass-instances.def" -#undef INSERT_PASSES_AFTER -#undef PUSH_INSERT_PASSES_WITHIN -#undef POP_INSERT_PASSES -#undef NEXT_PASS -#undef NEXT_PASS_WITH_ARG -#undef TERMINATE_PASS_LIST - }; // class pass_manager } // namespace gcc diff --git a/gcc/passes.cc b/gcc/passes.cc index 775c3e46302..3abae971ace 100644 --- a/gcc/passes.cc +++ b/gcc/passes.cc @@ -1591,12 +1591,6 @@ pass_manager::pass_manager (context *ctxt) #define NEXT_PASS_WITH_ARG(PASS, NUM, ARG) NEXT_PASS (PASS, NUM) #define TERMINATE_PASS_LIST(PASS) #include "pass-instances.def" -#undef INSERT_PASSES_AFTER -#undef PUSH_INSERT_PASSES_WITHIN -#undef POP_INSERT_PASSES -#undef NEXT_PASS -#undef NEXT_PASS_WITH_ARG -#undef TERMINATE_PASS_LIST /* Initialize the pass_lists array. */ #define DEF_PASS_LIST(LIST) pass_lists[PASS_LIST_NO_##LIST] = &LIST; @@ -1643,13 +1637,6 @@ pass_manager::pass_manager (context *ctxt) #include "pass-instances.def" -#undef INSERT_PASSES_AFTER -#undef PUSH_INSERT_PASSES_WITHIN -#undef POP_INSERT_PASSES -#undef NEXT_PASS -#undef NEXT_PASS_WITH_ARG -#undef TERMINATE_PASS_LIST - /* Register the passes with the tree dump code. */ register_dump_files (all_lowering_passes); register_dump_files (all_small_ipa_passes);