Page MenuHome
Differential D14043

Remap multiple items in referenced data.
ClosedPublic
Actions

Authored by Jeroen Bakker (jbakker) on Feb 8 2022, 9:28 AM.

Details

Reviewers
Bastien Montagne (mont29)
Maniphest Tasks
T95279: Remap multiple items in referenced data
Commits
rBa71a513def20: Remap multiple items in referenced data.
Summary

This patch increases the performance when remapping data.
D13615: Performance: Remap multiple items in UI introduced a mechanism to remap multiple items in a single go.
This patch uses the same mechanism when remapping data inside ID datablocks.

Benchmark results when loading the village scene of sprite fright on AMD Ryzen 7 3800X 8-Core Processor

Before this patch 115 seconds

When patch applied less than 43 seconds

There is still some room for improvement by porting relink code.

Diff Detail

Repository
rB Blender
Branch
tmp-T95279-remapping-type (branched from master)
Build Status
Buildable 20438
Build 20438: arc lint + arc unit

Event Timeline

Jeroen Bakker (jbakker) created this revision.Feb 8 2022, 9:28 AM
Harbormaster completed remote builds in B20401: Diff 48074.Feb 8 2022, 9:28 AM
Jeroen Bakker (jbakker) added a task: T95279: Remap multiple items in referenced data.Feb 8 2022, 9:28 AM
Jeroen Bakker (jbakker) added a reviewer: Bastien Montagne (mont29).
Jeroen Bakker (jbakker) added a project: Core.
Jeroen Bakker (jbakker) updated this revision to Diff 48109.Feb 9 2022, 10:26 AM
  • Reuse id_remapper during cleaning.
  • Add BKE_library_id_can_use_filter_id.
  • Debug functions for id_remapper.
  • Moved id_remapper one level down.
Harbormaster completed remote builds in B20422: Diff 48109.Feb 9 2022, 10:26 AM
Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)Feb 9 2022, 2:06 PM
Jeroen Bakker (jbakker) updated this revision to Diff 48135.Feb 9 2022, 3:47 PM
  • Moved id_mappings one level.
  • Use ID runtime to tag ids.
Harbormaster completed remote builds in B20438: Diff 48135.Feb 9 2022, 3:47 PM
Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)Feb 9 2022, 3:50 PM
Jeroen Bakker (jbakker) added inline comments.Feb 9 2022, 3:53 PM
source/blender/blenkernel/intern/lib_remap.c
71

Remove obsolete comment.

source/blender/makesdna/DNA_ID.h
487

Revert format changes

Jeroen Bakker (jbakker) updated this revision to Diff 48176.Feb 10 2022, 10:52 AM
  • Fix test case unassign_when_mapped_to_self.
  • Fix test case users_are_decreased_when_not_skipping_never_null.
  • Revert formatting changes in DNA_ID.h.
  • Cleanup: Remove obsolete comment.
Harbormaster completed remote builds in B20466: Diff 48176.Feb 10 2022, 10:52 AM
Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)Feb 10 2022, 11:00 AM
Jeroen Bakker (jbakker) added a project: Performance.
Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)Feb 10 2022, 11:03 AM
Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)Feb 10 2022, 11:06 AM
Jeroen Bakker (jbakker) added inline comments.
source/blender/blenkernel/intern/lib_id_remapper.cc
195

Remove comment. Assert statement has this in the message

221

Debug helpers could land in master outside this patch.

Jeroen Bakker (jbakker) requested review of this revision.Feb 10 2022, 11:06 AM
Jeroen Bakker (jbakker) updated this revision to Diff 48226.Feb 11 2022, 8:45 AM
  • Rebased with latest master.
  • Missing runtime member in ID struct
  • Remove redundant comment.
Harbormaster completed remote builds in B20492: Diff 48226.Feb 11 2022, 8:45 AM
Jeroen Bakker (jbakker) updated this revision to Diff 48227.Feb 11 2022, 8:48 AM
  • Remove redundant import.
  • Revert code formatting style.
Harbormaster completed remote builds in B20493: Diff 48227.Feb 11 2022, 8:48 AM
Jeroen Bakker (jbakker) added inline comments.Feb 11 2022, 9:02 AM
source/blender/blenkernel/BKE_lib_query.h
21

Remove is redudant import.

source/blender/blenkernel/intern/lib_remap.c
341–342

revert formatting change

Bastien Montagne (mont29) requested changes to this revision.Feb 11 2022, 11:46 AM

LGTM, mostly minor improvements suggested below.

source/blender/blenkernel/BKE_lib_remap.h
184–187

Would be good to have detailed explanation of the meaning of those three options?

source/blender/makesdna/DNA_ID.h
351–359

Think this should be in its own sub-struct inside ID_Runtime (ID_Runtime_Remap?).

This runtime will be used for many other things, better keep it well organized from the start.

352

can be renamed to just status once put into a remap sub-struct.

This revision now requires changes to proceed.Feb 11 2022, 11:46 AM
Jeroen Bakker (jbakker) updated this revision to Diff 48236.Feb 11 2022, 1:35 PM
Jeroen Bakker (jbakker) marked 3 inline comments as done.
  • Describe ID_REMAP_APPLY_UNMAP_WHEN_REMAPPING_TO_SELF option.
  • Moved remap status and counters in own runtime struct.
Harbormaster completed remote builds in B20498: Diff 48236.Feb 11 2022, 1:35 PM
Bastien Montagne (mont29) accepted this revision.Feb 11 2022, 2:40 PM

LGTM

source/blender/blenkernel/BKE_lib_remap.h
189

instead ;)

This revision is now accepted and ready to land.Feb 11 2022, 2:40 PM
Jeroen Bakker (jbakker) updated this revision to Diff 48243.Feb 11 2022, 2:52 PM

Rebased with latest master.

Harbormaster completed remote builds in B20499: Diff 48243.Feb 11 2022, 2:52 PM
Closed by commit rBa71a513def20: Remap multiple items in referenced data. (authored by Jeroen Bakker (jbakker)). · Explain WhyFeb 11 2022, 2:55 PM
This revision was automatically updated to reflect the committed changes.
Jeroen Bakker (jbakker) added a commit: rBa71a513def20: Remap multiple items in referenced data..

Revision Contents
Changeset List

PathSize
source/
blender/
blenkernel/
5 lines
7 lines
37 lines
intern/
8 lines
83 lines
36 lines
123 lines
338 lines
makesdna/
68 lines

Diff 48135

View Options

source/blender/blenkernel/BKE_lib_id.h

Loading...
View Options

source/blender/blenkernel/BKE_lib_query.h

Loading...
View Options

source/blender/blenkernel/BKE_lib_remap.h

Loading...
View Options

source/blender/blenkernel/intern/lib_id.c

Loading...
View Options

source/blender/blenkernel/intern/lib_id_remapper.cc

Loading...
View Options

source/blender/blenkernel/intern/lib_id_remapper_test.cc

Loading...
View Options

source/blender/blenkernel/intern/lib_query.c

Loading...
View Options

source/blender/blenkernel/intern/lib_remap.c

Loading...
View Options

source/blender/makesdna/DNA_ID.h

Loading...