blender
/
blender
128
395
Fork 567
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Attribute Math: Improve performance of mixer in some cases 

The `DefaultMixer` for mixing generic data types has some issues:
1. The full buffer is always zeroed, even if only some is used.
2. Finalizing also works on all values, even if only some are used.
3. "mixing" doesn't allow setting the first value, requiring that
everything is cleared beforehand.

This commit adds the following functionality:
1. Constructor with the specified `IndexMask` for preliminary zeroing.
2. `set` method to overwrite the value.
3. `finalize` with the specified mask to process a subset of values.

This is useful in situations where you want to use the
DefaultMixer without having to overwrite all the values many times.

A performance improvement was observed for NURBS curve evaluation and
attribute interpolation from the point to curve domain of about 15% and
35% respectively (100,000 curves).

Differential Revision: https://developer.blender.org/D15434
This commit is contained in:
Iliay Katueshenock 2022-08-03 10:17:36 -05:00 committed by Hans Goudey
parent 144027d70f
commit 55a332da64
5 changed files with 181 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
source/blender/blenkernel/BKE_attribute_math.hh
View File

@ -188,10 +188,28 @@ template<typename T> class SimpleMixer {
* \param default_value: Output value for an element that has not been affected by a #mix_in.
*/
SimpleMixer(MutableSpan<T> buffer, T default_value = {})
: SimpleMixer(buffer, buffer.index_range(), default_value)
{
}
/**
* \param mask: Only initialize these indices. Other indices in the buffer will be invalid.
*/
SimpleMixer(MutableSpan<T> buffer, const IndexMask mask, T default_value = {})
: buffer_(buffer), default_value_(default_value), total_weights_(buffer.size(), 0.0f)
{
BLI_STATIC_ASSERT(std::is_trivial_v<T>, "");
memset(buffer_.data(), 0, sizeof(T) * buffer_.size());
mask.foreach_index([&](const int64_t i) { buffer_[i] = default_value_; });
}
/**
* Set a #value into the element with the given #index.
*/
void set(const int64_t index, const T &value, const float weight = 1.0f)
{
BLI_assert(weight >= 0.0f);
buffer_[index] = value * weight;
total_weights_[index] = weight;
}
/**
@ -209,7 +227,12 @@ template<typename T> class SimpleMixer {
*/
void finalize()
{
for (const int64_t i : buffer_.index_range()) {
this->finalize(IndexMask(buffer_.size()));
}
void finalize(const IndexMask mask)
{
mask.foreach_index([&](const int64_t i) {
const float weight = total_weights_[i];
if (weight > 0.0f) {
buffer_[i] *= 1.0f / weight;
@ -217,7 +240,7 @@ template<typename T> class SimpleMixer {
else {
buffer_[i] = default_value_;
}
}
});
}
};
@ -237,9 +260,25 @@ class BooleanPropagationMixer {
/**
* \param buffer: Span where the interpolated values should be stored.
*/
BooleanPropagationMixer(MutableSpan<bool> buffer) : buffer_(buffer)
BooleanPropagationMixer(MutableSpan<bool> buffer)
: BooleanPropagationMixer(buffer, buffer.index_range())
{
buffer_.fill(false);
}
/**
* \param mask: Only initialize these indices. Other indices in the buffer will be invalid.
*/
BooleanPropagationMixer(MutableSpan<bool> buffer, const IndexMask mask) : buffer_(buffer)
{
mask.foreach_index([&](const int64_t i) { buffer_[i] = false; });
}
/**
* Set a #value into the element with the given #index.
*/
void set(const int64_t index, const bool value, [[maybe_unused]] const float weight = 1.0f)
{
buffer_[index] = value;
}
/**
@ -256,6 +295,10 @@ class BooleanPropagationMixer {
void finalize()
{
}
void finalize(const IndexMask /*mask*/)
{
}
};
/**
@ -277,8 +320,27 @@ class SimpleMixerWithAccumulationType {
public:
SimpleMixerWithAccumulationType(MutableSpan<T> buffer, T default_value = {})
: SimpleMixerWithAccumulationType(buffer, buffer.index_range(), default_value)
{
}
/**
* \param mask: Only initialize these indices. Other indices in the buffer will be invalid.
*/
SimpleMixerWithAccumulationType(MutableSpan<T> buffer,
const IndexMask mask,
T default_value = {})
: buffer_(buffer), default_value_(default_value), accumulation_buffer_(buffer.size())
{
mask.foreach_index([&](const int64_t index) { buffer_[index] = default_value_; });
}
void set(const int64_t index, const T &value, const float weight = 1.0f)
{
const AccumulationT converted_value = static_cast<AccumulationT>(value);
Item &item = accumulation_buffer_[index];
item.value = converted_value * weight;
item.weight = weight;
}
void mix_in(const int64_t index, const T &value, const float weight = 1.0f)
@ -291,7 +353,12 @@ class SimpleMixerWithAccumulationType {
void finalize()
{
for (const int64_t i : buffer_.index_range()) {
this->finalize(buffer_.index_range());
}
void finalize(const IndexMask mask)
{
mask.foreach_index([&](const int64_t i) {
const Item &item = accumulation_buffer_[i];
if (item.weight > 0.0f) {
const float weight_inv = 1.0f / item.weight;
@ -301,7 +368,7 @@ class SimpleMixerWithAccumulationType {
else {
buffer_[i] = default_value_;
}
}
});
}
};
@ -314,8 +381,16 @@ class ColorGeometry4fMixer {
public:
ColorGeometry4fMixer(MutableSpan<ColorGeometry4f> buffer,
ColorGeometry4f default_color = ColorGeometry4f(0.0f, 0.0f, 0.0f, 1.0f));
/**
* \param mask: Only initialize these indices. Other indices in the buffer will be invalid.
*/
ColorGeometry4fMixer(MutableSpan<ColorGeometry4f> buffer,
IndexMask mask,
ColorGeometry4f default_color = ColorGeometry4f(0.0f, 0.0f, 0.0f, 1.0f));
void set(int64_t index, const ColorGeometry4f &color, float weight = 1.0f);
void mix_in(int64_t index, const ColorGeometry4f &color, float weight = 1.0f);
void finalize();
void finalize(IndexMask mask);
};
class ColorGeometry4bMixer {
@ -328,8 +403,16 @@ class ColorGeometry4bMixer {
public:
ColorGeometry4bMixer(MutableSpan<ColorGeometry4b> buffer,
ColorGeometry4b default_color = ColorGeometry4b(0, 0, 0, 255));
/**
* \param mask: Only initialize these indices. Other indices in the buffer will be invalid.
*/
ColorGeometry4bMixer(MutableSpan<ColorGeometry4b> buffer,
IndexMask mask,
ColorGeometry4b default_color = ColorGeometry4b(0, 0, 0, 255));
void set(int64_t index, const ColorGeometry4b &color, float weight = 1.0f);
void mix_in(int64_t index, const ColorGeometry4b &color, float weight = 1.0f);
void finalize();
void finalize(IndexMask mask);
};
template<typename T> struct DefaultMixerStruct {

69
source/blender/blenkernel/intern/attribute_math.cc
View File

@ -4,13 +4,31 @@
namespace blender::attribute_math {
ColorGeometry4fMixer::ColorGeometry4fMixer(MutableSpan<ColorGeometry4f> output_buffer,
ColorGeometry4fMixer::ColorGeometry4fMixer(MutableSpan<ColorGeometry4f> buffer,
ColorGeometry4f default_color)
: buffer_(output_buffer),
default_color_(default_color),
total_weights_(output_buffer.size(), 0.0f)
: ColorGeometry4fMixer(buffer, buffer.index_range(), default_color)
{
buffer_.fill(ColorGeometry4f(0.0f, 0.0f, 0.0f, 0.0f));
}
ColorGeometry4fMixer::ColorGeometry4fMixer(MutableSpan<ColorGeometry4f> buffer,
const IndexMask mask,
const ColorGeometry4f default_color)
: buffer_(buffer), default_color_(default_color), total_weights_(buffer.size(), 0.0f)
{
const ColorGeometry4f zero{0.0f, 0.0f, 0.0f, 0.0f};
mask.foreach_index([&](const int64_t i) { buffer_[i] = zero; });
}
void ColorGeometry4fMixer::set(const int64_t index,
const ColorGeometry4f &color,
const float weight)
{
BLI_assert(weight >= 0.0f);
buffer_[index].r = color.r * weight;
buffer_[index].g = color.g * weight;
buffer_[index].b = color.b * weight;
buffer_[index].a = color.a * weight;
total_weights_[index] = weight;
}
void ColorGeometry4fMixer::mix_in(const int64_t index,
@ -28,7 +46,12 @@ void ColorGeometry4fMixer::mix_in(const int64_t index,
void ColorGeometry4fMixer::finalize()
{
for (const int64_t i : buffer_.index_range()) {
this->finalize(buffer_.index_range());
}
void ColorGeometry4fMixer::finalize(const IndexMask mask)
{
mask.foreach_index([&](const int64_t i) {
const float weight = total_weights_[i];
ColorGeometry4f &output_color = buffer_[i];
if (weight > 0.0f) {
@ -41,16 +64,37 @@ void ColorGeometry4fMixer::finalize()
else {
output_color = default_color_;
}
}
});
}
ColorGeometry4bMixer::ColorGeometry4bMixer(MutableSpan<ColorGeometry4b> buffer,
ColorGeometry4b default_color)
const ColorGeometry4b default_color)
: ColorGeometry4bMixer(buffer, buffer.index_range(), default_color)
{
}
ColorGeometry4bMixer::ColorGeometry4bMixer(MutableSpan<ColorGeometry4b> buffer,
const IndexMask mask,
const ColorGeometry4b default_color)
: buffer_(buffer),
default_color_(default_color),
total_weights_(buffer.size(), 0.0f),
accumulation_buffer_(buffer.size(), float4(0, 0, 0, 0))
{
const ColorGeometry4b zero{0, 0, 0, 0};
mask.foreach_index([&](const int64_t i) { buffer_[i] = zero; });
}
void ColorGeometry4bMixer::ColorGeometry4bMixer::set(int64_t index,
const ColorGeometry4b &color,
const float weight)
{
BLI_assert(weight >= 0.0f);
accumulation_buffer_[index][0] = color.r * weight;
accumulation_buffer_[index][1] = color.g * weight;
accumulation_buffer_[index][2] = color.b * weight;
accumulation_buffer_[index][3] = color.a * weight;
total_weights_[index] = weight;
}
void ColorGeometry4bMixer::mix_in(int64_t index, const ColorGeometry4b &color, float weight)
@ -66,7 +110,12 @@ void ColorGeometry4bMixer::mix_in(int64_t index, const ColorGeometry4b &color, f
void ColorGeometry4bMixer::finalize()
{
for (const int64_t i : buffer_.index_range()) {
this->finalize(buffer_.index_range());
}
void ColorGeometry4bMixer::finalize(const IndexMask mask)
{
mask.foreach_index([&](const int64_t i) {
const float weight = total_weights_[i];
const float4 &accum_value = accumulation_buffer_[i];
ColorGeometry4b &output_color = buffer_[i];
@ -80,7 +129,7 @@ void ColorGeometry4bMixer::finalize()
else {
output_color = default_color_;
}
}
});
}
} // namespace blender::attribute_math

40
source/blender/blenkernel/intern/curve_nurbs.cc
View File

@ -4,8 +4,9 @@
* \ingroup bke
*/
#include "BKE_attribute_math.hh"
#include "BLI_task.hh"
#include "BKE_attribute_math.hh"
#include "BKE_curves.hh"
namespace blender::bke::curves::nurbs {
@ -192,16 +193,16 @@ static void interpolate_to_evaluated(const BasisCache &basis_cache,
{
attribute_math::DefaultMixer<T> mixer{dst};
for (const int i : dst.index_range()) {
Span<float> point_weights = basis_cache.weights.as_span().slice(i * order, order);
for (const int j : point_weights.index_range()) {
const int point_index = (basis_cache.start_indices[i] + j) % src.size();
mixer.mix_in(i, src[point_index], point_weights[j]);
threading::parallel_for(dst.index_range(), 128, [&](const IndexRange range) {
for (const int i : range) {
Span<float> point_weights = basis_cache.weights.as_span().slice(i * order, order);
for (const int j : point_weights.index_range()) {
const int point_index = (basis_cache.start_indices[i] + j) % src.size();
mixer.mix_in(i, src[point_index], point_weights[j]);
}
}
}
mixer.finalize();
mixer.finalize(range);
});
}
template<typename T>
@ -213,17 +214,18 @@ static void interpolate_to_evaluated_rational(const BasisCache &basis_cache,
{
attribute_math::DefaultMixer<T> mixer{dst};
for (const int i : dst.index_range()) {
Span<float> point_weights = basis_cache.weights.as_span().slice(i * order, order);
threading::parallel_for(dst.index_range(), 128, [&](const IndexRange range) {
for (const int i : range) {
Span<float> point_weights = basis_cache.weights.as_span().slice(i * order, order);
for (const int j : point_weights.index_range()) {
const int point_index = (basis_cache.start_indices[i] + j) % src.size();
const float weight = point_weights[j] * control_weights[point_index];
mixer.mix_in(i, src[point_index], weight);
for (const int j : point_weights.index_range()) {
const int point_index = (basis_cache.start_indices[i] + j) % src.size();
const float weight = point_weights[j] * control_weights[point_index];
mixer.mix_in(i, src[point_index], weight);
}
}
}
mixer.finalize();
mixer.finalize(range);
});
}
void interpolate_to_evaluated(const BasisCache &basis_cache,

14
source/blender/blenkernel/intern/curves_geometry.cc
View File

@ -13,6 +13,7 @@
#include "BLI_index_mask_ops.hh"
#include "BLI_length_parameterize.hh"
#include "BLI_math_rotation.hh"
#include "BLI_task.hh"
#include "DNA_curves_types.h"
@ -1467,12 +1468,15 @@ static void adapt_curve_domain_point_to_curve_impl(const CurvesGeometry &curves,
MutableSpan<T> r_values)
{
attribute_math::DefaultMixer<T> mixer(r_values);
for (const int i_curve : IndexRange(curves.curves_num())) {
for (const int i_point : curves.points_for_curve(i_curve)) {
mixer.mix_in(i_curve, old_values[i_point]);
threading::parallel_for(curves.curves_range(), 128, [&](const IndexRange range) {
for (const int i_curve : range) {
for (const int i_point : curves.points_for_curve(i_curve)) {
mixer.mix_in(i_curve, old_values[i_point]);
}
}
}
mixer.finalize();
mixer.finalize(range);
});
}
/**

3
source/blender/geometry/intern/add_curves_on_mesh.cc
View File

@ -1,6 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "BLI_length_parameterize.hh"
#include "BLI_task.hh"
#include "BKE_attribute_math.hh"
#include "BKE_mesh_sample.hh"
@ -102,8 +103,8 @@ void interpolate_from_neighbors(const Span<NeighborCurves> neighbors_per_curve,
}
}
}
mixer.finalize(range);
});
mixer.finalize();
}
static void interpolate_position_without_interpolation(