weaselbot/conflict-set
1
Fork 0
forked from weaselab/conflict-set
Code Pull Requests Activity

Make insert_iterations for interleaved writes more closely match

Browse Source
This commit is contained in:
andrew
2024-11-04 14:46:30 -08:00
parent f079d84bda
commit 4494359ca2
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ConflictSet.cpp
+8 -4
View File
@@ -4087,12 +4087,13 @@ void pointIter(Job *job, Context *context) {
MUSTTAIL return complete(job, context); MUSTTAIL return complete(job, context);
} }
++context->iterations;
if (!job->getChildAndIndex(child, job->remaining.front())) [[unlikely]] { if (!job->getChildAndIndex(child, job->remaining.front())) [[unlikely]] {
*job->result = {job->n, job->remaining}; *job->result = {job->n, job->remaining};
MUSTTAIL return complete(job, context); MUSTTAIL return complete(job, context);
} }
++context->iterations;
job->continuation = PointIterTable<NodeTTo>::table[job->child.getType()]; job->continuation = PointIterTable<NodeTTo>::table[job->child.getType()];
__builtin_prefetch(job->child); __builtin_prefetch(job->child);
MUSTTAIL return keepGoing(job, context); MUSTTAIL return keepGoing(job, context);
@@ -4193,11 +4194,12 @@ void prefixIter(Job *job, Context *context) {
} }
} }
++context->iterations;
if (!job->getChildAndIndex(child, job->remaining.front())) [[unlikely]] { if (!job->getChildAndIndex(child, job->remaining.front())) [[unlikely]] {
goto noNodeOnSearchPath; goto noNodeOnSearchPath;
} }
++context->iterations;
job->continuation = PrefixIterTable<NodeTTo>::table[job->child.getType()]; job->continuation = PrefixIterTable<NodeTTo>::table[job->child.getType()];
__builtin_prefetch(job->child); __builtin_prefetch(job->child);
MUSTTAIL return keepGoing(job, context); MUSTTAIL return keepGoing(job, context);
@@ -4267,11 +4269,12 @@ void beginIter(Job *job, Context *context) {
goto gotoEndIter; goto gotoEndIter;
} }
++context->iterations;
if (!job->getChildAndIndex(child, job->begin.front())) [[unlikely]] { if (!job->getChildAndIndex(child, job->begin.front())) [[unlikely]] {
goto gotoEndIter; goto gotoEndIter;
} }
++context->iterations;
job->continuation = BeginIterTable<NodeTTo>::table[job->child.getType()]; job->continuation = BeginIterTable<NodeTTo>::table[job->child.getType()];
__builtin_prefetch(job->child); __builtin_prefetch(job->child);
MUSTTAIL return keepGoing(job, context); MUSTTAIL return keepGoing(job, context);
@@ -4331,13 +4334,14 @@ void endIter(Job *job, Context *context) {
MUSTTAIL return complete(job, context); MUSTTAIL return complete(job, context);
} }
++context->iterations;
if (!job->getChildAndIndex(child, job->end.front())) [[unlikely]] { if (!job->getChildAndIndex(child, job->end.front())) [[unlikely]] {
*job->result = {job->n, job->begin, job->endNode, job->end}; *job->result = {job->n, job->begin, job->endNode, job->end};
assert(job->endNode != nullptr); assert(job->endNode != nullptr);
MUSTTAIL return complete(job, context); MUSTTAIL return complete(job, context);
} }
++context->iterations;
job->continuation = EndIterTable<NodeTTo>::table[job->child.getType()]; job->continuation = EndIterTable<NodeTTo>::table[job->child.getType()];
__builtin_prefetch(job->child); __builtin_prefetch(job->child);
MUSTTAIL return keepGoing(job, context); MUSTTAIL return keepGoing(job, context);