Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix static object issues in rocprofiler tool init #636

Merged
merged 1 commit into from
Jan 28, 2025
Merged

Fix static object issues in rocprofiler tool init #636

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 25 additions & 22 deletions src/services/rocprofiler/RocProfiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ class RocProfilerService
std::map<uint64_t, std::string> m_kernel_info;
std::mutex m_kernel_info_mutex;

std::map<uint64_t, const rocprofiler_agent_t*> agent_info_map;

Channel m_channel;

static RocProfilerService* s_instance;
Expand All @@ -103,8 +105,6 @@ class RocProfilerService

static rocprofiler_buffer_id_t activity_buf;

static std::map<uint64_t, const rocprofiler_agent_t*> s_agents;

void create_attributes(Caliper* c)
{
Attribute subs_attr = c->get_attribute("subscription_event");
Expand Down Expand Up @@ -211,7 +211,7 @@ class RocProfilerService

const char* kernel_name = s_instance->get_kernel_name(record->dispatch_info.kernel_id);

uint64_t agent = s_agents.at(record->dispatch_info.agent_id.handle)->logical_node_id;
uint64_t agent = s_instance->agent_info_map.at(record->dispatch_info.agent_id.handle)->logical_node_id;

const Variant data[] = {
Variant(CALI_TYPE_STRING, activity_name, len),
Expand Down Expand Up @@ -250,8 +250,8 @@ class RocProfilerService
&len
));

uint64_t src_agent = s_agents.at(record->src_agent_id.handle)->logical_node_id;
uint64_t dst_agent = s_agents.at(record->dst_agent_id.handle)->logical_node_id;
uint64_t src_agent = s_instance->agent_info_map.at(record->src_agent_id.handle)->logical_node_id;
uint64_t dst_agent = s_instance->agent_info_map.at(record->dst_agent_id.handle)->logical_node_id;

const Variant data[] = {
Variant(CALI_TYPE_STRING, activity_name, len),
Expand Down Expand Up @@ -378,6 +378,26 @@ class RocProfilerService
m_enable_snapshot_timestamps = config.get("enable_snapshot_timestamps").to_bool();

create_attributes(c);

// initialize rocprofiler agents
//

rocprofiler_query_available_agents_cb_t iterate_agents =
[](rocprofiler_agent_version_t, const void** agents_arr, size_t num_agents, void* usr) {
for (size_t i = 0; i < num_agents; ++i) {
const auto* agent_v = static_cast<const rocprofiler_agent_v0_t*>(agents_arr[i]);
RocProfilerService* instance = static_cast<RocProfilerService*>(usr);
instance->agent_info_map.emplace(agent_v->id.handle, agent_v);
}
return ROCPROFILER_STATUS_SUCCESS;
};

ROCPROFILER_CALL(rocprofiler_query_available_agents(
ROCPROFILER_AGENT_INFO_VERSION_0,
iterate_agents,
sizeof(rocprofiler_agent_t),
this
));
}

public:
Expand Down Expand Up @@ -455,21 +475,6 @@ class RocProfilerService
nullptr
));

rocprofiler_query_available_agents_cb_t iterate_agents =
[](rocprofiler_agent_version_t, const void** agents_arr, size_t num_agents, void*) {
for (size_t i = 0; i < num_agents; ++i) {
const auto* agent_v = static_cast<const rocprofiler_agent_v0_t*>(agents_arr[i]);
s_agents.emplace(agent_v->id.handle, agent_v);
}
return ROCPROFILER_STATUS_SUCCESS;
};

ROCPROFILER_CALL(rocprofiler_query_available_agents(
ROCPROFILER_AGENT_INFO_VERSION_0,
iterate_agents,
sizeof(rocprofiler_agent_t),
nullptr
));
// auto client_thread = rocprofiler_callback_thread_t{};
// ROCPROFILER_CALL(
// rocprofiler_create_callback_thread(&client_thread));
Expand Down Expand Up @@ -535,8 +540,6 @@ rocprofiler_context_id_t RocProfilerService::rocprofiler_ctx = {};

rocprofiler_buffer_id_t RocProfilerService::activity_buf = {};

std::map<uint64_t, const rocprofiler_agent_t*> RocProfilerService::s_agents;

const char* RocProfilerService::s_spec = R"json(
{
"name": "rocprofiler",
Expand Down