From patchwork Sun Sep 17 20:41:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Fran=C3=A7ois_Dumont?= X-Patchwork-Id: 1835767 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=RC2QZZQb; 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 4Rpfwk5XQ8z1yfd for ; Mon, 18 Sep 2023 06:41:41 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 13E8D3858017 for ; Sun, 17 Sep 2023 20:41:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 13E8D3858017 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1694983299; bh=QdxmCCkDXvIU/JcSmA0iEIwiDqcQ7oZwweuC0p9OneY=; h=Date:To:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=RC2QZZQb9cagYrDCbd0LHz783QJuCbaF0nkd6jKYh1rred9R0I0e2LPPcKtKU+HXK Lr5Uy/7pT0C+9co+SlFnCCoJPvB1X2QSNT2JXZatUxNz3Ea9Gto817ynmQxBMLOVE+ JfMhd0TNchqKdHh8BsmTW9P28xuuMACHNQUZMM9U= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by sourceware.org (Postfix) with ESMTPS id D35863858D32; Sun, 17 Sep 2023 20:41:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D35863858D32 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-401ec23be82so41347435e9.0; Sun, 17 Sep 2023 13:41:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694983276; x=1695588076; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=QdxmCCkDXvIU/JcSmA0iEIwiDqcQ7oZwweuC0p9OneY=; b=HC4EaDVwN2/G7ntdgZqWKENVYNPLrcyH2Ov5bUu5o+iUvMr/qFCGTVLcjAx/yU4TV6 /Ft9vdHX/ec1hBR2iwg3EBbPcZ5mCJEo/QCCFQg6lAj6gVJ3VaBhha13/9RSMnZBnCeW 5MhqsbQTd0O6KHv2eY0cBOfdQzHfmURpghZgEE4bVcpqIsKuYZ/Dnqcfx7Tx8xFYoP2r /My49lSooU3ZeVItEwCG0F/lm9hB7fubjT/51nzygIBl5hHSf6gO1Fnn/FHaOdOYoH7E DULM+/7V30adFZNl1K16FAsHsGGPOBb371m56chgnnEXv8VzlfAQUV5+FHI3c8Zp2UMW A0XQ== X-Gm-Message-State: AOJu0Yzg43VmQp+m68EiBYm6KkqEzW7FvE8Fg20DUe95NHNqkG400qJE /PsWXWIQmIlGk8HJQf1LpeCHjSmcdls= X-Google-Smtp-Source: AGHT+IHTwUCCTm6GwnVGNxjPo6XOMs6UYv6ZlRGh0ubkWNRLh+iVUKGbxdB4EU0vHYZS9zMT4hx5bQ== X-Received: by 2002:a05:600c:2241:b0:3fa:934c:8356 with SMTP id a1-20020a05600c224100b003fa934c8356mr6454256wmm.10.1694983275923; Sun, 17 Sep 2023 13:41:15 -0700 (PDT) Received: from ?IPV6:2a01:e0a:1dc:b1c0:9dc0:9d56:99a6:e6bf? ([2a01:e0a:1dc:b1c0:9dc0:9d56:99a6:e6bf]) by smtp.gmail.com with ESMTPSA id 8-20020a05600c028800b00402c0a8a084sm13212552wmk.17.2023.09.17.13.41.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 17 Sep 2023 13:41:14 -0700 (PDT) Message-ID: <8046050f-c7e7-e41a-caf6-ddf087719597@gmail.com> Date: Sun, 17 Sep 2023 22:41:13 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Content-Language: en-US To: libstdc++ Cc: gcc-patches Subject: [PATCH][_Hashtable] Avoid redundant usage of rehash policy X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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: , X-Patchwork-Original-From: =?utf-8?q?Fran=C3=A7ois_Dumont_via_Gcc-patches?= From: =?utf-8?q?Fran=C3=A7ois_Dumont?= Reply-To: =?utf-8?q?Fran=C3=A7ois_Dumont?= Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" libstdc++: [_Hashtable] Avoid redundant usage of rehash policy Bypass usage of __detail::__distance_fwd and check for need to rehash when assigning an initializer_list to an unordered_multimap or unordered_multiset. libstdc++-v3/ChangeLog:     * include/bits/hashtable_policy.h     (_Insert_base<>::_M_insert_range(_InputIte, _InputIte, _NodeGen&)): New.     (_Insert_base<>::_M_insert_range(_InputIte, _InputIte, true_type)): Use latter.     (_Insert_base<>::_M_insert_range(_InputIte, _InputIte, false_type)): Likewise.     * include/bits/hashtable.h (_Hashtable<>::operator=(initializer_list)): Likewise.     (_Hashtable<>::_Hashtable(_InputIte, _InputIte, size_type, const _Hash&, const _Equal&,     const allocator_type&, false_type)): Likewise. Ok to commit ? François diff --git a/libstdc++-v3/include/bits/hashtable.h b/libstdc++-v3/include/bits/hashtable.h index 4c12dc895b2..c544094847d 100644 --- a/libstdc++-v3/include/bits/hashtable.h +++ b/libstdc++-v3/include/bits/hashtable.h @@ -614,7 +614,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION if (_M_bucket_count < __l_bkt_count) rehash(__l_bkt_count); - this->_M_insert_range(__l.begin(), __l.end(), __roan, __unique_keys{}); + this->_M_insert_range(__l.begin(), __l.end(), __roan); return *this; } @@ -1254,8 +1254,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } __alloc_node_gen_t __node_gen(*this); - for (; __f != __l; ++__f) - _M_insert(*__f, __node_gen, __uks); + this->_M_insert_range(__f, __l, __node_gen); } template void _M_insert_range(_InputIterator __first, _InputIterator __last, - const _NodeGetter&, true_type __uks); + const _NodeGetter&); - template + template void _M_insert_range(_InputIterator __first, _InputIterator __last, - const _NodeGetter&, false_type __uks); + true_type __uks); + + template + void + _M_insert_range(_InputIterator __first, _InputIterator __last, + false_type __uks); public: using iterator = _Node_iterator<_Value, __constant_iterators::value, @@ -966,11 +971,7 @@ namespace __detail template void insert(_InputIterator __first, _InputIterator __last) - { - __hashtable& __h = _M_conjure_hashtable(); - __node_gen_type __node_gen(__h); - return _M_insert_range(__first, __last, __node_gen, __unique_keys{}); - } + { _M_insert_range(__first, __last, __unique_keys{}); } }; template:: _M_insert_range(_InputIterator __first, _InputIterator __last, - const _NodeGetter& __node_gen, true_type __uks) + const _NodeGetter& __node_gen) { __hashtable& __h = _M_conjure_hashtable(); for (; __first != __last; ++__first) - __h._M_insert(*__first, __node_gen, __uks); + __h._M_insert(*__first, __node_gen, __unique_keys{}); } template - template + template + void + _Insert_base<_Key, _Value, _Alloc, _ExtractKey, _Equal, + _Hash, _RangeHash, _Unused, + _RehashPolicy, _Traits>:: + _M_insert_range(_InputIterator __first, _InputIterator __last, + true_type /* __uks */) + { + __hashtable& __h = _M_conjure_hashtable(); + __node_gen_type __node_gen(__h); + _M_insert_range(__first, __last, __node_gen); + } + + template + template void _Insert_base<_Key, _Value, _Alloc, _ExtractKey, _Equal, _Hash, _RangeHash, _Unused, _RehashPolicy, _Traits>:: _M_insert_range(_InputIterator __first, _InputIterator __last, - const _NodeGetter& __node_gen, false_type __uks) + false_type /* __uks */) { using __rehash_type = typename __hashtable::__rehash_type; using __rehash_state = typename __hashtable::__rehash_state; @@ -1020,8 +1038,8 @@ namespace __detail if (__do_rehash.first) __h._M_rehash(__do_rehash.second, __saved_state); - for (; __first != __last; ++__first) - __h._M_insert(*__first, __node_gen, __uks); + __node_gen_type __node_gen(__h); + _M_insert_range(__first, __last, __node_gen); } /**