kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycle CUDA: revert the f1aeb2ccf4 and 84f958754 busywait fixes for now.

Browse Source 
It's unclear what kind of impact they have on performance at the moment, so I
rather play it safe and postpone this for 2.71.

Ref T38679, Ref T38712
This commit is contained in:
Brecht Van Lommel 2014-02-19 15:59:15 +01:00
parent d85d117b32
commit 6b1a4fc66e
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
intern/cycles/device/device_cuda.cpp
View File

@ -41,8 +41,6 @@ public:
CUdevice cuDevice;
CUcontext cuContext;
CUmodule cuModule;
CUstream cuStream;
CUevent tileDone;
map<device_ptr, bool> tex_interp_map;
int cuDevId;
int cuDevArchitecture;
@ -209,9 +207,6 @@ public:
if(cuda_error_(result, "cuCtxCreate"))
return;
cuda_assert(cuStreamCreate(&cuStream, 0))
cuda_assert(cuEventCreate(&tileDone, 0x1))
int major, minor;
cuDeviceComputeCapability(&major, &minor, cuDevId);
cuDevArchitecture = major*100 + minor*10;
@ -228,8 +223,6 @@ public:
{
task_pool.stop();
cuda_assert(cuEventDestroy(tileDone))
cuda_assert(cuStreamDestroy(cuStream))
cuda_assert(cuCtxDestroy(cuContext))
}
@ -652,7 +645,9 @@ public:
cuda_assert(cuFuncSetCacheConfig(cuPathTrace, CU_FUNC_CACHE_PREFER_L1))
cuda_assert(cuFuncSetBlockShape(cuPathTrace, xthreads, ythreads, 1))
cuda_assert(cuLaunchGridAsync(cuPathTrace, xblocks, yblocks, cuStream))
cuda_assert(cuLaunchGrid(cuPathTrace, xblocks, yblocks))
cuda_assert(cuCtxSynchronize())
cuda_pop_context();
}
@ -986,8 +981,6 @@ public:
task->update_progress(tile);
}
cuda_assert(cuEventRecord(tileDone, cuStream ))
cuda_assert(cuEventSynchronize(tileDone))
task->release_tile(tile);
}