[Bf-blender-cvs] [e6099c7e46f] blender2.7: T61576: Do Not (Re-)Compile OpenCL kernels
Jeroen Bakker
noreply at git.blender.org
Tue Feb 26 12:46:53 CET 2019
Commit: e6099c7e46f6ca90dff3dc62d06db7fcb276e790
Author: Jeroen Bakker
Date: Tue Feb 26 08:53:47 2019 +0100
Branches: blender2.7
https://developer.blender.org/rBe6099c7e46f6ca90dff3dc62d06db7fcb276e790
T61576: Do Not (Re-)Compile OpenCL kernels
The goal of this patch is to have limit the number of times
kernels needs to be compiled and are reused as kernels with
different compile directives can lead to identical same
binaries.
The implementation does this by stripping the compile directives.
and reshuffling kernels so the output is more likely to be the
same.
We focussed on the kernels where it was easy to detect and maintain
(bundle, bake, displace, do_volume and background). More optimizations
could be done but they are probably less obvious.
Merged the data_init and state_buffer_size kernels to split_bundle.
This patch will also remove empty kernels for do_volume and bake
when their features are not enabled.
When using the benchmark files there are less background, bake and
do_volume kernels compiled.
Fix: T61576, T61501, T61466
Reviewed By: brecht, #cycles
Differential Revision: https://developer.blender.org/D4390
===================================================================
M intern/cycles/device/device_split_kernel.cpp
M intern/cycles/device/opencl/opencl.h
M intern/cycles/device/opencl/opencl_split.cpp
M intern/cycles/kernel/kernels/opencl/kernel_split_bundle.cl
===================================================================
diff --git a/intern/cycles/device/device_split_kernel.cpp b/intern/cycles/device/device_split_kernel.cpp
index ab2c11e904d..ee566e57918 100644
--- a/intern/cycles/device/device_split_kernel.cpp
+++ b/intern/cycles/device/device_split_kernel.cpp
@@ -97,7 +97,9 @@ bool DeviceSplitKernel::load_kernels(const DeviceRequestedFeatures& requested_fe
LOAD_KERNEL(path_init);
LOAD_KERNEL(scene_intersect);
LOAD_KERNEL(lamp_emission);
- LOAD_KERNEL(do_volume);
+ if (requested_features.use_volume) {
+ LOAD_KERNEL(do_volume);
+ }
LOAD_KERNEL(queue_enqueue);
LOAD_KERNEL(indirect_background);
LOAD_KERNEL(shader_setup);
@@ -239,7 +241,9 @@ bool DeviceSplitKernel::path_trace(DeviceTask *task,
for(int PathIter = 0; PathIter < 16; PathIter++) {
ENQUEUE_SPLIT_KERNEL(scene_intersect, global_size, local_size);
ENQUEUE_SPLIT_KERNEL(lamp_emission, global_size, local_size);
- ENQUEUE_SPLIT_KERNEL(do_volume, global_size, local_size);
+ if (kernel_do_volume) {
+ ENQUEUE_SPLIT_KERNEL(do_volume, global_size, local_size);
+ }
ENQUEUE_SPLIT_KERNEL(queue_enqueue, global_size, local_size);
ENQUEUE_SPLIT_KERNEL(indirect_background, global_size, local_size);
ENQUEUE_SPLIT_KERNEL(shader_setup, global_size, local_size);
diff --git a/intern/cycles/device/opencl/opencl.h b/intern/cycles/device/opencl/opencl.h
index 1c5f6d375ec..6e5eab1a265 100644
--- a/intern/cycles/device/opencl/opencl.h
+++ b/intern/cycles/device/opencl/opencl.h
@@ -326,29 +326,17 @@ public:
DeviceSplitKernel *split_kernel;
- OpenCLProgram program_data_init;
- OpenCLProgram program_state_buffer_size;
-
OpenCLProgram program_split;
- OpenCLProgram program_path_init;
- OpenCLProgram program_scene_intersect;
OpenCLProgram program_lamp_emission;
OpenCLProgram program_do_volume;
- OpenCLProgram program_queue_enqueue;
OpenCLProgram program_indirect_background;
- OpenCLProgram program_shader_setup;
- OpenCLProgram program_shader_sort;
OpenCLProgram program_shader_eval;
OpenCLProgram program_holdout_emission_blurring_pathtermination_ao;
OpenCLProgram program_subsurface_scatter;
OpenCLProgram program_direct_lighting;
OpenCLProgram program_shadow_blocked_ao;
OpenCLProgram program_shadow_blocked_dl;
- OpenCLProgram program_enqueue_inactive;
- OpenCLProgram program_next_iteration_setup;
- OpenCLProgram program_indirect_subsurface;
- OpenCLProgram program_buffer_update;
OpenCLProgram base_program;
OpenCLProgram bake_program;
@@ -386,8 +374,7 @@ public:
const string get_opencl_program_name(bool single_program, const string& kernel_name);
/* Get the program file name to compile (*.cl) for the given kernel */
const string get_opencl_program_filename(bool single_program, const string& kernel_name);
- string get_build_options(const DeviceRequestedFeatures& requested_features);
- string get_build_options_for_bake(const DeviceRequestedFeatures& requested_features);
+ string get_build_options(const DeviceRequestedFeatures& requested_features, const string& opencl_program_name);
void mem_alloc(device_memory& mem);
void mem_copy_to(device_memory& mem);
diff --git a/intern/cycles/device/opencl/opencl_split.cpp b/intern/cycles/device/opencl/opencl_split.cpp
index be408e92520..0b60c498bfc 100644
--- a/intern/cycles/device/opencl/opencl_split.cpp
+++ b/intern/cycles/device/opencl/opencl_split.cpp
@@ -41,7 +41,9 @@ struct texture_slot_t {
};
static const string fast_compiled_kernels =
+ "data_init "
"path_init "
+ "state_buffer_size "
"scene_intersect "
"queue_enqueue "
"shader_setup "
@@ -81,25 +83,95 @@ const string OpenCLDevice::get_opencl_program_filename(bool single_program, cons
}
}
-string OpenCLDevice::get_build_options(const DeviceRequestedFeatures& requested_features)
+string OpenCLDevice::get_build_options(const DeviceRequestedFeatures& requested_features, const string& opencl_program_name)
{
- string build_options = "-D__SPLIT_KERNEL__ ";
- build_options += requested_features.get_build_options();
+ /* first check for non-split kernel programs */
+ if (opencl_program_name == "base" || opencl_program_name == "denoising") {
+ return "";
+ }
+ else if (opencl_program_name == "bake") {
+ /* Note: get_build_options for bake is only requested when baking is enabled.
+ displace and background are always requested.
+ `__SPLIT_KERNEL__` must not be present in the compile directives for bake */
+ DeviceRequestedFeatures features(requested_features);
+ features.use_denoising = false;
+ features.use_object_motion = false;
+ features.use_camera_motion = false;
+ return features.get_build_options();
+ }
+ else if (opencl_program_name == "displace") {
+ /* As displacement does not use any nodes from the Shading group (eg BSDF).
+ We disable all features that are related to shading. */
+ DeviceRequestedFeatures features(requested_features);
+ features.use_denoising = false;
+ features.use_object_motion = false;
+ features.use_camera_motion = false;
+ features.use_baking = false;
+ features.use_transparent = false;
+ features.use_shadow_tricks = false;
+ features.use_subsurface = false;
+ features.use_volume = false;
+ features.nodes_features &= ~NODE_FEATURE_VOLUME;
+ features.use_denoising = false;
+ features.use_principled = false;
+ return features.get_build_options();
+ }
+ else if (opencl_program_name == "background") {
+ /* Background uses Background shading
+ It is save to disable shadow features, subsurface and volumetric. */
+ DeviceRequestedFeatures features(requested_features);
+ features.use_baking = false;
+ features.use_transparent = false;
+ features.use_shadow_tricks = false;
+ features.use_denoising = false;
+ /* NOTE: currently possible to use surface nodes like `Hair Info`, `Bump` node.
+ Perhaps we should remove them in UI as it does not make any sense when
+ rendering background. */
+ features.nodes_features &= ~NODE_FEATURE_VOLUME;
+ features.use_subsurface = false;
+ features.use_volume = false;
+ return features.get_build_options();
+ }
+ string build_options = "-D__SPLIT_KERNEL__ ";
+ DeviceRequestedFeatures nofeatures;
/* Set compute device build option. */
cl_device_type device_type;
OpenCLInfo::get_device_type(this->cdDevice, &device_type, &this->ciErr);
assert(this->ciErr == CL_SUCCESS);
if(device_type == CL_DEVICE_TYPE_GPU) {
- build_options += " -D__COMPUTE_DEVICE_GPU__";
+ build_options += "-D__COMPUTE_DEVICE_GPU__ ";
}
- return build_options;
-}
+ /* Add program specific optimized compile directives */
+ if (opencl_program_name == "split_do_volume" && !requested_features.use_volume) {
+ build_options += nofeatures.get_build_options();
+ }
+ else if (opencl_program_name == "split_subsurface_scatter" && !requested_features.use_subsurface) {
+ /* When subsurface is off, the kernel updates indexes and does not need any
+ Compile directives */
+ build_options += nofeatures.get_build_options();
+ }
+ else {
+ DeviceRequestedFeatures features(requested_features);
+
+ /* Always turn off baking at this point. Baking is only usefull when building the bake kernel.
+ this also makes sure that the kernels that are build during baking can be reused
+ when not doing any baking. */
+ features.use_baking = false;
+
+ /* Do not vary on shaders when program doesn't do any shading.
+ We have bundled them in a single program. */
+ if (opencl_program_name == "split_bundle") {
+ features.max_nodes_group = 0;
+ features.nodes_features = 0;
+ }
-string OpenCLDevice::get_build_options_for_bake(const DeviceRequestedFeatures& requested_features)
-{
- return requested_features.get_build_options();
+ /* No specific settings, just add the regular ones */
+ build_options += features.get_build_options();
+ }
+
+ return build_options;
}
namespace {
@@ -209,11 +281,12 @@ public:
OpenCLSplitKernelFunction* kernel = new OpenCLSplitKernelFunction(device, cached_memory);
bool single_program = OpenCLInfo::use_single_program();
+ const string program_name = device->get_opencl_program_name(single_program, kernel_name);
kernel->program =
OpenCLDevice::OpenCLProgram(device,
- device->get_opencl_program_name(single_program, kernel_name),
+ program_name,
device->get_opencl_program_filename(single_program, kernel_name),
- device->get_build_options(requested_features));
+ device->get_build_options(requested_features, program_name));
kernel->program.add_kernel(ustring("path_trace_" + kernel_name));
kernel->program.load();
@@ -233,11 +306,12 @@ public:
size_buffer.zero_to_device();
uint threads = num_threads;
- device->kernel_set_args(device->program_state_buffer_size(), 0, kg, data, threads, size_buffer);
+ cl_kernel kernel_state_buffer_size = device->program_split(ustring("path_trace_state_buffer_size"));
+ device->kernel_set_args(kernel_state_buffer_size, 0, kg, data, threads, size_buffer);
size_t global_size = 64;
device->ciErr = clEnqueueNDRangeKernel(device->cqCommandQueue,
- device->program_state_buffer_size(),
+ kernel_state_buffer_size,
1,
NULL,
&global_size,
@@ -282,8 +356,10 @@ public:
cl_int start_sample = rtile.start_sample;
cl_int end_sample = rtile.start_sample + rtile.num_samples;
+ cl_kernel kernel_data_init = device->program_split(ustring("path_trace_data_init"));
+
cl_uint start_arg_index =
- device->kernel_set_args(device->program_data_init(),
+ device->kernel_set_args(kernel_data_init,
0,
kernel_globals,
kernel_data,
@@ -291,10 +367,10 @@ public:
num_global_elements,
ray_state);
- device->set_kernel_arg_buffers(device->program_data_init(), &start_arg_index);
+ device->set_kernel_arg_buffers(kernel_data_init, &start_arg_index);
start_arg_index +=
- device->kern
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list