diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-19 18:59:15 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-19 19:08:08 +0400 |
commit | 6b1a4fc66ef4e3197601318ce4c36db2c8359b98 (patch) | |
tree | 60a351f9c9a5a8580228f4e684a198a1d3ef2163 /intern | |
parent | d85d117b32523db4c57113ab58b95947edf9c187 (diff) |
Cycle CUDA: revert the f1aeb2ccf4 and 84f958754 busywait fixes for now.
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
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/device/device_cuda.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index fa65aeffba1..0fbb48cf431 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -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); } |