griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Jacques Lucke
2024-10-21 14:19:58 +02:00
parent 3075bd3f2c 21a24cf82b
commit e67d7355f2
5 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/nodes/NOD_geometry_nodes_lazy_function.hh
View File

@@ -502,6 +502,34 @@ class ScopedComputeContextTimer {
}
};
/**
* Utility to measure the time that is spend in a specific node during geometry nodes evaluation.
*/
class ScopedNodeTimer {
private:
const lf::Context &context_;
const bNode &node_;
geo_eval_log::TimePoint start_;
public:
ScopedNodeTimer(const lf::Context &context, const bNode &node) : context_(context), node_(node)
{
start_ = geo_eval_log::Clock::now();
}
~ScopedNodeTimer()
{
const geo_eval_log::TimePoint end = geo_eval_log::Clock::now();
auto &user_data = static_cast<GeoNodesLFUserData &>(*context_.user_data);
auto &local_user_data = static_cast<GeoNodesLFLocalUserData &>(*context_.local_user_data);
if (geo_eval_log::GeoTreeLogger *tree_logger = local_user_data.try_get_tree_logger(user_data))
{
tree_logger->node_execution_times.append(*tree_logger->allocator,
{node_.identifier, start_, end});
}
}
};
bool should_log_socket_values_for_context(const GeoNodesLFUserData &user_data,
const ComputeContextHash hash);

12
source/blender/nodes/intern/geometry_nodes_foreach_geometry_element_zone.cc
View File

@@ -324,6 +324,8 @@ class LazyFunctionForForeachGeometryElementZone : public LazyFunction {
void execute_impl(lf::Params &params, const lf::Context &context) const override
{
const ScopedNodeTimer node_timer{context, output_bnode_};
auto &user_data = *static_cast<GeoNodesLFUserData *>(context.user_data);
auto &local_user_data = *static_cast<GeoNodesLFLocalUserData *>(context.local_user_data);
@@ -332,16 +334,6 @@ class LazyFunctionForForeachGeometryElementZone : public LazyFunction {
auto &eval_storage = *static_cast<ForeachGeometryElementEvalStorage *>(context.storage);
geo_eval_log::GeoTreeLogger *tree_logger = local_user_data.try_get_tree_logger(user_data);
/* Measure execution time of the entire zone. */
const geo_eval_log::TimePoint start_time = geo_eval_log::Clock::now();
BLI_SCOPED_DEFER([&]() {
if (tree_logger) {
const geo_eval_log::TimePoint end_time = geo_eval_log::Clock::now();
tree_logger->node_execution_times.append(*tree_logger->allocator,
{output_bnode_.identifier, start_time, end_time});
}
});
if (!eval_storage.graph_executor) {
/* Create the execution graph in the first evaluation. */
this->initialize_execution_graph(params, eval_storage, node_storage);

14
source/blender/nodes/intern/geometry_nodes_lazy_function.cc
View File

@@ -196,6 +196,8 @@ class LazyFunctionForGeometryNode : public LazyFunction {
void execute_impl(lf::Params &params, const lf::Context &context) const override
{
const ScopedNodeTimer node_timer{context, node_};
GeoNodesLFUserData *user_data = dynamic_cast<GeoNodesLFUserData *>(context.user_data);
BLI_assert(user_data != nullptr);
const auto &local_user_data = *static_cast<GeoNodesLFLocalUserData *>(context.local_user_data);
@@ -254,15 +256,7 @@ class LazyFunctionForGeometryNode : public LazyFunction {
own_lf_graph_info_.mapping.lf_input_index_for_reference_set_for_output,
get_anonymous_attribute_name};
geo_eval_log::TimePoint start_time = geo_eval_log::Clock::now();
node_.typeinfo->geometry_node_execute(geo_params);
geo_eval_log::TimePoint end_time = geo_eval_log::Clock::now();
if (geo_eval_log::GeoTreeLogger *tree_logger = local_user_data.try_get_tree_logger(*user_data))
{
tree_logger->node_execution_times.append(*tree_logger->allocator,
{node_.identifier, start_time, end_time});
}
}
std::string input_name(const int index) const override
@@ -1134,6 +1128,7 @@ class LazyFunctionForGroupNode : public LazyFunction {
void execute_impl(lf::Params &params, const lf::Context &context) const override
{
const ScopedNodeTimer node_timer{context, group_node_};
GeoNodesLFUserData *user_data = dynamic_cast<GeoNodesLFUserData *>(context.user_data);
BLI_assert(user_data != nullptr);
@@ -1470,6 +1465,7 @@ class LazyFunctionForSimulationZone : public LazyFunction {
void execute_impl(lf::Params &params, const lf::Context &context) const override
{
ScopedNodeTimer node_timer{context, sim_output_bnode_};
GeoNodesLFUserData &user_data = *static_cast<GeoNodesLFUserData *>(context.user_data);
bke::SimulationZoneComputeContext compute_context{user_data.compute_context,
@@ -1482,8 +1478,6 @@ class LazyFunctionForSimulationZone : public LazyFunction {
GeoNodesLFLocalUserData zone_local_user_data{zone_user_data};
lf::Context zone_context{context.storage, &zone_user_data, &zone_local_user_data};
ScopedComputeContextTimer timer(zone_context);
fn_.execute(params, zone_context);
}

12
source/blender/nodes/intern/geometry_nodes_log.cc
View File

@@ -351,18 +351,6 @@ void GeoTreeLog::ensure_execution_times()
}
this->execution_time += tree_logger->execution_time;
}
for (const ComputeContextHash &child_hash : children_hashes_) {
GeoTreeLog &child_log = modifier_log_->get_tree_log(child_hash);
if (child_log.tree_loggers_.is_empty()) {
continue;
}
child_log.ensure_execution_times();
const std::optional<int32_t> &parent_node_id = child_log.tree_loggers_[0]->parent_node_id;
if (parent_node_id.has_value()) {
this->nodes.lookup_or_add_default(*parent_node_id).execution_time +=
child_log.execution_time;
}
}
reduced_execution_times_ = true;
}

4
source/blender/nodes/intern/geometry_nodes_repeat_zone.cc
View File

@@ -54,8 +54,6 @@ class RepeatBodyNodeExecuteWrapper : public lf::GraphExecutorNodeExecuteWrapper
GeoNodesLFLocalUserData body_local_user_data{body_user_data};
lf::Context body_context{context.storage, &body_user_data, &body_local_user_data};
ScopedComputeContextTimer timer(body_context);
fn.execute(params, body_context);
}
};
@@ -148,6 +146,8 @@ class LazyFunctionForRepeatZone : public LazyFunction {
void execute_impl(lf::Params &params, const lf::Context &context) const override
{
const ScopedNodeTimer node_timer{context, repeat_output_bnode_};
auto &user_data = *static_cast<GeoNodesLFUserData *>(context.user_data);
auto &local_user_data = *static_cast<GeoNodesLFLocalUserData *>(context.local_user_data);