From patchwork Wed Feb 21 09:36:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 204077 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp930494dyc; Wed, 21 Feb 2024 01:41:26 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUYpA//2nQE6eIHg9ICRDat+N8Ht02F/CvmnnxJmXtUVCmyFkk6A4S1Ck93uPmtoZq37DN0OyzqZQ3zQyvbPo+tLXQiUg== X-Google-Smtp-Source: AGHT+IGZYZobZbb6pXU2meY1hPqXgL1gc4gNp7+Rpa3FtfAnM6QVFJk0D2GNEYrNmMFEI1gZPScU X-Received: by 2002:a05:620a:100a:b0:787:25b6:2b2b with SMTP id z10-20020a05620a100a00b0078725b62b2bmr19532325qkj.17.1708508486670; Wed, 21 Feb 2024 01:41:26 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708508486; cv=pass; d=google.com; s=arc-20160816; b=b4l+kmbdcMgu67/h5wP8t/3LZsewSk8mk5Vu5NJ8uZd0/0o7g5g1urRfive8q30jwn hCds+qPznH+OlBgU4gDY+H7DD46Oe+kvOHekqhzYCWPj1QIUw/CbAnwVLlxKRYeETBsU 8im5RHYO3bBj96gFUbD62Q5/5gcz6z7Z2z4AIqvwSmF2J3tcSi5z49sGekD5kTuFqCiL Ojm4q6P4M4UpKGhme8f/uh/KoDIzAzQk3rwo1eTEW/yR3IGusaY6MsqIU31tPIXtGIX9 ByGMSbmICWSRzePK/alzcH6BlPQmeSxIiCgWnyniBdKCvTndEPBjycWMsbYokcQECihF u1Mg== 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=bA29ORAAWcXK9b/D0tn/mHPS1V1LMyfnRJurlb+oOdI=; fh=kSSy/oyUXqQD15FLeKdymIgDBFPFITPA1Gj52CNOxRQ=; b=Ds1NMIYbGkaM2HXKm5aGj6pJhbg09NMtyM8kNWDLTxkD09AYBI5prF+F9fMImvVxPj bA2zR7eIdmnjfDRHxlm4rrqbiI1v2EM24Tth9uFhV3SzjH6VxC/6Ogijm5I0tol9gj9B K6RyNkj7vU3l4u8LY5s3Bg+BfUTzpz7zWMOVBE5FRZXmi4K4mK9IJR1o8c/49Y2f5k2K ffy3UxY1bDOUXRRYbUmIj4efcd42vGKTgU7Lp9KV+lXxv6c++quYKoZYRFoBcmwgFJx8 dcX5sMkNOH99zbUWkMzn61i5ZkvCa/EG2/n6wlNFdAsRXaRydfoQgkRHPI4PNE4HLw23 rZrQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=kcti0h9W; 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 y7-20020a05620a44c700b00787281f8a9esi11410260qkp.653.2024.02.21.01.41.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 01:41:26 -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=kcti0h9W; 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 4E29A3858CDA for ; Wed, 21 Feb 2024 09:41:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4E29A3858CDA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1708508486; bh=bA29ORAAWcXK9b/D0tn/mHPS1V1LMyfnRJurlb+oOdI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=kcti0h9W489C/a1iAr0rQVDvGP5/dPEabZ8H1r+PG+5FShNm8OGQxK5ez8XNKgMaf MSKvfhS7Cxk10EFdCrWAml7wZt+S/xomdSVaA0p3MPTH7U9/tz+2ROKOBoo6QD3yZf B86JbZTOcVys0QCYigtfh2SjBD/+dkBPCfxhlNYA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0b-00641c01.pphosted.com (mx0b-00641c01.pphosted.com [205.220.177.146]) by sourceware.org (Postfix) with ESMTPS id 7CCBA3858CDA; Wed, 21 Feb 2024 09:36:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7CCBA3858CDA 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 7CCBA3858CDA Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=205.220.177.146 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708508196; cv=none; b=MPv4ypjxk131zO7y6QnJlLfM/5YPAMQb2ocPdWD5ymluhm6XDeH6ibBiHYx8Cohqc6ds78tmIher6RjugeKsmcK4KqNP9Wv9JHFDeU4PelY/qBLiq9PpuC0NRq3JdK4kk7wPxcFEvCIKGS8JJhg4JnDzKDF/V8QTDntjxPyc0cc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708508196; c=relaxed/simple; bh=iv6nnOW5zgf3KNR2hXeZXx73hHnWEO8098eV1v7ODVA=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=EREpcAMlCnqFOHWSQ2IN+W5gcUD/QCDcwMPYMr3Rl6n7QWij6DftVK2iEYxizB2stQEBknotfLbqQ/Ve+n+yrnZpUVu2BANJloXoukAfyyt0tIPgfiO9hPd7woR+lYpjHTqc2ZumugbgMs0blx0FOAsjn3YzzXr3tsbTLA1luAg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0247479.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 41L9Yecc000678; Wed, 21 Feb 2024 09:36:33 GMT Received: from mxout22.s.uw.edu (mxout22.s.uw.edu [128.95.242.222]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3wd56h3436-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 21 Feb 2024 09:36:32 +0000 Received: from smtp.washington.edu (smtp.washington.edu [128.208.60.132]) by mxout22.s.uw.edu (8.14.4+UW20.07/8.14.4+UW24.02) with ESMTP id 41L9aLB7020960 (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 41L9aJVo002942 (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 24/26] libstdc++: Optimize std::is_invocable compilation performance Date: Wed, 21 Feb 2024 01:36:14 -0800 Message-ID: <20240221093616.4001742-24-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: CWWLKJ1hBdAge6KPm9CxEsagiWcC4kAE X-Proofpoint-ORIG-GUID: CWWLKJ1hBdAge6KPm9CxEsagiWcC4kAE 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 adultscore=0 spamscore=0 bulkscore=0 priorityscore=1501 suspectscore=0 clxscore=1034 mlxlogscore=934 phishscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402210074 X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_DNSWL_LOW, 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: 1791500994872286405 X-GMAIL-MSGID: 1791500994872286405 This patch optimizes the compilation performance of std::is_invocable by dispatching to the new __is_invocable built-in trait. libstdc++-v3/ChangeLog: * include/std/type_traits (is_invocable): Use __is_invocable built-in trait. * testsuite/20_util/is_invocable/incomplete_args_neg.cc: Handle the new error from __is_invocable. * testsuite/20_util/is_invocable/incomplete_neg.cc: Likewise. Signed-off-by: Ken Matsui --- libstdc++-v3/include/std/type_traits | 4 ++++ .../testsuite/20_util/is_invocable/incomplete_args_neg.cc | 1 + libstdc++-v3/testsuite/20_util/is_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 1577042a5b8..9af233bcc75 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -3235,7 +3235,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// std::is_invocable template struct is_invocable +#if _GLIBCXX_USE_BUILTIN_TRAIT(__is_invocable) + : public __bool_constant<__is_invocable(_Fn, _ArgTypes...)> +#else : __is_invocable_impl<__invoke_result<_Fn, _ArgTypes...>, void>::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_invocable/incomplete_args_neg.cc b/libstdc++-v3/testsuite/20_util/is_invocable/incomplete_args_neg.cc index a575750f9e9..9619129b817 100644 --- a/libstdc++-v3/testsuite/20_util/is_invocable/incomplete_args_neg.cc +++ b/libstdc++-v3/testsuite/20_util/is_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_invocable/incomplete_neg.cc b/libstdc++-v3/testsuite/20_util/is_invocable/incomplete_neg.cc index 05848603555..b478ebce815 100644 --- a/libstdc++-v3/testsuite/20_util/is_invocable/incomplete_neg.cc +++ b/libstdc++-v3/testsuite/20_util/is_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