From patchwork Wed Feb 21 09:36:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 204098 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp934452dyc; Wed, 21 Feb 2024 01:52:09 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUYuPt69dUHAOQevxuy11BSY81X1Yk/UmmQDptiJtFJnKitPb0YsxsolPfogJF+FHlnigmWCHzvAmLSIS9XIe4d/ecFng== X-Google-Smtp-Source: AGHT+IE277AIcCdaddxJd5wBBaWC/QWAQcXpFP8MRcirWCrwMx8prYAxSMZx9wG/ReInkpNwHueH X-Received: by 2002:a05:620a:167c:b0:787:1fb5:7e61 with SMTP id d28-20020a05620a167c00b007871fb57e61mr19668648qko.46.1708509129196; Wed, 21 Feb 2024 01:52:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708509129; cv=pass; d=google.com; s=arc-20160816; b=EoWZW8I57gCFpoGHF8MO947jlGgTdGOjrEb4WUVJx8yWozzFAvbOy8tEPPBEvKfYn6 WgCX0eQMeNQOmlr0+JbVW8h+yJgaa86/7DCmeT1B0uRHKwp9GFLL7w8LRKvI+wqBzXEO G9wBFysYoo/fUY6BBodLFMsVXIahnBjrMWrtWE8Z19RqwPEwVONXmrm5WGBN91sptpWX z7oK6B38f7wFWi+YnuRXzNtfHerApe+us/qFoA3zrCWCyHG/HrlQo8vOYxvr+RCla0eo WAfVKupfbdEZ+IeTv6Klm77SdfMICFGdGvfwOgrBeGJFIKGULcZ/HS7iGdBWg61CW3zy SR5g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:arc-filter:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=vNP/Utyzd0OX5NTsfTKYidk0/AHt9jn822PJx1YBw4I=; fh=kSSy/oyUXqQD15FLeKdymIgDBFPFITPA1Gj52CNOxRQ=; b=eQmdmMibm0lL3mHKjYYj63wp57FcK8vM7QNZrAqLbHZJzcK5uZQegtSlZXpr04PNIX Ex+JuarwC4gBPIy7Tg4YcvHmuKf00f0SX4aMlmhWJXND+6r3wHUTt1VqY2jySnhuF5Wn aepB5uX8k6y/O2WM5anaKhPFLPxHIidCWHMdZeXlvCf9y9/rE6UNhoWPq5wAA0B9QeKK uy+WJgQwPX8i/wTtZvVtZV8iv0XVwR4d7ekLo8YwJ6kodFf5sBkjylcDK579Qbzg1wU/ G0Ra5EALOEipqicgjU3umKNp0YtUbVhDwnucjIuUI68yq45FGhTut6SBs7HRUX9fhJop 3ZCA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="OMij4U4/"; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id o27-20020a05620a22db00b00783da601714si10207726qki.574.2024.02.21.01.52.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 01:52:09 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="OMij4U4/"; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D3B253858296 for ; Wed, 21 Feb 2024 09:52:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D3B253858296 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1708509128; bh=vNP/Utyzd0OX5NTsfTKYidk0/AHt9jn822PJx1YBw4I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=OMij4U4/9nLBV6vvuiyeoMo5ebP9VtHbOEQV9wmNUJTZF6Zf5vAcEGaEqGCQmhvhi MxD/ocPIiMJwkp6f+6ggq3uQNcwy8cbCbY4MuaPrT7q0v2qzivre9fR8SZPS/BciVY opPDzdoTTQLtnm9YLLUqb7C89Dsd5UOVuAXCsPY4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-00641c01.pphosted.com (mx0a-00641c01.pphosted.com [205.220.165.146]) by sourceware.org (Postfix) with ESMTPS id 415F23858C24; Wed, 21 Feb 2024 09:37:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 415F23858C24 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=gcc.gnu.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 415F23858C24 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=205.220.165.146 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708508236; cv=none; b=ceUKmOBGAR2CDBLBhvnjubk0wy7hBofDI9NLYT+lJWrttCgCDm9Nsz9L0jfcflxqvN9xBUiTPtguJaMrb83m8rmrvFAeIQ42021jrvEN80S3FaSLIfUgmIqCng5N98LNZmX3CXBMkGCu+KqLP4/uWw+sXkb0xV6kTRMPf9g6ErE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708508236; c=relaxed/simple; bh=QXzLy/4IQFjtJXN7d08AtrQGiZ3J5Km6FpwPUv/ghX4=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=NLxgdmhfUclD3oOebP22q50tXMNRJyUlz4RQfhKSXoEbleoED71G2R1XpOGrGyYVzZRenjrlTypuQ6I3DvzGPIyC0yU75pZXG/nLAZRjbRCaFM6qt+68JopmGvegVK6iR11ojEUP+MOIJ7ijaDHvtvRUa+mTvqfehWwvAGnlwXc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0247471.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 41L9aZIC022030; Wed, 21 Feb 2024 09:37:05 GMT Received: from mxout23.cac.washington.edu (mxout23.cac.washington.edu [140.142.32.140]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3wd56gk8us-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 21 Feb 2024 09:37:04 +0000 Received: from smtp.washington.edu (smtp.washington.edu [128.208.60.132]) by mxout23.cac.washington.edu (8.14.4+UW20.07/8.14.4+UW24.02) with ESMTP id 41L9aL4U020584 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 21 Feb 2024 01:36:21 -0800 X-Auth-Received: from kmatsui-ThinkPad-X1-Carbon-Gen-9.dhcp4.washington.edu ([10.154.74.128]) (authenticated authid=kmatsui) by smtp.washington.edu (8.16.1+UW21.10/8.14.4+UW24.02) with ESMTPSA id 41L9aJVq002942 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 21 Feb 2024 01:36:21 -0800 X-UW-Orig-Sender: kmatsui@smtp.washington.edu From: Ken Matsui To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Ken Matsui Subject: [PATCH v13 26/26] libstdc++: Optimize std::is_nothrow_invocable compilation performance Date: Wed, 21 Feb 2024 01:36:16 -0800 Message-ID: <20240221093616.4001742-26-kmatsui@gcc.gnu.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240221093616.4001742-1-kmatsui@gcc.gnu.org> References: <20240221085142.3779280-26-kmatsui@gcc.gnu.org> <20240221093616.4001742-1-kmatsui@gcc.gnu.org> MIME-Version: 1.0 X-Proofpoint-GUID: -8-7tmnQce5mB9Q5D99hg5L7KpmvwitR X-Proofpoint-ORIG-GUID: -8-7tmnQce5mB9Q5D99hg5L7KpmvwitR X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-20_06,2024-02-20_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1034 adultscore=0 malwarescore=0 bulkscore=0 priorityscore=1501 phishscore=0 mlxlogscore=839 suspectscore=0 lowpriorityscore=0 impostorscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402210075 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NEUTRAL, TXREP, T_SCC_BODY_TEXT_LINE 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+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791498019344210488 X-GMAIL-MSGID: 1791501668238257864 This patch optimizes the compilation performance of std::is_nothrow_invocable by dispatching to the new __is_nothrow_invocable built-in trait. libstdc++-v3/ChangeLog: * include/std/type_traits (is_nothrow_invocable): Use __is_nothrow_invocable built-in trait. * testsuite/20_util/is_nothrow_invocable/incomplete_args_neg.cc: Handle the new error from __is_nothrow_invocable. * testsuite/20_util/is_nothrow_invocable/incomplete_neg.cc: Likewise. Signed-off-by: Ken Matsui --- libstdc++-v3/include/std/type_traits | 4 ++++ .../20_util/is_nothrow_invocable/incomplete_args_neg.cc | 1 + .../testsuite/20_util/is_nothrow_invocable/incomplete_neg.cc | 1 + 3 files changed, 6 insertions(+) diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index 9af233bcc75..093d85a51a8 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -3265,8 +3265,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// std::is_nothrow_invocable template struct is_nothrow_invocable +#if _GLIBCXX_USE_BUILTIN_TRAIT(__is_nothrow_invocable) + : public __bool_constant<__is_nothrow_invocable(_Fn, _ArgTypes...)> +#else : __and_<__is_invocable_impl<__invoke_result<_Fn, _ArgTypes...>, void>, __call_is_nothrow_<_Fn, _ArgTypes...>>::type +#endif { static_assert(std::__is_complete_or_unbounded(__type_identity<_Fn>{}), "_Fn must be a complete class or an unbounded array"); diff --git a/libstdc++-v3/testsuite/20_util/is_nothrow_invocable/incomplete_args_neg.cc b/libstdc++-v3/testsuite/20_util/is_nothrow_invocable/incomplete_args_neg.cc index 3c225883eaf..3f8542dd366 100644 --- a/libstdc++-v3/testsuite/20_util/is_nothrow_invocable/incomplete_args_neg.cc +++ b/libstdc++-v3/testsuite/20_util/is_nothrow_invocable/incomplete_args_neg.cc @@ -18,6 +18,7 @@ // . // { dg-error "must be a complete class" "" { target *-*-* } 0 } +// { dg-prune-output "invalid use of incomplete type" } #include diff --git a/libstdc++-v3/testsuite/20_util/is_nothrow_invocable/incomplete_neg.cc b/libstdc++-v3/testsuite/20_util/is_nothrow_invocable/incomplete_neg.cc index 5a728bfa03b..d3bdf08448b 100644 --- a/libstdc++-v3/testsuite/20_util/is_nothrow_invocable/incomplete_neg.cc +++ b/libstdc++-v3/testsuite/20_util/is_nothrow_invocable/incomplete_neg.cc @@ -18,6 +18,7 @@ // . // { dg-error "must be a complete class" "" { target *-*-* } 0 } +// { dg-prune-output "invalid use of incomplete type" } #include