weaselab/conflict-set
2
0
Fork 0
Code Issues 4 Packages Releases 13 Activity

Vectorize inner page check for Node256

Browse Source
This commit is contained in:
Andrew Noyes
2024-06-27 17:09:45 -07:00
parent 639518bed4
commit c065b185ae
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ConflictSet.cpp
View File

@@ -313,7 +313,7 @@ struct Node256 : Node {
BitSet bitSet; BitSet bitSet;
Node *children[256]; Node *children[256];
int64_t childMaxVersion[256]; int64_t childMaxVersion[256];
constexpr static int kMaxOfMaxPageSize = 8; constexpr static int kMaxOfMaxPageSize = 16;
constexpr static int kMaxOfMaxShift = constexpr static int kMaxOfMaxShift =
std::countr_zero(uint32_t(kMaxOfMaxPageSize)); std::countr_zero(uint32_t(kMaxOfMaxPageSize));
constexpr static int kMaxOfMaxTotalPages = 256 / kMaxOfMaxPageSize; constexpr static int kMaxOfMaxTotalPages = 256 / kMaxOfMaxPageSize;
@@ -1843,13 +1843,17 @@ bool checkMaxBetweenExclusive(Node *n, int begin, int end,
return result; return result;
} }
} }
// Check inner pages uint64_t conflict = 0;
bool result = true; // Check all pages
for (int i = (begin >> Node256::kMaxOfMaxShift) + 1; for (int i = 0; i < Node256::kMaxOfMaxTotalPages; ++i) {
i < ((end - 1) >> Node256::kMaxOfMaxShift); ++i) { conflict |= (self->maxOfMax[i] > readVersion) << i;
result &= self->maxOfMax[i] <= readVersion;
} }
return result; // Only keep inner pages
const int pageBegin = (begin >> Node256::kMaxOfMaxShift) + 1;
const int pageEnd = (end - 1) >> Node256::kMaxOfMaxShift;
conflict &= (1 << pageEnd) - 1;
conflict >>= pageBegin;
return !conflict;
} }
default: // GCOVR_EXCL_LINE default: // GCOVR_EXCL_LINE
__builtin_unreachable(); // GCOVR_EXCL_LINE __builtin_unreachable(); // GCOVR_EXCL_LINE