Page MenuHome
Differential D12341

Compositor: Merge equal operations
ClosedPublic
Actions

Authored by Manuel Castilla (manzanilla) on Aug 29 2021, 9:57 PM.

Details

Reviewers
Jeroen Bakker (jbakker)
Maniphest Tasks
T90919: Compositor: Add OpenImageDenoising prefiltering option to Denoising node.
Commits
rBb225a7c47051: Compositor: Merge equal operations
Summary

Some operations can take a lot of time to execute and
any duplication should be avoided.

This patch implements a compile step that detects
operations with same type, inputs and parameters that
produce the same result and merge them. Now operations
can generate a hash that represents their output result. They only
need to implement hash_output_params and hash any parameter
that affects the output result.

Only convert operations are implemented for merging right now.
And in another patch DenoiseOperation and DenoisePrefilterOperation.

Example of two denoise nodes with same parents and prefiltering. Only HDR option change.

Before mergingAfter merging (HDR equal on both)After merging (HDR different on one)

Diff Detail

Repository
rB Blender

Event Timeline

Manuel Castilla (manzanilla) requested review of this revision.Aug 29 2021, 9:57 PM
Manuel Castilla (manzanilla) created this revision.
Harbormaster completed remote builds in B16678: Diff 41201.Aug 29 2021, 9:57 PM
Manuel Castilla (manzanilla) added a parent revision: D12219: Compositor: Full frame filter nodes.Aug 29 2021, 9:59 PM
Manuel Castilla (manzanilla) removed a parent revision: D12219: Compositor: Full frame filter nodes.Aug 29 2021, 10:02 PM
Manuel Castilla (manzanilla) edited the summary of this revision. (Show Details)Aug 29 2021, 10:21 PM
Manuel Castilla (manzanilla) added a reviewer: Jeroen Bakker (jbakker).
Manuel Castilla (manzanilla) added a project: Compositing.
Manuel Castilla (manzanilla) updated this revision to Diff 41203.Aug 29 2021, 10:35 PM

rebase

Harbormaster completed remote builds in B16679: Diff 41203.Aug 29 2021, 10:35 PM
Manuel Castilla (manzanilla) added a child revision: D12342: Compositor: Add OIDN prefiltering option to Denoise node.Aug 29 2021, 10:50 PM
Manuel Castilla (manzanilla) updated this revision to Diff 41207.Aug 29 2021, 11:49 PM

rebase

Harbormaster completed remote builds in B16681: Diff 41207.Aug 29 2021, 11:49 PM
Manuel Castilla (manzanilla) updated this revision to Diff 41208.Aug 29 2021, 11:57 PM

fix last rebase

Harbormaster completed remote builds in B16682: Diff 41208.Aug 29 2021, 11:57 PM
Jeroen Bakker (jbakker) accepted this revision.Aug 30 2021, 12:27 PM

I wasn't able to apply this patch on master. (head was missing). But code seems fine for a first iteration.
I did had some questions about the usage of size_t but that should be raised to the core team. Seems hash functions are 32 bit, but the combine is platform specific.

Only a small change for code clarity.

source/blender/compositor/intern/COM_NodeOperationBuilder.cc
480

Bit of naming confusion.

bool check_for_next_merge = true 
while (check_for_next_merge) {
  ...
  bool any_merged = false;
  ...

  check_for_next_merge = any_merged;
}
This revision is now accepted and ready to land.Aug 30 2021, 12:27 PM
Closed by commit rBb225a7c47051: Compositor: Merge equal operations (authored by Manuel Castilla (manzanilla)). · Explain WhySep 4 2021, 5:20 PM
This revision was automatically updated to reflect the committed changes.
Manuel Castilla (manzanilla) added a commit: rBb225a7c47051: Compositor: Merge equal operations.
Manuel Castilla (manzanilla) mentioned this in rBb7718bbdf55c: Cleanup: improve code clarity.Sep 5 2021, 2:39 PM
Manuel Castilla (manzanilla) added a task: T90919: Compositor: Add OpenImageDenoising prefiltering option to Denoising node..Sep 7 2021, 12:29 AM

Revision Contents
Changeset List

PathSize
source/
blender/
compositor/
1 line
intern/
3 lines
70 lines
43 lines
5 lines
74 lines
operations/
3 lines
16 lines
tests/
169 lines

Diff 41458

View Options

source/blender/compositor/CMakeLists.txt

Loading...
View Options

source/blender/compositor/intern/COM_Debug.cc

Loading...
View Options

source/blender/compositor/intern/COM_NodeOperation.h

Loading...
View Options

source/blender/compositor/intern/COM_NodeOperation.cc

Loading...
View Options

source/blender/compositor/intern/COM_NodeOperationBuilder.h

Loading...
View Options

source/blender/compositor/intern/COM_NodeOperationBuilder.cc

Loading...
View Options

source/blender/compositor/operations/COM_ConvertOperation.h

Loading...
View Options

source/blender/compositor/operations/COM_ConvertOperation.cc

Loading...
View Options

source/blender/compositor/tests/COM_NodeOperation_test.cc

Loading...