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

Dispatch on type pairs for end iter

Browse Source
This commit is contained in:
Andrew Noyes
2024-11-01 13:45:41 -07:00
parent c73a3da14c
commit 681a961289
1 changed files with 106 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
ConflictSet.cpp
View File

@@ -4287,11 +4287,8 @@ template <class NodeTFrom, class NodeTTo>
PRESERVE_NONE void prefixIter(Job *, Context *);
template <class NodeTFrom, class NodeTTo>
PRESERVE_NONE void beginIter(Job *, Context *);
template <class NodeT> PRESERVE_NONE void endIter(Job *, Context *);
static Continuation endIterTable[] = {endIter<Node0>, endIter<Node3>,
endIter<Node16>, endIter<Node48>,
endIter<Node256>};
template <class NodeTFrom, class NodeTTo>
PRESERVE_NONE void endIter(Job *, Context *);
template <class NodeTFrom> struct PrefixIterTable {
static constexpr Continuation table[] = {
@@ -4319,6 +4316,19 @@ static constexpr Continuation const *beginIterTable[] = {
BeginIterTable<Node256>::table,
};
template <class NodeTFrom> struct EndIterTable {
static constexpr Continuation table[] = {
endIter<NodeTFrom, Node0>, endIter<NodeTFrom, Node3>,
endIter<NodeTFrom, Node16>, endIter<NodeTFrom, Node48>,
endIter<NodeTFrom, Node256>};
};
static constexpr Continuation const *endIterTable[] = {
EndIterTable<Node0>::table, EndIterTable<Node3>::table,
EndIterTable<Node16>::table, EndIterTable<Node48>::table,
EndIterTable<Node256>::table,
};
template <class NodeTFrom, class NodeTTo>
void prefixIter(Job *job, Context *context) {
assert(NodeTFrom::kType == job->n->getType());
@@ -4358,9 +4368,9 @@ void prefixIter(Job *job, Context *context) {
job->end = job->end.subspan(job->commonPrefixLen,
job->end.size() - job->commonPrefixLen);
if (job->begin.size() == 0) [[unlikely]] {
MUSTTAIL return endIter<NodeTTo>(job, context);
goto gotoEndIter;
} else if (!job->getChildAndIndex(child, job->begin.front())) [[unlikely]] {
MUSTTAIL return endIter<NodeTTo>(job, context);
goto gotoEndIter;
} else {
job->continuation = BeginIterTable<NodeTTo>::table[job->child.getType()];
__builtin_prefetch(job->child);
@@ -4377,7 +4387,7 @@ void prefixIter(Job *job, Context *context) {
__builtin_prefetch(job->child);
MUSTTAIL return keepGoing(job, context);
noNodeOnSearchPath:
noNodeOnSearchPath: {
int prefixLen = job->commonPrefixLen - job->remaining.size();
assert(prefixLen >= 0);
assert(job->n != nullptr);
@@ -4390,6 +4400,22 @@ noNodeOnSearchPath:
MUSTTAIL return complete(job, context);
}
gotoEndIter:
if (!job->getChildAndIndex(child, job->end.front())) [[unlikely]] {
*job->result = {
job->n,
job->begin,
job->n,
job->end,
};
MUSTTAIL return complete(job, context);
} else {
job->continuation = EndIterTable<NodeTTo>::table[job->child.getType()];
__builtin_prefetch(job->child);
MUSTTAIL return keepGoing(job, context);
}
}
template <class NodeTFrom, class NodeTTo>
void beginIter(Job *job, Context *context) {
assert(NodeTFrom::kType == job->n->getType());
@@ -4403,7 +4429,7 @@ void beginIter(Job *job, Context *context) {
int partialKeyIndex =
longestCommonPrefix(child->partialKey(), key.data(), commonLen);
if (partialKeyIndex < child->partialKeyLen) {
MUSTTAIL return endIterTable[job->endNode->getType()](job, context);
goto gotoEndIter;
}
}
@@ -4423,39 +4449,82 @@ void beginIter(Job *job, Context *context) {
}
if (job->begin.size() == 0) [[unlikely]] {
MUSTTAIL return endIterTable[job->endNode->getType()](job, context);
goto gotoEndIter;
}
if (!job->getChildAndIndex(child, job->begin.front())) [[unlikely]] {
MUSTTAIL return endIterTable[job->endNode->getType()](job, context);
goto gotoEndIter;
}
++context->iterations;
job->continuation = BeginIterTable<NodeTTo>::table[job->child.getType()];
__builtin_prefetch(job->child);
MUSTTAIL return keepGoing(job, context);
gotoEndIter:
if (!job->getChildAndIndex(job->endNode, job->end.front())) [[unlikely]] {
*job->result = {
job->n,
job->begin,
job->endNode,
job->end,
};
MUSTTAIL return complete(job, context);
} else {
MUSTTAIL return endIterTable[job->endNode->getType()][job->child.getType()](
job, context);
}
}
template <class NodeT> void endIter(Job *job, Context *context) {
assert(NodeT::kType == job->endNode->getType());
NodeT *endNode = static_cast<NodeT *>(job->endNode);
template <class NodeTFrom, class NodeTTo>
void endIter(Job *job, Context *context) {
assert(NodeTFrom::kType == job->endNode->getType());
NodeTFrom *endNode = static_cast<NodeTFrom *>(job->endNode);
assert(NodeTTo::kType == job->child->getType());
NodeTTo *child = static_cast<NodeTTo *>(job->child);
TaggedNodePointer *child =
getChildUpdatingMaxVersion(endNode, job->end, context->writeVersion);
if (child == nullptr) [[unlikely]] {
*job->result = {job->n, job->begin, job->endNode, job->end};
assert(job->endNode != nullptr);
MUSTTAIL return complete(job, context);
auto key = job->end.subspan(1, job->end.size() - 1);
if (child->partialKeyLen > 0) {
int commonLen = std::min<int>(child->partialKeyLen, key.size());
int partialKeyIndex =
longestCommonPrefix(child->partialKey(), key.data(), commonLen);
if (partialKeyIndex < child->partialKeyLen) {
*job->result = {job->n, job->begin, job->endNode, job->end};
assert(job->endNode != nullptr);
MUSTTAIL return complete(job, context);
}
}
job->endNode = *child;
// child is on the search path. Commit to advancing and updating max version
job->endNode = child;
job->end =
key.subspan(child->partialKeyLen, key.size() - child->partialKeyLen);
if constexpr (std::is_same_v<NodeTFrom, Node3> ||
std::is_same_v<NodeTFrom, Node16>) {
endNode->childMaxVersion[job->childIndex] = context->writeVersion;
} else if constexpr (std::is_same_v<NodeTFrom, Node48> ||
std::is_same_v<NodeTFrom, Node256>) {
endNode->maxOfMax[job->childIndex >> NodeTFrom::kMaxOfMaxShift] = std::max(
endNode->maxOfMax[job->childIndex >> NodeTFrom::kMaxOfMaxShift],
context->writeVersion);
endNode->childMaxVersion[job->childIndex] = context->writeVersion;
}
if (job->end.size() == 0) [[unlikely]] {
*job->result = {job->n, job->begin, job->endNode, job->end};
assert(job->endNode != nullptr);
MUSTTAIL return complete(job, context);
}
if (!job->getChildAndIndex(child, job->end.front())) [[unlikely]] {
*job->result = {job->n, job->begin, job->endNode, job->end};
assert(job->endNode != nullptr);
MUSTTAIL return complete(job, context);
}
++context->iterations;
job->continuation = endIterTable[child->getType()];
__builtin_prefetch(job->endNode);
job->continuation = EndIterTable<NodeTTo>::table[job->child.getType()];
__builtin_prefetch(job->child);
MUSTTAIL return keepGoing(job, context);
}
@@ -4494,16 +4563,23 @@ void Job::init(Context *context, int index) {
} else {
continuation = prefixIterTable[n->getType()][child.getType()];
}
} else if (begin.size() > 0) {
} else if (begin.size() > 0 && getChildAndIndex(n, begin.front())) {
endNode = n;
if (!getChildAndIndex(n, begin.front())) [[unlikely]] {
continuation = endIterTable[n->getType()];
} else {
continuation = beginIterTable[n->getType()][child.getType()];
}
continuation = beginIterTable[n->getType()][child.getType()];
} else {
assert(end.size() > 0);
endNode = n;
continuation = endIterTable[n->getType()];
if (!getChildAndIndex(n, end.front())) [[unlikely]] {
*result = {
n,
begin,
n,
end,
};
continuation = complete;
} else {
continuation = endIterTable[n->getType()][child.getType()];
}
}
return;