[Bf-blender-cvs] [94fd38b8b9c] cycles_oneapi: Cleanup: Spelling
Sergey Sharybin
noreply at git.blender.org
Wed Apr 20 13:10:37 CEST 2022
Commit: 94fd38b8b9cf542962919fc8353c9eb5e6b685e0
Author: Sergey Sharybin
Date: Wed Apr 20 10:42:02 2022 +0200
Branches: cycles_oneapi
https://developer.blender.org/rB94fd38b8b9cf542962919fc8353c9eb5e6b685e0
Cleanup: Spelling
===================================================================
M intern/cycles/device/oneapi/queue.cpp
M intern/cycles/kernel/device/oneapi/dll_interface_template.h
M intern/cycles/kernel/device/oneapi/kernel.cpp
===================================================================
diff --git a/intern/cycles/device/oneapi/queue.cpp b/intern/cycles/device/oneapi/queue.cpp
index 628ff2c90ac..a34ff1be21f 100644
--- a/intern/cycles/device/oneapi/queue.cpp
+++ b/intern/cycles/device/oneapi/queue.cpp
@@ -128,7 +128,7 @@ int OneapiDeviceQueue::num_concurrent_states(const size_t state_size) const
}
}
else {
- // iGPU path - no really nead to allocate a lot of integrator states, because it is shared GPU
+ // iGPU path - no really need to allocate a lot of integrator states, because it is shared GPU
// memory
num_states = 1024 * 512;
}
@@ -179,9 +179,9 @@ bool OneapiDeviceQueue::enqueue(DeviceKernel kernel,
size_t kernel_work_size = (size_t)signed_kernel_work_size;
size_t kernel_local_size =
- (oneapi_dll_.oneapi_kernel_prefered_local_size)(kernel_context_->queue,
- (::DeviceKernel)kernel,
- kernel_work_size);
+ (oneapi_dll_.oneapi_kernel_preferred_local_size)(kernel_context_->queue,
+ (::DeviceKernel)kernel,
+ kernel_work_size);
size_t uniformed_kernel_work_size = round_up(kernel_work_size, kernel_local_size);
assert(kernel_context_);
diff --git a/intern/cycles/kernel/device/oneapi/dll_interface_template.h b/intern/cycles/kernel/device/oneapi/dll_interface_template.h
index 18d66407974..815f4fbe1a3 100644
--- a/intern/cycles/kernel/device/oneapi/dll_interface_template.h
+++ b/intern/cycles/kernel/device/oneapi/dll_interface_template.h
@@ -37,7 +37,7 @@ DLL_INTERFACE_CALL(oneapi_set_global_memory,
const char *memory_name,
void *memory_device_pointer)
-DLL_INTERFACE_CALL(oneapi_kernel_prefered_local_size,
+DLL_INTERFACE_CALL(oneapi_kernel_preferred_local_size,
size_t,
SyclQueue *queue,
const DeviceKernel kernel,
diff --git a/intern/cycles/kernel/device/oneapi/kernel.cpp b/intern/cycles/kernel/device/oneapi/kernel.cpp
index b046ca26f6a..a80e04edc87 100644
--- a/intern/cycles/kernel/device/oneapi/kernel.cpp
+++ b/intern/cycles/kernel/device/oneapi/kernel.cpp
@@ -256,17 +256,17 @@ void oneapi_set_global_memory(SyclQueue *queue_,
# undef KERNEL_TEX
}
-size_t oneapi_kernel_prefered_local_size(SyclQueue *queue_,
- const DeviceKernel kernel,
- const size_t kernel_global_size)
+size_t oneapi_kernel_preferred_local_size(SyclQueue *queue_,
+ const DeviceKernel kernel,
+ const size_t kernel_global_size)
{
assert(queue_);
sycl::queue *queue = reinterpret_cast<sycl::queue *>(queue_);
(void)kernel_global_size;
- const static size_t prefered_work_group_size_intersect_shading = 32;
- const static size_t prefered_work_group_size_technical = 1024;
+ const static size_t preferred_work_group_size_intersect_shading = 32;
+ const static size_t preferred_work_group_size_technical = 1024;
- size_t prefered_work_group_size = 0;
+ size_t preferred_work_group_size = 0;
switch (kernel) {
case DEVICE_KERNEL_INTEGRATOR_INIT_FROM_CAMERA:
case DEVICE_KERNEL_INTEGRATOR_INIT_FROM_BAKE:
@@ -280,7 +280,7 @@ size_t oneapi_kernel_prefered_local_size(SyclQueue *queue_,
case DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_RAYTRACE:
case DEVICE_KERNEL_INTEGRATOR_SHADE_VOLUME:
case DEVICE_KERNEL_INTEGRATOR_SHADE_SHADOW:
- prefered_work_group_size = prefered_work_group_size_intersect_shading;
+ preferred_work_group_size = preferred_work_group_size_intersect_shading;
break;
case DEVICE_KERNEL_INTEGRATOR_QUEUED_PATHS_ARRAY:
@@ -295,16 +295,16 @@ size_t oneapi_kernel_prefered_local_size(SyclQueue *queue_,
case DEVICE_KERNEL_INTEGRATOR_COMPACT_SHADOW_STATES:
case DEVICE_KERNEL_INTEGRATOR_RESET:
case DEVICE_KERNEL_INTEGRATOR_SHADOW_CATCHER_COUNT_POSSIBLE_SPLITS:
- prefered_work_group_size = prefered_work_group_size_technical;
+ preferred_work_group_size = preferred_work_group_size_technical;
break;
default:
- prefered_work_group_size = 512;
+ preferred_work_group_size = 512;
}
const size_t limit_work_group_size =
queue->get_device().get_info<sycl::info::device::max_work_group_size>();
- return std::min(limit_work_group_size, prefered_work_group_size);
+ return std::min(limit_work_group_size, preferred_work_group_size);
}
bool oneapi_enqueue_kernel(KernelContext *kernel_context,
@@ -321,7 +321,7 @@ bool oneapi_enqueue_kernel(KernelContext *kernel_context,
return false;
}
- size_t local_size = oneapi_kernel_prefered_local_size(
+ size_t local_size = oneapi_kernel_preferred_local_size(
kernel_context->queue, device_kernel, global_size);
assert(global_size % local_size == 0);
More information about the Bf-blender-cvs
mailing list