From patchwork Fri Oct 20 16:17:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 156225 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp1173265vqb; Fri, 20 Oct 2023 09:22:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHVGJ7LyiYdnzl45ibZceg/mebFD2l9hz1rD+X392S/eXk1ze6UXsmF0OdbEqaXOXSxGLYq X-Received: by 2002:a05:6122:308a:b0:48d:5be:2899 with SMTP id cd10-20020a056122308a00b0048d05be2899mr2621790vkb.2.1697818968046; Fri, 20 Oct 2023 09:22:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1697818968; cv=pass; d=google.com; s=arc-20160816; b=wzzgmtAl4ecBYQ91aNZ4iWBPgq/DzVwv3hHAsErzqwdwdrIIQ0zjrrTirHmM8klhbB 87XdPkZpx4nn/RPjs/2TDFSzJvLObO12HK4j4m/Iy76h7BcYbAVldTR5zKBIIakOiQYf FYwXI74Ctf8GKXx0PWVPb6Vd/nIcJD5MZ89jyOncnDfaMTGLxV/OmZ8SsOob1pf51Trl eUdXOGAieOlNa8OdU6HWaV7TBV8/1rYyVlzkkyyHkuBr1GEuFXnZ5X/gJd33QL6aTq5H XCyCHtWnjdAcEN1idMtEMjRaLkeeu8w6lnEsBCcWsTS1omDg3VhB5PbzejV7HWu5NTAT l1wg== 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=cG8i9qpk7NIhDSiGi+uGgITBTv1/ygSQT0CzI1N+5v8=; fh=kSSy/oyUXqQD15FLeKdymIgDBFPFITPA1Gj52CNOxRQ=; b=SWXirJsrGivWg02yFuKVOUSvyhC4axPpJLAfcrpP+7FOyBz7ARcB+zfO+wlZiXV4N1 SukuUnPvvd5zLMQ0/I5H1CczrJD1/a1TcNm316ezMyqTbZ4VgFcHF/PrQn2JY58ote84 l4MU5CFUJR7pB0I0kG0T60lU/z1+6jG92AssZyYuF0868U0UAIW1vtphp2krIaYVlfFX eeKIYdElk2+SOL23kipfYRVxX1dOs0MdB2Pjh/JoG4qQys15/4yg8D5OQPftP815ZCqy cZLq8kZRTvXsatXf6Ao4wn5qcvJuqUu2ZjEFDibouARf7p4ZwxV9LGv9u8Vae97haIRX s7Lg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=jYD3pA78; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id y12-20020a05622a004c00b003f9ae403acasi1540421qtw.263.2023.10.20.09.22.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 09:22:48 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=jYD3pA78; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 55B883857345 for ; Fri, 20 Oct 2023 16:22:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 55B883857345 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1697818967; bh=cG8i9qpk7NIhDSiGi+uGgITBTv1/ygSQT0CzI1N+5v8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=jYD3pA782aPWeDbu3grWOErn2LK7IGQDuWuPpPVF7tGyyhXKkJBLCKOWefRPrOXHH urll3k+qwYeCeX66gvvPLRApj+Zh88nnZfa2xU6sbwbBgmijDTaqyovlYM9FVmZkyI WmlGBPBKGUow/KvSRt8ZJK78/tZiPM/bYyAsCrLM= 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 5BF2E3858422; Fri, 20 Oct 2023 16:22:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5BF2E3858422 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 5BF2E3858422 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=1697818923; cv=none; b=hZnyQeoUi1e+zWi0V/u88xwF3FTIlDCJPTnfe+1bO7BUI3jzSH45b37S9ex2MwdZuO5c5jdGkC+MtIv+1dohCTwLMZTZIdSzVgu1Z9lqgbrgjd/X9fPnH4AlZH7vmalwK5DQjGVrCQna3DHs7b7KvLsN8gzkBNeKuZlPXy9w8Xc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697818923; c=relaxed/simple; bh=qBsdz13WlQlTwoUGT2laq7f/WQAbB6feMEtdIIicZ3E=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=NkPhkSSm70jtb64m+BOE/qllHOREEiPGBt/CzfNIGtnH0w96Bvv2J8EPKQ9g6YnZDSa97befLS5P/KNk2FgpckmzkhJsobgm65japvBMIYorYECNgx+eDo3wST8+aHD8UqGHQFnlG7CFPnaab03O///nFkeMgsSZB2IA/hS0hDY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0247475.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39KGEpTn016953; Fri, 20 Oct 2023 16:22:00 GMT Received: from mxout22.s.uw.edu (mxout22.s.uw.edu [128.95.242.222]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3tuby4nyf6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 20 Oct 2023 16:22:00 +0000 Received: from smtp.washington.edu (smtp.washington.edu [140.142.234.157]) by mxout22.s.uw.edu (8.14.4+UW20.07/8.14.4+UW22.04) with ESMTP id 39KGLsZa016829 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 20 Oct 2023 09:21:54 -0700 X-Auth-Received: from kmatsui-ThinkPad-X1-Carbon-Gen-9.dhcp4.washington.edu ([10.19.18.191]) (authenticated authid=kmatsui) by smtp.washington.edu (8.16.1+UW21.10/8.14.4+UW19.10) with ESMTPSA id 39KGLNU5027456 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 20 Oct 2023 09:21:54 -0700 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 v24 33/33] libstdc++: Optimize std::is_invocable compilation performance Date: Fri, 20 Oct 2023 09:17:02 -0700 Message-ID: <20231020162115.2307797-34-kmatsui@gcc.gnu.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231020162115.2307797-1-kmatsui@gcc.gnu.org> References: <20231020135748.1846670-1-kmatsui@gcc.gnu.org> <20231020162115.2307797-1-kmatsui@gcc.gnu.org> MIME-Version: 1.0 X-Proofpoint-GUID: G57iFtShjyXgJqGQ7uuyYspk7C0EF4rt X-Proofpoint-ORIG-GUID: G57iFtShjyXgJqGQ7uuyYspk7C0EF4rt X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-20_10,2023-10-19_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 spamscore=0 phishscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 lowpriorityscore=0 impostorscore=0 priorityscore=1501 mlxscore=0 clxscore=1034 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310170001 definitions=main-2310200136 X-Spam-Status: No, score=-13.2 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 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: 1780284538906999082 X-GMAIL-MSGID: 1780292222177331734 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 | 6 ++++++ .../testsuite/20_util/is_invocable/incomplete_args_neg.cc | 1 + .../testsuite/20_util/is_invocable/incomplete_neg.cc | 1 + 3 files changed, 8 insertions(+) diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index 75a94cb8d7e..91851b78c7e 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -3167,9 +3167,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION using invoke_result_t = typename invoke_result<_Fn, _Args...>::type; /// std::is_invocable +#if _GLIBCXX_USE_BUILTIN_TRAIT(__is_invocable) + template + struct is_invocable + : public __bool_constant<__is_invocable(_Fn, _ArgTypes...)> +#else template struct is_invocable : __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 34d1d9431d1..3f9e5274f3c 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 e1e54d25ee5..92af48c48b6 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