Details

Reviewers

Sergey Sharybin (sergey)
Hristo Gueorguiev (nirved)

Commits

rCe444b06c8289: Branched path tracing for the split kernel
rBS915766f42df5: Cycles: Branched path tracing for the split kernel
rB915766f42df5: Cycles: Branched path tracing for the split kernel

Summary

This implements branched path tracking for the split kernel.

Its kind of hard to keep all the different integration loops in sync, so this needs lots of testing to make sure everything is working correctly. We should probably start trying to deduplicate the integration loops more now.

Nonbranched BMW is ~2% slower, while classroom is ~2% faster, other scenes need testing still.

Diff Detail

Event Timeline

Mai Lavelle (maiself) created this revision.Apr 8 2017, 4:00 PM

I got this error with Barcelona "1- time: midday" scene:

fail log branched path.log13 KBDownload

Using latest 17.4.1 driver with RX480 on Windows 7 x64

Some areas seems a re-implementation of megakernel logic (i.e. kernel_split_branched_path_subsurface_indirect_light_init). This is worrying, any chance to get more code shared across two implementations?

intern/cycles/kernel/kernel_types.h
1324	A bit weird to have enum flags ifdef-ed. Looks kind of nasty and not sure how easy it is to maintain. Any specific reason to do this?
intern/cycles/kernel/split/kernel_branched.h
92	Guess this can be moved to some utility function and re-used with mega-kernel BPT.

Aaron Carlisle (Blendify) added a subscriber: Aaron Carlisle (Blendify).Apr 13 2017, 7:26 AM

Kernels fail to compile when using PT with volume, and when using BPT without subsurface.
The body of kernel_lamp_emission should be skipped during regular BPT iteration.
In kernel_holdout_... houldout and kernel_write_passes should be skipped during indirect BPT iteration.
In same kernel shader_bsdf_blur should be skipped during regular BPT iteration.

This revision now requires changes to proceed.Apr 14 2017, 1:29 AM

shader_bsdf_blur is ok, my mistake.

intern/cycles/kernel/split/kernel_do_volume.h
19	`#if defined(__BRANCHED_PATH__) && defined(__VOLUME__)`
100–103	`#ifdef __BRANCHED_PATH__`
intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
143	There's no holdout during indirect iteration.
167–168	Shouldn't happen during indirect iteration.
218	`__BRANCHED_PATH__`
intern/cycles/kernel/split/kernel_shadow_blocked_dl.h
56	`#ifdef __BRANCHED_PATH__`
intern/cycles/kernel/split/kernel_subsurface_scatter.h
19	Should be `#if defined(__BRANCHED_PATH__) && defined(__SUBSURFACE__)`

Fixed ifdefs
Fixed usage of wrong PathRadiance in do_volume and subsurface_scatter after the change in ray_index for loop iteration.
Fixed logic for path termination
Rebased on master

Reuploading with context, couldnt see where inline comments where attached to.

Mai Lavelle (maiself) marked 3 inline comments as done.Apr 25 2017, 12:12 PM

Mai Lavelle (maiself) added inline comments.

intern/cycles/kernel/kernel_types.h
1324	While working on this it helped catch flags being used in places they shouldnt be, but can be removed for final commit if you'd like.
intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
143	Pretty sure the check with PATH_RAY_CAMERA handles this.

Fixed path termination again
Removed ifdef around ray flags
Rebased on master

Pretty sure everything is ok now.

@Hristo Gueorguiev (nirved) did discover another compiler bug, but thats not a problem with this code and we still need to find a workaround.

Hristo Gueorguiev (nirved) accepted this revision.May 2 2017, 12:12 PM

This revision is now accepted and ready to land.May 2 2017, 12:12 PM

Closed by commit rB915766f42df5: Cycles: Branched path tracing for the split kernel (authored by Mai Lavelle (maiself)). · Explain WhyMay 2 2017, 8:27 PM

This revision was automatically updated to reflect the committed changes.

Cycles: Branched path tracking for split kernel
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 8742

intern/cycles/blender/addon/ui.py

intern/cycles/device/device_split_kernel.cpp

intern/cycles/kernel/CMakeLists.txt

intern/cycles/kernel/kernel_path.h

intern/cycles/kernel/kernel_path_branched.h

intern/cycles/kernel/kernel_path_surface.h

intern/cycles/kernel/kernel_subsurface.h

intern/cycles/kernel/kernel_types.h

intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h

intern/cycles/kernel/kernels/cuda/kernel_split.cu

intern/cycles/kernel/kernels/opencl/kernel_subsurface_scatter.cl

intern/cycles/kernel/split/kernel_branched.h

intern/cycles/kernel/split/kernel_data_init.h

intern/cycles/kernel/split/kernel_direct_lighting.h

intern/cycles/kernel/split/kernel_do_volume.h

intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h

intern/cycles/kernel/split/kernel_indirect_background.h

intern/cycles/kernel/split/kernel_indirect_subsurface.h

intern/cycles/kernel/split/kernel_next_iteration_setup.h

intern/cycles/kernel/split/kernel_shader_eval.h

intern/cycles/kernel/split/kernel_shadow_blocked_ao.h

intern/cycles/kernel/split/kernel_shadow_blocked_dl.h

intern/cycles/kernel/split/kernel_split_common.h

intern/cycles/kernel/split/kernel_split_data_types.h

intern/cycles/kernel/split/kernel_subsurface_scatter.h

Cycles: Branched path tracking for split kernelClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 8742

intern/cycles/blender/addon/ui.py

intern/cycles/device/device_split_kernel.cpp

intern/cycles/kernel/CMakeLists.txt

intern/cycles/kernel/kernel_path.h

intern/cycles/kernel/kernel_path_branched.h

intern/cycles/kernel/kernel_path_surface.h

intern/cycles/kernel/kernel_subsurface.h

intern/cycles/kernel/kernel_types.h

intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h

intern/cycles/kernel/kernels/cuda/kernel_split.cu

intern/cycles/kernel/kernels/opencl/kernel_subsurface_scatter.cl

intern/cycles/kernel/split/kernel_branched.h

intern/cycles/kernel/split/kernel_data_init.h

intern/cycles/kernel/split/kernel_direct_lighting.h

intern/cycles/kernel/split/kernel_do_volume.h

intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h

intern/cycles/kernel/split/kernel_indirect_background.h

intern/cycles/kernel/split/kernel_indirect_subsurface.h

intern/cycles/kernel/split/kernel_next_iteration_setup.h

intern/cycles/kernel/split/kernel_shader_eval.h

intern/cycles/kernel/split/kernel_shadow_blocked_ao.h

intern/cycles/kernel/split/kernel_shadow_blocked_dl.h

intern/cycles/kernel/split/kernel_split_common.h

intern/cycles/kernel/split/kernel_split_data_types.h

intern/cycles/kernel/split/kernel_subsurface_scatter.h

Cycles: Branched path tracking for split kernel
ClosedPublic
Actions

Revision Contents
Changeset List