diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-04-09 01:25:54 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-04-09 01:25:54 +0400 |
| commit | 297a2223b5535cab21c3758ea10ccb4e0f5668e2 (patch) | |
| tree | d2146487e02fd4c7ac0e04d3f935bbc3aaf277e2 /intern | |
| parent | 5580afb5dfe98771c7db8b0660398c47751c1ade (diff) | |
Cycles / CUDA: Increase sm_2x registers to 40.
This fixes the ptaxs "ACCESS_VIOLATION" error and should allow our Linux and Windows build bots to compile again.
Unfortunately this comes with a performance penalty on sm_2x cards, so this is only a workaround for now. Branched Path is still globally disabled on GPU.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/SConscript | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index a5e4ec63699..edee32e6506 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -320,7 +320,7 @@ public: /* CUDA 5.x build flags for different archs */ if(major == 2) { /* sm_2x */ - arch_flags = "--maxrregcount=32 --use_fast_math"; + arch_flags = "--maxrregcount=40 --use_fast_math"; } else if(major == 3) { /* sm_3x */ diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 45b4c81610e..7dab65f4dd2 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -165,7 +165,7 @@ if(WITH_CYCLES_CUDA_BINARIES) # CUDA 5.x build flags for different archs if(${arch} MATCHES "sm_2[0-9]") # sm_2x - set(cuda_arch_flags "--maxrregcount=32") + set(cuda_arch_flags "--maxrregcount=40") elseif(${arch} MATCHES "sm_3[0-9]") # sm_3x set(cuda_arch_flags "--maxrregcount=32") diff --git a/intern/cycles/kernel/SConscript b/intern/cycles/kernel/SConscript index 82aaccb62d6..61ddaff59a5 100644 --- a/intern/cycles/kernel/SConscript +++ b/intern/cycles/kernel/SConscript @@ -90,7 +90,7 @@ if env['WITH_BF_CYCLES_CUDA_BINARIES']: # CUDA 5.x build flags for different archs if arch.startswith("sm_2"): # sm_2x - cuda_arch_flags = "--maxrregcount=32 --use_fast_math" + cuda_arch_flags = "--maxrregcount=40 --use_fast_math" elif arch.startswith("sm_3"): # sm_3x cuda_arch_flags = "--maxrregcount=32 --use_fast_math" |