Details

Reviewers

Brecht Van Lommel (brecht)
William Leeson (leesonw)

Maniphest Tasks

T92212: Cycles Metal device

Commits

rCa7335a6533c6: Several small fixes and additions for msl
rBd19e35873f67: Cycles: several small fixes and additions for MSL

Summary

This patch contains many small leftover fixes and additions that are required for Metal-enablement:

Address space fixes and a few other small compile fixes
Addition of missing functionality to the Metal adapter headers
Addition of various scattered __KERNEL_METAL__ blocks (e.g. for atomic support & maths functions)

Ref T92212

Diff Detail

Repository

rB Blender

Branch

arcpatch-D13263 (branched from master)

Build Status

Buildable 18753
Build 18753: arc lint + arc unit

Event Timeline

Michael Jones (michael_jones) requested review of this revision.Nov 17 2021, 3:37 PM

Michael Jones (michael_jones) created this revision.

Harbormaster completed remote builds in B18740: Diff 44880.Nov 17 2021, 3:37 PM

Eugen (mycoconut) awarded a token.Nov 17 2021, 3:44 PM

Looks generally fine.

intern/cycles/kernel/geom/attribute.h
30–35	I'd prefer to move the definition here rather than make this metal specific.
intern/cycles/kernel/sample/lcg.h
22–23	Would be helpful to add a comment this is templated to handle multiple address spaces.
intern/cycles/kernel/sample/pattern.h
165–166	We should add a `popcount` in `util/math.h` rather than doing more device specific things here.
intern/cycles/util/half.h
33	`float4_store_half` was removed for other devices, this should no longer be needed.
57	This also is not defined for other devices.

This revision now requires changes to proceed.Nov 17 2021, 4:14 PM

Add popcount in util/math.h, and use instead of ccl_gpu_popc
Remove unused half util functions
Add comment about templating to handle multiple address spaces
Move definition of subd_triangle_patch instead of a forward declare

Harbormaster completed remote builds in B18744: Diff 44891.Nov 17 2021, 10:48 PM

Thank you for the suggestions @Brecht Van Lommel (brecht) - I have updated the patch accordingly.

make format

Harbormaster completed remote builds in B18745: Diff 44892.Nov 17 2021, 10:56 PM

Use uint instead of int in popcount, and use ccl_device_inline macro

Harbormaster completed remote builds in B18753: Diff 44904.Nov 18 2021, 10:32 AM

Looks fine to me now, I'll commit this along with D13241.

This revision is now accepted and ready to land.Nov 18 2021, 2:57 PM

Closed by commit rBd19e35873f67: Cycles: several small fixes and additions for MSL (authored by Michael Jones (michael_jones), committed by Brecht Van Lommel (brecht)). · Explain WhyNov 18 2021, 2:58 PM

This revision was automatically updated to reflect the committed changes.

Brecht Van Lommel (brecht) added a commit: rBd19e35873f67: Cycles: several small fixes and additions for MSL.

Brecht Van Lommel (brecht) added a commit: rCa7335a6533c6: Several small fixes and additions for msl.Jan 27 2022, 11:37 PM

Cycles: Several small fixes and additions for MSL
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 44904

intern/cycles/kernel/bvh/util.h

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

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

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

intern/cycles/kernel/device/hip/compat.h

intern/cycles/kernel/device/metal/compat.h

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

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

intern/cycles/kernel/film/accumulate.h

intern/cycles/kernel/geom/attribute.h

intern/cycles/kernel/geom/subd_triangle.h

intern/cycles/kernel/sample/lcg.h

intern/cycles/kernel/sample/pattern.h

intern/cycles/kernel/svm/svm.h

intern/cycles/kernel/types.h

intern/cycles/util/atomic.h

intern/cycles/util/debug.h

intern/cycles/util/debug.cpp

intern/cycles/util/half.h

intern/cycles/util/math.h

intern/cycles/util/math_float2.h

intern/cycles/util/math_float3.h

intern/cycles/util/math_float4.h

intern/cycles/util/math_int2.h

intern/cycles/util/math_int3.h

intern/cycles/util/math_matrix.h

intern/cycles/util/path.cpp

intern/cycles/util/transform.h

intern/cycles/util/types.h

Cycles: Several small fixes and additions for MSLClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 44904

intern/cycles/kernel/bvh/util.h

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

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

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

intern/cycles/kernel/device/hip/compat.h

intern/cycles/kernel/device/metal/compat.h

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

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

intern/cycles/kernel/film/accumulate.h

intern/cycles/kernel/geom/attribute.h

intern/cycles/kernel/geom/subd_triangle.h

intern/cycles/kernel/sample/lcg.h

intern/cycles/kernel/sample/pattern.h

intern/cycles/kernel/svm/svm.h

intern/cycles/kernel/types.h

intern/cycles/util/atomic.h

intern/cycles/util/debug.h

intern/cycles/util/debug.cpp

intern/cycles/util/half.h

intern/cycles/util/math.h

intern/cycles/util/math_float2.h

intern/cycles/util/math_float3.h

intern/cycles/util/math_float4.h

intern/cycles/util/math_int2.h

intern/cycles/util/math_int3.h

intern/cycles/util/math_matrix.h

intern/cycles/util/path.cpp

intern/cycles/util/transform.h

intern/cycles/util/types.h

Cycles: Several small fixes and additions for MSL
ClosedPublic
Actions

Revision Contents
Changeset List