Geometry Nodes: Avoid geometry copies in "no cache" simulation #109742

Hans Goudey · 2023-07-05T15:14:33+02:00

Hans Goudey commented

2023-07-05 15:14:33 +02:00

When we don't need to preserve a persistent cache, we can use
the geometry from the last frame directly rather than copying it.
Though implicit lets us avoid copying large data arrays when they
aren't changed, this can still give a large improvement for something
like particle simulation where the majority of the data was copied
every frame.

Depends on #109741

When we don't need to preserve a persistent cache, we can use the geometry from the last frame directly rather than copying it. Though implicit lets us avoid copying large data arrays when they aren't changed, this can still give a large improvement for something like particle simulation where the majority of the data was copied every frame. Depends on #109741

Hans Goudey added 3 commits 2023-07-05 15:14:39 +02:00

67f93da4d9 Fix #109462 : Incorrect "No Cache" simulation cache invalidation

The "No Cache" simulation nodes option effectively changes the cache
to work in a "realtime mode" where there are only two states, the
current and previous frame. Whenever the current frame doesn't
increase, the previous state should reset. This didn't happen
properly, and it was hard to verify because the code was shared
with the regular "cache on" mode.

Instead, separate the caching more in the code, usin a different
struct to store the two "realtime" states. Also clarify that we
don't support animation of the "No Cache" option by disabling
support for that in RNA.

buildbot/vexp-code-patch-coordinator Build done. Details

d4af732202 Fix compile error

c947f7d6c1 Geometry Nodes: Avoid geometry copies in "no cache" simulation

When we don't need to preserve a persistent cache, we can use
the geometry from the last frame directly rather than copying it.
Though implicit lets us avoid copying large data arrays when they
aren't changed, this can still give a large improvement for something
like particle simulation where the majority of the data was copied
every frame.

Depends on #109741

Hans Goudey added 3 commits 2023-07-10 17:24:34 +02:00

3acb6099e4 Merge branch 'main' into simulation-avoid-copies

83d779e7d8 Remove unrelated changes

buildbot/vexp-code-patch-coordinator Build done. Details

a86841d6e7 Deduplicate code

Hans Goudey requested review from Jacques Lucke 2023-07-10 17:24:54 +02:00

Hans Goudey added this to the Nodes & Physics project 2023-07-10 17:25:29 +02:00

Jacques Lucke commented

2023-07-11 12:59:05 +02:00

@blender-bot build

Jacques Lucke approved these changes 2023-07-11 12:59:12 +02:00

source/blender/nodes/geometry/nodes/node_geo_simulation_input.cc Outdated

						
				@ -88,0 +81,4 @@

				    }

				    /* When caching is turned off and the old state doesn't need to persist, moving data

				     * from the last state instead of copying it can avoid copies of geometry data arrays. */

				    if (auto *state = modifier_data.prev_simulation_state_mutable) {

Jacques Lucke commented

2023-07-11 12:51:16 +02:00

It seems like the check for mutability should come first. This is important when both prev_simulation_state_mutable and prev_simulation_state are set.

It seems like the check for mutability should come first. This is important when both `prev_simulation_state_mutable` and `prev_simulation_state` are set.

HooglyBoogly marked this conversation as resolved

Hans Goudey added 3 commits 2023-07-11 14:02:52 +02:00

942789edad Merge branch 'main' into simulation-avoid-copies

07f265af4c Move mutable simulation state first

6c60df9a0f Merge branch 'main' into simulation-avoid-copies

Hans Goudey merged commit 424c6edc53 into main

2023-07-11 14:03:18 +02:00

Hans Goudey referenced this issue from a commit

2023-07-11 14:03:20 +02:00

Geometry Nodes: Avoid geometry copies in "no cache" simulation

Hans Goudey deleted branch simulation-avoid-copies

2023-07-11 14:03:20 +02:00