blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

Nodes: Update of nodes topology cache more parallel #107686

Open
Iliya Katushenock wants to merge 8 commits from mod_moder/blender:tmp_more_parallel_node_topology_cache into main
pull from: mod_moder/blender:tmp_more_parallel_node_topology_cache
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 8 Files Changed 1 +33 -28
1 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
source/blender/blenkernel/intern/node_runtime.cc
View File

@ -96,7 +96,7 @@ static void update_internal_link_inputs(const bNodeTree &ntree)
{
bNodeTreeRuntime &tree_runtime = *ntree.runtime;
for (bNode *node : tree_runtime.nodes_by_id) {
for (bNodeSocket *socket : node->runtime->outputs) {
LISTBASE_FOREACH (bNodeSocket *, socket, &node->outputs) {
socket->runtime->internal_link_input = nullptr;
}
for (bNodeLink &link : node->runtime->internal_links) {
@ -109,18 +109,19 @@ static void update_directly_linked_links_and_sockets(const bNodeTree &ntree)
{
bNodeTreeRuntime &tree_runtime = *ntree.runtime;
for (bNode *node : tree_runtime.nodes_by_id) {
for (bNodeSocket *socket : node->runtime->inputs) {
LISTBASE_FOREACH (bNodeSocket *, socket, &node->inputs) {
socket->runtime->directly_linked_links.clear();
socket->runtime->directly_linked_sockets.clear();
}
for (bNodeSocket *socket : node->runtime->outputs) {
LISTBASE_FOREACH (bNodeSocket *, socket, &node->outputs) {
socket->runtime->directly_linked_links.clear();
socket->runtime->directly_linked_sockets.clear();
}
node->runtime->has_available_linked_inputs = false;
node->runtime->has_available_linked_outputs = false;
}
for (bNodeLink *link : tree_runtime.links) {
LISTBASE_FOREACH (bNodeLink *, link, &ntree.links) {
link->fromsock->runtime->directly_linked_links.append(link);
link->fromsock->runtime->directly_linked_sockets.append(link->tosock);
link->tosock->runtime->directly_linked_links.append(link);
@ -129,19 +130,23 @@ static void update_directly_linked_links_and_sockets(const bNodeTree &ntree)
link->tonode->runtime->has_available_linked_inputs = true;
}
}
for (bNodeSocket *socket : tree_runtime.input_sockets) {
if (socket->flag & SOCK_MULTI_INPUT) {
std::sort(socket->runtime->directly_linked_links.begin(),
socket->runtime->directly_linked_links.end(),
[&](const bNodeLink *a, const bNodeLink *b) {
return a->multi_input_socket_index > b->multi_input_socket_index;
});
for (bNode *node : tree_runtime.nodes_by_id) {
LISTBASE_FOREACH (bNodeSocket *, socket, &node->inputs) {
if (socket->is_multi_input()) {
std::sort(socket->runtime->directly_linked_links.begin(),
socket->runtime->directly_linked_links.end(),
[&](const bNodeLink *a, const bNodeLink *b) {
return a->multi_input_socket_index > b->multi_input_socket_index;
});
}
}
}
for (bNodeSocket *socket : tree_runtime.input_sockets) {
for (bNodeLink *link : socket->runtime->directly_linked_links) {
/* Do this after sorting the input links. */
socket->runtime->directly_linked_sockets.append(link->fromsock);
for (bNode *node : tree_runtime.nodes_by_id) {
LISTBASE_FOREACH (bNodeSocket *, socket, &node->outputs) {
for (bNodeLink *link : socket->runtime->directly_linked_links) {
/* Do this after sorting the input links. */
link->tosock->runtime->directly_linked_sockets.append(link->fromsock);
}
}
}
}
@ -219,13 +224,7 @@ static void update_logically_linked_sockets(const bNodeTree &ntree)
socket->runtime->logically_linked_sockets,
socket->runtime->logically_linked_skipped_sockets);
}
}
});
/* Clear logically linked sockets to outputs. */
threading::parallel_for(nodes.index_range(), 128, [&](const IndexRange range) {
for (const int i : range) {
bNode &node = *nodes[i];
for (bNodeSocket *socket : node.runtime->outputs) {
socket->runtime->logically_linked_sockets.clear();
}
@ -512,14 +511,19 @@ static void ensure_topology_cache(const bNodeTree &ntree)
bNodeTreeRuntime &tree_runtime = *ntree.runtime;
tree_runtime.topology_cache_mutex.ensure([&]() {
update_interface_sockets(ntree);
update_node_vector(ntree);
update_link_vector(ntree);
update_socket_vectors_and_owner_node(ntree);
update_internal_link_inputs(ntree);
update_directly_linked_links_and_sockets(ntree);
update_nodes_by_type(ntree);
/* Cache kinds based only on a dna node data. */
threading::parallel_invoke(
tree_runtime.nodes_by_id.size() > 32,
tree_runtime.nodes_by_id.size() > 64,
[&] { update_node_vector(ntree); },
[&] { update_link_vector(ntree); },
[&] { update_socket_vectors_and_owner_node(ntree); },
[&] { update_internal_link_inputs(ntree); },
[&] { update_directly_linked_links_and_sockets(ntree); },
[&] { update_nodes_by_type(ntree); });
threading::parallel_invoke(
tree_runtime.nodes_by_id.size() > 64,
[&]() { update_logically_linked_sockets(ntree); },
[&]() { update_sockets_by_identifier(ntree); },
[&]() {
@ -543,6 +547,7 @@ static void ensure_topology_cache(const bNodeTree &ntree)
},
[&]() { update_root_frames(ntree); },
[&]() { update_direct_frames_childrens(ntree); });
update_group_output_node(ntree);
tree_runtime.topology_cache_exists = true;
});