blender
/
blender
136
407
Fork 590
Code Issues 6.3k Pull Requests 778 Projects 19 Wiki Activity

WIP: Functions: new local allocator for better memory reuse and performance #104630

Draft
Jacques Lucke wants to merge 44 commits from JacquesLucke/blender:local-allocator into main
pull from: JacquesLucke/blender:local-allocator
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 44 Files Changed 13 +18 -10
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9308a4c428 - Show all commits

2
source/blender/blenlib/BLI_local_pool.hh
View File

@ -85,7 +85,7 @@ template<typename Allocator = GuardedAllocator> class LocalPool : NonCopyable, N
#endif
BLI_asan_poison(buffer, alignment);
BufferStack &buffer_stack = this->get_buffer_stack(size, alignment);
buffer_stack.stack.push(buffer);
buffer_stack.stack.push(const_cast<void *>(buffer));
}
template<typename T, typename... Args> destruct_ptr<T> construct(Args &&...args)

26
source/blender/functions/intern/lazy_function_graph_executor.cc
View File

@ -382,10 +382,11 @@ class Executor {
fn.destruct_storage(node_state.storage);
}
}
LocalPool<> &allocator = this->get_main_or_local_allocator();
for (const int i : node.inputs().index_range()) {
InputState &input_state = node_state.inputs[i];
const InputSocket &input_socket = node.input(i);
this->destruct_input_value_if_exists(input_state, input_socket.type());
this->destruct_input_value_if_exists(input_state, input_socket.type(), allocator);
}
std::destroy_at(&node_state);
}
@ -798,7 +799,7 @@ class Executor {
this->assert_expected_outputs_have_been_computed(locked_node);
}
#endif
this->finish_node_if_possible(locked_node);
this->finish_node_if_possible(locked_node, allocator);
const bool reschedule_requested = node_state.schedule_state ==
NodeScheduleState::RunningAndRescheduled;
node_state.schedule_state = NodeScheduleState::NotScheduled;
@ -836,7 +837,7 @@ class Executor {
}
}
void finish_node_if_possible(LockedNode &locked_node)
void finish_node_if_possible(LockedNode &locked_node, LocalPool<> &allocator)
{
const Node &node = locked_node.node;
NodeState &node_state = locked_node.node_state;
@ -864,10 +865,10 @@ class Executor {
const InputSocket &input_socket = node.input(input_index);
InputState &input_state = node_state.inputs[input_index];
if (input_state.usage == ValueUsage::Maybe) {
this->set_input_unused(locked_node, input_socket);
this->set_input_unused(locked_node, input_socket, allocator);
}
else if (input_state.usage == ValueUsage::Used) {
this->destruct_input_value_if_exists(input_state, input_socket.type());
this->destruct_input_value_if_exists(input_state, input_socket.type(), allocator);
}
}
@ -880,10 +881,13 @@ class Executor {
}
}
void destruct_input_value_if_exists(InputState &input_state, const CPPType &type)
void destruct_input_value_if_exists(InputState &input_state,
const CPPType &type,
LocalPool<> &allocator)
{
if (input_state.value != nullptr) {
type.destruct(input_state.value);
allocator.deallocate(input_state.value, type.size(), type.alignment());
input_state.value = nullptr;
}
}
@ -895,13 +899,16 @@ class Executor {
const int input_index,
CurrentTask &current_task)
{
LocalPool<> &allocator = this->get_main_or_local_allocator();
const InputSocket &input_socket = node.input(input_index);
this->with_locked_node(node, node_state, current_task, [&](LockedNode &locked_node) {
this->set_input_unused(locked_node, input_socket);
this->set_input_unused(locked_node, input_socket, allocator);
});
}
void set_input_unused(LockedNode &locked_node, const InputSocket &input_socket)
void set_input_unused(LockedNode &locked_node,
const InputSocket &input_socket,
LocalPool<> &allocator)
{
NodeState &node_state = locked_node.node_state;
const int input_index = input_socket.index();
@ -913,7 +920,7 @@ class Executor {
}
input_state.usage = ValueUsage::Unused;
this->destruct_input_value_if_exists(input_state, input_socket.type());
this->destruct_input_value_if_exists(input_state, input_socket.type(), allocator);
if (input_state.was_ready_for_execution) {
return;
}
@ -1030,6 +1037,7 @@ class Executor {
}
if (value_to_forward.get() != nullptr) {
value_to_forward.destruct();
allocator.deallocate(value_to_forward.get(), type.size(), type.alignment());
}
}