From patchwork Mon Oct 14 17:58:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 1997067 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=JuYWGhR+; 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 4XS4kg53R9z1xvK for ; Tue, 15 Oct 2024 04:59:55 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DF0583858288 for ; Mon, 14 Oct 2024 17:59:53 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by sourceware.org (Postfix) with ESMTPS id 8889B3858C5F for ; Mon, 14 Oct 2024 17:58:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8889B3858C5F 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 8889B3858C5F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728928711; cv=none; b=Ob7KEzz8oUtHqBwzOr3rIvB1TqEStyANNbQGAGrbyVUe29f4dKaXhaDaLW/OVNlfaF/H9cRdGmFYRPl5FDYIl6bivg10uha/2Qn9YJ/cCc7bAek7+GUrPYsdvCT/ffMFlLDNxAB+8C5l9xd440Mv+CwOlhMg9yarzCxV0/STmmY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728928711; c=relaxed/simple; bh=XSwVgKxeZE2hSeK6Vxfu3bvUlh5rEp+Vr09SA2zk6Mk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=j4SwIHyKq/ijvUPaYkZ5efUDzN6eUx+rOj8zkwm5StbduQsVeXPVSWjCkwr1seF7yNQG/nOK1k2oalm1yzFUWw+X9Pg7fSflijVpyEpgfAf6TseFqusCduk77xwTyVLfJ+O+96e1kkY5+N3DIO2UpGOVyxf1RpnNmWv+siIrXd4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49EAS3jF017026 for ; Mon, 14 Oct 2024 17:58:27 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=tAVICLb2n5Hy3IEI6KNCNK 4+6t1Dw5+sUejI06Qb+g4=; b=JuYWGhR+kRnJ6ludJ8tST7beNI8W1IX4JWKgmg EMC7qd+pgvxjvaoY8PNLNl6i90hz2WKfducjZaFROggCUvvD/zRhh2QiT0IV9uKB dV+01sngH5DVg9T+uS0J8NcDfI89AltX+hUU/ftgEYDmueURj7KjZRv37hBShUze aZn9JGvwCpQAhfPvQYMRqXqaYbBe6AQ+UTQzSvmp649kFSUVcqKo/pjVrZwuCR7u uzhhUGd5yjg5qZrey53KwqRjVqGAgbBIyQbwBuv9dCgMEH5YdEkfjZZQDE9qbZyU FzYVdDZyjwFeI/qcHeno3LJl83PiSeOKZT2fRvRhrCA7An6w== Received: from nasanppmta04.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 427h6tw9wj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 14 Oct 2024 17:58:26 +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 49EHwPWp022054 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 14 Oct 2024 17:58:25 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; Mon, 14 Oct 2024 10:58:25 -0700 From: Andrew Pinski To: CC: Andrew Pinski Subject: [PATCH v2] passes: Remove limit on the number of params Date: Mon, 14 Oct 2024 10:58:12 -0700 Message-ID: <20241014175812.1374861-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: nalasex01a.na.qualcomm.com (10.47.209.196) 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: 0Fhmj8LlHuV3OU0pNBbWIrb2VdPueuph X-Proofpoint-ORIG-GUID: 0Fhmj8LlHuV3OU0pNBbWIrb2VdPueuph 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 bulkscore=0 phishscore=0 mlxlogscore=999 malwarescore=0 lowpriorityscore=0 mlxscore=0 adultscore=0 spamscore=0 suspectscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2410140128 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 Having a limit of 2 params for NEXT_PASS was just done because I didn't think there was a way to handle arbitrary number of params. But I found that we can handle this via a static const variable array (constexpr so we know it is true or false at compile time) and just loop over the array. Note I keep around NEXT_PASS_WITH_ARG and NEXT_PASS macros instead of always using NEXT_PASS_WITH_ARGS macro to make sure these cases get optimized for -O0 (stage1). Tested INSERT_PASS_AFTER/INSERT_PASS_BEFORE manually by changing config/i386/i386-passes.def's stv lines to have a 2nd argument and checked the resuling pass-instances.def to see the NEXT_PASS_WITH_ARGS was correctly done. changes from v1: * v2: Handle INSERT_PASS_AFTER/INSERT_PASS_BEFORE too. Bootstrapped and tested on x86_64-linux-gnu. gcc/ChangeLog: * gen-pass-instances.awk: Remove the limit of the params. * pass_manager.h (NEXT_PASS_WITH_ARG2): Rename to ... (NEXT_PASS_WITH_ARGS): This. * passes.cc (NEXT_PASS_WITH_ARG2): Rename to ... (NEXT_PASS_WITH_ARGS): This and support more than 2 params by using a constexpr array. Signed-off-by: Andrew Pinski --- gcc/gen-pass-instances.awk | 22 ++++++++++------------ gcc/pass_manager.h | 2 +- gcc/passes.cc | 13 +++++++++---- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/gcc/gen-pass-instances.awk b/gcc/gen-pass-instances.awk index def09347765..1e5b3f0c8cc 100644 --- a/gcc/gen-pass-instances.awk +++ b/gcc/gen-pass-instances.awk @@ -100,7 +100,7 @@ function adjust_linenos(above, increment, p, i) lineno += increment; } -function insert_remove_pass(line, fnname, arg3) +function insert_remove_pass(line, fnname, arg3, i) { parse_line($0, fnname); pass_name = args[1]; @@ -110,8 +110,13 @@ function insert_remove_pass(line, fnname, arg3) arg3 = args[3]; sub(/^[ \t]*/, "", arg3); new_line = prefix "NEXT_PASS (" arg3; - if (args[4]) - new_line = new_line "," args[4]; + # Add the optional params back. + i = 4; + while (args[i]) + { + new_line = new_line "," args[i]; + i++; + } new_line = new_line ")" postfix; if (!pass_lines[pass_name, pass_num]) { @@ -195,7 +200,6 @@ 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"); @@ -220,13 +224,8 @@ END { 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; + printf "S"; } else printf "NEXT_PASS"; @@ -266,8 +265,7 @@ 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 NEXT_PASS_WITH_ARGS" print "#undef TERMINATE_PASS_LIST" } diff --git a/gcc/pass_manager.h b/gcc/pass_manager.h index f18ae026257..294cdd0b1f7 100644 --- a/gcc/pass_manager.h +++ b/gcc/pass_manager.h @@ -130,7 +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 NEXT_PASS_WITH_ARGS(PASS, NUM, ...) NEXT_PASS (PASS, NUM) #define TERMINATE_PASS_LIST(PASS) #include "pass-instances.def" diff --git a/gcc/passes.cc b/gcc/passes.cc index b5475fce522..ae80f40b96a 100644 --- a/gcc/passes.cc +++ b/gcc/passes.cc @@ -1589,7 +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 NEXT_PASS_WITH_ARGS(PASS, NUM, ...) NEXT_PASS (PASS, NUM) #define TERMINATE_PASS_LIST(PASS) #include "pass-instances.def" @@ -1636,11 +1636,16 @@ pass_manager::pass_manager (context *ctxt) PASS ## _ ## NUM->set_pass_param (0, ARG); \ } while (0) -#define NEXT_PASS_WITH_ARG2(PASS, NUM, ARG0, ARG1) \ +#define NEXT_PASS_WITH_ARGS(PASS, NUM, ...) \ do { \ NEXT_PASS (PASS, NUM); \ - PASS ## _ ## NUM->set_pass_param (0, ARG0); \ - PASS ## _ ## NUM->set_pass_param (1, ARG1); \ + static constexpr bool values[] = { __VA_ARGS__ }; \ + unsigned i = 0; \ + for (bool value : values) \ + { \ + PASS ## _ ## NUM->set_pass_param (i, value); \ + i++; \ + } \ } while (0) #include "pass-instances.def"