Page MenuHome
Differential D13263

Cycles: Several small fixes and additions for MSL
ClosedPublic
Actions

Authored by Michael Jones (michael_jones) on Nov 17 2021, 3:37 PM.

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
master
Build Status
Buildable 18740
Build 18740: 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
Brecht Van Lommel (brecht) requested changes to this revision.Nov 17 2021, 4:14 PM

Looks generally fine.

intern/cycles/kernel/geom/attribute.h
31

I'd prefer to move the definition here rather than make this metal specific.

intern/cycles/kernel/sample/lcg.h
22

Would be helpful to add a comment this is templated to handle multiple address spaces.

intern/cycles/kernel/sample/pattern.h
166–179

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
Michael Jones (michael_jones) updated this revision to Diff 44891.Nov 17 2021, 10:48 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
Michael Jones (michael_jones) marked 5 inline comments as done.Nov 17 2021, 10:52 PM

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

Michael Jones (michael_jones) updated this revision to Diff 44892.Nov 17 2021, 10:56 PM
  • make format
Harbormaster completed remote builds in B18745: Diff 44892.Nov 17 2021, 10:56 PM
Michael Jones (michael_jones) updated this revision to Diff 44904.Nov 18 2021, 10:32 AM
  • 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
Brecht Van Lommel (brecht) accepted this revision.Nov 18 2021, 2:57 PM

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

Revision Contents
Changeset List

PathSize
intern/
cycles/
kernel/
bvh/
2 lines
device/
metal/
9 lines
2 lines
film/
3 lines
geom/
2 lines
sample/
4 lines
2 lines
svm/
2 lines
7 lines
util/
56 lines
14 lines
12 lines
57 lines
57 lines
5 lines
144 lines
145 lines
4 lines
40 lines
2 lines
2 lines
23 lines
4 lines

Diff 44880

View Options

intern/cycles/kernel/bvh/util.h

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

intern/cycles/kernel/film/accumulate.h

Loading...
View Options

intern/cycles/kernel/geom/attribute.h

Loading...
View Options

intern/cycles/kernel/sample/lcg.h

Loading...
View Options

intern/cycles/kernel/sample/pattern.h

Loading...
View Options

intern/cycles/kernel/svm/svm.h

Loading...
View Options

intern/cycles/kernel/types.h

Loading...
View Options

intern/cycles/util/atomic.h

Loading...
View Options

intern/cycles/util/debug.h

Loading...
View Options

intern/cycles/util/debug.cpp

Loading...
View Options

intern/cycles/util/half.h

Loading...
View Options

intern/cycles/util/math.h

Loading...
View Options

intern/cycles/util/math_float2.h

Loading...
View Options

intern/cycles/util/math_float3.h

Loading...
View Options

intern/cycles/util/math_float4.h

Loading...
View Options

intern/cycles/util/math_int2.h

Loading...
View Options

intern/cycles/util/math_int3.h

Loading...
View Options

intern/cycles/util/math_matrix.h

Loading...
View Options

intern/cycles/util/path.cpp

Loading...
View Options

intern/cycles/util/transform.h

Loading...
View Options

intern/cycles/util/types.h

Loading...