Paths

Table of Contentst

Differential D12888

Cycles: replace integrator state argument macros
ClosedPublic
Actions

Authored by Brecht Van Lommel (brecht) on Oct 16 2021, 12:08 AM.

Tags

None

Subscribers

Michael Jones (michael_jones)

Tokens

"Love" token, awarded by Alaska.

Details

Reviewers

Sergey Sharybin (sergey)
William Leeson (leesonw)
Michael Jones (michael_jones)

Commits

rC4d67cad66231: Replace integrator state argument macros
rB1df3b5198885: Cycles: replace integrator state argument macros

Summary

Rename struct KernelGlobals to struct KernelGlobalsCPU
Add KernelGlobals, IntegratorState and ConstIntegratorState typedefs that every device can define in its own way.
Remove INTEGRATOR_STATE_ARGS and INTEGRATOR_STATE_PASS macros and replace with these new typedefs.
Add explicit state argument to INTEGRATOR_STATE and similar macros

In preparation for decoupling main and shadow paths.

Diff Detail

Repository: rB Blender

Event Timeline

Brecht Van Lommel (brecht) requested review of this revision.Oct 16 2021, 12:08 AM

Brecht Van Lommel (brecht) created this revision.

Harbormaster completed remote builds in B17891: Diff 43411.Oct 16 2021, 12:08 AM

Brecht Van Lommel (brecht) added a child revision: D12889: Cycles: decouple shadow paths from main path on GPU.Oct 16 2021, 12:10 AM

Alaska (Alaska) awarded a token.Oct 16 2021, 3:14 AM

The code seems fine.

This revision is now accepted and ready to land.Oct 18 2021, 11:18 AM

@Michael Jones (michael_jones), does this conflict with any of your planned changes?

@Brecht Van Lommel (brecht) , I think this is okay. Assuming KernelGlobals is used exclusively for parameter declarations, we can add a #define KernelGlobals ccl_global KernelGlobalsGPU or similar in our compat.h

KernelGlobals is only for parameter declarations in practice (IntegratorState is not).

So #define should work, though typedef like CUDA would be a little cleaner if it works.

typedef ccl_global const KernelGlobalsGPU *ccl_restrict KernelGlobals;

The general direction seems interesting to me!

The extra warning is rather annoying though.

