diff options
Diffstat (limited to 'intern/cycles/util/util_debug.cpp')
-rw-r--r-- | intern/cycles/util/util_debug.cpp | 228 |
1 files changed, 111 insertions, 117 deletions
diff --git a/intern/cycles/util/util_debug.cpp b/intern/cycles/util/util_debug.cpp index b4cc69411ed..aabfea7fc49 100644 --- a/intern/cycles/util/util_debug.cpp +++ b/intern/cycles/util/util_debug.cpp @@ -26,159 +26,153 @@ CCL_NAMESPACE_BEGIN DebugFlags::CPU::CPU() - : avx2(true), - avx(true), - sse41(true), - sse3(true), - sse2(true), - bvh_layout(BVH_LAYOUT_DEFAULT), - split_kernel(false) + : avx2(true), + avx(true), + sse41(true), + sse3(true), + sse2(true), + bvh_layout(BVH_LAYOUT_DEFAULT), + split_kernel(false) { - reset(); + reset(); } void DebugFlags::CPU::reset() { #define STRINGIFY(x) #x #define CHECK_CPU_FLAGS(flag, env) \ - do { \ - flag = (getenv(env) == NULL); \ - if(!flag) { \ - VLOG(1) << "Disabling " << STRINGIFY(flag) << " instruction set."; \ - } \ - } while(0) - - CHECK_CPU_FLAGS(avx2, "CYCLES_CPU_NO_AVX2"); - CHECK_CPU_FLAGS(avx, "CYCLES_CPU_NO_AVX"); - CHECK_CPU_FLAGS(sse41, "CYCLES_CPU_NO_SSE41"); - CHECK_CPU_FLAGS(sse3, "CYCLES_CPU_NO_SSE3"); - CHECK_CPU_FLAGS(sse2, "CYCLES_CPU_NO_SSE2"); + do { \ + flag = (getenv(env) == NULL); \ + if (!flag) { \ + VLOG(1) << "Disabling " << STRINGIFY(flag) << " instruction set."; \ + } \ + } while (0) + + CHECK_CPU_FLAGS(avx2, "CYCLES_CPU_NO_AVX2"); + CHECK_CPU_FLAGS(avx, "CYCLES_CPU_NO_AVX"); + CHECK_CPU_FLAGS(sse41, "CYCLES_CPU_NO_SSE41"); + CHECK_CPU_FLAGS(sse3, "CYCLES_CPU_NO_SSE3"); + CHECK_CPU_FLAGS(sse2, "CYCLES_CPU_NO_SSE2"); #undef STRINGIFY #undef CHECK_CPU_FLAGS - if(getenv("CYCLES_BVH2") != NULL) { - bvh_layout = BVH_LAYOUT_BVH2; - } - else if(getenv("CYCLES_BVH4") != NULL) { - bvh_layout = BVH_LAYOUT_BVH4; - } - else if(getenv("CYCLES_BVH8") != NULL) { - bvh_layout = BVH_LAYOUT_BVH8; - } - else { - bvh_layout = BVH_LAYOUT_DEFAULT; - } - - split_kernel = false; + if (getenv("CYCLES_BVH2") != NULL) { + bvh_layout = BVH_LAYOUT_BVH2; + } + else if (getenv("CYCLES_BVH4") != NULL) { + bvh_layout = BVH_LAYOUT_BVH4; + } + else if (getenv("CYCLES_BVH8") != NULL) { + bvh_layout = BVH_LAYOUT_BVH8; + } + else { + bvh_layout = BVH_LAYOUT_DEFAULT; + } + + split_kernel = false; } -DebugFlags::CUDA::CUDA() - : adaptive_compile(false), - split_kernel(false) +DebugFlags::CUDA::CUDA() : adaptive_compile(false), split_kernel(false) { - reset(); + reset(); } void DebugFlags::CUDA::reset() { - if(getenv("CYCLES_CUDA_ADAPTIVE_COMPILE") != NULL) - adaptive_compile = true; + if (getenv("CYCLES_CUDA_ADAPTIVE_COMPILE") != NULL) + adaptive_compile = true; - split_kernel = false; + split_kernel = false; } -DebugFlags::OpenCL::OpenCL() - : device_type(DebugFlags::OpenCL::DEVICE_ALL), - debug(false) +DebugFlags::OpenCL::OpenCL() : device_type(DebugFlags::OpenCL::DEVICE_ALL), debug(false) { - reset(); + reset(); } void DebugFlags::OpenCL::reset() { - /* Initialize device type from environment variables. */ - device_type = DebugFlags::OpenCL::DEVICE_ALL; - char *device = getenv("CYCLES_OPENCL_TEST"); - if(device) { - if(strcmp(device, "NONE") == 0) { - device_type = DebugFlags::OpenCL::DEVICE_NONE; - } - else if(strcmp(device, "ALL") == 0) { - device_type = DebugFlags::OpenCL::DEVICE_ALL; - } - else if(strcmp(device, "DEFAULT") == 0) { - device_type = DebugFlags::OpenCL::DEVICE_DEFAULT; - } - else if(strcmp(device, "CPU") == 0) { - device_type = DebugFlags::OpenCL::DEVICE_CPU; - } - else if(strcmp(device, "GPU") == 0) { - device_type = DebugFlags::OpenCL::DEVICE_GPU; - } - else if(strcmp(device, "ACCELERATOR") == 0) { - device_type = DebugFlags::OpenCL::DEVICE_ACCELERATOR; - } - } - /* Initialize other flags from environment variables. */ - debug = (getenv("CYCLES_OPENCL_DEBUG") != NULL); + /* Initialize device type from environment variables. */ + device_type = DebugFlags::OpenCL::DEVICE_ALL; + char *device = getenv("CYCLES_OPENCL_TEST"); + if (device) { + if (strcmp(device, "NONE") == 0) { + device_type = DebugFlags::OpenCL::DEVICE_NONE; + } + else if (strcmp(device, "ALL") == 0) { + device_type = DebugFlags::OpenCL::DEVICE_ALL; + } + else if (strcmp(device, "DEFAULT") == 0) { + device_type = DebugFlags::OpenCL::DEVICE_DEFAULT; + } + else if (strcmp(device, "CPU") == 0) { + device_type = DebugFlags::OpenCL::DEVICE_CPU; + } + else if (strcmp(device, "GPU") == 0) { + device_type = DebugFlags::OpenCL::DEVICE_GPU; + } + else if (strcmp(device, "ACCELERATOR") == 0) { + device_type = DebugFlags::OpenCL::DEVICE_ACCELERATOR; + } + } + /* Initialize other flags from environment variables. */ + debug = (getenv("CYCLES_OPENCL_DEBUG") != NULL); } -DebugFlags::DebugFlags() -: viewport_static_bvh(false) +DebugFlags::DebugFlags() : viewport_static_bvh(false) { - /* Nothing for now. */ + /* Nothing for now. */ } void DebugFlags::reset() { - viewport_static_bvh = false; - cpu.reset(); - cuda.reset(); - opencl.reset(); + viewport_static_bvh = false; + cpu.reset(); + cuda.reset(); + opencl.reset(); } -std::ostream& operator <<(std::ostream &os, - DebugFlagsConstRef debug_flags) +std::ostream &operator<<(std::ostream &os, DebugFlagsConstRef debug_flags) { - os << "CPU flags:\n" - << " AVX2 : " << string_from_bool(debug_flags.cpu.avx2) << "\n" - << " AVX : " << string_from_bool(debug_flags.cpu.avx) << "\n" - << " SSE4.1 : " << string_from_bool(debug_flags.cpu.sse41) << "\n" - << " SSE3 : " << string_from_bool(debug_flags.cpu.sse3) << "\n" - << " SSE2 : " << string_from_bool(debug_flags.cpu.sse2) << "\n" - << " BVH layout : " << bvh_layout_name(debug_flags.cpu.bvh_layout) << "\n" - << " Split : " << string_from_bool(debug_flags.cpu.split_kernel) << "\n"; - - os << "CUDA flags:\n" - << " Adaptive Compile: " << string_from_bool(debug_flags.cuda.adaptive_compile) << "\n"; - - const char *opencl_device_type; - switch(debug_flags.opencl.device_type) { - case DebugFlags::OpenCL::DEVICE_NONE: - opencl_device_type = "NONE"; - break; - case DebugFlags::OpenCL::DEVICE_ALL: - opencl_device_type = "ALL"; - break; - case DebugFlags::OpenCL::DEVICE_DEFAULT: - opencl_device_type = "DEFAULT"; - break; - case DebugFlags::OpenCL::DEVICE_CPU: - opencl_device_type = "CPU"; - break; - case DebugFlags::OpenCL::DEVICE_GPU: - opencl_device_type = "GPU"; - break; - case DebugFlags::OpenCL::DEVICE_ACCELERATOR: - opencl_device_type = "ACCELERATOR"; - break; - } - os << "OpenCL flags:\n" - << " Device type : " << opencl_device_type << "\n" - << " Debug : " << string_from_bool(debug_flags.opencl.debug) << "\n" - << " Memory limit : " << string_human_readable_size(debug_flags.opencl.mem_limit) << "\n"; - return os; + os << "CPU flags:\n" + << " AVX2 : " << string_from_bool(debug_flags.cpu.avx2) << "\n" + << " AVX : " << string_from_bool(debug_flags.cpu.avx) << "\n" + << " SSE4.1 : " << string_from_bool(debug_flags.cpu.sse41) << "\n" + << " SSE3 : " << string_from_bool(debug_flags.cpu.sse3) << "\n" + << " SSE2 : " << string_from_bool(debug_flags.cpu.sse2) << "\n" + << " BVH layout : " << bvh_layout_name(debug_flags.cpu.bvh_layout) << "\n" + << " Split : " << string_from_bool(debug_flags.cpu.split_kernel) << "\n"; + + os << "CUDA flags:\n" + << " Adaptive Compile: " << string_from_bool(debug_flags.cuda.adaptive_compile) << "\n"; + + const char *opencl_device_type; + switch (debug_flags.opencl.device_type) { + case DebugFlags::OpenCL::DEVICE_NONE: + opencl_device_type = "NONE"; + break; + case DebugFlags::OpenCL::DEVICE_ALL: + opencl_device_type = "ALL"; + break; + case DebugFlags::OpenCL::DEVICE_DEFAULT: + opencl_device_type = "DEFAULT"; + break; + case DebugFlags::OpenCL::DEVICE_CPU: + opencl_device_type = "CPU"; + break; + case DebugFlags::OpenCL::DEVICE_GPU: + opencl_device_type = "GPU"; + break; + case DebugFlags::OpenCL::DEVICE_ACCELERATOR: + opencl_device_type = "ACCELERATOR"; + break; + } + os << "OpenCL flags:\n" + << " Device type : " << opencl_device_type << "\n" + << " Debug : " << string_from_bool(debug_flags.opencl.debug) << "\n" + << " Memory limit : " << string_human_readable_size(debug_flags.opencl.mem_limit) << "\n"; + return os; } CCL_NAMESPACE_END |