Page MenuHome
Differential D656 Diff 2192 intern/cycles/device/device_cpu.cpp

Changeset View

Standalone View

View Options

intern/cycles/device/device_cpu.cpp

Show First 20 Lines • Show All 427 Lines • ▼ Show 20 Lines void thread_shader(DeviceTask& task)
KernelGlobals kg = kernel_globals; KernelGlobals kg = kernel_globals;
#ifdef WITH_OSL #ifdef WITH_OSL
OSLShader::thread_init(&kg, &kernel_globals, &osl_globals); OSLShader::thread_init(&kg, &kernel_globals, &osl_globals);
#endif #endif
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_AVX2 #ifdef WITH_CYCLES_OPTIMIZED_KERNEL_AVX2
if(system_cpu_support_avx2()) { if(system_cpu_support_avx2()) {
for(int x = task.shader_x; x < task.shader_x + task.shader_w; x++) { for(int sample = 0; sample < task.num_samples; sample++) {
for(int sample = 0; sample < task.num_samples; sample++) for(int x = task.shader_x; x < task.shader_x + task.shader_w; x++)
kernel_cpu_avx2_shader(&kg, (uint4*)task.shader_input, (float4*)task.shader_output, task.shader_eval_type, x, sample); kernel_cpu_avx2_shader(&kg, (uint4*)task.shader_input, (float4*)task.shader_output, task.shader_eval_type, x, sample);
if(task.get_cancel() || task_pool.canceled()) if(task.get_cancel() || task_pool.canceled())
break; break;
if(task.update_progress_sample)
task.update_progress_sample();
} }
} }
else else
#endif #endif
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_AVX #ifdef WITH_CYCLES_OPTIMIZED_KERNEL_AVX
if(system_cpu_support_avx()) { if(system_cpu_support_avx()) {
for(int x = task.shader_x; x < task.shader_x + task.shader_w; x++) { for(int sample = 0; sample < task.num_samples; sample++) {
for(int sample = 0; sample < task.num_samples; sample++) for(int x = task.shader_x; x < task.shader_x + task.shader_w; x++)
kernel_cpu_avx_shader(&kg, (uint4*)task.shader_input, (float4*)task.shader_output, task.shader_eval_type, x, sample); kernel_cpu_avx_shader(&kg, (uint4*)task.shader_input, (float4*)task.shader_output, task.shader_eval_type, x, sample);
if(task.get_cancel() || task_pool.canceled()) if(task.get_cancel() || task_pool.canceled())
break; break;
if(task.update_progress_sample)
task.update_progress_sample();
} }
} }
else else
#endif #endif
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE41 #ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE41
if(system_cpu_support_sse41()) { if(system_cpu_support_sse41()) {
for(int x = task.shader_x; x < task.shader_x + task.shader_w; x++) { for(int sample = 0; sample < task.num_samples; sample++) {
for(int sample = 0; sample < task.num_samples; sample++) for(int x = task.shader_x; x < task.shader_x + task.shader_w; x++)
kernel_cpu_sse41_shader(&kg, (uint4*)task.shader_input, (float4*)task.shader_output, task.shader_eval_type, x, sample); kernel_cpu_sse41_shader(&kg, (uint4*)task.shader_input, (float4*)task.shader_output, task.shader_eval_type, x, sample);
if(task.get_cancel() || task_pool.canceled()) if(task.get_cancel() || task_pool.canceled())
break; break;
if(task.update_progress_sample)
task.update_progress_sample();
} }
} }
else else
#endif #endif
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE3 #ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE3
if(system_cpu_support_sse3()) { if(system_cpu_support_sse3()) {
for(int x = task.shader_x; x < task.shader_x + task.shader_w; x++) { for(int sample = 0; sample < task.num_samples; sample++) {
for(int sample = 0; sample < task.num_samples; sample++) for(int x = task.shader_x; x < task.shader_x + task.shader_w; x++)
kernel_cpu_sse3_shader(&kg, (uint4*)task.shader_input, (float4*)task.shader_output, task.shader_eval_type, x, sample); kernel_cpu_sse3_shader(&kg, (uint4*)task.shader_input, (float4*)task.shader_output, task.shader_eval_type, x, sample);
if(task.get_cancel() || task_pool.canceled()) if(task.get_cancel() || task_pool.canceled())
break; break;
if(task.update_progress_sample)
task.update_progress_sample();
} }
} }
else else
#endif #endif
#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 #ifdef WITH_CYCLES_OPTIMIZED_KERNEL_SSE2
if(system_cpu_support_sse2()) { if(system_cpu_support_sse2()) {
for(int x = task.shader_x; x < task.shader_x + task.shader_w; x++) { for(int sample = 0; sample < task.num_samples; sample++) {
for(int sample = 0; sample < task.num_samples; sample++) for(int x = task.shader_x; x < task.shader_x + task.shader_w; x++)
kernel_cpu_sse2_shader(&kg, (uint4*)task.shader_input, (float4*)task.shader_output, task.shader_eval_type, x, sample); kernel_cpu_sse2_shader(&kg, (uint4*)task.shader_input, (float4*)task.shader_output, task.shader_eval_type, x, sample);
if(task.get_cancel() || task_pool.canceled()) if(task.get_cancel() || task_pool.canceled())
break; break;
if(task.update_progress_sample)
task.update_progress_sample();
} }
} }
else else
#endif #endif
{ {
for(int x = task.shader_x; x < task.shader_x + task.shader_w; x++) { for(int sample = 0; sample < task.num_samples; sample++) {
for(int sample = 0; sample < task.num_samples; sample++) for(int x = task.shader_x; x < task.shader_x + task.shader_w; x++)
kernel_cpu_shader(&kg, (uint4*)task.shader_input, (float4*)task.shader_output, task.shader_eval_type, x, sample); kernel_cpu_shader(&kg, (uint4*)task.shader_input, (float4*)task.shader_output, task.shader_eval_type, x, sample);
if(task.get_cancel() || task_pool.canceled()) if(task.get_cancel() || task_pool.canceled())
break; break;
if(task.update_progress_sample)
task.update_progress_sample();
} }
} }
#ifdef WITH_OSL #ifdef WITH_OSL
OSLShader::thread_free(&kg); OSLShader::thread_free(&kg);
#endif #endif
} }
int task_count(DeviceTask& task)
{
if (task.type == DeviceTask::SHADER)
return task.get_number_tasks(TaskScheduler::num_threads(), 256);
else
return task.get_number_tasks(TaskScheduler::num_threads());
}
void task_add(DeviceTask& task) void task_add(DeviceTask& task)
{ {
/* split task into smaller ones */ /* split task into smaller ones */
list<DeviceTask> tasks; list<DeviceTask> tasks;
if(task.type == DeviceTask::SHADER) if(task.type == DeviceTask::SHADER)
task.split(tasks, TaskScheduler::num_threads(), 256); task.split(tasks, TaskScheduler::num_threads(), 256);
else else
Show All 38 Lines