diff options
author | Sergey Sharybin <sergey@blender.org> | 2022-06-21 12:28:48 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey@blender.org> | 2022-06-21 13:06:29 +0300 |
commit | ffb155ee33d6d801ab0d5d2424fb75c1e79f6688 (patch) | |
tree | f2a41a9da69bed1e594719ca66b71deab771e7c8 /intern/cycles | |
parent | 5b1f8347e814ab6154f7508cb2963efc6fa85e25 (diff) |
Cycles oneAPI: tweak logging verbosity levels
- Use more semantic macros for logging instead of magic constants.
- Move debugging log to a more verbose level.
Levels might still need to be adjusted to make them even more semantic,
but for now the goal is to allow `blender --debug-cycles` to output the
final time statistics without spamming the console with memory allocator
logs.
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/device/oneapi/device.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/device/oneapi/device_impl.cpp | 52 | ||||
-rw-r--r-- | intern/cycles/device/oneapi/queue.cpp | 4 |
3 files changed, 30 insertions, 30 deletions
diff --git a/intern/cycles/device/oneapi/device.cpp b/intern/cycles/device/oneapi/device.cpp index fb7ade1c240..326bdfabe92 100644 --- a/intern/cycles/device/oneapi/device.cpp +++ b/intern/cycles/device/oneapi/device.cpp @@ -67,7 +67,7 @@ bool device_oneapi_init() # include "kernel/device/oneapi/dll_interface_template.h" # undef DLL_INTERFACE_CALL - VLOG(1) << "oneAPI kernel shared library has been loaded successfully"; + VLOG_INFO << "oneAPI kernel shared library has been loaded successfully"; // We need to have this oneapi kernel shared library during all life-span of the Blender. // So it is not unloaded because of this. @@ -152,7 +152,7 @@ static void device_iterator_cb(const char *id, const char *name, int num, void * info.display_device = false; devices->push_back(info); - VLOG(1) << "Added device \"" << name << "\" with id \"" << info.id << "\"."; + VLOG_INFO << "Added device \"" << name << "\" with id \"" << info.id << "\"."; } #endif diff --git a/intern/cycles/device/oneapi/device_impl.cpp b/intern/cycles/device/oneapi/device_impl.cpp index 1621cf4c1f1..a2f79fa1bed 100644 --- a/intern/cycles/device/oneapi/device_impl.cpp +++ b/intern/cycles/device/oneapi/device_impl.cpp @@ -44,8 +44,8 @@ OneapiDevice::OneapiDevice(const DeviceInfo &info, "\""); } else { - VLOG(1) << "oneAPI queue has been successfully created for the device \"" << info.description - << "\""; + VLOG_DEBUG << "oneAPI queue has been successfully created for the device \"" + << info.description << "\""; assert(device_queue); } @@ -56,7 +56,7 @@ OneapiDevice::OneapiDevice(const DeviceInfo &info, oneapi_error_string + "\""); } else { - VLOG(1) << "Successfully created global/constant memory segment (kernel globals object)"; + VLOG_DEBUG << "Successfully created global/constant memory segment (kernel globals object)"; } kg_memory = oneapi_dll.oneapi_usm_aligned_alloc_host(device_queue, globals_segment_size, 16); @@ -102,7 +102,7 @@ bool OneapiDevice::load_kernels(const uint requested_features) set_error("oneAPI kernel load: got runtime exception \"" + oneapi_error_string + "\""); } else { - VLOG(1) << "Runtime compilation done for \"" << info.description << "\""; + VLOG_INFO << "Runtime compilation done for \"" << info.description << "\""; assert(device_queue); } return is_finished_ok; @@ -205,9 +205,9 @@ void OneapiDevice::mem_alloc(device_memory &mem) } else { if (mem.name) { - VLOG(2) << "OneapiDevice::mem_alloc: \"" << mem.name << "\", " - << string_human_readable_number(mem.memory_size()) << " bytes. (" - << string_human_readable_size(mem.memory_size()) << ")"; + VLOG_DEBUG << "OneapiDevice::mem_alloc: \"" << mem.name << "\", " + << string_human_readable_number(mem.memory_size()) << " bytes. (" + << string_human_readable_size(mem.memory_size()) << ")"; } generic_alloc(mem); } @@ -216,9 +216,9 @@ void OneapiDevice::mem_alloc(device_memory &mem) void OneapiDevice::mem_copy_to(device_memory &mem) { if (mem.name) { - VLOG(4) << "OneapiDevice::mem_copy_to: \"" << mem.name << "\", " - << string_human_readable_number(mem.memory_size()) << " bytes. (" - << string_human_readable_size(mem.memory_size()) << ")"; + VLOG_DEBUG << "OneapiDevice::mem_copy_to: \"" << mem.name << "\", " + << string_human_readable_number(mem.memory_size()) << " bytes. (" + << string_human_readable_size(mem.memory_size()) << ")"; } if (mem.type == MEM_GLOBAL) { @@ -247,10 +247,10 @@ void OneapiDevice::mem_copy_from(device_memory &mem, size_t y, size_t w, size_t const size_t offset = elem * y * w; if (mem.name) { - VLOG(4) << "OneapiDevice::mem_copy_from: \"" << mem.name << "\" object of " - << string_human_readable_number(mem.memory_size()) << " bytes. (" - << string_human_readable_size(mem.memory_size()) << ") from offset " << offset - << " data " << size << " bytes"; + VLOG_DEBUG << "OneapiDevice::mem_copy_from: \"" << mem.name << "\" object of " + << string_human_readable_number(mem.memory_size()) << " bytes. (" + << string_human_readable_size(mem.memory_size()) << ") from offset " << offset + << " data " << size << " bytes"; } assert(device_queue); @@ -271,9 +271,9 @@ void OneapiDevice::mem_copy_from(device_memory &mem, size_t y, size_t w, size_t void OneapiDevice::mem_zero(device_memory &mem) { if (mem.name) { - VLOG(4) << "OneapiDevice::mem_zero: \"" << mem.name << "\", " - << string_human_readable_number(mem.memory_size()) << " bytes. (" - << string_human_readable_size(mem.memory_size()) << ")\n"; + VLOG_DEBUG << "OneapiDevice::mem_zero: \"" << mem.name << "\", " + << string_human_readable_number(mem.memory_size()) << " bytes. (" + << string_human_readable_size(mem.memory_size()) << ")\n"; } if (!mem.device_pointer) { @@ -295,9 +295,9 @@ void OneapiDevice::mem_zero(device_memory &mem) void OneapiDevice::mem_free(device_memory &mem) { if (mem.name) { - VLOG(2) << "OneapiDevice::mem_free: \"" << mem.name << "\", " - << string_human_readable_number(mem.device_size) << " bytes. (" - << string_human_readable_size(mem.device_size) << ")\n"; + VLOG_DEBUG << "OneapiDevice::mem_free: \"" << mem.name << "\", " + << string_human_readable_number(mem.device_size) << " bytes. (" + << string_human_readable_size(mem.device_size) << ")\n"; } if (mem.type == MEM_GLOBAL) { @@ -321,9 +321,9 @@ void OneapiDevice::const_copy_to(const char *name, void *host, size_t size) { assert(name); - VLOG(4) << "OneapiDevice::const_copy_to \"" << name << "\" object " - << string_human_readable_number(size) << " bytes. (" << string_human_readable_size(size) - << ")"; + VLOG_DEBUG << "OneapiDevice::const_copy_to \"" << name << "\" object " + << string_human_readable_number(size) << " bytes. (" + << string_human_readable_size(size) << ")"; ConstMemMap::iterator i = m_const_mem_map.find(name); device_vector<uchar> *data; @@ -351,9 +351,9 @@ void OneapiDevice::global_alloc(device_memory &mem) assert(mem.name); size_t size = mem.memory_size(); - VLOG(2) << "OneapiDevice::global_alloc \"" << mem.name << "\" object " - << string_human_readable_number(size) << " bytes. (" << string_human_readable_size(size) - << ")"; + VLOG_DEBUG << "OneapiDevice::global_alloc \"" << mem.name << "\" object " + << string_human_readable_number(size) << " bytes. (" + << string_human_readable_size(size) << ")"; generic_alloc(mem); generic_copy_to(mem); diff --git a/intern/cycles/device/oneapi/queue.cpp b/intern/cycles/device/oneapi/queue.cpp index 0d68e31b0e3..52a8a429208 100644 --- a/intern/cycles/device/oneapi/queue.cpp +++ b/intern/cycles/device/oneapi/queue.cpp @@ -65,8 +65,8 @@ int OneapiDeviceQueue::num_concurrent_states(const size_t state_size) const num_states = 1024 * 512; } - VLOG(3) << "GPU queue concurrent states: " << num_states << ", using up to " - << string_human_readable_size(num_states * state_size); + VLOG_DEVICE_STATS << "GPU queue concurrent states: " << num_states << ", using up to " + << string_human_readable_size(num_states * state_size); return num_states; } |