highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-03-01 02:29:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

clusterlin: track suboptimal chunks (optimization)

Browse Source 
This avoids adding them a second time to m_suboptimal_chunks when they
happen to already be there.
This commit is contained in:
Pieter Wuille
2025-10-15 21:35:58 -04:00
committed by Pieter Wuille
parent 63b06d5523
commit 1daa600c1c
2 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/cluster_linearize.h
View File

@@ -682,6 +682,10 @@ private:
/** The set of all chunk SetIdx's. This excludes the SetIdxs that refer to active
* dependencies' tops. */
SetType m_chunk_idxs;
/** The set of all SetIdx's that appear in m_suboptimal_chunks. Note that they do not need to
* be chunks: some of these sets may have been converted to a dependency's top set since being
* added to m_suboptimal_chunks. */
SetType m_suboptimal_idxs;
/** Information about each transaction (and chunks). Keeps the "holes" from DepGraph during
* construction. Indexed by TxIdx. */
std::vector<TxData> m_tx_data;
@@ -979,8 +983,11 @@ private:
if (merged_chunk_idx == INVALID_SET_IDX) break;
chunk_idx = merged_chunk_idx;
}
// Add the chunk to the queue of improvable chunks.
m_suboptimal_chunks.push_back(chunk_idx);
// Add the chunk to the queue of improvable chunks, if it wasn't already there.
if (!m_suboptimal_idxs[chunk_idx]) {
m_suboptimal_idxs.Set(chunk_idx);
m_suboptimal_chunks.push_back(chunk_idx);
}
}
/** Split a chunk, and then merge the resulting two chunks to make the graph topological
@@ -1007,7 +1014,10 @@ private:
// on the child chunk, so child_chunk_idx is the "top" and parent_chunk_idx is the
// "bottom" for MergeChunks.
auto merged_chunk_idx = MergeChunks(child_chunk_idx, parent_chunk_idx);
m_suboptimal_chunks.push_back(merged_chunk_idx);
if (!m_suboptimal_idxs[merged_chunk_idx]) {
m_suboptimal_idxs.Set(merged_chunk_idx);
m_suboptimal_chunks.push_back(merged_chunk_idx);
}
} else {
// Merge the top chunk with lower-feerate chunks it depends on.
MergeSequence<false>(parent_chunk_idx);
@@ -1022,6 +1032,8 @@ private:
while (!m_suboptimal_chunks.empty()) {
// Pop an entry from the potentially-suboptimal chunk queue.
SetIdx chunk_idx = m_suboptimal_chunks.front();
Assume(m_suboptimal_idxs[chunk_idx]);
m_suboptimal_idxs.Reset(chunk_idx);
m_suboptimal_chunks.pop_front();
if (m_chunk_idxs[chunk_idx]) return chunk_idx;
// If what was popped is not currently a chunk, continue. This may
@@ -1117,6 +1129,7 @@ public:
void MakeTopological() noexcept
{
Assume(m_suboptimal_chunks.empty());
m_suboptimal_idxs = m_chunk_idxs;
for (auto chunk_idx : m_chunk_idxs) {
m_suboptimal_chunks.emplace_back(chunk_idx);
// Randomize the initial order of suboptimal chunks in the queue.
@@ -1129,6 +1142,8 @@ public:
// Pop an entry from the potentially-suboptimal chunk queue.
SetIdx chunk_idx = m_suboptimal_chunks.front();
m_suboptimal_chunks.pop_front();
Assume(m_suboptimal_idxs[chunk_idx]);
m_suboptimal_idxs.Reset(chunk_idx);
// If what was popped is not currently a chunk, continue. This may
// happen when it was merged with something else since being added.
if (!m_chunk_idxs[chunk_idx]) continue;
@@ -1138,14 +1153,20 @@ public:
// Attempt to merge the chunk upwards.
auto result_up = MergeStep<false>(chunk_idx);
if (result_up != INVALID_SET_IDX) {
m_suboptimal_chunks.push_back(result_up);
if (!m_suboptimal_idxs[result_up]) {
m_suboptimal_idxs.Set(result_up);
m_suboptimal_chunks.push_back(result_up);
}
break;
}
} else {
// Attempt to merge the chunk downwards.
auto result_down = MergeStep<true>(chunk_idx);
if (result_down != INVALID_SET_IDX) {
m_suboptimal_chunks.push_back(result_down);
if (!m_suboptimal_idxs[result_down]) {
m_suboptimal_idxs.Set(result_down);
m_suboptimal_chunks.push_back(result_down);
}
break;
}
}
@@ -1158,6 +1179,7 @@ public:
{
Assume(m_suboptimal_chunks.empty());
// Mark chunks suboptimal.
m_suboptimal_idxs = m_chunk_idxs;
for (auto chunk_idx : m_chunk_idxs) {
m_suboptimal_chunks.push_back(chunk_idx);
// Randomize the initial order of suboptimal chunks in the queue.
@@ -1603,10 +1625,13 @@ public:
//
// Verify m_suboptimal_chunks.
//
SetType suboptimal_idxs;
for (size_t i = 0; i < m_suboptimal_chunks.size(); ++i) {
auto chunk_idx = m_suboptimal_chunks[i];
assert(chunk_idx < m_set_info.size());
assert(!suboptimal_idxs[chunk_idx]);
suboptimal_idxs.Set(chunk_idx);
}
assert(m_suboptimal_idxs == suboptimal_idxs);
//
// Verify m_nonminimal_chunks.

10
src/test/util/cluster_linearize.h
View File

@@ -403,13 +403,13 @@ inline uint64_t MaxOptimalLinearizationIters(DepGraphIndex cluster_count)
static constexpr uint64_t ITERS[65] = {
0,
0, 4, 10, 34, 76, 156, 229, 380,
432, 517, 678, 896, 1037, 1366, 1479, 1711,
432, 517, 678, 896, 1037, 1366, 1464, 1792,
2060, 2542, 3068, 3116, 4029, 3467, 5324, 5512,
6481, 7161, 7441, 8183, 8843, 9353, 11104, 11269,
12354, 11871, 13367, 14259, 14229, 12397, 13581, 17774,
18737, 16581, 23217, 24044, 29597, 28879, 34069, 34162,
36028, 26227, 34471, 37212, 40814, 29554, 40305, 34019,
36582, 55659, 39994, 41277, 42365, 52822, 60151, 67035
11791, 11871, 13367, 14259, 14229, 12397, 13581, 18152,
18737, 16581, 23217, 24044, 29597, 29030, 34069, 34594,
33630, 26227, 34471, 38815, 40814, 31182, 40305, 34019,
36582, 55659, 39994, 41277, 42365, 52822, 59733, 67035
};
assert(cluster_count < std::size(ITERS));
// Multiply the table number by two, to account for the fact that they are not absolutes.