Blender Git Loki
Git Commits -> Revision fcc844f
Revision fcc844f by Brecht Van Lommel (master) June 15, 2021, 15:28 (GMT) |
BLI: use explicit task isolation, no longer part of parallel operations After looking into task isolation issues with Sergey, we couldn't find the reason behind the deadlocks that we are getting in T87938 and a Sprite Fright file involving motion blur renders. There is no apparent place where we adding or waiting on tasks in a task group from different isolation regions, which is what is known to cause problems. Yet it still hangs. Either we do not understand some limitation of TBB isolation, or there is a bug in TBB, but we could not figure it out. Instead the idea is to use isolation only where we know we need it: when holding a mutex lock and then doing some multithreaded operation within that locked region. Three places where we do this now: * Generated images * Cached BVH tree building * OpenVDB lazy grid loading Compared to the more automatic approach previously used, there is the downside that it is easy to miss places where we need isolation. Yet doing it more automatically is also causing unexpected issue and bugs that we found no solution for, so this seems better. Patch implemented by Sergey and me. Differential Revision: https://developer.blender.org/D11603 |
Commit Details:
Full Hash: fcc844f8fbd0d10aeb5012c0b25babe76c278e9e
Parent Commit: b3f0dc2
Lines Changed: +180, -168
29 Modified Paths:
/intern/cycles/blender/blender_python.cpp (+5, -7) (Diff)
/source/blender/blenkernel/intern/bvhutils.c (+37, -9) (Diff)
/source/blender/blenkernel/intern/editmesh_tangent.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/image.c (+44, -11) (Diff)
/source/blender/blenkernel/intern/lib_override.c (+1, -2) (Diff)
/source/blender/blenkernel/intern/mesh_evaluate.c (+1, -2) (Diff)
/source/blender/blenkernel/intern/mesh_tangent.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/ocean.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/particle.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/particle_distribute.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/volume.cc (+14, -9) (Diff)
/source/blender/blenlib/BLI_task.h (+33, -43) (Diff)
/source/blender/blenlib/intern/task_graph.cc (+1, -1) (Diff)
/source/blender/blenlib/intern/task_iterator.c (+2, -2) (Diff)
/source/blender/blenlib/intern/task_pool.cc (+9, -54) (Diff)
/source/blender/blenlib/intern/task_range.cc (+5, -7) (Diff)
/source/blender/blenlib/intern/task_scheduler.cc (+10, -0) (Diff)
/source/blender/blenlib/tests/BLI_linklist_lockfree_test.cc (+1, -1) (Diff)
/source/blender/compositor/intern/COM_WorkScheduler.cc (+1, -2) (Diff)
/source/blender/depsgraph/intern/eval/deg_eval.cc (+1, -2) (Diff)
/source/blender/editors/mesh/editmesh_undo.c (+1, -1) (Diff)
/source/blender/editors/render/render_opengl.c (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_image_proj.c (+1, -1) (Diff)
/source/blender/editors/space_clip/clip_editor.c (+1, -1) (Diff)
/source/blender/editors/space_clip/clip_ops.c (+1, -1) (Diff)
/source/blender/editors/space_file/filelist.c (+1, -2) (Diff)
/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c (+2, -2) (Diff)
/source/blender/imbuf/intern/imageprocess.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_nodes_evaluator.cc (+1, -1) (Diff)
/source/blender/blenkernel/intern/bvhutils.c (+37, -9) (Diff)
/source/blender/blenkernel/intern/editmesh_tangent.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/image.c (+44, -11) (Diff)
/source/blender/blenkernel/intern/lib_override.c (+1, -2) (Diff)
/source/blender/blenkernel/intern/mesh_evaluate.c (+1, -2) (Diff)
/source/blender/blenkernel/intern/mesh_tangent.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/ocean.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/particle.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/particle_distribute.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/volume.cc (+14, -9) (Diff)
/source/blender/blenlib/BLI_task.h (+33, -43) (Diff)
/source/blender/blenlib/intern/task_graph.cc (+1, -1) (Diff)
/source/blender/blenlib/intern/task_iterator.c (+2, -2) (Diff)
/source/blender/blenlib/intern/task_pool.cc (+9, -54) (Diff)
/source/blender/blenlib/intern/task_range.cc (+5, -7) (Diff)
/source/blender/blenlib/intern/task_scheduler.cc (+10, -0) (Diff)
/source/blender/blenlib/tests/BLI_linklist_lockfree_test.cc (+1, -1) (Diff)
/source/blender/compositor/intern/COM_WorkScheduler.cc (+1, -2) (Diff)
/source/blender/depsgraph/intern/eval/deg_eval.cc (+1, -2) (Diff)
/source/blender/editors/mesh/editmesh_undo.c (+1, -1) (Diff)
/source/blender/editors/render/render_opengl.c (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_image_proj.c (+1, -1) (Diff)
/source/blender/editors/space_clip/clip_editor.c (+1, -1) (Diff)
/source/blender/editors/space_clip/clip_ops.c (+1, -1) (Diff)
/source/blender/editors/space_file/filelist.c (+1, -2) (Diff)
/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c (+2, -2) (Diff)
/source/blender/imbuf/intern/imageprocess.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_nodes_evaluator.cc (+1, -1) (Diff)