Skip to content

Commit 3e92f72

Browse files
achow101vijaydasmp
authored andcommitted
Merge bitcoin#27334: util: implement noexcept move assignment & move ctor for prevector
bfb9291 util: implement prevector's move ctor & move assignment (Martin Leitner-Ankerl) fffc86f test: CScriptCheck is used a lot in std::vector, make sure that's efficient (Martin Leitner-Ankerl) 81f6797 util: prevector's move ctor and move assignment is `noexcept` (Martin Leitner-Ankerl) d380d28 bench: Add benchmark for prevector usage in std::vector (Martin Leitner-Ankerl) Pull request description: `prevector`'s move assignment and move constructor were not `noexcept`, which makes it inefficient to use inside STL containers like `std::vector`. That's the case e.g. for `CScriptCheck`. This PR adds `noexcept`, and also implements the move assignment & ctor, which makes it quite a bit more efficient to use prevector in an std::vector. The PR also adds a benchmark which grows an `std::vector` by adding `prevector` objects to it. merge-base: | ns/op | op/s | err% | ins/op | cyc/op | IPC | bra/op | miss% | total | benchmark |--------------------:|--------------------:|--------:|----------------:|----------------:|-------:|---------------:|--------:|----------:|:---------- | 6,440.29 | 155,272.42 | 0.2% | 40,713.01 | 20,473.84 | 1.989 | 7,132.01 | 0.2% | 0.44 | `PrevectorFillVectorDirectNontrivial` | 3,213.19 | 311,217.35 | 0.7% | 35,373.01 | 10,214.07 | 3.463 | 6,945.00 | 0.2% | 0.43 | `PrevectorFillVectorDirectTrivial` | 34,749.70 | 28,777.23 | 0.1% | 364,396.05 | 110,521.94 | 3.297 | 78,568.37 | 0.1% | 0.43 | `PrevectorFillVectorIndirectNontrivial` | 32,535.05 | 30,736.09 | 0.4% | 353,823.31 | 103,464.53 | 3.420 | 79,871.80 | 0.2% | 0.40 | `PrevectorFillVectorIndirectTrivial` util: prevector's move ctor and move assignment is `noexcept`: | ns/op | op/s | err% | ins/op | cyc/op | IPC | bra/op | miss% | total | benchmark |--------------------:|--------------------:|--------:|----------------:|----------------:|-------:|---------------:|--------:|----------:|:---------- | 6,603.87 | 151,426.40 | 0.2% | 23,734.01 | 21,009.63 | 1.130 | 2,445.01 | 0.3% | 0.44 | `PrevectorFillVectorDirectNontrivial` | 1,980.93 | 504,813.15 | 0.1% | 13,784.00 | 6,304.32 | 2.186 | 2,258.00 | 0.3% | 0.44 | `PrevectorFillVectorDirectTrivial` | 19,110.54 | 52,327.15 | 0.1% | 139,816.41 | 51,987.72 | 2.689 | 28,512.18 | 0.1% | 0.43 | `PrevectorFillVectorIndirectNontrivial` | 12,334.37 | 81,074.27 | 0.7% | 125,655.12 | 39,253.58 | 3.201 | 27,854.46 | 0.2% | 0.44 | `PrevectorFillVectorIndirectTrivial` util: implement prevector's move ctor & move assignment | ns/op | op/s | err% | ins/op | cyc/op | IPC | bra/op | miss% | total | benchmark |--------------------:|--------------------:|--------:|----------------:|----------------:|-------:|---------------:|--------:|----------:|:---------- | 5,262.66 | 190,018.01 | 0.2% | 20,157.01 | 16,745.26 | 1.204 | 2,445.01 | 0.3% | 0.44 | `PrevectorFillVectorDirectNontrivial` | 1,687.07 | 592,744.35 | 0.2% | 12,742.00 | 5,368.02 | 2.374 | 2,258.00 | 0.3% | 0.44 | `PrevectorFillVectorDirectTrivial` | 17,930.80 | 55,769.95 | 0.1% | 136,237.69 | 47,903.31 | 2.844 | 28,512.02 | 0.2% | 0.42 | `PrevectorFillVectorIndirectNontrivial` | 11,893.75 | 84,077.78 | 0.2% | 126,182.02 | 37,852.91 | 3.333 | 28,152.01 | 0.1% | 0.44 | `PrevectorFillVectorIndirectTrivial` As can be seen, mostly thanks to just `noexcept` the benchmark becomes about 2 times faster because `std::vector` can now use move operations instead of having to fall back to copy everything I had a look at how this change affects the other benchmarks, and they are all pretty much the same, the only noticable difference is `CCheckQueueSpeedPrevectorJob` goes from 364.56ns down to 346.21ns. ACKs for top commit: achow101: ACK bfb9291 jonatack: > Tested Approach ACK [bfb9291](bitcoin@bfb9291), ~ACK modulo re-verifying the implementation of the last commit. john-moffett: Approach ACK bfb9291 theStack: Tested and light code-review ACK bfb9291 Tree-SHA512: 242995d7cb2f8ebfa73177aa690a505f189d91edeb8cea3e34a41ca507c8cb17c65fe2a4e196fdafc5c6e89b2b2222627bfc9f5c316517de0857b7b5e9c58225
1 parent 3d33740 commit 3e92f72

