From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id D7CBE3857C76; Wed, 24 Nov 2021 11:51:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D7CBE3857C76 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-9287] libstdc++: Optimize std::seed_seq construction X-Act-Checkin: gcc X-Git-Author: Antony Polukhin X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 1caca76928ab46cba0b85a649ff6f22a1c1d05c4 X-Git-Newrev: 41dd7f27b6070c409f0576fff61eda05c68d1237 Message-Id: <20211124115107.D7CBE3857C76@sourceware.org> Date: Wed, 24 Nov 2021 11:51:07 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Nov 2021 11:51:07 -0000 https://gcc.gnu.org/g:41dd7f27b6070c409f0576fff61eda05c68d1237 commit r11-9287-g41dd7f27b6070c409f0576fff61eda05c68d1237 Author: Antony Polukhin Date: Tue Aug 17 13:50:53 2021 +0100 libstdc++: Optimize std::seed_seq construction When std::seed_seq is constructed from random access iterators we can detect the internal vector size in O(1). Reserving memory for elements in such cases may avoid multiple memory allocations. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * include/bits/random.tcc (seed_seq::seed_seq): Reserve capacity if distance is O(1). * testsuite/26_numerics/random/pr60037-neg.cc: Adjust dg-error line number. Co-authored-by: Jonathan Wakely (cherry picked from commit 174f9257a75dec93221eca26c236e0a6346c9dfd) Diff: --- libstdc++-v3/include/bits/random.tcc | 4 ++++ libstdc++-v3/testsuite/26_numerics/random/pr60037-neg.cc | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/random.tcc b/libstdc++-v3/include/bits/random.tcc index b33f8a819f8..22ae1f38ebb 100644 --- a/libstdc++-v3/include/bits/random.tcc +++ b/libstdc++-v3/include/bits/random.tcc @@ -3234,6 +3234,7 @@ namespace __detail template seed_seq::seed_seq(std::initializer_list<_IntType> __il) { + _M_v.reserve(__il.size()); for (auto __iter = __il.begin(); __iter != __il.end(); ++__iter) _M_v.push_back(__detail::__mod::__value>(*__iter)); @@ -3242,6 +3243,9 @@ namespace __detail template seed_seq::seed_seq(_InputIterator __begin, _InputIterator __end) { + if _GLIBCXX17_CONSTEXPR (__is_random_access_iter<_InputIterator>::value) + _M_v.reserve(std::distance(__begin, __end)); + for (_InputIterator __iter = __begin; __iter != __end; ++__iter) _M_v.push_back(__detail::__mod::__value>(*__iter)); diff --git a/libstdc++-v3/testsuite/26_numerics/random/pr60037-neg.cc b/libstdc++-v3/testsuite/26_numerics/random/pr60037-neg.cc index 1da46ceebda..3ded306bd5f 100644 --- a/libstdc++-v3/testsuite/26_numerics/random/pr60037-neg.cc +++ b/libstdc++-v3/testsuite/26_numerics/random/pr60037-neg.cc @@ -12,4 +12,4 @@ auto x = std::generate_canonical