[Bf-blender-cvs] [01b6c4b32bf] master: Functions: make multi functions smaller and cheaper to construct in many cases
Jacques Lucke
noreply at git.blender.org
Mon Mar 22 12:01:18 CET 2021
Commit: 01b6c4b32bf0aa3f2add0d4d51de9f777cf5c51c
Author: Jacques Lucke
Date: Mon Mar 22 11:57:24 2021 +0100
Branches: master
https://developer.blender.org/rB01b6c4b32bf0aa3f2add0d4d51de9f777cf5c51c
Functions: make multi functions smaller and cheaper to construct in many cases
Previously, the signature of a `MultiFunction` was always embedded into the function.
There are two issues with that. First, `MFSignature` is relatively large, because it contains
multiple strings and vectors. Secondly, constructing it can add overhead that should not
be necessary, because often the same signature can be reused.
The solution is to only keep a pointer to a signature in `MultiFunction` that is set during
construction. Child classes are responsible for making sure that the signature lives
long enough. In most cases, the signature is either embedded into the child class or
it is allocated statically (and is only created once).
===================================================================
M source/blender/functions/FN_multi_function.hh
M source/blender/functions/FN_multi_function_builder.hh
M source/blender/functions/FN_multi_function_network_evaluation.hh
M source/blender/functions/FN_multi_function_signature.hh
M source/blender/functions/intern/multi_function.cc
M source/blender/functions/intern/multi_function_builder.cc
M source/blender/functions/intern/multi_function_network_evaluation.cc
M source/blender/functions/tests/FN_multi_function_network_test.cc
M source/blender/functions/tests/FN_multi_function_test.cc
M source/blender/nodes/function/nodes/node_fn_object_transforms.cc
M source/blender/nodes/function/nodes/node_fn_random_float.cc
M source/blender/nodes/intern/node_socket.cc
M source/blender/nodes/shader/nodes/node_shader_map_range.cc
M source/blender/nodes/shader/nodes/node_shader_sepcombRGB.cc
M source/blender/nodes/shader/nodes/node_shader_sepcombXYZ.cc
M source/blender/nodes/shader/nodes/node_shader_valToRgb.cc
===================================================================
diff --git a/source/blender/functions/FN_multi_function.hh b/source/blender/functions/FN_multi_function.hh
index d8924b3cf23..2ce65426245 100644
--- a/source/blender/functions/FN_multi_function.hh
+++ b/source/blender/functions/FN_multi_function.hh
@@ -53,7 +53,7 @@ namespace blender::fn {
class MultiFunction {
private:
- MFSignature signature_;
+ const MFSignature *signature_ref_ = nullptr;
public:
virtual ~MultiFunction()
@@ -74,44 +74,50 @@ class MultiFunction {
int param_amount() const
{
- return signature_.param_types.size();
+ return signature_ref_->param_types.size();
}
IndexRange param_indices() const
{
- return signature_.param_types.index_range();
+ return signature_ref_->param_types.index_range();
}
MFParamType param_type(int param_index) const
{
- return signature_.param_types[param_index];
+ return signature_ref_->param_types[param_index];
}
StringRefNull param_name(int param_index) const
{
- return signature_.param_names[param_index];
+ return signature_ref_->param_names[param_index];
}
StringRefNull name() const
{
- return signature_.function_name;
+ return signature_ref_->function_name;
}
bool depends_on_context() const
{
- return signature_.depends_on_context;
+ return signature_ref_->depends_on_context;
}
const MFSignature &signature() const
{
- return signature_;
+ BLI_assert(signature_ref_ != nullptr);
+ return *signature_ref_;
}
protected:
- MFSignatureBuilder get_builder(std::string function_name)
+ /* Make the function use the given signature. This should be called once in the constructor of
+ * child classes. No copy of the signature is made, so the caller has to make sure that the
+ * signature lives as long as the multi function. It is ok to embed the signature into the child
+ * class. */
+ void set_signature(const MFSignature *signature)
{
- signature_.function_name = std::move(function_name);
- return MFSignatureBuilder(signature_);
+ /* Take a pointer as argument, so that it is more obvious that no copy is created. */
+ BLI_assert(signature != nullptr);
+ signature_ref_ = signature;
}
};
diff --git a/source/blender/functions/FN_multi_function_builder.hh b/source/blender/functions/FN_multi_function_builder.hh
index b73c41d3f59..389d0b14bb5 100644
--- a/source/blender/functions/FN_multi_function_builder.hh
+++ b/source/blender/functions/FN_multi_function_builder.hh
@@ -40,13 +40,16 @@ template<typename In1, typename Out1> class CustomMF_SI_SO : public MultiFunctio
private:
using FunctionT = std::function<void(IndexMask, const VArray<In1> &, MutableSpan<Out1>)>;
FunctionT function_;
+ MFSignature signature_;
public:
CustomMF_SI_SO(StringRef name, FunctionT function) : function_(std::move(function))
{
- MFSignatureBuilder signature = this->get_builder(name);
+ MFSignatureBuilder signature{name};
signature.single_input<In1>("In1");
signature.single_output<Out1>("Out1");
+ signature_ = signature.build();
+ this->set_signature(&signature_);
}
template<typename ElementFuncT>
@@ -83,14 +86,17 @@ class CustomMF_SI_SI_SO : public MultiFunction {
using FunctionT =
std::function<void(IndexMask, const VArray<In1> &, const VArray<In2> &, MutableSpan<Out1>)>;
FunctionT function_;
+ MFSignature signature_;
public:
CustomMF_SI_SI_SO(StringRef name, FunctionT function) : function_(std::move(function))
{
- MFSignatureBuilder signature = this->get_builder(name);
+ MFSignatureBuilder signature{name};
signature.single_input<In1>("In1");
signature.single_input<In2>("In2");
signature.single_output<Out1>("Out1");
+ signature_ = signature.build();
+ this->set_signature(&signature_);
}
template<typename ElementFuncT>
@@ -135,15 +141,18 @@ class CustomMF_SI_SI_SI_SO : public MultiFunction {
const VArray<In3> &,
MutableSpan<Out1>)>;
FunctionT function_;
+ MFSignature signature_;
public:
CustomMF_SI_SI_SI_SO(StringRef name, FunctionT function) : function_(std::move(function))
{
- MFSignatureBuilder signature = this->get_builder(name);
+ MFSignatureBuilder signature{name};
signature.single_input<In1>("In1");
signature.single_input<In2>("In2");
signature.single_input<In3>("In3");
signature.single_output<Out1>("Out1");
+ signature_ = signature.build();
+ this->set_signature(&signature_);
}
template<typename ElementFuncT>
@@ -193,16 +202,19 @@ class CustomMF_SI_SI_SI_SI_SO : public MultiFunction {
const VArray<In4> &,
MutableSpan<Out1>)>;
FunctionT function_;
+ MFSignature signature_;
public:
CustomMF_SI_SI_SI_SI_SO(StringRef name, FunctionT function) : function_(std::move(function))
{
- MFSignatureBuilder signature = this->get_builder(name);
+ MFSignatureBuilder signature{name};
signature.single_input<In1>("In1");
signature.single_input<In2>("In2");
signature.single_input<In3>("In3");
signature.single_input<In4>("In4");
signature.single_output<Out1>("Out1");
+ signature_ = signature.build();
+ this->set_signature(&signature_);
}
template<typename ElementFuncT>
@@ -244,12 +256,15 @@ template<typename Mut1> class CustomMF_SM : public MultiFunction {
private:
using FunctionT = std::function<void(IndexMask, MutableSpan<Mut1>)>;
FunctionT function_;
+ MFSignature signature_;
public:
CustomMF_SM(StringRef name, FunctionT function) : function_(std::move(function))
{
- MFSignatureBuilder signature = this->get_builder(name);
+ MFSignatureBuilder signature{name};
signature.single_mutable<Mut1>("Mut1");
+ signature_ = signature.build();
+ this->set_signature(&signature_);
}
template<typename ElementFuncT>
@@ -278,11 +293,18 @@ template<typename Mut1> class CustomMF_SM : public MultiFunction {
template<typename From, typename To> class CustomMF_Convert : public MultiFunction {
public:
CustomMF_Convert()
+ {
+ static MFSignature signature = create_signature();
+ this->set_signature(&signature);
+ }
+
+ static MFSignature create_signature()
{
std::string name = CPPType::get<From>().name() + " to " + CPPType::get<To>().name();
- MFSignatureBuilder signature = this->get_builder(std::move(name));
+ MFSignatureBuilder signature{std::move(name)};
signature.single_input<From>("Input");
signature.single_output<To>("Output");
+ return signature.build();
}
void call(IndexMask mask, MFParams params, MFContext UNUSED(context)) const override
@@ -304,6 +326,7 @@ class CustomMF_GenericConstant : public MultiFunction {
private:
const CPPType &type_;
const void *value_;
+ MFSignature signature_;
template<typename T> friend class CustomMF_Constant;
@@ -321,6 +344,7 @@ class CustomMF_GenericConstant : public MultiFunction {
class CustomMF_GenericConstantArray : public MultiFunction {
private:
GSpan array_;
+ MFSignature signature_;
public:
CustomMF_GenericConstantArray(GSpan array);
@@ -333,14 +357,17 @@ class CustomMF_GenericConstantArray : public MultiFunction {
template<typename T> class CustomMF_Constant : public MultiFunction {
private:
T value_;
+ MFSignature signature_;
public:
template<typename U> CustomMF_Constant(U &&value) : value_(std::forward<U>(value))
{
- MFSignatureBuilder signature = this->get_builder("Constant");
+ MFSignatureBuilder signature{"Constant"};
std::stringstream ss;
ss << value_;
signature.single_output<T>(ss.str());
+ signature_ = signature.build();
+ this->set_signature(&signature_);
}
void call(IndexMask mask, MFParams params, MFContext UNUSED(context)) const override
@@ -375,6 +402,7 @@ template<typename T> class CustomMF_Constant : public MultiFunction {
class CustomMF_DefaultOutput : public MultiFunction {
private:
int output_amount_;
+ MFSignature signature_;
public:
CustomMF_DefaultOutput(StringRef name,
diff --git a/source/blender/functions/FN_multi_function_network_evaluation.hh b/source/blender/functions/FN_multi_function_network_evaluation.hh
index 2c0d94615b0..17cffa406f7 100644
--- a/source/blender/functions/FN_multi_function_network_evaluation.hh
+++ b/source/blender/functions/FN_multi_function_network_evaluation.hh
@@ -28,6 +28,7 @@ class MFNetworkEvaluationStorage;
class MFNetworkEvaluator : public MultiFunction {
private:
+ MFSignature signature_;
Vector<const MFOutputSocket *> inputs_;
Vector<const MFInputSocket *> outputs_;
diff --git a/source/blender/functions/FN_multi_function_signature.hh b/source/blender/functions/FN_multi_function_signature.hh
index e05ea1c2578..23309c9a5e6 100644
--- a/source/blender/functions/FN_multi_function_signature.hh
+++ b/source/blender/functions/FN_multi_function_signature.hh
@@ -44,18 +44,21 @@ struct MFSignature {
class MFSignatureBuilder {
private:
- MFSignature &data_;
+ MFSignature signature_;
int span_count_ = 0;
int virtual_array_count_ = 0;
int virtual_vector_array_count_ = 0;
int vector_array_count_ = 0;
public:
- MFSignatureBuilder(MFSignature &data) : data_(data)
+ MFSignatureBuilder(std::string function_name)
{
- BLI_assert(data.param_names.is_empty());
- BLI_assert(data.param_types.is_empty());
- BLI_assert(data.param_data_indices.is_empty());
+ signature_.function_name = std::move(function_name);
+ }
+
+ MFSignature build() const
+ {
+ return std::move(signature_);
}
/* Input Parameter Types */
@@ -78,15 +81,15 @@ class MFSignatureBuilder {
}
void input(StringRef name, MFDataType data_type)
{
- data_.param_names.append(name);
- data_.param_types.append(MFParamType(MFParamType::Input, data_type));
+ signature_.param_names.append(name);
+ signature_.param_types.append(MFParamType(MFParamType::Input, data_type));
switch (data_type.category()) {
case MFDataType::Single:
- data_.param_data_indices.append(virtual_array_count_++);
+ signature_.par
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list