ROCpd support [Part 1] (#279)
- Add rocpd support for - cpu_frequency - amd_smi - sampling
Este commit está contenido en:
Aleksandar Djordjevic
cometido por
GitHub
GitHub
padre
4b4a846b58
commit
26ae543012
@@ -21,15 +21,15 @@
|
||||
// SOFTWARE.
|
||||
|
||||
#include "library/cpu_freq.hpp"
|
||||
#include "core/agent.hpp"
|
||||
#include "core/agent_manager.hpp"
|
||||
#include "core/common.hpp"
|
||||
#include "core/components/fwd.hpp"
|
||||
#include "core/config.hpp"
|
||||
#include "core/debug.hpp"
|
||||
#include "core/defines.hpp"
|
||||
#include "core/node_info.hpp"
|
||||
#include "core/perfetto.hpp"
|
||||
#include "core/timemory.hpp"
|
||||
#include "core/rocpd/data_processor.hpp"
|
||||
#include "library/components/cpu_freq.hpp"
|
||||
#include "library/thread_data.hpp"
|
||||
#include "library/thread_info.hpp"
|
||||
|
||||
#include <timemory/components/rusage/backends.hpp>
|
||||
@@ -44,7 +44,6 @@
|
||||
#include <sys/resource.h>
|
||||
#include <tuple>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
namespace rocprofsys
|
||||
{
|
||||
@@ -65,6 +64,181 @@ init_perfetto_counter_tracks(type_list<Types...>)
|
||||
{
|
||||
(perfetto_counter_track<Types>::init(), ...);
|
||||
}
|
||||
|
||||
template <typename Category>
|
||||
inline std::string
|
||||
get_cpu_freq_track_name(uint64_t cpu_id)
|
||||
{
|
||||
return std::string(trait::name<Category>::value) + " [" + std::to_string(cpu_id) +
|
||||
"]";
|
||||
}
|
||||
|
||||
template <typename Func>
|
||||
void
|
||||
do_for_enabled_cpus(Func&& func)
|
||||
{
|
||||
const auto& enabled_cpus = component::cpu_freq::get_enabled_cpus();
|
||||
for(const auto& cpu : enabled_cpus)
|
||||
{
|
||||
func(cpu);
|
||||
}
|
||||
}
|
||||
|
||||
rocpd::data_processor&
|
||||
get_data_processor()
|
||||
{
|
||||
return rocpd::data_processor::get_instance();
|
||||
}
|
||||
|
||||
void
|
||||
rocpd_initialize_cpu_freq_category()
|
||||
{
|
||||
get_data_processor().insert_category(ROCPROFSYS_CATEGORY_CPU_FREQ,
|
||||
trait::name<category::cpu_freq>::value);
|
||||
}
|
||||
|
||||
void
|
||||
rocpd_initialize_cpu_freq_tracks()
|
||||
{
|
||||
auto& data_processor = get_data_processor();
|
||||
auto& n_info = node_info::get_instance();
|
||||
const auto thread_idx = std::nullopt; // Internal thread ID for cpu-freq
|
||||
|
||||
do_for_enabled_cpus([&](size_t cpu_id) {
|
||||
data_processor.insert_track(
|
||||
get_cpu_freq_track_name<category::cpu_freq>(cpu_id).c_str(), n_info.id,
|
||||
getpid(), thread_idx);
|
||||
});
|
||||
}
|
||||
|
||||
void
|
||||
rocpd_initialize_cpu_usage_tracks()
|
||||
{
|
||||
auto& data_processor = get_data_processor();
|
||||
auto& n_info = node_info::get_instance();
|
||||
const auto thread_idx = std::nullopt; // Internal thread ID for cpu-freq
|
||||
|
||||
data_processor.insert_track(trait::name<category::process_page>::value, n_info.id,
|
||||
getpid(), thread_idx);
|
||||
data_processor.insert_track(trait::name<category::process_virt>::value, n_info.id,
|
||||
getpid(), thread_idx);
|
||||
data_processor.insert_track(trait::name<category::process_peak>::value, n_info.id,
|
||||
getpid(), thread_idx);
|
||||
data_processor.insert_track(trait::name<category::process_context_switch>::value,
|
||||
n_info.id, getpid(), thread_idx);
|
||||
data_processor.insert_track(trait::name<category::process_page_fault>::value,
|
||||
n_info.id, getpid(), thread_idx);
|
||||
data_processor.insert_track(trait::name<category::process_user_mode_time>::value,
|
||||
n_info.id, getpid(), thread_idx);
|
||||
data_processor.insert_track(trait::name<category::process_kernel_mode_time>::value,
|
||||
n_info.id, getpid(), thread_idx);
|
||||
}
|
||||
|
||||
void
|
||||
rocpd_initialize_cpu_freq_pmc(size_t dev_id)
|
||||
{
|
||||
auto& data_processor = get_data_processor();
|
||||
// find the proper values for a following definitions
|
||||
size_t EVENT_CODE = 0;
|
||||
size_t INSTANCE_ID = 0;
|
||||
const char* LONG_DESCRIPTION = "";
|
||||
const char* COMPONENT = "";
|
||||
const char* BLOCK = "";
|
||||
const char* EXPRESSION = "";
|
||||
const char* MEMORY = "MB";
|
||||
const char* TIME = "sec";
|
||||
auto ni = node_info::get_instance();
|
||||
const auto* TARGET_ARCH = "CPU";
|
||||
|
||||
auto& _agent_manager = agent_manager::get_instance();
|
||||
auto base_id = _agent_manager.get_agent_by_id(dev_id, agent_type::CPU).base_id;
|
||||
|
||||
do_for_enabled_cpus([&](size_t cpu_id) {
|
||||
data_processor.insert_pmc_description(
|
||||
ni.id, getpid(), base_id, TARGET_ARCH, EVENT_CODE, INSTANCE_ID,
|
||||
get_cpu_freq_track_name<category::cpu_freq>(cpu_id).c_str(), "Frequency",
|
||||
trait::name<category::cpu_freq>::description, LONG_DESCRIPTION, COMPONENT,
|
||||
component::cpu_freq::display_unit().c_str(), "ABS", BLOCK, EXPRESSION, 0, 0);
|
||||
});
|
||||
|
||||
data_processor.insert_pmc_description(
|
||||
ni.id, getpid(), base_id, TARGET_ARCH, EVENT_CODE, INSTANCE_ID,
|
||||
trait::name<category::process_page>::value, "Memory Usage",
|
||||
trait::name<category::process_page>::description, LONG_DESCRIPTION, COMPONENT,
|
||||
MEMORY, "ABS", BLOCK, EXPRESSION, 0, 0);
|
||||
|
||||
data_processor.insert_pmc_description(
|
||||
ni.id, getpid(), base_id, TARGET_ARCH, EVENT_CODE, INSTANCE_ID,
|
||||
trait::name<category::process_virt>::value, "Virtual Memory Usage",
|
||||
trait::name<category::process_virt>::description, LONG_DESCRIPTION, COMPONENT,
|
||||
MEMORY, "ABS", BLOCK, EXPRESSION, 0, 0);
|
||||
|
||||
data_processor.insert_pmc_description(
|
||||
ni.id, getpid(), base_id, TARGET_ARCH, EVENT_CODE, INSTANCE_ID,
|
||||
trait::name<category::process_peak>::value, "Peak Memory",
|
||||
trait::name<category::process_peak>::description, LONG_DESCRIPTION, COMPONENT,
|
||||
MEMORY, "ABS", BLOCK, EXPRESSION, 0, 0);
|
||||
|
||||
data_processor.insert_pmc_description(
|
||||
ni.id, getpid(), base_id, TARGET_ARCH, EVENT_CODE, INSTANCE_ID,
|
||||
trait::name<category::process_context_switch>::value, "Context Switches",
|
||||
trait::name<category::process_context_switch>::description, LONG_DESCRIPTION,
|
||||
COMPONENT, "", "ABS", BLOCK, EXPRESSION, 0, 0);
|
||||
|
||||
data_processor.insert_pmc_description(
|
||||
ni.id, getpid(), base_id, TARGET_ARCH, EVENT_CODE, INSTANCE_ID,
|
||||
trait::name<category::process_page_fault>::value, "Page Faults",
|
||||
trait::name<category::process_page_fault>::description, LONG_DESCRIPTION,
|
||||
COMPONENT, "", "ABS", BLOCK, EXPRESSION, 0, 0);
|
||||
|
||||
data_processor.insert_pmc_description(
|
||||
ni.id, getpid(), base_id, TARGET_ARCH, EVENT_CODE, INSTANCE_ID,
|
||||
trait::name<category::process_user_mode_time>::value, "User Time",
|
||||
trait::name<category::process_user_mode_time>::description, LONG_DESCRIPTION,
|
||||
COMPONENT, TIME, "ABS", BLOCK, EXPRESSION, 0, 0);
|
||||
|
||||
data_processor.insert_pmc_description(
|
||||
ni.id, getpid(), base_id, TARGET_ARCH, EVENT_CODE, INSTANCE_ID,
|
||||
trait::name<category::process_kernel_mode_time>::value, "Kernel Time",
|
||||
trait::name<category::process_kernel_mode_time>::description, LONG_DESCRIPTION,
|
||||
COMPONENT, TIME, "ABS", BLOCK, EXPRESSION, 0, 0);
|
||||
}
|
||||
|
||||
void
|
||||
rocpd_process_cpu_usage_events(const uint32_t device_id, uint64_t timestamp,
|
||||
const component::cpu_freq& freq, double mem_page,
|
||||
double virt_mem_page, double peak_mem,
|
||||
double context_switch, double page_fault, double user_time,
|
||||
double kernel_time)
|
||||
{
|
||||
auto& data_processor = get_data_processor();
|
||||
auto event_id = data_processor.insert_event(ROCPROFSYS_CATEGORY_CPU_FREQ, 0, 0, 0);
|
||||
|
||||
auto& agent_mngr = agent_manager::get_instance();
|
||||
auto base_id = agent_mngr.get_agent_by_id(device_id, agent_type::CPU).base_id;
|
||||
|
||||
auto insert_event_and_sample = [&](const char* name, double value) {
|
||||
data_processor.insert_pmc_event(event_id, base_id, name, value);
|
||||
data_processor.insert_sample(name, timestamp, event_id);
|
||||
};
|
||||
|
||||
do_for_enabled_cpus([&](size_t cpu_id) {
|
||||
insert_event_and_sample(
|
||||
get_cpu_freq_track_name<category::cpu_freq>(cpu_id).c_str(), freq.at(cpu_id));
|
||||
});
|
||||
|
||||
insert_event_and_sample(trait::name<category::process_page>::value, mem_page);
|
||||
insert_event_and_sample(trait::name<category::process_virt>::value, virt_mem_page);
|
||||
insert_event_and_sample(trait::name<category::process_peak>::value, peak_mem);
|
||||
insert_event_and_sample(trait::name<category::process_context_switch>::value,
|
||||
context_switch);
|
||||
insert_event_and_sample(trait::name<category::process_page_fault>::value, page_fault);
|
||||
insert_event_and_sample(trait::name<category::process_user_mode_time>::value,
|
||||
user_time);
|
||||
insert_event_and_sample(trait::name<category::process_kernel_mode_time>::value,
|
||||
kernel_time);
|
||||
}
|
||||
|
||||
} // namespace
|
||||
} // namespace cpu_freq
|
||||
} // namespace rocprofsys
|
||||
@@ -76,11 +250,14 @@ namespace cpu_freq
|
||||
void
|
||||
setup()
|
||||
{
|
||||
init_perfetto_counter_tracks(
|
||||
type_list<category::cpu_freq, category::process_page, category::process_virt,
|
||||
category::process_peak, category::process_context_switch,
|
||||
category::process_page_fault, category::process_user_mode_time,
|
||||
category::process_kernel_mode_time>{});
|
||||
if(get_use_perfetto())
|
||||
{
|
||||
init_perfetto_counter_tracks(
|
||||
type_list<category::cpu_freq, category::process_page, category::process_virt,
|
||||
category::process_peak, category::process_context_switch,
|
||||
category::process_page_fault, category::process_user_mode_time,
|
||||
category::process_kernel_mode_time>{});
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
@@ -163,6 +340,28 @@ post_process()
|
||||
ROCPROFSYS_VERBOSE(1,
|
||||
"Post-processing %zu cpu frequency and memory usage entries...\n",
|
||||
data.size());
|
||||
|
||||
auto& enabled_cpus = component::cpu_freq::get_enabled_cpus();
|
||||
|
||||
if(get_use_rocpd())
|
||||
{
|
||||
rocpd_initialize_cpu_freq_category();
|
||||
rocpd_initialize_cpu_usage_tracks();
|
||||
rocpd_initialize_cpu_freq_tracks();
|
||||
|
||||
// `get_enabled_cpus()` returns the number of cores enabled for monitoring but the
|
||||
// actually device_id is 0, since there is a single device available. And the
|
||||
// agents seems to be assigned per device basis not per core.
|
||||
// TODO: `get_enabled_cpus()` should be fixed in the future to align with GPU
|
||||
// implementation.
|
||||
auto cpu_agents =
|
||||
agent_manager::get_instance().get_agents_by_type(agent_type::CPU);
|
||||
for(auto& agent : cpu_agents)
|
||||
{
|
||||
rocpd_initialize_cpu_freq_pmc(agent->device_id);
|
||||
}
|
||||
}
|
||||
|
||||
auto _process_frequencies = [](size_t _idx, size_t _offset) {
|
||||
using freq_track = perfetto_counter_track<category::cpu_freq>;
|
||||
|
||||
@@ -191,14 +390,17 @@ post_process()
|
||||
};
|
||||
|
||||
auto _process_cpu_rusage = []() {
|
||||
config_perfetto_counter_tracks(
|
||||
type_list<category::process_page, category::process_virt,
|
||||
category::process_peak, category::process_context_switch,
|
||||
category::process_page_fault, category::process_user_mode_time,
|
||||
category::process_kernel_mode_time>{},
|
||||
{ "Memory Usage", "Virtual Memory Usage", "Peak Memory", "Context Switches",
|
||||
"Page Faults", "User Time", "Kernel Time" },
|
||||
{ "MB", "MB", "MB", "", "", "sec", "sec" });
|
||||
if(get_use_perfetto())
|
||||
{
|
||||
config_perfetto_counter_tracks(
|
||||
type_list<category::process_page, category::process_virt,
|
||||
category::process_peak, category::process_context_switch,
|
||||
category::process_page_fault, category::process_user_mode_time,
|
||||
category::process_kernel_mode_time>{},
|
||||
{ "Memory Usage", "Virtual Memory Usage", "Peak Memory",
|
||||
"Context Switches", "Page Faults", "User Time", "Kernel Time" },
|
||||
{ "MB", "MB", "MB", "", "", "sec", "sec" });
|
||||
}
|
||||
|
||||
const auto& _thread_info = thread_info::get(0, InternalTID);
|
||||
ROCPROFSYS_CI_THROW(!_thread_info, "Missing thread info for thread 0");
|
||||
@@ -209,47 +411,61 @@ post_process()
|
||||
uint64_t _ts = std::get<0>(itr);
|
||||
if(!_thread_info->is_valid_time(_ts)) continue;
|
||||
|
||||
double _page = std::get<1>(itr);
|
||||
double _virt = std::get<2>(itr);
|
||||
double _peak = std::get<3>(itr);
|
||||
double _page = std::get<1>(itr) / units::megabyte;
|
||||
double _virt = std::get<2>(itr) / units::megabyte;
|
||||
double _peak = std::get<3>(itr) / units::megabyte;
|
||||
uint64_t _cntx = std::get<4>(itr);
|
||||
uint64_t _flts = std::get<5>(itr);
|
||||
double _user = std::get<6>(itr);
|
||||
double _kern = std::get<7>(itr);
|
||||
write_perfetto_counter_track<category::process_page>(_ts,
|
||||
_page / units::megabyte);
|
||||
write_perfetto_counter_track<category::process_virt>(_ts,
|
||||
_virt / units::megabyte);
|
||||
write_perfetto_counter_track<category::process_peak>(_ts,
|
||||
_peak / units::megabyte);
|
||||
write_perfetto_counter_track<category::process_context_switch>(_ts, _cntx);
|
||||
write_perfetto_counter_track<category::process_page_fault>(_ts, _flts);
|
||||
write_perfetto_counter_track<category::process_user_mode_time>(
|
||||
_ts, _user / units::sec);
|
||||
write_perfetto_counter_track<category::process_kernel_mode_time>(
|
||||
_ts, _kern / units::sec);
|
||||
double _user = std::get<6>(itr) / units::sec;
|
||||
double _kern = std::get<7>(itr) / units::sec;
|
||||
if(get_use_perfetto())
|
||||
{
|
||||
write_perfetto_counter_track<category::process_page>(_ts, _page);
|
||||
write_perfetto_counter_track<category::process_virt>(_ts, _virt);
|
||||
write_perfetto_counter_track<category::process_peak>(_ts, _peak);
|
||||
write_perfetto_counter_track<category::process_context_switch>(_ts,
|
||||
_cntx);
|
||||
write_perfetto_counter_track<category::process_page_fault>(_ts, _flts);
|
||||
write_perfetto_counter_track<category::process_user_mode_time>(_ts,
|
||||
_user);
|
||||
write_perfetto_counter_track<category::process_kernel_mode_time>(_ts,
|
||||
_kern);
|
||||
}
|
||||
if(get_use_rocpd())
|
||||
{
|
||||
const auto& freq_data = std::get<8>(itr);
|
||||
rocpd_process_cpu_usage_events(0, _ts, freq_data, _page, _virt, _peak,
|
||||
_cntx, _flts, _user, _kern);
|
||||
}
|
||||
}
|
||||
|
||||
auto _end_ts = _thread_info->get_stop();
|
||||
write_perfetto_counter_track<category::process_page>(_end_ts, 0.0);
|
||||
write_perfetto_counter_track<category::process_virt>(_end_ts, 0.0);
|
||||
write_perfetto_counter_track<category::process_peak>(_end_ts, 0.0);
|
||||
write_perfetto_counter_track<category::process_context_switch>(_end_ts, 0);
|
||||
write_perfetto_counter_track<category::process_page_fault>(_end_ts, 0);
|
||||
write_perfetto_counter_track<category::process_user_mode_time>(_end_ts, 0.0);
|
||||
write_perfetto_counter_track<category::process_kernel_mode_time>(_end_ts, 0.0);
|
||||
if(get_use_perfetto())
|
||||
{
|
||||
auto _end_ts = _thread_info->get_stop();
|
||||
write_perfetto_counter_track<category::process_page>(_end_ts, 0.0);
|
||||
write_perfetto_counter_track<category::process_virt>(_end_ts, 0.0);
|
||||
write_perfetto_counter_track<category::process_peak>(_end_ts, 0.0);
|
||||
write_perfetto_counter_track<category::process_context_switch>(_end_ts, 0);
|
||||
write_perfetto_counter_track<category::process_page_fault>(_end_ts, 0);
|
||||
write_perfetto_counter_track<category::process_user_mode_time>(_end_ts, 0.0);
|
||||
write_perfetto_counter_track<category::process_kernel_mode_time>(_end_ts,
|
||||
0.0);
|
||||
}
|
||||
};
|
||||
|
||||
_process_cpu_rusage();
|
||||
|
||||
auto& enabled_cpu_freqs = component::cpu_freq::get_enabled_cpus();
|
||||
for(auto itr = enabled_cpu_freqs.begin(); itr != enabled_cpu_freqs.end(); ++itr)
|
||||
if(get_use_perfetto())
|
||||
{
|
||||
auto _idx = *itr;
|
||||
auto _offset = std::distance(enabled_cpu_freqs.begin(), itr);
|
||||
_process_frequencies(_idx, _offset);
|
||||
for(auto itr = enabled_cpus.begin(); itr != enabled_cpus.end(); ++itr)
|
||||
{
|
||||
auto _idx = *itr;
|
||||
auto _offset = std::distance(enabled_cpus.begin(), itr);
|
||||
_process_frequencies(_idx, _offset);
|
||||
}
|
||||
}
|
||||
enabled_cpu_freqs.clear();
|
||||
enabled_cpus.clear();
|
||||
}
|
||||
|
||||
} // namespace cpu_freq
|
||||
} // namespace rocprofsys
|
||||
|
||||
Referencia en una nueva incidencia
Block a user