[Bf-blender-cvs] [3176b113e40] master: Geometry Nodes: Reduce socket logging overhead

[Hans Goudey]

Commit: 3176b113e4087d771fa6ae90699c42de963fb685
Author: Hans Goudey
Date:   Wed Dec 28 20:37:16 2022 -0500
Branches: master
https://developer.blender.org/rB3176b113e4087d771fa6ae90699c42de963fb685

Geometry Nodes: Reduce socket logging overhead

Use socket indices to keep track of logged values instead of their
identifiers. This decreases memory pressure when there are many
sockets. In cases with many cheap nodes, this can give a relatively
large improvement to overall performance. We observed a 15% increase
in a case with many math nodes and a larger increase in an experimental
softbody node setup. The log is invalidated when we add/remove/move
sockets anyway.

===================================================================

M	source/blender/nodes/NOD_geometry_nodes_log.hh
M	source/blender/nodes/intern/geometry_nodes_log.cc

===================================================================

diff --git a/source/blender/nodes/NOD_geometry_nodes_log.hh b/source/blender/nodes/NOD_geometry_nodes_log.hh
index e2207338823..cfcecc31276 100644
--- a/source/blender/nodes/NOD_geometry_nodes_log.hh
+++ b/source/blender/nodes/NOD_geometry_nodes_log.hh
@@ -180,7 +180,7 @@ class GeoTreeLogger {
   };
   struct SocketValueLog {
     int32_t node_id;
-    StringRefNull socket_identifier;
+    int socket_index;
     destruct_ptr<ValueLog> value;
   };
   struct NodeExecutionTime {
@@ -234,9 +234,9 @@ class GeoNodeLog {
    * inside.
    */
   std::chrono::nanoseconds run_time{0};
-  /** Maps from socket identifiers to their values. */
-  Map<StringRefNull, ValueLog *> input_values_;
-  Map<StringRefNull, ValueLog *> output_values_;
+  /** Maps from socket indices to their values. */
+  Map<int, ValueLog *> input_values_;
+  Map<int, ValueLog *> output_values_;
   /** Maps from attribute name to their usage flags. */
   Map<StringRefNull, NamedAttributeUsage> used_named_attributes;
   /** Messages that are used for debugging purposes during development. */
diff --git a/source/blender/nodes/intern/geometry_nodes_log.cc b/source/blender/nodes/intern/geometry_nodes_log.cc
index e8b65a3d319..eb2e9bd9015 100644
--- a/source/blender/nodes/intern/geometry_nodes_log.cc
+++ b/source/blender/nodes/intern/geometry_nodes_log.cc
@@ -151,8 +151,7 @@ void GeoTreeLogger::log_value(const bNode &node, const bNodeSocket &socket, cons
   auto store_logged_value = [&](destruct_ptr<ValueLog> value_log) {
     auto &socket_values = socket.in_out == SOCK_IN ? this->input_socket_values :
                                                      this->output_socket_values;
-    socket_values.append(
-        {node.identifier, this->allocator->copy_string(socket.identifier), std::move(value_log)});
+    socket_values.append({node.identifier, socket.index(), std::move(value_log)});
   };
 
   auto log_generic_value = [&](const CPPType &type, const void *value) {
@@ -252,11 +251,11 @@ void GeoTreeLog::ensure_socket_values()
   for (GeoTreeLogger *tree_logger : tree_loggers_) {
     for (const GeoTreeLogger::SocketValueLog &value_log_data : tree_logger->input_socket_values) {
       this->nodes.lookup_or_add_as(value_log_data.node_id)
-          .input_values_.add(value_log_data.socket_identifier, value_log_data.value.get());
+          .input_values_.add(value_log_data.socket_index, value_log_data.value.get());
     }
     for (const GeoTreeLogger::SocketValueLog &value_log_data : tree_logger->output_socket_values) {
       this->nodes.lookup_or_add_as(value_log_data.node_id)
-          .output_values_.add(value_log_data.socket_identifier, value_log_data.value.get());
+          .output_values_.add(value_log_data.socket_index, value_log_data.value.get());
     }
   }
   reduced_socket_values_ = true;
@@ -376,10 +375,8 @@ ValueLog *GeoTreeLog::find_socket_value_log(const bNodeSocket &query_socket)
     const bNode &node = socket.owner_node();
     if (GeoNodeLog *node_log = this->nodes.lookup_ptr(node.identifier)) {
       ValueLog *value_log = socket.is_input() ?
-                                node_log->input_values_.lookup_default(socket.identifier,
-                                                                       nullptr) :
-                                node_log->output_values_.lookup_default(socket.identifier,
-                                                                        nullptr);
+                                node_log->input_values_.lookup_default(socket.index(), nullptr) :
+                                node_log->output_values_.lookup_default(socket.index(), nullptr);
       if (value_log != nullptr) {
         return value_log;
       }