2022-02-11 13:53:21 +01:00
|
|
|
/* SPDX-License-Identifier: Apache-2.0
|
|
|
|
|
* Copyright 2021-2022 Blender Foundation */
|
Cycles: merge of cycles-x branch, a major update to the renderer
This includes much improved GPU rendering performance, viewport interactivity,
new shadow catcher, revamped sampling settings, subsurface scattering anisotropy,
new GPU volume sampling, improved PMJ sampling pattern, and more.
Some features have also been removed or changed, breaking backwards compatibility.
Including the removal of the OpenCL backend, for which alternatives are under
development.
Release notes and code docs:
https://wiki.blender.org/wiki/Reference/Release_Notes/3.0/Cycles
https://wiki.blender.org/wiki/Source/Render/Cycles
Credits:
* Sergey Sharybin
* Brecht Van Lommel
* Patrick Mours (OptiX backend)
* Christophe Hery (subsurface scattering anisotropy)
* William Leeson (PMJ sampling pattern)
* Alaska (various fixes and tweaks)
* Thomas Dinges (various fixes)
For the full commit history, see the cycles-x branch. This squashes together
all the changes since intermediate changes would often fail building or tests.
Ref T87839, T87837, T87836
Fixes T90734, T89353, T80267, T80267, T77185, T69800
2021-09-20 17:59:20 +02:00
|
|
|
|
|
|
|
|
#pragma once
|
|
|
|
|
|
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
|
|
|
|
|
|
/* Given an array of states, build an array of indices for which the states
|
|
|
|
|
* are active.
|
|
|
|
|
*
|
2021-09-23 22:06:49 +10:00
|
|
|
* Shared memory requirement is `sizeof(int) * (number_of_warps + 1)`. */
|
Cycles: merge of cycles-x branch, a major update to the renderer
This includes much improved GPU rendering performance, viewport interactivity,
new shadow catcher, revamped sampling settings, subsurface scattering anisotropy,
new GPU volume sampling, improved PMJ sampling pattern, and more.
Some features have also been removed or changed, breaking backwards compatibility.
Including the removal of the OpenCL backend, for which alternatives are under
development.
Release notes and code docs:
https://wiki.blender.org/wiki/Reference/Release_Notes/3.0/Cycles
https://wiki.blender.org/wiki/Source/Render/Cycles
Credits:
* Sergey Sharybin
* Brecht Van Lommel
* Patrick Mours (OptiX backend)
* Christophe Hery (subsurface scattering anisotropy)
* William Leeson (PMJ sampling pattern)
* Alaska (various fixes and tweaks)
* Thomas Dinges (various fixes)
For the full commit history, see the cycles-x branch. This squashes together
all the changes since intermediate changes would often fail building or tests.
Ref T87839, T87837, T87836
Fixes T90734, T89353, T80267, T80267, T77185, T69800
2021-09-20 17:59:20 +02:00
|
|
|
|
2021-10-24 14:19:19 +02:00
|
|
|
#include "util/atomic.h"
|
Cycles: merge of cycles-x branch, a major update to the renderer
This includes much improved GPU rendering performance, viewport interactivity,
new shadow catcher, revamped sampling settings, subsurface scattering anisotropy,
new GPU volume sampling, improved PMJ sampling pattern, and more.
Some features have also been removed or changed, breaking backwards compatibility.
Including the removal of the OpenCL backend, for which alternatives are under
development.
Release notes and code docs:
https://wiki.blender.org/wiki/Reference/Release_Notes/3.0/Cycles
https://wiki.blender.org/wiki/Source/Render/Cycles
Credits:
* Sergey Sharybin
* Brecht Van Lommel
* Patrick Mours (OptiX backend)
* Christophe Hery (subsurface scattering anisotropy)
* William Leeson (PMJ sampling pattern)
* Alaska (various fixes and tweaks)
* Thomas Dinges (various fixes)
For the full commit history, see the cycles-x branch. This squashes together
all the changes since intermediate changes would often fail building or tests.
Ref T87839, T87837, T87836
Fixes T90734, T89353, T80267, T80267, T77185, T69800
2021-09-20 17:59:20 +02:00
|
|
|
|
2021-09-28 16:51:14 +02:00
|
|
|
#ifdef __HIP__
|
|
|
|
|
# define GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE 1024
|
|
|
|
|
#else
|
|
|
|
|
# define GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE 512
|
|
|
|
|
#endif
|
Cycles: merge of cycles-x branch, a major update to the renderer
This includes much improved GPU rendering performance, viewport interactivity,
new shadow catcher, revamped sampling settings, subsurface scattering anisotropy,
new GPU volume sampling, improved PMJ sampling pattern, and more.
Some features have also been removed or changed, breaking backwards compatibility.
Including the removal of the OpenCL backend, for which alternatives are under
development.
Release notes and code docs:
https://wiki.blender.org/wiki/Reference/Release_Notes/3.0/Cycles
https://wiki.blender.org/wiki/Source/Render/Cycles
Credits:
* Sergey Sharybin
* Brecht Van Lommel
* Patrick Mours (OptiX backend)
* Christophe Hery (subsurface scattering anisotropy)
* William Leeson (PMJ sampling pattern)
* Alaska (various fixes and tweaks)
* Thomas Dinges (various fixes)
For the full commit history, see the cycles-x branch. This squashes together
all the changes since intermediate changes would often fail building or tests.
Ref T87839, T87837, T87836
Fixes T90734, T89353, T80267, T80267, T77185, T69800
2021-09-20 17:59:20 +02:00
|
|
|
|
2022-06-29 12:58:04 +02:00
|
|
|
/* TODO: abstract more device differences, define ccl_gpu_local_syncthreads,
|
|
|
|
|
* ccl_gpu_thread_warp, ccl_gpu_warp_index, ccl_gpu_num_warps for all devices
|
|
|
|
|
* and keep device specific code in compat.h */
|
|
|
|
|
|
|
|
|
|
#ifdef __KERNEL_ONEAPI__
|
|
|
|
|
|
|
|
|
|
template<typename IsActiveOp>
|
|
|
|
|
void gpu_parallel_active_index_array_impl(const uint num_states,
|
|
|
|
|
ccl_global int *ccl_restrict indices,
|
|
|
|
|
ccl_global int *ccl_restrict num_indices,
|
|
|
|
|
IsActiveOp is_active_op)
|
|
|
|
|
{
|
2023-01-03 20:45:57 +01:00
|
|
|
# ifdef WITH_ONEAPI_SYCL_HOST_TASK
|
|
|
|
|
int write_index = 0;
|
|
|
|
|
for (int state_index = 0; state_index < num_states; state_index++) {
|
|
|
|
|
if (is_active_op(state_index))
|
|
|
|
|
indices[write_index++] = state_index;
|
|
|
|
|
}
|
|
|
|
|
*num_indices = write_index;
|
|
|
|
|
return;
|
|
|
|
|
# endif /* WITH_ONEAPI_SYCL_HOST_TASK */
|
|
|
|
|
|
2022-06-29 12:58:04 +02:00
|
|
|
const sycl::nd_item<1> &item_id = sycl::ext::oneapi::experimental::this_nd_item<1>();
|
|
|
|
|
const uint blocksize = item_id.get_local_range(0);
|
|
|
|
|
|
|
|
|
|
sycl::multi_ptr<int[GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE + 1],
|
|
|
|
|
sycl::access::address_space::local_space>
|
|
|
|
|
ptr = sycl::ext::oneapi::group_local_memory<
|
|
|
|
|
int[GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE + 1]>(item_id.get_group());
|
|
|
|
|
int *warp_offset = *ptr;
|
|
|
|
|
|
|
|
|
|
/* NOTE(@nsirgien): Here we calculate the same value as below but
|
|
|
|
|
* faster for DPC++ : seems CUDA converting "%", "/", "*" based calculations below into
|
|
|
|
|
* something faster already but DPC++ doesn't, so it's better to use
|
|
|
|
|
* direct request of needed parameters - switching from this computation to computation below
|
|
|
|
|
* will cause 2.5x performance slowdown. */
|
|
|
|
|
const uint thread_index = item_id.get_local_id(0);
|
|
|
|
|
const uint thread_warp = item_id.get_sub_group().get_local_id();
|
|
|
|
|
|
|
|
|
|
const uint warp_index = item_id.get_sub_group().get_group_id();
|
|
|
|
|
const uint num_warps = item_id.get_sub_group().get_group_range()[0];
|
|
|
|
|
|
|
|
|
|
const uint state_index = item_id.get_global_id(0);
|
|
|
|
|
|
|
|
|
|
/* Test if state corresponding to this thread is active. */
|
|
|
|
|
const uint is_active = (state_index < num_states) ? is_active_op(state_index) : 0;
|
|
|
|
|
#else /* !__KERNEL__ONEAPI__ */
|
|
|
|
|
# ifndef __KERNEL_METAL__
|
2022-11-30 21:38:57 +01:00
|
|
|
template<typename IsActiveOp>
|
2022-02-10 18:03:52 +00:00
|
|
|
__device__
|
2022-06-29 12:58:04 +02:00
|
|
|
# endif
|
2022-02-15 00:59:26 +01:00
|
|
|
void
|
|
|
|
|
gpu_parallel_active_index_array_impl(const uint num_states,
|
|
|
|
|
ccl_global int *indices,
|
|
|
|
|
ccl_global int *num_indices,
|
2022-06-29 12:58:04 +02:00
|
|
|
# ifdef __KERNEL_METAL__
|
2022-02-15 00:59:26 +01:00
|
|
|
const uint is_active,
|
|
|
|
|
const uint blocksize,
|
|
|
|
|
const int thread_index,
|
|
|
|
|
const uint state_index,
|
|
|
|
|
const int ccl_gpu_warp_size,
|
|
|
|
|
const int thread_warp,
|
|
|
|
|
const int warp_index,
|
|
|
|
|
const int num_warps,
|
|
|
|
|
threadgroup int *warp_offset)
|
2022-02-10 18:03:52 +00:00
|
|
|
{
|
2022-06-29 12:58:04 +02:00
|
|
|
# else
|
2022-02-10 18:03:52 +00:00
|
|
|
IsActiveOp is_active_op)
|
Cycles: merge of cycles-x branch, a major update to the renderer
This includes much improved GPU rendering performance, viewport interactivity,
new shadow catcher, revamped sampling settings, subsurface scattering anisotropy,
new GPU volume sampling, improved PMJ sampling pattern, and more.
Some features have also been removed or changed, breaking backwards compatibility.
Including the removal of the OpenCL backend, for which alternatives are under
development.
Release notes and code docs:
https://wiki.blender.org/wiki/Reference/Release_Notes/3.0/Cycles
https://wiki.blender.org/wiki/Source/Render/Cycles
Credits:
* Sergey Sharybin
* Brecht Van Lommel
* Patrick Mours (OptiX backend)
* Christophe Hery (subsurface scattering anisotropy)
* William Leeson (PMJ sampling pattern)
* Alaska (various fixes and tweaks)
* Thomas Dinges (various fixes)
For the full commit history, see the cycles-x branch. This squashes together
all the changes since intermediate changes would often fail building or tests.
Ref T87839, T87837, T87836
Fixes T90734, T89353, T80267, T80267, T77185, T69800
2021-09-20 17:59:20 +02:00
|
|
|
{
|
|
|
|
|
extern ccl_gpu_shared int warp_offset[];
|
|
|
|
|
|
2022-11-30 21:38:57 +01:00
|
|
|
# ifndef __KERNEL_METAL__
|
|
|
|
|
const uint blocksize = ccl_gpu_block_dim_x;
|
|
|
|
|
# endif
|
|
|
|
|
|
Cycles: merge of cycles-x branch, a major update to the renderer
This includes much improved GPU rendering performance, viewport interactivity,
new shadow catcher, revamped sampling settings, subsurface scattering anisotropy,
new GPU volume sampling, improved PMJ sampling pattern, and more.
Some features have also been removed or changed, breaking backwards compatibility.
Including the removal of the OpenCL backend, for which alternatives are under
development.
Release notes and code docs:
https://wiki.blender.org/wiki/Reference/Release_Notes/3.0/Cycles
https://wiki.blender.org/wiki/Source/Render/Cycles
Credits:
* Sergey Sharybin
* Brecht Van Lommel
* Patrick Mours (OptiX backend)
* Christophe Hery (subsurface scattering anisotropy)
* William Leeson (PMJ sampling pattern)
* Alaska (various fixes and tweaks)
* Thomas Dinges (various fixes)
For the full commit history, see the cycles-x branch. This squashes together
all the changes since intermediate changes would often fail building or tests.
Ref T87839, T87837, T87836
Fixes T90734, T89353, T80267, T80267, T77185, T69800
2021-09-20 17:59:20 +02:00
|
|
|
const uint thread_index = ccl_gpu_thread_idx_x;
|
|
|
|
|
const uint thread_warp = thread_index % ccl_gpu_warp_size;
|
|
|
|
|
|
|
|
|
|
const uint warp_index = thread_index / ccl_gpu_warp_size;
|
|
|
|
|
const uint num_warps = blocksize / ccl_gpu_warp_size;
|
|
|
|
|
|
|
|
|
|
const uint state_index = ccl_gpu_block_idx_x * blocksize + thread_index;
|
2022-02-10 18:03:52 +00:00
|
|
|
|
|
|
|
|
/* Test if state corresponding to this thread is active. */
|
|
|
|
|
const uint is_active = (state_index < num_states) ? is_active_op(state_index) : 0;
|
2022-06-29 12:58:04 +02:00
|
|
|
# endif
|
|
|
|
|
#endif /* !__KERNEL_ONEAPI__ */
|
2022-02-10 18:03:52 +00:00
|
|
|
/* For each thread within a warp compute how many other active states precede it. */
|
2022-06-29 12:58:04 +02:00
|
|
|
#ifdef __KERNEL_ONEAPI__
|
|
|
|
|
const uint thread_offset = sycl::exclusive_scan_over_group(
|
|
|
|
|
item_id.get_sub_group(), is_active, std::plus<>());
|
|
|
|
|
#else
|
2022-02-10 18:03:52 +00:00
|
|
|
const uint thread_offset = popcount(ccl_gpu_ballot(is_active) &
|
|
|
|
|
ccl_gpu_thread_mask(thread_warp));
|
2022-06-29 12:58:04 +02:00
|
|
|
#endif
|
Cycles: merge of cycles-x branch, a major update to the renderer
This includes much improved GPU rendering performance, viewport interactivity,
new shadow catcher, revamped sampling settings, subsurface scattering anisotropy,
new GPU volume sampling, improved PMJ sampling pattern, and more.
Some features have also been removed or changed, breaking backwards compatibility.
Including the removal of the OpenCL backend, for which alternatives are under
development.
Release notes and code docs:
https://wiki.blender.org/wiki/Reference/Release_Notes/3.0/Cycles
https://wiki.blender.org/wiki/Source/Render/Cycles
Credits:
* Sergey Sharybin
* Brecht Van Lommel
* Patrick Mours (OptiX backend)
* Christophe Hery (subsurface scattering anisotropy)
* William Leeson (PMJ sampling pattern)
* Alaska (various fixes and tweaks)
* Thomas Dinges (various fixes)
For the full commit history, see the cycles-x branch. This squashes together
all the changes since intermediate changes would often fail building or tests.
Ref T87839, T87837, T87836
Fixes T90734, T89353, T80267, T80267, T77185, T69800
2021-09-20 17:59:20 +02:00
|
|
|
|
2022-02-10 18:03:52 +00:00
|
|
|
/* Last thread in warp stores number of active states for each warp. */
|
2022-06-29 12:58:04 +02:00
|
|
|
#ifdef __KERNEL_ONEAPI__
|
|
|
|
|
if (thread_warp == item_id.get_sub_group().get_local_range()[0] - 1) {
|
|
|
|
|
#else
|
2022-02-10 18:03:52 +00:00
|
|
|
if (thread_warp == ccl_gpu_warp_size - 1) {
|
2022-06-29 12:58:04 +02:00
|
|
|
#endif
|
2022-02-10 18:03:52 +00:00
|
|
|
warp_offset[warp_index] = thread_offset + is_active;
|
|
|
|
|
}
|
Cycles: merge of cycles-x branch, a major update to the renderer
This includes much improved GPU rendering performance, viewport interactivity,
new shadow catcher, revamped sampling settings, subsurface scattering anisotropy,
new GPU volume sampling, improved PMJ sampling pattern, and more.
Some features have also been removed or changed, breaking backwards compatibility.
Including the removal of the OpenCL backend, for which alternatives are under
development.
Release notes and code docs:
https://wiki.blender.org/wiki/Reference/Release_Notes/3.0/Cycles
https://wiki.blender.org/wiki/Source/Render/Cycles
Credits:
* Sergey Sharybin
* Brecht Van Lommel
* Patrick Mours (OptiX backend)
* Christophe Hery (subsurface scattering anisotropy)
* William Leeson (PMJ sampling pattern)
* Alaska (various fixes and tweaks)
* Thomas Dinges (various fixes)
For the full commit history, see the cycles-x branch. This squashes together
all the changes since intermediate changes would often fail building or tests.
Ref T87839, T87837, T87836
Fixes T90734, T89353, T80267, T80267, T77185, T69800
2021-09-20 17:59:20 +02:00
|
|
|
|
2022-06-29 12:58:04 +02:00
|
|
|
#ifdef __KERNEL_ONEAPI__
|
|
|
|
|
/* NOTE(@nsirgien): For us here only local memory writing (warp_offset) is important,
|
|
|
|
|
* so faster local barriers can be used. */
|
|
|
|
|
ccl_gpu_local_syncthreads();
|
|
|
|
|
#else
|
2022-02-10 18:03:52 +00:00
|
|
|
ccl_gpu_syncthreads();
|
2022-06-29 12:58:04 +02:00
|
|
|
#endif
|
2022-02-10 18:03:52 +00:00
|
|
|
|
|
|
|
|
/* Last thread in block converts per-warp sizes to offsets, increments global size of
|
2022-02-15 00:59:26 +01:00
|
|
|
* index array and gets offset to write to. */
|
2022-02-10 18:03:52 +00:00
|
|
|
if (thread_index == blocksize - 1) {
|
|
|
|
|
/* TODO: parallelize this. */
|
|
|
|
|
int offset = 0;
|
|
|
|
|
for (int i = 0; i < num_warps; i++) {
|
|
|
|
|
int num_active = warp_offset[i];
|
|
|
|
|
warp_offset[i] = offset;
|
|
|
|
|
offset += num_active;
|
Cycles: merge of cycles-x branch, a major update to the renderer
This includes much improved GPU rendering performance, viewport interactivity,
new shadow catcher, revamped sampling settings, subsurface scattering anisotropy,
new GPU volume sampling, improved PMJ sampling pattern, and more.
Some features have also been removed or changed, breaking backwards compatibility.
Including the removal of the OpenCL backend, for which alternatives are under
development.
Release notes and code docs:
https://wiki.blender.org/wiki/Reference/Release_Notes/3.0/Cycles
https://wiki.blender.org/wiki/Source/Render/Cycles
Credits:
* Sergey Sharybin
* Brecht Van Lommel
* Patrick Mours (OptiX backend)
* Christophe Hery (subsurface scattering anisotropy)
* William Leeson (PMJ sampling pattern)
* Alaska (various fixes and tweaks)
* Thomas Dinges (various fixes)
For the full commit history, see the cycles-x branch. This squashes together
all the changes since intermediate changes would often fail building or tests.
Ref T87839, T87837, T87836
Fixes T90734, T89353, T80267, T80267, T77185, T69800
2021-09-20 17:59:20 +02:00
|
|
|
}
|
|
|
|
|
|
2022-02-10 18:03:52 +00:00
|
|
|
const uint block_num_active = warp_offset[warp_index] + thread_offset + is_active;
|
|
|
|
|
warp_offset[num_warps] = atomic_fetch_and_add_uint32(num_indices, block_num_active);
|
|
|
|
|
}
|
Cycles: merge of cycles-x branch, a major update to the renderer
This includes much improved GPU rendering performance, viewport interactivity,
new shadow catcher, revamped sampling settings, subsurface scattering anisotropy,
new GPU volume sampling, improved PMJ sampling pattern, and more.
Some features have also been removed or changed, breaking backwards compatibility.
Including the removal of the OpenCL backend, for which alternatives are under
development.
Release notes and code docs:
https://wiki.blender.org/wiki/Reference/Release_Notes/3.0/Cycles
https://wiki.blender.org/wiki/Source/Render/Cycles
Credits:
* Sergey Sharybin
* Brecht Van Lommel
* Patrick Mours (OptiX backend)
* Christophe Hery (subsurface scattering anisotropy)
* William Leeson (PMJ sampling pattern)
* Alaska (various fixes and tweaks)
* Thomas Dinges (various fixes)
For the full commit history, see the cycles-x branch. This squashes together
all the changes since intermediate changes would often fail building or tests.
Ref T87839, T87837, T87836
Fixes T90734, T89353, T80267, T80267, T77185, T69800
2021-09-20 17:59:20 +02:00
|
|
|
|
2022-06-29 12:58:04 +02:00
|
|
|
#ifdef __KERNEL_ONEAPI__
|
|
|
|
|
/* NOTE(@nsirgien): For us here only important local memory writing (warp_offset),
|
|
|
|
|
* so faster local barriers can be used. */
|
|
|
|
|
ccl_gpu_local_syncthreads();
|
|
|
|
|
#else
|
2022-02-10 18:03:52 +00:00
|
|
|
ccl_gpu_syncthreads();
|
2022-06-29 12:58:04 +02:00
|
|
|
#endif
|
Cycles: merge of cycles-x branch, a major update to the renderer
This includes much improved GPU rendering performance, viewport interactivity,
new shadow catcher, revamped sampling settings, subsurface scattering anisotropy,
new GPU volume sampling, improved PMJ sampling pattern, and more.
Some features have also been removed or changed, breaking backwards compatibility.
Including the removal of the OpenCL backend, for which alternatives are under
development.
Release notes and code docs:
https://wiki.blender.org/wiki/Reference/Release_Notes/3.0/Cycles
https://wiki.blender.org/wiki/Source/Render/Cycles
Credits:
* Sergey Sharybin
* Brecht Van Lommel
* Patrick Mours (OptiX backend)
* Christophe Hery (subsurface scattering anisotropy)
* William Leeson (PMJ sampling pattern)
* Alaska (various fixes and tweaks)
* Thomas Dinges (various fixes)
For the full commit history, see the cycles-x branch. This squashes together
all the changes since intermediate changes would often fail building or tests.
Ref T87839, T87837, T87836
Fixes T90734, T89353, T80267, T80267, T77185, T69800
2021-09-20 17:59:20 +02:00
|
|
|
|
2022-02-10 18:03:52 +00:00
|
|
|
/* Write to index array. */
|
|
|
|
|
if (is_active) {
|
|
|
|
|
const uint block_offset = warp_offset[num_warps];
|
|
|
|
|
indices[block_offset + warp_offset[warp_index] + thread_offset] = state_index;
|
Cycles: merge of cycles-x branch, a major update to the renderer
This includes much improved GPU rendering performance, viewport interactivity,
new shadow catcher, revamped sampling settings, subsurface scattering anisotropy,
new GPU volume sampling, improved PMJ sampling pattern, and more.
Some features have also been removed or changed, breaking backwards compatibility.
Including the removal of the OpenCL backend, for which alternatives are under
development.
Release notes and code docs:
https://wiki.blender.org/wiki/Reference/Release_Notes/3.0/Cycles
https://wiki.blender.org/wiki/Source/Render/Cycles
Credits:
* Sergey Sharybin
* Brecht Van Lommel
* Patrick Mours (OptiX backend)
* Christophe Hery (subsurface scattering anisotropy)
* William Leeson (PMJ sampling pattern)
* Alaska (various fixes and tweaks)
* Thomas Dinges (various fixes)
For the full commit history, see the cycles-x branch. This squashes together
all the changes since intermediate changes would often fail building or tests.
Ref T87839, T87837, T87836
Fixes T90734, T89353, T80267, T80267, T77185, T69800
2021-09-20 17:59:20 +02:00
|
|
|
}
|
2022-02-10 18:03:52 +00:00
|
|
|
}
|
Cycles: Adapt shared kernel/device/gpu layer for MSL
This patch adapts the shared kernel entrypoints so that they can be compiled as MSL (Metal Shading Language). Where possible, the adaptations avoid changes in common code.
In MSL, kernel function inputs are explicitly bound to resources. In the case of argument buffers, we declare a struct containing the kernel arguments, accessible via device pointer. This differs from CUDA and HIP where kernel function arguments are declared as traditional C-style function parameters. This patch adapts the entrypoints declared in kernel.h so that they can be translated via a new `ccl_gpu_kernel_signature` macro into the required parameter struct + kernel entrypoint pairing for MSL.
MSL buffer attribution must be applied to function parameters or non-static class data members. To allow universal access to the integrator state, kernel data, and texture fetch adapters, we wrap all of the shared kernel code in a `MetalKernelContext` class. This is achieved by bracketing the appropriate kernel headers with "context_begin.h" and "context_end.h" on Metal. When calling deeper into the kernel code, we must reference the context class (e.g. `context.integrator_init_from_camera`). This extra prefixing is performed by a set of defines in "context_end.h". These will require explicit maintenance if entrypoints change. We invite discussion on more maintainable ways to enforce correctness.
Lambda expressions are not supported on MSL, so a new `ccl_gpu_kernel_lambda` macro generates an inline function object and optionally capturing any required state. This yields the same behaviour. This approach is applied to all parallel_... implementations which are templated by operation. The lambda expressions in the film_convert... kernels don't adapt cleanly to use function objects. However, these entrypoints can be macro-generated more concisely to avoid lambda expressions entirely, instead relying on constant folding to handle the pixel/channel conversions.
A separate implementation of `gpu_parallel_active_index_array` is provided for Metal to workaround some subtle differences in SIMD width, and also to encapsulate some required thread parameters which must be declared as explicit entrypoint function parameters.
Ref T92212
Reviewed By: brecht
Maniphest Tasks: T92212
Differential Revision: https://developer.blender.org/D13109
2021-11-09 21:30:46 +00:00
|
|
|
|
|
|
|
|
#ifdef __KERNEL_METAL__
|
|
|
|
|
|
2022-11-30 21:38:57 +01:00
|
|
|
# define gpu_parallel_active_index_array(num_states, indices, num_indices, is_active_op) \
|
2022-02-15 00:59:26 +01:00
|
|
|
const uint is_active = (ccl_gpu_global_id_x() < num_states) ? \
|
|
|
|
|
is_active_op(ccl_gpu_global_id_x()) : \
|
|
|
|
|
0; \
|
|
|
|
|
gpu_parallel_active_index_array_impl(num_states, \
|
|
|
|
|
indices, \
|
|
|
|
|
num_indices, \
|
|
|
|
|
is_active, \
|
|
|
|
|
metal_local_size, \
|
|
|
|
|
metal_local_id, \
|
|
|
|
|
metal_global_id, \
|
|
|
|
|
simdgroup_size, \
|
|
|
|
|
simd_lane_index, \
|
|
|
|
|
simd_group_index, \
|
|
|
|
|
num_simd_groups, \
|
2023-02-06 11:16:02 +00:00
|
|
|
(threadgroup int *)threadgroup_array)
|
2022-06-29 12:58:04 +02:00
|
|
|
#elif defined(__KERNEL_ONEAPI__)
|
2022-10-21 14:10:25 +02:00
|
|
|
|
2022-11-30 21:38:57 +01:00
|
|
|
# define gpu_parallel_active_index_array(num_states, indices, num_indices, is_active_op) \
|
2022-10-21 14:10:25 +02:00
|
|
|
gpu_parallel_active_index_array_impl(num_states, indices, num_indices, is_active_op)
|
|
|
|
|
|
2022-02-10 18:03:52 +00:00
|
|
|
#else
|
|
|
|
|
|
2022-11-30 21:38:57 +01:00
|
|
|
# define gpu_parallel_active_index_array(num_states, indices, num_indices, is_active_op) \
|
|
|
|
|
gpu_parallel_active_index_array_impl(num_states, indices, num_indices, is_active_op)
|
2022-02-10 18:03:52 +00:00
|
|
|
|
Cycles: Adapt shared kernel/device/gpu layer for MSL
This patch adapts the shared kernel entrypoints so that they can be compiled as MSL (Metal Shading Language). Where possible, the adaptations avoid changes in common code.
In MSL, kernel function inputs are explicitly bound to resources. In the case of argument buffers, we declare a struct containing the kernel arguments, accessible via device pointer. This differs from CUDA and HIP where kernel function arguments are declared as traditional C-style function parameters. This patch adapts the entrypoints declared in kernel.h so that they can be translated via a new `ccl_gpu_kernel_signature` macro into the required parameter struct + kernel entrypoint pairing for MSL.
MSL buffer attribution must be applied to function parameters or non-static class data members. To allow universal access to the integrator state, kernel data, and texture fetch adapters, we wrap all of the shared kernel code in a `MetalKernelContext` class. This is achieved by bracketing the appropriate kernel headers with "context_begin.h" and "context_end.h" on Metal. When calling deeper into the kernel code, we must reference the context class (e.g. `context.integrator_init_from_camera`). This extra prefixing is performed by a set of defines in "context_end.h". These will require explicit maintenance if entrypoints change. We invite discussion on more maintainable ways to enforce correctness.
Lambda expressions are not supported on MSL, so a new `ccl_gpu_kernel_lambda` macro generates an inline function object and optionally capturing any required state. This yields the same behaviour. This approach is applied to all parallel_... implementations which are templated by operation. The lambda expressions in the film_convert... kernels don't adapt cleanly to use function objects. However, these entrypoints can be macro-generated more concisely to avoid lambda expressions entirely, instead relying on constant folding to handle the pixel/channel conversions.
A separate implementation of `gpu_parallel_active_index_array` is provided for Metal to workaround some subtle differences in SIMD width, and also to encapsulate some required thread parameters which must be declared as explicit entrypoint function parameters.
Ref T92212
Reviewed By: brecht
Maniphest Tasks: T92212
Differential Revision: https://developer.blender.org/D13109
2021-11-09 21:30:46 +00:00
|
|
|
#endif
|
Cycles: merge of cycles-x branch, a major update to the renderer
This includes much improved GPU rendering performance, viewport interactivity,
new shadow catcher, revamped sampling settings, subsurface scattering anisotropy,
new GPU volume sampling, improved PMJ sampling pattern, and more.
Some features have also been removed or changed, breaking backwards compatibility.
Including the removal of the OpenCL backend, for which alternatives are under
development.
Release notes and code docs:
https://wiki.blender.org/wiki/Reference/Release_Notes/3.0/Cycles
https://wiki.blender.org/wiki/Source/Render/Cycles
Credits:
* Sergey Sharybin
* Brecht Van Lommel
* Patrick Mours (OptiX backend)
* Christophe Hery (subsurface scattering anisotropy)
* William Leeson (PMJ sampling pattern)
* Alaska (various fixes and tweaks)
* Thomas Dinges (various fixes)
For the full commit history, see the cycles-x branch. This squashes together
all the changes since intermediate changes would often fail building or tests.
Ref T87839, T87837, T87836
Fixes T90734, T89353, T80267, T80267, T77185, T69800
2021-09-20 17:59:20 +02:00
|
|
|
|
|
|
|
|
CCL_NAMESPACE_END
|