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

Functions: only allocate resource scope when it is actually used 

In most cases it is currently not used, so always having it there
causes unnecessary overhead. In my test file that causes
a 2 % performance improvement.
This commit is contained in:
Jacques Lucke 2023-01-14 15:56:43 +01:00
parent 50980981e3
commit 72cc68e299
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source/blender/functions/FN_multi_function_params.hh
View File

@ -25,7 +25,7 @@ namespace blender::fn::multi_function {
class ParamsBuilder {
private:
ResourceScope scope_;
std::unique_ptr<ResourceScope> scope_;
const Signature *signature_;
IndexMask mask_;
int64_t min_array_size_;
@ -90,13 +90,15 @@ class ParamsBuilder {
void add_readonly_vector_input(const GVectorArray &vector_array, StringRef expected_name = "")
{
this->add_readonly_vector_input(scope_.construct<GVVectorArray_For_GVectorArray>(vector_array),
expected_name);
this->add_readonly_vector_input(
this->resource_scope().construct<GVVectorArray_For_GVectorArray>(vector_array),
expected_name);
}
void add_readonly_vector_input(const GSpan single_vector, StringRef expected_name = "")
{
this->add_readonly_vector_input(
scope_.construct<GVVectorArray_For_SingleGSpan>(single_vector, min_array_size_),
this->resource_scope().construct<GVVectorArray_For_SingleGSpan>(single_vector,
min_array_size_),
expected_name);
}
void add_readonly_vector_input(const GVVectorArray &ref, StringRef expected_name = "")
@ -174,11 +176,6 @@ class ParamsBuilder {
return *std::get<GVectorArray *>(actual_params_[param_index]);
}
ResourceScope &resource_scope()
{
return scope_;
}
private:
void assert_current_param_type(ParamType param_type, StringRef expected_name = "")
{
@ -214,6 +211,14 @@ class ParamsBuilder {
return actual_params_.size();
}
ResourceScope &resource_scope()
{
if (!scope_) {
scope_ = std::make_unique<ResourceScope>();
}
return *scope_;
}
void add_unused_output_for_unsupporting_function(const CPPType &type);
};
@ -285,7 +290,7 @@ class Params {
const VVectorArray<T> &readonly_vector_input(int param_index, StringRef name = "")
{
const GVVectorArray &vector_array = this->readonly_vector_input(param_index, name);
return builder_->scope_.construct<VVectorArray_For_GVVectorArray<T>>(vector_array);
return builder_->resource_scope().construct<VVectorArray_For_GVVectorArray<T>>(vector_array);
}
const GVVectorArray &readonly_vector_input(int param_index, StringRef name = "")
{

7
source/blender/functions/intern/multi_function_params.cc
View File

@ -6,12 +6,13 @@ namespace blender::fn::multi_function {
void ParamsBuilder::add_unused_output_for_unsupporting_function(const CPPType &type)
{
void *buffer = scope_.linear_allocator().allocate(type.size() * min_array_size_,
type.alignment());
ResourceScope &scope = this->resource_scope();
void *buffer = scope.linear_allocator().allocate(type.size() * min_array_size_,
type.alignment());
const GMutableSpan span{type, buffer, min_array_size_};
actual_params_.append_unchecked_as(std::in_place_type<GMutableSpan>, span);
if (!type.is_trivially_destructible()) {
scope_.add_destruct_call(
scope.add_destruct_call(
[&type, buffer, mask = mask_]() { type.destruct_indices(buffer, mask); });
}
}