Am i right the integrator flow macro mush not rely on the existence of the kg is the current scope and we can simply do path_state_init(KernelGlobals /*kg*/, ?

intern/cycles/kernel/device/cpu/globals.h
57	From my understanding you can only inform the compiler that it's OK to have typedef which is unused, but you can't make it so variables are "inheriting" the maybe-unused attribute.
intern/cycles/kernel/kernel_path_state.h
34	Got a compiler warning that the `kg` is unused.

This revision now requires changes to proceed.Oct 18 2021, 12:33 PM

William Leeson (leesonw) mentioned this in D12889: Cycles: decouple shadow paths from main path on GPU.Oct 18 2021, 12:58 PM

Address comments.

Harbormaster completed remote builds in B17944: Diff 43495.Oct 18 2021, 5:03 PM

Brecht Van Lommel (brecht) marked 2 inline comments as done.Oct 18 2021, 5:09 PM

Sergey Sharybin (sergey) accepted this revision.Oct 18 2021, 5:14 PM

This revision is now accepted and ready to land.Oct 18 2021, 5:14 PM

Closed by commit rB1df3b5198885: Cycles: replace integrator state argument macros (authored by Brecht Van Lommel (brecht)). · Explain WhyOct 18 2021, 7:04 PM

This revision was automatically updated to reflect the committed changes.

Brecht Van Lommel (brecht) added a commit: rB1df3b5198885: Cycles: replace integrator state argument macros.

Brecht Van Lommel (brecht) added a commit: rC4d67cad66231: Replace integrator state argument macros.Jan 27 2022, 11:29 PM

Large Diff

This large diff affects 128 files. Files without inline comments have been collapsed. Expand All Files

Revision Contents
Changeset List

Path

Size

intern/

cycles/

bvh/

2 lines

device/

cpu/

2 lines

20 lines

kernel_thread_globals.h

8 lines

kernel_thread_globals.cpp

8 lines

integrator/

path_trace_work_cpu.h

4 lines

path_trace_work_cpu.cpp

4 lines

shader_eval.cpp

2 lines

kernel/

bvh/

10 lines

8 lines

4 lines

10 lines

bvh_shadow_all.h

4 lines

bvh_traversal.h

4 lines

20 lines

4 lines

bvh_volume_all.h

4 lines

closure/

8 lines

bsdf_hair_principled.h

8 lines

bsdf_microfacet.h

8 lines

bsdf_microfacet_multi.h

4 lines

device/

cpu/

6 lines

4 lines

14 lines

4 lines

20 lines

kernel_arch_impl.h

20 lines

cuda/

3 lines

gpu/

4 lines

24 lines

optix/

3 lines

geom/

geom_attribute.h

12 lines

17 lines

geom_curve_intersect.h

4 lines

geom_motion_curve.h

15 lines

geom_motion_triangle.h

15 lines

geom_motion_triangle_intersect.h

8 lines

geom_motion_triangle_shader.h

2 lines

89 lines

18 lines

geom_primitive.h

32 lines

geom_shader_data.h

13 lines

geom_subd_triangle.h

24 lines

geom_triangle.h

29 lines

geom_triangle_intersect.h

8 lines

4 lines

integrator/

integrator_init_from_bake.h

19 lines

integrator_init_from_camera.h

15 lines

integrator_intersect_closest.h

58 lines

integrator_intersect_shadow.h

42 lines

integrator_intersect_subsurface.h

4 lines

integrator_intersect_volume_stack.h

25 lines

integrator_megakernel.h

31 lines

integrator_shade_background.h

74 lines

integrator_shade_light.h

38 lines

integrator_shade_shadow.h

72 lines

integrator_shade_surface.h

196 lines

integrator_shade_volume.h

158 lines

integrator_state.h

69 lines

integrator_state_flow.h

41 lines

integrator_state_util.h

170 lines

integrator_subsurface.h

62 lines

integrator_subsurface_disk.h

17 lines

integrator_subsurface_random_walk.h

25 lines

integrator_volume_stack.h

37 lines

kernel_accumulate.h

150 lines

kernel_adaptive_sampling.h

11 lines

8 lines

kernel_camera.h

16 lines

4 lines

kernel_emission.h

19 lines

kernel_id_passes.h

2 lines

kernel_jitter.h

7 lines

46 lines

kernel_light_background.h

31 lines

kernel_light_common.h

5 lines

kernel_lookup_table.h

7 lines

kernel_passes.h

59 lines

kernel_path_state.h

157 lines

kernel_random.h

8 lines

kernel_shader.h

90 lines

kernel_shadow_catcher.h

30 lines

56 lines

osl/

osl_closures.cpp

2 lines

6 lines

osl_services.cpp

38 lines

16 lines

16 lines

svm/

86 lines

18 lines

18 lines

svm_attribute.h

11 lines

26 lines

svm_blackbody.h

2 lines

7 lines

4 lines

2 lines

2 lines

2 lines

40 lines

2 lines

13 lines

12 lines

2 lines

9 lines

14 lines

svm_light_path.h

25 lines

7 lines

svm_map_range.h

2 lines

6 lines

4 lines

2 lines

2 lines

2 lines

2 lines

39 lines

svm_sepcomb_hsv.h

4 lines

13 lines

svm_tex_coord.h

10 lines

4 lines

svm_vector_transform.h

2 lines

svm_vertex_color.h

6 lines

11 lines

7 lines

7 lines

svm_wavelength.h

2 lines

svm_white_noise.h

2 lines

svm_wireframe.h

4 lines

Diff 43502

intern/cycles/bvh/bvh_embree.cpp

intern/cycles/device/cpu/device_impl.h

intern/cycles/device/cpu/kernel.h

intern/cycles/device/cpu/kernel_thread_globals.h

intern/cycles/device/cpu/kernel_thread_globals.cpp

intern/cycles/integrator/path_trace_work_cpu.h

intern/cycles/integrator/path_trace_work_cpu.cpp

intern/cycles/integrator/shader_eval.cpp

intern/cycles/kernel/bvh/bvh.h

intern/cycles/kernel/bvh/bvh_embree.h

intern/cycles/kernel/bvh/bvh_local.h

intern/cycles/kernel/bvh/bvh_nodes.h

intern/cycles/kernel/bvh/bvh_shadow_all.h

intern/cycles/kernel/bvh/bvh_traversal.h

intern/cycles/kernel/bvh/bvh_util.h

intern/cycles/kernel/bvh/bvh_volume.h

intern/cycles/kernel/bvh/bvh_volume_all.h

intern/cycles/kernel/closure/bsdf.h

intern/cycles/kernel/closure/bsdf_hair_principled.h

intern/cycles/kernel/closure/bsdf_microfacet.h

intern/cycles/kernel/closure/bsdf_microfacet_multi.h

intern/cycles/kernel/device/cpu/globals.h

Loading...

intern/cycles/kernel/device/cpu/image.h

intern/cycles/kernel/device/cpu/kernel.h

intern/cycles/kernel/device/cpu/kernel.cpp

intern/cycles/kernel/device/cpu/kernel_arch.h

intern/cycles/kernel/device/cpu/kernel_arch_impl.h

intern/cycles/kernel/device/cuda/globals.h

intern/cycles/kernel/device/gpu/image.h

intern/cycles/kernel/device/gpu/kernel.h

intern/cycles/kernel/device/optix/globals.h

intern/cycles/kernel/geom/geom_attribute.h

intern/cycles/kernel/geom/geom_curve.h

intern/cycles/kernel/geom/geom_curve_intersect.h

intern/cycles/kernel/geom/geom_motion_curve.h

intern/cycles/kernel/geom/geom_motion_triangle.h

intern/cycles/kernel/geom/geom_motion_triangle_intersect.h

intern/cycles/kernel/geom/geom_motion_triangle_shader.h

intern/cycles/kernel/geom/geom_object.h

intern/cycles/kernel/geom/geom_patch.h

intern/cycles/kernel/geom/geom_primitive.h

intern/cycles/kernel/geom/geom_shader_data.h

intern/cycles/kernel/geom/geom_subd_triangle.h

intern/cycles/kernel/geom/geom_triangle.h

intern/cycles/kernel/geom/geom_triangle_intersect.h

intern/cycles/kernel/geom/geom_volume.h

intern/cycles/kernel/integrator/integrator_init_from_bake.h

intern/cycles/kernel/integrator/integrator_init_from_camera.h

intern/cycles/kernel/integrator/integrator_intersect_closest.h

intern/cycles/kernel/integrator/integrator_intersect_shadow.h

intern/cycles/kernel/integrator/integrator_intersect_subsurface.h

intern/cycles/kernel/integrator/integrator_intersect_volume_stack.h

intern/cycles/kernel/integrator/integrator_megakernel.h

intern/cycles/kernel/integrator/integrator_shade_background.h

intern/cycles/kernel/integrator/integrator_shade_light.h

intern/cycles/kernel/integrator/integrator_shade_shadow.h

intern/cycles/kernel/integrator/integrator_shade_surface.h

intern/cycles/kernel/integrator/integrator_shade_volume.h

intern/cycles/kernel/integrator/integrator_state.h

intern/cycles/kernel/integrator/integrator_state_flow.h

intern/cycles/kernel/integrator/integrator_state_util.h

intern/cycles/kernel/integrator/integrator_subsurface.h

intern/cycles/kernel/integrator/integrator_subsurface_disk.h

intern/cycles/kernel/integrator/integrator_subsurface_random_walk.h

intern/cycles/kernel/integrator/integrator_volume_stack.h

intern/cycles/kernel/kernel_accumulate.h

intern/cycles/kernel/kernel_adaptive_sampling.h

intern/cycles/kernel/kernel_bake.h

intern/cycles/kernel/kernel_camera.h

intern/cycles/kernel/kernel_color.h

intern/cycles/kernel/kernel_emission.h

intern/cycles/kernel/kernel_id_passes.h

intern/cycles/kernel/kernel_jitter.h

intern/cycles/kernel/kernel_light.h

intern/cycles/kernel/kernel_light_background.h

intern/cycles/kernel/kernel_light_common.h

intern/cycles/kernel/kernel_lookup_table.h

intern/cycles/kernel/kernel_passes.h

intern/cycles/kernel/kernel_path_state.h

Loading...

intern/cycles/kernel/kernel_random.h

intern/cycles/kernel/kernel_shader.h

intern/cycles/kernel/kernel_shadow_catcher.h

intern/cycles/kernel/kernel_types.h

intern/cycles/kernel/osl/osl_closures.cpp

intern/cycles/kernel/osl/osl_services.h

intern/cycles/kernel/osl/osl_services.cpp

intern/cycles/kernel/osl/osl_shader.h

intern/cycles/kernel/osl/osl_shader.cpp

intern/cycles/kernel/svm/svm.h

intern/cycles/kernel/svm/svm_ao.h

intern/cycles/kernel/svm/svm_aov.h

intern/cycles/kernel/svm/svm_attribute.h

intern/cycles/kernel/svm/svm_bevel.h

intern/cycles/kernel/svm/svm_blackbody.h

intern/cycles/kernel/svm/svm_brick.h

intern/cycles/kernel/svm/svm_bump.h

intern/cycles/kernel/svm/svm_camera.h

intern/cycles/kernel/svm/svm_checker.h

intern/cycles/kernel/svm/svm_clamp.h

intern/cycles/kernel/svm/svm_closure.h

intern/cycles/kernel/svm/svm_convert.h

intern/cycles/kernel/svm/svm_displace.h

intern/cycles/kernel/svm/svm_geometry.h

intern/cycles/kernel/svm/svm_hsv.h

intern/cycles/kernel/svm/svm_ies.h

intern/cycles/kernel/svm/svm_image.h

intern/cycles/kernel/svm/svm_light_path.h

intern/cycles/kernel/svm/svm_magic.h

intern/cycles/kernel/svm/svm_map_range.h

intern/cycles/kernel/svm/svm_mapping.h

intern/cycles/kernel/svm/svm_math.h

intern/cycles/kernel/svm/svm_mix.h

intern/cycles/kernel/svm/svm_musgrave.h

intern/cycles/kernel/svm/svm_noisetex.h

intern/cycles/kernel/svm/svm_normal.h

intern/cycles/kernel/svm/svm_ramp.h

intern/cycles/kernel/svm/svm_sepcomb_hsv.h

intern/cycles/kernel/svm/svm_sky.h

intern/cycles/kernel/svm/svm_tex_coord.h

intern/cycles/kernel/svm/svm_value.h

intern/cycles/kernel/svm/svm_vector_transform.h

intern/cycles/kernel/svm/svm_vertex_color.h

intern/cycles/kernel/svm/svm_voronoi.h

intern/cycles/kernel/svm/svm_voxel.h

intern/cycles/kernel/svm/svm_wave.h

intern/cycles/kernel/svm/svm_wavelength.h

intern/cycles/kernel/svm/svm_white_noise.h

intern/cycles/kernel/svm/svm_wireframe.h