blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

BLI: Improve IndexMask::complement() performance #108331

Merged
Hans Goudey merged 15 commits from HooglyBoogly/blender:index-mask-complement-performance into main 2023-05-31 17:11:11 +02:00
Conversation 1 Commits 15 Files Changed 2 +12 -1
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 64d31f1b65 - Show all commits

13
source/blender/blenlib/intern/index_mask.cc
View File

@ -334,6 +334,17 @@ static void range_to_segments(const IndexRange range, Vector<IndexMaskSegment, 1
}
}
static int64_t get_size_before_gap(const Span<int16_t> indices)
{
BLI_assert(indices.size() >= 2);
if (indices[1] > indices[0] + 1) {
HooglyBoogly marked this conversation as resolved Outdated
Jacques Lucke commented 2023-05-27 08:26:15 +02:00
Outdated
Review
Copy Link

r_segments

`r_segments`
/* For sparse indices, often the next gap is just after the next index.
* In this case we can skip the logarithmic check below.*/
return 1;
}
return unique_sorted_indices::find_size_of_next_range(indices);
}
static void inverted_indices_to_segments(const IndexMaskSegment segment,
LinearAllocator<> &allocator,
Vector<IndexMaskSegment, 16> &r_segments)
@ -362,7 +373,7 @@ static void inverted_indices_to_segments(const IndexMaskSegment segment,
Span<int16_t> indices = segment.base_span();
while (indices.size() > 1) {
const int64_t size_before_gap = unique_sorted_indices::find_size_of_next_range(indices);
const int64_t size_before_gap = get_size_before_gap(indices);
if (size_before_gap == indices.size()) {
break;
HooglyBoogly marked this conversation as resolved
Jacques Lucke commented 2023-05-27 08:30:20 +02:00
Review
Copy Link

Add indices "at once" instead of one by one. Essentially increasing inverted_indices_count only once.

Add indices "at once" instead of one by one. Essentially increasing ` inverted_indices_count` only once.
Hans Goudey commented 2023-05-30 23:10:19 +02:00
Review
Copy Link

This didn't seem to change the performance, but I did it anyway just in case, it is a bit clearer

This didn't seem to change the performance, but I did it anyway just in case, it is a bit clearer
}