File tree

3 files changed

+43
-4
lines changed

3 files changed

+43
-4
lines changed

src/bench/prevector.cpp

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,30 @@ static void PrevectorAssignTo(benchmark::Bench& bench)
107107
});
108108
}
109109

110+
template <typename T>
111+
static void PrevectorFillVectorDirect(benchmark::Bench& bench)
112+
{
113+
bench.run([&] {
114+
std::vector<prevector<28, T>> vec;
115+
for (size_t i = 0; i < 260; ++i) {
116+
vec.emplace_back();
117+
}
118+
});
119+
}
120+
121+
122+
template <typename T>
123+
static void PrevectorFillVectorIndirect(benchmark::Bench& bench)
124+
{
125+
bench.run([&] {
126+
std::vector<prevector<28, T>> vec;
127+
for (size_t i = 0; i < 260; ++i) {
128+
// force allocation
129+
vec.emplace_back(29, T{});
130+
}
131+
});
132+
}
133+
110134
#define PREVECTOR_TEST(name) \
111135
static void Prevector##name##Nontrivial(benchmark::Bench& bench) \
112136
{ \
@@ -126,3 +150,5 @@ PREVECTOR_TEST(Deserialize)
126150

127151
BENCHMARK(PrevectorAssign)
128152
BENCHMARK(PrevectorAssignTo)
153+
PREVECTOR_TEST(FillVectorDirect)
154+
PREVECTOR_TEST(FillVectorIndirect)

src/prevector.h

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,10 @@ class prevector {
286286
fill(item_ptr(0), other.begin(), other.end());
287287
}
288288

289-
prevector(prevector<N, T, Size, Diff>&& other) {
290-
swap(other);
289+
prevector(prevector<N, T, Size, Diff>&& other) noexcept
290+
: _union(std::move(other._union)), _size(other._size)
291+
{
292+
other._size = 0;
291293
}
292294

293295
prevector& operator=(const prevector<N, T, Size, Diff>& other) {
@@ -298,8 +300,13 @@ class prevector {
298300
return *this;
299301
}
300302

301-
prevector& operator=(prevector<N, T, Size, Diff>&& other) {
302-
swap(other);
303+
prevector& operator=(prevector<N, T, Size, Diff>&& other) noexcept {
304+
if (!is_direct()) {
305+
free(_union.indirect_contents.indirect);
306+
}
307+
_union = std::move(other._union);
308+
_size = other._size;
309+
other._size = 0;
303310
return *this;
304311
}
305312

src/validation.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#include <stdint.h>
3939
#include <string>
4040
#include <thread>
41+
#include <type_traits>
4142
#include <utility>
4243
#include <vector>
4344

@@ -337,6 +338,11 @@ class CScriptCheck
337338
ScriptError GetScriptError() const { return error; }
338339
};
339340

341+
// CScriptCheck is used a lot in std::vector, make sure that's efficient
342+
static_assert(std::is_nothrow_move_assignable_v<CScriptCheck>);
343+
static_assert(std::is_nothrow_move_constructible_v<CScriptCheck>);
344+
static_assert(std::is_nothrow_destructible_v<CScriptCheck>);
345+
340346
/** Initializes the script-execution cache */
341347
void InitScriptExecutionCache();
342348

0 commit comments

Comments
 (0)