6a3f79e626
* Update include/rocprofiler
- remove rocprofiler_external_correlation_id_t
- redefine rocprofiler_correlation_id_t to include internal id and external user data
- associate rocprofiler_push_external_correlation_id and rocprofiler_pop_external_correlation_id with a context
* Update include/rocprofiler/rocprofiler.h
- rocprofiler_get_status_name
- rocprofiler_get_status_string
* Update lib/rocprofiler/rocprofiler.cpp
- implement rocprofiler_get_status_name and rocprofiler_get_status_string
* Update lib/rocprofiler/tests/status.cpp
- unit test for status string and name
* Update lib/rocprofiler/tests/registration.cpp
- update to new rocprofiler_correlation_id_t
* Update samples
- update to new rocprofiler_correlation_id_t
* Add lib/rocprofiler/external_correlation.cpp
- placeholder for external correlation push/pop
* Update lib/rocprofiler/hsa/agent_cache.cpp
- slight tweak to when HSA_AMD_AGENT_INFO_NEAREST_CPU is defined
* Update context implementation and hsa.cpp
- get_active_contexts is array of const context pointers
- update hsa_api_impl<Idx>::functor to new rocprofiler_correlation_id_t
* Update include/rocprofiler/fwd.h
- add ROCPROFILER_STATUS_ERROR_INVALID_ARGUMENT
- reorder enum for consistency
* Update include/rocprofiler/external_correlation.h
- doxygen comments
- thread id parameter
* Update include/rocprofiler/rocprofiler.h
- add rocprofiler_get_thread_id function (needed for external corr id)
* Update lib/common/synchronized.hpp
- explicit LockedType
- define all copy/move ctor and assignment
- update rlock/wlock/ulock to support arguments and return values
- Support additional template parameter for special case of synchronized instance which is the mapped type of a sychronized map
* Update lib/rocprofiler/external_correlation.cpp
- implement rocprofiler_{push,pop}_external_correlation_id
* Update lib/rocprofiler/CMakeLists.txt
- external_correlation.hpp
* Update lib/rocprofiler/rocprofiler.cpp
- status string for ROCPROFILER_STATUS_ERROR_INVALID_ARGUMENT
- implement rocprofiler_get_thread_id
* Update lib/rocprofiler/tests (external correlation)
- add external_correlation unit tests
* Update include/rocprofiler/callback_tracing.h
- doxygen comments
- callback invoked in callback tracing has user_data pointer passed to it
* Update samples/api_callback_tracing/client.cpp
- add rocprofiler_user_data_t* to tool_tracing_callback
* Update lib/rocprofiler/tests/registration.cpp
- add rocprofiler_user_data_t* to tool_tracing_callback
* Update lib/rocprofiler/context/context.{hpp,cpp}
- update correlation_tracing_service
- external_correlation instance
- rename get_unique_record_id to get_unique_internal_id
* Update lib/tests/common/demangling.cpp
- tweak mangled definitions due to changing function get_unique_record_id to get_unique_internal_id
* Update lib/rocprofiler/hsa/hsa.cpp
- handle updates to external correlation id
- handle updates to callback signature in callback tracing
* Update CMakeLists.txt
- CMAKE_BUILD_TYPE=Coverage defines CODECOV=1
* Update samples/api_callback_tracing/client.cpp
151 строка
5.7 KiB
C++
151 строка
5.7 KiB
C++
// MIT License
|
|
//
|
|
// Copyright (c) 2023 ROCm Developer Tools
|
|
//
|
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
// of this software and associated documentation files (the "Software"), to deal
|
|
// in the Software without restriction, including without limitation the rights
|
|
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
// copies of the Software, and to permit persons to whom the Software is
|
|
// furnished to do so, subject to the following conditions:
|
|
//
|
|
// The above copyright notice and this permission notice shall be included in all
|
|
// copies or substantial portions of the Software.
|
|
//
|
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
// SOFTWARE.
|
|
|
|
#include <rocprofiler/external_correlation.h>
|
|
#include <rocprofiler/fwd.h>
|
|
|
|
#include "lib/common/synchronized.hpp"
|
|
#include "lib/rocprofiler/context/context.hpp"
|
|
#include "lib/rocprofiler/external_correlation.hpp"
|
|
|
|
#include <unistd.h>
|
|
|
|
namespace rocprofiler
|
|
{
|
|
namespace external_correlation
|
|
{
|
|
rocprofiler_user_data_t
|
|
external_correlation::get(rocprofiler_thread_id_t tid) const
|
|
{
|
|
static constexpr auto empty_user_data = rocprofiler_user_data_t{.value = 0};
|
|
|
|
return data.rlock(
|
|
[](const external_correlation_map_t& _data, rocprofiler_thread_id_t tid_v) {
|
|
if(_data.count(tid_v) == 0) return empty_user_data;
|
|
const auto& itr = _data.at(tid_v);
|
|
return itr.rlock([](const external_correlation_stack_t& data_stack) {
|
|
if(data_stack.empty()) return empty_user_data;
|
|
return data_stack.back();
|
|
});
|
|
},
|
|
tid);
|
|
}
|
|
|
|
void
|
|
external_correlation::push(rocprofiler_thread_id_t tid, rocprofiler_user_data_t user_data)
|
|
{
|
|
// ensure that data contains key for provided thread id
|
|
while(!data.ulock(
|
|
[](const external_correlation_map_t& _data, rocprofiler_thread_id_t tid_v) {
|
|
return (_data.find(tid_v) != _data.end());
|
|
},
|
|
[](external_correlation_map_t& _data, rocprofiler_thread_id_t tid_v) {
|
|
_data.emplace(tid_v, external_correlation_stack_t{});
|
|
return true;
|
|
},
|
|
tid))
|
|
{}
|
|
|
|
// since we know from above that there will be a key for the tid, we start with a read
|
|
// lock and then once we have have the mapped data for the key, we leverage the enabling
|
|
// of the wlock const overload to remove the constness and use a write lock. If we were to use a
|
|
// write lock at the top lovel, then we would unnecessarily block other threads from writing to
|
|
// the stack of another thread
|
|
data.rlock(
|
|
[](const external_correlation_map_t& _data,
|
|
rocprofiler_thread_id_t tid_v,
|
|
rocprofiler_user_data_t user_data_v) {
|
|
const auto& itr = _data.at(tid_v);
|
|
itr.wlock([](external_correlation_stack_t& data_stack,
|
|
rocprofiler_user_data_t value) { data_stack.emplace_back(value); },
|
|
user_data_v);
|
|
},
|
|
tid,
|
|
user_data);
|
|
}
|
|
|
|
rocprofiler_user_data_t
|
|
external_correlation::pop(rocprofiler_thread_id_t tid)
|
|
{
|
|
static constexpr auto empty_user_data = rocprofiler_user_data_t{.value = 0};
|
|
|
|
return data.wlock(
|
|
[](external_correlation_map_t& _data, rocprofiler_thread_id_t tid_v) {
|
|
if(_data.count(tid_v) == 0) return empty_user_data;
|
|
auto& itr = _data.at(tid_v);
|
|
return itr.wlock([](external_correlation_stack_t& data_stack) {
|
|
if(data_stack.empty()) return empty_user_data;
|
|
auto ret = data_stack.back();
|
|
data_stack.pop_back();
|
|
return ret;
|
|
});
|
|
},
|
|
tid);
|
|
}
|
|
} // namespace external_correlation
|
|
} // namespace rocprofiler
|
|
|
|
extern "C" {
|
|
rocprofiler_status_t
|
|
rocprofiler_push_external_correlation_id(rocprofiler_context_id_t context,
|
|
rocprofiler_thread_id_t tid,
|
|
rocprofiler_user_data_t external_correlation_id)
|
|
{
|
|
// assumption is that thread ids are monotonically increasing from the pid
|
|
static uint64_t pid_v = getpid();
|
|
if(tid < pid_v) return ROCPROFILER_STATUS_ERROR_INVALID_ARGUMENT;
|
|
|
|
for(auto& itr : rocprofiler::context::get_registered_contexts())
|
|
{
|
|
if(itr->context_idx == context.handle)
|
|
{
|
|
itr->correlation_tracer.external_correlator.push(tid, external_correlation_id);
|
|
return ROCPROFILER_STATUS_SUCCESS;
|
|
}
|
|
}
|
|
|
|
return ROCPROFILER_STATUS_ERROR_CONTEXT_NOT_FOUND;
|
|
}
|
|
|
|
rocprofiler_status_t
|
|
rocprofiler_pop_external_correlation_id(rocprofiler_context_id_t context,
|
|
rocprofiler_thread_id_t tid,
|
|
rocprofiler_user_data_t* external_correlation_id)
|
|
{
|
|
// assumption is that thread ids are monotonically increasing from the pid
|
|
static uint64_t pid_v = getpid();
|
|
if(tid < pid_v) return ROCPROFILER_STATUS_ERROR_INVALID_ARGUMENT;
|
|
|
|
for(auto& itr : rocprofiler::context::get_registered_contexts())
|
|
{
|
|
if(itr->context_idx == context.handle)
|
|
{
|
|
auto former = itr->correlation_tracer.external_correlator.pop(tid);
|
|
if(external_correlation_id) *external_correlation_id = former;
|
|
return ROCPROFILER_STATUS_SUCCESS;
|
|
}
|
|
}
|
|
|
|
return ROCPROFILER_STATUS_ERROR_CONTEXT_NOT_FOUND;
|
|
}
|
|
}
|