From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id A54873858035 for ; Thu, 1 Sep 2022 09:29:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A54873858035 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662024591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NZaqktcnA0plGWDRFyNnR1zpICkq3lQixYmgpBZXg38=; b=iwYZRJ4yUbPFjV9TpHayLKbtM53uagroxbmLcI2XOzQBdgFae8oWQs/2kvApiZfd0JgTCH FipqWT4fVaz7/HU2HbjmxKo0rYLqu+FsJ2/HejL2inDvjic/Au2sVbDgb50rWfrKWC2x+7 R6atzBtgbfUr39/A8CWVcWvyOQVpG/g= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-221-EfBpHGTOMDubULTD833P_w-1; Thu, 01 Sep 2022 05:29:40 -0400 X-MC-Unique: EfBpHGTOMDubULTD833P_w-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4B31590DE22; Thu, 1 Sep 2022 09:29:33 +0000 (UTC) Received: from localhost (unknown [10.33.36.187]) by smtp.corp.redhat.com (Postfix) with ESMTP id 14620112131E; Thu, 1 Sep 2022 09:29:32 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Optimize array traits Date: Thu, 1 Sep 2022 10:29:32 +0100 Message-Id: <20220901092932.193133-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Tested powerpc64le-linux, pushed to trunk. This is the first in a series of patches to optimize compile time for the contents of . -- >8 -- Improve compile times by avoiding unnecessary class template instantiations. __is_array_known_bounds and __is_array_unknown_bounds can be defined without instantiating extent, by providing partial specializations for the true cases. std::extent can avoid recursing down through a multidimensional array, so it stops after providing the result. Previously extent would instantiate extent and extent as well. std::is_array_v can use partial specializations to avoid instantiating std::is_array, and similarly for std::rank_v and std::extent_v. std::is_bounded_array_v and std::is_unbounded_array_v can also use partial specializations, and then the class templates can be defined in terms of the variable templates. This makes sense for these traits, because they are new in C++20 and so the variable templates are always available, which isn't true in general for C++11 and C++14 traits. libstdc++-v3/ChangeLog: * include/std/type_traits (__is_array_known_bounds): Add partial specialization instead of using std::extent. (__is_array_unknown_bounds): Likewise. (extent): Add partial specializations to stop recursion after the result is found. (is_array_v): Add partial specializations instead of instantiating the class template. (rank_v, extent_v): Likewise. (is_bounded_array_v, is_unbounded_array_v): Likewise. (is_bounded_array, is_unbounded_array): Define in terms of the variable templates. --- libstdc++-v3/include/std/type_traits | 102 ++++++++++++++++++--------- 1 file changed, 69 insertions(+), 33 deletions(-) diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index c2f5cb9c806..5984442c0aa 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -867,21 +867,28 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template auto declval() noexcept -> decltype(__declval<_Tp>(0)); - template - struct extent; - template struct remove_all_extents; /// @cond undocumented template struct __is_array_known_bounds - : public integral_constant::value > 0)> + : public false_type + { }; + + template + struct __is_array_known_bounds<_Tp[_Size]> + : public true_type { }; template struct __is_array_unknown_bounds - : public __and_, __not_>> + : public false_type + { }; + + template + struct __is_array_unknown_bounds<_Tp[]> + : public true_type { }; // Destructible and constructible type properties. @@ -1430,23 +1437,25 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : public integral_constant::value> { }; /// extent - template + template struct extent - : public integral_constant { }; + : public integral_constant { }; - template + template + struct extent<_Tp[_Size], 0> + : public integral_constant { }; + + template struct extent<_Tp[_Size], _Uint> - : public integral_constant::value> - { }; + : public extent<_Tp, _Uint - 1>::type { }; + + template + struct extent<_Tp[], 0> + : public integral_constant { }; template struct extent<_Tp[], _Uint> - : public integral_constant::value> - { }; + : public extent<_Tp, _Uint - 1>::type { }; // Type relations. @@ -3133,8 +3142,14 @@ template inline constexpr bool is_integral_v = is_integral<_Tp>::value; template inline constexpr bool is_floating_point_v = is_floating_point<_Tp>::value; + template - inline constexpr bool is_array_v = is_array<_Tp>::value; + inline constexpr bool is_array_v = false; +template + inline constexpr bool is_array_v<_Tp[]> = true; +template + inline constexpr bool is_array_v<_Tp[_Num]> = true; + template inline constexpr bool is_pointer_v = is_pointer<_Tp>::value; template @@ -3276,10 +3291,25 @@ template has_virtual_destructor<_Tp>::value; template inline constexpr size_t alignment_of_v = alignment_of<_Tp>::value; + template - inline constexpr size_t rank_v = rank<_Tp>::value; + inline constexpr size_t rank_v = 0; +template + inline constexpr size_t rank_v<_Tp[_Size]> = 1 + rank_v<_Tp>; +template + inline constexpr size_t rank_v<_Tp[]> = 1 + rank_v<_Tp>; + template - inline constexpr size_t extent_v = extent<_Tp, _Idx>::value; + inline constexpr size_t extent_v = 0; +template + inline constexpr size_t extent_v<_Tp[_Size], 0> = _Size; +template + inline constexpr size_t extent_v<_Tp[_Size], _Idx> = extent_v<_Tp, _Idx - 1>; +template + inline constexpr size_t extent_v<_Tp[], 0> = 0; +template + inline constexpr size_t extent_v<_Tp[], _Idx> = extent_v<_Tp, _Idx - 1>; + #ifdef _GLIBCXX_HAVE_BUILTIN_IS_SAME template inline constexpr bool is_same_v = __is_same(_Tp, _Up); @@ -3407,32 +3437,38 @@ template #define __cpp_lib_bounded_array_traits 201902L + /// True for a type that is an array of known bound. + /// @ingroup variable_templates + /// @since C++20 + template + inline constexpr bool is_bounded_array_v = false; + + template + inline constexpr bool is_bounded_array_v<_Tp[_Size]> = true; + + /// True for a type that is an array of unknown bound. + /// @ingroup variable_templates + /// @since C++20 + template + inline constexpr bool is_unbounded_array_v = false; + + template + inline constexpr bool is_unbounded_array_v<_Tp[]> = true; + /// True for a type that is an array of known bound. /// @since C++20 template struct is_bounded_array - : public __is_array_known_bounds<_Tp> + : public bool_constant> { }; /// True for a type that is an array of unknown bound. /// @since C++20 template struct is_unbounded_array - : public __is_array_unknown_bounds<_Tp> + : public bool_constant> { }; - /// @ingroup variable_templates - /// @since C++20 - template - inline constexpr bool is_bounded_array_v - = is_bounded_array<_Tp>::value; - - /// @ingroup variable_templates - /// @since C++20 - template - inline constexpr bool is_unbounded_array_v - = is_unbounded_array<_Tp>::value; - #if __has_builtin(__is_layout_compatible) /// @since C++20 -- 2.37.2