diff --git a/samples/advanced_thread_trace/client.cpp b/samples/advanced_thread_trace/client.cpp index 6befe9ac96..05773cd309 100644 --- a/samples/advanced_thread_trace/client.cpp +++ b/samples/advanced_thread_trace/client.cpp @@ -166,14 +166,14 @@ tool_codeobj_tracing_callback(rocprofiler_callback_tracing_record_t record, assert(callback_data && "Shader callback passed null!"); ToolData& tool = *reinterpret_cast(callback_data); - if(record.operation == ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_DEVICE_KERNEL_SYMBOL_REGISTER) + if(record.operation == ROCPROFILER_CODE_OBJECT_DEVICE_KERNEL_SYMBOL_REGISTER) { std::unique_lock lg(tool.isa_map_mut); auto* data = static_cast(record.payload); tool.kernel_object_to_kernel_name.emplace(data->kernel_object, data->kernel_name); } - if(record.operation != ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_LOAD) return; + if(record.operation != ROCPROFILER_CODE_OBJECT_LOAD) return; std::unique_lock lg(tool.isa_map_mut); auto* data = static_cast(record.payload); diff --git a/samples/api_buffered_tracing/client.cpp b/samples/api_buffered_tracing/client.cpp index dbbd78e52d..c73aa3fcd4 100644 --- a/samples/api_buffered_tracing/client.cpp +++ b/samples/api_buffered_tracing/client.cpp @@ -96,7 +96,7 @@ tool_code_object_callback(rocprofiler_callback_tracing_record_t record, void* callback_data) { if(record.kind == ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT && - record.operation == ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_LOAD) + record.operation == ROCPROFILER_CODE_OBJECT_LOAD) { if(record.phase == ROCPROFILER_CALLBACK_PHASE_UNLOAD) { @@ -108,8 +108,7 @@ tool_code_object_callback(rocprofiler_callback_tracing_record_t record, } } else if(record.kind == ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT && - record.operation == - ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_DEVICE_KERNEL_SYMBOL_REGISTER) + record.operation == ROCPROFILER_CODE_OBJECT_DEVICE_KERNEL_SYMBOL_REGISTER) { auto* data = static_cast(record.payload); if(record.phase == ROCPROFILER_CALLBACK_PHASE_LOAD) diff --git a/samples/code_object_isa_decode/client.cpp b/samples/code_object_isa_decode/client.cpp index 53134bee0d..2faabf5318 100644 --- a/samples/code_object_isa_decode/client.cpp +++ b/samples/code_object_isa_decode/client.cpp @@ -85,7 +85,7 @@ tool_codeobj_tracing_callback(rocprofiler_callback_tracing_record_t record, if(record.kind != ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT) return; if(record.phase != ROCPROFILER_CALLBACK_PHASE_LOAD) return; - if(record.operation == ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_LOAD) + if(record.operation == ROCPROFILER_CODE_OBJECT_LOAD) { auto* data = static_cast(record.payload); @@ -98,8 +98,7 @@ tool_codeobj_tracing_callback(rocprofiler_callback_tracing_record_t record, registered_kernels.insert({symbol.name, {vaddr, vaddr + symbol.mem_size}}); } } - else if(record.operation == - ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_DEVICE_KERNEL_SYMBOL_REGISTER) + else if(record.operation == ROCPROFILER_CODE_OBJECT_DEVICE_KERNEL_SYMBOL_REGISTER) { std::cout << std::hex; auto* data = static_cast(record.payload); diff --git a/samples/code_object_tracing/client.cpp b/samples/code_object_tracing/client.cpp index 1da0077143..ecb9fe7630 100644 --- a/samples/code_object_tracing/client.cpp +++ b/samples/code_object_tracing/client.cpp @@ -215,7 +215,7 @@ tool_tracing_callback(rocprofiler_callback_tracing_record_t record, void* callback_data) { if(record.kind == ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT && - record.operation == ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_LOAD) + record.operation == ROCPROFILER_CODE_OBJECT_LOAD) { auto* data = static_cast(record.payload); auto* call_stack_v = static_cast(callback_data); @@ -243,7 +243,7 @@ tool_tracing_callback(rocprofiler_callback_tracing_record_t record, call_stack_v->emplace_back(source_location{__FUNCTION__, __FILE__, __LINE__, info.str()}); } if(record.kind == ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT && - record.operation == ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_DEVICE_KERNEL_SYMBOL_REGISTER) + record.operation == ROCPROFILER_CODE_OBJECT_DEVICE_KERNEL_SYMBOL_REGISTER) { auto* data = static_cast(record.payload); auto* call_stack_v = static_cast(callback_data); diff --git a/source/include/rocprofiler-sdk/fwd.h b/source/include/rocprofiler-sdk/fwd.h index 73d704bfdb..f61ab37548 100644 --- a/source/include/rocprofiler-sdk/fwd.h +++ b/source/include/rocprofiler-sdk/fwd.h @@ -183,10 +183,10 @@ typedef enum // NOLINT(performance-enum-size) */ typedef enum // NOLINT(performance-enum-size) { - ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_NONE = 0, ///< Unknown code object operation - ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_LOAD, ///< Code object containing kernel symbols - ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_DEVICE_KERNEL_SYMBOL_REGISTER, ///< Kernel symbols - ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_LAST, + ROCPROFILER_CODE_OBJECT_NONE = 0, ///< Unknown code object operation + ROCPROFILER_CODE_OBJECT_LOAD, ///< Code object containing kernel symbols + ROCPROFILER_CODE_OBJECT_DEVICE_KERNEL_SYMBOL_REGISTER, ///< Kernel symbols + ROCPROFILER_CODE_OBJECT_LAST, } rocprofiler_code_object_operation_t; /** @@ -194,12 +194,12 @@ typedef enum // NOLINT(performance-enum-size) */ typedef enum // NOLINT(performance-enum-size) { - ROCPROFILER_BUFFER_TRACING_MEMORY_COPY_NONE = 0, ///< Unknown memory copy direction - ROCPROFILER_BUFFER_TRACING_MEMORY_COPY_HOST_TO_HOST, ///< Memory copy from host to host - ROCPROFILER_BUFFER_TRACING_MEMORY_COPY_HOST_TO_DEVICE, ///< Memory copy from host to device - ROCPROFILER_BUFFER_TRACING_MEMORY_COPY_DEVICE_TO_HOST, ///< Memory copy from device to host - ROCPROFILER_BUFFER_TRACING_MEMORY_COPY_DEVICE_TO_DEVICE, ///< Memory copy from device to device - ROCPROFILER_BUFFER_TRACING_MEMORY_COPY_LAST, + ROCPROFILER_MEMORY_COPY_NONE = 0, ///< Unknown memory copy direction + ROCPROFILER_MEMORY_COPY_HOST_TO_HOST, ///< Memory copy from host to host + ROCPROFILER_MEMORY_COPY_HOST_TO_DEVICE, ///< Memory copy from host to device + ROCPROFILER_MEMORY_COPY_DEVICE_TO_HOST, ///< Memory copy from device to host + ROCPROFILER_MEMORY_COPY_DEVICE_TO_DEVICE, ///< Memory copy from device to device + ROCPROFILER_MEMORY_COPY_LAST, } rocprofiler_memory_copy_operation_t; /** diff --git a/source/lib/rocprofiler-sdk-tool/tool.cpp b/source/lib/rocprofiler-sdk-tool/tool.cpp index b64dbf46bd..1f3db3a69f 100644 --- a/source/lib/rocprofiler-sdk-tool/tool.cpp +++ b/source/lib/rocprofiler-sdk-tool/tool.cpp @@ -957,7 +957,7 @@ code_object_tracing_callback(rocprofiler_callback_tracing_record_t record, void* data) { if(record.kind == ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT && - record.operation == ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_LOAD) + record.operation == ROCPROFILER_CODE_OBJECT_LOAD) { if(record.phase == ROCPROFILER_CALLBACK_PHASE_LOAD) { @@ -978,7 +978,7 @@ code_object_tracing_callback(rocprofiler_callback_tracing_record_t record, } if(record.kind == ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT && - record.operation == ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_DEVICE_KERNEL_SYMBOL_REGISTER) + record.operation == ROCPROFILER_CODE_OBJECT_DEVICE_KERNEL_SYMBOL_REGISTER) { auto* sym_data = static_cast(record.payload); if(record.phase == ROCPROFILER_CALLBACK_PHASE_LOAD) diff --git a/source/lib/rocprofiler-sdk/hsa/async_copy.cpp b/source/lib/rocprofiler-sdk/hsa/async_copy.cpp index 9bcb678723..bf8c70df40 100644 --- a/source/lib/rocprofiler-sdk/hsa/async_copy.cpp +++ b/source/lib/rocprofiler-sdk/hsa/async_copy.cpp @@ -98,9 +98,9 @@ struct async_copy_info; #define SPECIALIZE_ASYNC_COPY_INFO(DIRECTION) \ template <> \ - struct async_copy_info \ + struct async_copy_info \ { \ - static constexpr auto operation_idx = ROCPROFILER_BUFFER_TRACING_MEMORY_COPY_##DIRECTION; \ + static constexpr auto operation_idx = ROCPROFILER_MEMORY_COPY_##DIRECTION; \ static constexpr auto name = #DIRECTION; \ }; @@ -169,12 +169,12 @@ constexpr auto null_rocp_agent_id = struct async_copy_data { - hsa_signal_t orig_signal = {}; - hsa_signal_t rocp_signal = {}; - rocprofiler_thread_id_t tid = common::get_tid(); - rocprofiler_agent_id_t dst_agent = null_rocp_agent_id; - rocprofiler_agent_id_t src_agent = null_rocp_agent_id; - rocprofiler_memory_copy_operation_t direction = ROCPROFILER_BUFFER_TRACING_MEMORY_COPY_NONE; + hsa_signal_t orig_signal = {}; + hsa_signal_t rocp_signal = {}; + rocprofiler_thread_id_t tid = common::get_tid(); + rocprofiler_agent_id_t dst_agent = null_rocp_agent_id; + rocprofiler_agent_id_t src_agent = null_rocp_agent_id; + rocprofiler_memory_copy_operation_t direction = ROCPROFILER_MEMORY_COPY_NONE; context::correlation_id* correlation_id = nullptr; context::context_array_t contexts = {}; external_corr_id_map_t extern_corr_ids = {}; @@ -466,7 +466,7 @@ async_copy_impl(Args... args) } // determine the direction of the memory copy - auto _direction = ROCPROFILER_BUFFER_TRACING_MEMORY_COPY_NONE; + auto _direction = ROCPROFILER_MEMORY_COPY_NONE; auto _src_agent_id = rocprofiler_agent_id_t{}; auto _dst_agent_id = rocprofiler_agent_id_t{}; { @@ -489,9 +489,9 @@ async_copy_impl(Args... args) if(_rocp_src_agent->type == ROCPROFILER_AGENT_TYPE_CPU) { if(_rocp_dst_agent->type == ROCPROFILER_AGENT_TYPE_CPU) - _direction = ROCPROFILER_BUFFER_TRACING_MEMORY_COPY_HOST_TO_HOST; + _direction = ROCPROFILER_MEMORY_COPY_HOST_TO_HOST; else if(_rocp_dst_agent->type == ROCPROFILER_AGENT_TYPE_GPU) - _direction = ROCPROFILER_BUFFER_TRACING_MEMORY_COPY_HOST_TO_DEVICE; + _direction = ROCPROFILER_MEMORY_COPY_HOST_TO_DEVICE; else { ROCP_CI_LOG(WARNING) @@ -502,9 +502,9 @@ async_copy_impl(Args... args) else if(_rocp_src_agent->type == ROCPROFILER_AGENT_TYPE_GPU) { if(_rocp_dst_agent->type == ROCPROFILER_AGENT_TYPE_CPU) - _direction = ROCPROFILER_BUFFER_TRACING_MEMORY_COPY_DEVICE_TO_HOST; + _direction = ROCPROFILER_MEMORY_COPY_DEVICE_TO_HOST; else if(_rocp_dst_agent->type == ROCPROFILER_AGENT_TYPE_GPU) - _direction = ROCPROFILER_BUFFER_TRACING_MEMORY_COPY_DEVICE_TO_DEVICE; + _direction = ROCPROFILER_MEMORY_COPY_DEVICE_TO_DEVICE; else { ROCP_CI_LOG(WARNING) @@ -708,22 +708,21 @@ using async_copy_index_seq_t = const char* name_by_id(uint32_t id) { - return name_by_id(id, std::make_index_sequence{}); + return name_by_id(id, std::make_index_sequence{}); } uint32_t id_by_name(const char* name) { - return id_by_name(name, - std::make_index_sequence{}); + return id_by_name(name, std::make_index_sequence{}); } std::vector get_ids() { auto _data = std::vector{}; - _data.reserve(ROCPROFILER_BUFFER_TRACING_MEMORY_COPY_LAST); - get_ids(_data, std::make_index_sequence{}); + _data.reserve(ROCPROFILER_MEMORY_COPY_LAST); + get_ids(_data, std::make_index_sequence{}); return _data; } @@ -731,8 +730,8 @@ std::vector get_names() { auto _data = std::vector{}; - _data.reserve(ROCPROFILER_BUFFER_TRACING_MEMORY_COPY_LAST); - get_names(_data, std::make_index_sequence{}); + _data.reserve(ROCPROFILER_MEMORY_COPY_LAST); + get_names(_data, std::make_index_sequence{}); return _data; } } // namespace async_copy diff --git a/source/lib/rocprofiler-sdk/hsa/code_object.cpp b/source/lib/rocprofiler-sdk/hsa/code_object.cpp index 28b936084e..75cac1e2a3 100644 --- a/source/lib/rocprofiler-sdk/hsa/code_object.cpp +++ b/source/lib/rocprofiler-sdk/hsa/code_object.cpp @@ -70,11 +70,10 @@ struct code_object_info; #define SPECIALIZE_CODE_OBJECT_INFO(OPERATION) \ template <> \ - struct code_object_info \ + struct code_object_info \ { \ - static constexpr auto operation_idx = \ - ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_##OPERATION; \ - static constexpr auto name = #OPERATION; \ + static constexpr auto operation_idx = ROCPROFILER_CODE_OBJECT_##OPERATION; \ + static constexpr auto name = #OPERATION; \ }; SPECIALIZE_CODE_OBJECT_INFO(NONE) @@ -103,7 +102,7 @@ id_by_name(const char* name, std::index_sequence) if constexpr(sizeof...(IdxTail) > 0) return id_by_name(name, std::index_sequence{}); else - return ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_NONE; + return ROCPROFILER_CODE_OBJECT_NONE; } template @@ -111,8 +110,7 @@ void get_ids(std::vector& _id_list, std::index_sequence) { auto _emplace = [](auto& _vec, uint32_t _v) { - if(_v < static_cast(ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_LAST)) - _vec.emplace_back(_v); + if(_v < static_cast(ROCPROFILER_CODE_OBJECT_LAST)) _vec.emplace_back(_v); }; (_emplace(_id_list, code_object_info::operation_idx), ...); @@ -134,23 +132,21 @@ get_names(std::vector& _name_list, std::index_sequence) const char* name_by_id(uint32_t id) { - return name_by_id(id, - std::make_index_sequence{}); + return name_by_id(id, std::make_index_sequence{}); } uint32_t id_by_name(const char* name) { - return id_by_name(name, - std::make_index_sequence{}); + return id_by_name(name, std::make_index_sequence{}); } std::vector get_ids() { auto _data = std::vector{}; - _data.reserve(ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_LAST); - get_ids(_data, std::make_index_sequence{}); + _data.reserve(ROCPROFILER_CODE_OBJECT_LAST); + get_ids(_data, std::make_index_sequence{}); return _data; } @@ -158,8 +154,8 @@ std::vector get_names() { auto _data = std::vector{}; - _data.reserve(ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_LAST); - get_names(_data, std::make_index_sequence{}); + _data.reserve(ROCPROFILER_CODE_OBJECT_LAST); + get_names(_data, std::make_index_sequence{}); return _data; } } // namespace code_object @@ -870,9 +866,9 @@ executable_freeze(hsa_executable_t executable, const char* options) }); constexpr auto CODE_OBJECT_KIND = ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT; - constexpr auto CODE_OBJECT_LOAD = ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_LOAD; + constexpr auto CODE_OBJECT_LOAD = ROCPROFILER_CODE_OBJECT_LOAD; constexpr auto CODE_OBJECT_KERNEL_SYMBOL = - ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_DEVICE_KERNEL_SYMBOL_REGISTER; + ROCPROFILER_CODE_OBJECT_DEVICE_KERNEL_SYMBOL_REGISTER; auto&& context_filter = [](const context_t* ctx) { return (ctx->callback_tracer && ctx->callback_tracer->domains(CODE_OBJECT_KIND) && @@ -1006,9 +1002,9 @@ shutdown(hsa_executable_t executable) executable, code_object_unload_callback, &_unloaded); constexpr auto CODE_OBJECT_KIND = ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT; - constexpr auto CODE_OBJECT_LOAD = ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_LOAD; + constexpr auto CODE_OBJECT_LOAD = ROCPROFILER_CODE_OBJECT_LOAD; constexpr auto CODE_OBJECT_KERNEL_SYMBOL = - ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_DEVICE_KERNEL_SYMBOL_REGISTER; + ROCPROFILER_CODE_OBJECT_DEVICE_KERNEL_SYMBOL_REGISTER; auto tidx = common::get_tid(); for(auto& itr : _unloaded) diff --git a/source/lib/rocprofiler-sdk/tests/naming.cpp b/source/lib/rocprofiler-sdk/tests/naming.cpp index 905e1856cd..eeff773a7f 100644 --- a/source/lib/rocprofiler-sdk/tests/naming.cpp +++ b/source/lib/rocprofiler-sdk/tests/naming.cpp @@ -103,7 +103,7 @@ TEST(rocprofiler_lib, api_id_names) // Code object callback EXPECT_EQ(callback_names.operation_names.at(ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT).size(), - ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_LAST); + ROCPROFILER_CODE_OBJECT_LAST); { auto hsa_core_ids = ::rocprofiler::hsa::get_ids(); diff --git a/tests/tools/json-tool.cpp b/tests/tools/json-tool.cpp index 319df7a00f..71dab5ac8a 100644 --- a/tests/tools/json-tool.cpp +++ b/tests/tools/json-tool.cpp @@ -662,7 +662,7 @@ tool_tracing_callback(rocprofiler_callback_tracing_record_t record, if(record.kind == ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT) { - if(record.operation == ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_LOAD) + if(record.operation == ROCPROFILER_CODE_OBJECT_LOAD) { auto data_v = *static_cast(record.payload); @@ -671,8 +671,7 @@ tool_tracing_callback(rocprofiler_callback_tracing_record_t record, auto _lk = std::unique_lock{_mutex}; code_object_records.emplace_back(code_object_callback_record_t{ts, record, data_v}); } - else if(record.operation == - ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT_DEVICE_KERNEL_SYMBOL_REGISTER) + else if(record.operation == ROCPROFILER_CODE_OBJECT_DEVICE_KERNEL_SYMBOL_REGISTER) { auto data_v = *static_cast(record.payload);