From patchwork Mon Oct 14 02:21:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 1996663 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=XnxE2UJM; 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 4XRgzH0rwrz1xvt for ; Mon, 14 Oct 2024 13:24:26 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A37ED385B524 for ; Mon, 14 Oct 2024 02:24:24 +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 87A64385696C for ; Mon, 14 Oct 2024 02:22:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 87A64385696C 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 87A64385696C 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=PZJfkOrUGyp8quQrIm7Nb5PTXwrzGUXZPyDopvY9bxFEPWR2ekwDpf5AGpbtulUhD/wF9zL8F/WOYhnoSpCh0SzMXuGZaSB2B6QowLWzbVqVkYmGjZIybQ0WGP3QnPUcwcy/em25BtUe6aaxHwFqkgJJoPSjEpjnGXzAy80146A= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728872551; c=relaxed/simple; bh=MzkjVvDMl1IQX4NlKNu0HYDi6U3r7Pt/p3TfOABiXm4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=TO/TzGoiXT+iq9HvZJuLjVjmyO1KNUMk9DWJVq2rwkpFR7k4Xj9GrCo6kj1aTViTAs5PR/99kr/xcbBklBMKtTPV0+FGcY3hpJ93gCs4KukONKVoDm3l7oSY4BwE8UoipVUZbSR51WPCJWxfhQ3LtrXk8dedK900OHcDTTjsY7o= 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 49DMx7P6017312 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:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 1/83rkIoh46uvVgyEjMHfKR1V/m8tnaDeui3xjOPJZ4=; b=XnxE2UJM7MyPn2md KJxXgQ9QwhnmDPYr8dOzNX48Fugkt7+yL7C8sR98keWgyXkOCbbEPX+QTkVPWTCH eu3DKJgDNMUFkpjJDySQbivb+v+Y2BKJAKvZ8Qe2nog3JK+sogeM5WmI/g0MJiNK WntqVVxvxD1QJO/nI2GtvEvj3423vBTa9geObohskrgE+7Nyuoq5MiIhBhlUUtZc XeJ6s/6TIVFHW7s6NpErpC+RL24C9hPMyH5p4yQt7wxHdtxM/rWS5Bsji/6A7WV/ R2gCiTk9IfBn4zRbKj0oOAQUWvp79J07pQQlaIQPu6wxSUQ7QS+0xNSRRY2as2s0 slER8g== Received: from nasanppmta03.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 427hvftx02-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 NASANPPMTA03.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 49E2MDgg018610 (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 2/5] passes: Allow for second param for NEXT_PASS Date: Sun, 13 Oct 2024 19:21:58 -0700 Message-ID: <20241014022201.1011677-2-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: QXjYqvAoq0gRlbHQPoxkL0QBMoCEq1hf X-Proofpoint-ORIG-GUID: QXjYqvAoq0gRlbHQPoxkL0QBMoCEq1hf 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=999 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 Right now we currently only support 1 parameter for each pass in NEXT_PASS. We also don't error out if someone tries to use more than 1. This adds support for more than one but only to a max of max_number_args (which is currently 2). In the next patch, this will be used for DCE, adding a new parameter. Bootstrapped and tested on x86_64-linux-gnu. gcc/ChangeLog: * gen-pass-instances.awk (END): Handle processing of multiple arguments to NEXT_PASS. Also error out if using more than max_number_args (2). * pass_manager.h (NEXT_PASS_WITH_ARG2): New define. * passes.cc (NEXT_PASS_WITH_ARG2): New define. Signed-off-by: Andrew Pinski --- gcc/gen-pass-instances.awk | 24 +++++++++++++++++++----- gcc/pass_manager.h | 1 + gcc/passes.cc | 8 ++++++++ 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/gcc/gen-pass-instances.awk b/gcc/gen-pass-instances.awk index f56b8072ed5..def09347765 100644 --- a/gcc/gen-pass-instances.awk +++ b/gcc/gen-pass-instances.awk @@ -195,6 +195,7 @@ function replace_pass(line, fnname, num, i) } END { + max_number_args = 2; for (i = 1; i < lineno; i++) { ret = parse_line(lines[i], "NEXT_PASS"); @@ -202,7 +203,9 @@ END { { # Set pass_name argument, an optional with_arg argument pass_name = args[1]; - with_arg = args[2]; + num_args = 0; + while (args[num_args + 2]) + num_args++; # Set pass_final_counts if (pass_name in pass_final_counts) @@ -214,13 +217,22 @@ END { # Print call expression with extra pass_num argument printf "%s", prefix; - if (with_arg) - printf "NEXT_PASS_WITH_ARG"; + if (num_args > 0) + { + printf "NEXT_PASS_WITH_ARG"; + if (num_args > max_number_args) + { + print "ERROR: Only supports up to " max_number_args " args to NEXT_PASS"; + exit 1; + } + if (num_args != 1) + printf num_args; + } else printf "NEXT_PASS"; printf " (%s, %s", pass_name, pass_num; - if (with_arg) - printf ",%s", with_arg; + for (j = 0; j < num_args; j++) + printf ",%s", args[j+2]; printf ")%s\n", postfix; continue; @@ -254,6 +266,8 @@ END { print "#undef POP_INSERT_PASSES" print "#undef NEXT_PASS" print "#undef NEXT_PASS_WITH_ARG" + for (i = 2; i <= max_number_args; i++) + print "#undef NEXT_PASS_WITH_ARG" i print "#undef TERMINATE_PASS_LIST" } diff --git a/gcc/pass_manager.h b/gcc/pass_manager.h index 5a78d3fe56b..f18ae026257 100644 --- a/gcc/pass_manager.h +++ b/gcc/pass_manager.h @@ -130,6 +130,7 @@ private: #define POP_INSERT_PASSES() #define NEXT_PASS(PASS, NUM) opt_pass *PASS ## _ ## NUM #define NEXT_PASS_WITH_ARG(PASS, NUM, ARG) NEXT_PASS (PASS, NUM) +#define NEXT_PASS_WITH_ARG2(PASS, NUM, ARG0, ARG1) NEXT_PASS (PASS, NUM) #define TERMINATE_PASS_LIST(PASS) #include "pass-instances.def" diff --git a/gcc/passes.cc b/gcc/passes.cc index 3abae971ace..b5475fce522 100644 --- a/gcc/passes.cc +++ b/gcc/passes.cc @@ -1589,6 +1589,7 @@ pass_manager::pass_manager (context *ctxt) #define POP_INSERT_PASSES() #define NEXT_PASS(PASS, NUM) PASS ## _ ## NUM = NULL #define NEXT_PASS_WITH_ARG(PASS, NUM, ARG) NEXT_PASS (PASS, NUM) +#define NEXT_PASS_WITH_ARG2(PASS, NUM, ARG0, ARG1) NEXT_PASS (PASS, NUM) #define TERMINATE_PASS_LIST(PASS) #include "pass-instances.def" @@ -1635,6 +1636,13 @@ pass_manager::pass_manager (context *ctxt) PASS ## _ ## NUM->set_pass_param (0, ARG); \ } while (0) +#define NEXT_PASS_WITH_ARG2(PASS, NUM, ARG0, ARG1) \ + do { \ + NEXT_PASS (PASS, NUM); \ + PASS ## _ ## NUM->set_pass_param (0, ARG0); \ + PASS ## _ ## NUM->set_pass_param (1, ARG1); \ + } while (0) + #include "pass-instances.def" /* Register the passes with the tree dump code. */