AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Profiler - Migrate from rocprofv1 to rocprofv3

Browse Source 
Signed-off-by: Galantsev, Dmitrii <dmitrii.galantsev@amd.com>

Fixed RDC for Rocprofv3

Updates

Signed-off-by: adapryor <Adam.pryor@amd.com>
Change-Id: Ic9162bacf1322b265e6bbcdd9fbb9b1fdef414fd

last updates

Change-Id: I12e168501327c5e4cff8a9273b0512fb0e098fe7

comment

Change-Id: I61da61e66dcc017ec46f98ff4c90fb064c9679e8
This commit is contained in:
Galantsev, Dmitrii
2024-12-13 16:50:32 -06:00
committed by Pryor, Adam
parent 35eb8e7c4b
commit 7c91a07a43
11 changed files with 542 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/rdc_modules/rdc_rocp/RdcRocpBase.h
+7 -14
View File
@@ -22,7 +22,7 @@ THE SOFTWARE.
#ifndef RDC_MODULES_RDC_ROCP_RDCROCPBASE_H_
#define RDC_MODULES_RDC_ROCP_RDCROCPBASE_H_
#include <rocprofiler/rocprofiler.h>
#include <rocprofiler-sdk/agent.h>
#include <cstdint>
#include <map>
@@ -32,16 +32,11 @@ THE SOFTWARE.
#include "rdc/rdc.h"
#include "rdc_lib/RdcTelemetryLibInterface.h"
#include "rdc_modules/rdc_rocp/RdcRocpCounterSampler.h"
namespace amd {
namespace rdc {
typedef struct {
hsa_agent_t* agents;
unsigned count;
unsigned capacity;
} hsa_agent_arr_t;
/// Common interface for RocP tests and samples
class RdcRocpBase {
public:
@@ -68,18 +63,16 @@ class RdcRocpBase {
protected:
private:
typedef std::pair<uint32_t, rdc_field_t> rdc_field_pair_t;
static const size_t buffer_length_k = 5;
/**
* @brief Tweak this to change for how long each metric is collected
*/
static const uint32_t collection_duration_us_k = 10000;
double read_feature(rocprofiler_t* context, uint32_t gpu_index);
double read_feature(rocprofiler_record_counter_t* record, uint32_t gpu_index);
double run_profiler(uint32_t gpu_index, rdc_field_t field);
hsa_agent_arr_t agent_arr = {};
std::vector<hsa_queue_t*> queues;
std::map<uint32_t, rocprofiler_feature_t> gpuid_to_feature;
std::vector<rocprofiler_agent_v0_t> agents = {};
std::vector<std::shared_ptr<CounterSampler>> samplers = {};
std::map<rdc_field_t, const char*> field_to_metric = {};
// these fields must be divided by time passed
@@ -89,9 +82,9 @@ class RdcRocpBase {
};
/**
* @brief Convert from rocmtools status into RDC status
* @brief Convert from profiler status into RDC status
*/
rdc_status_t Rocp2RdcError(hsa_status_t status);
rdc_status_t Rocp2RdcError(rocprofiler_status_t status);
};
} // namespace rdc
include/rdc_modules/rdc_rocp/RdcRocpCounterSampler.h
+92
View File
@@ -0,0 +1,92 @@
// MIT License
//
// Copyright (c) 2025 Advanced Micro Devices, Inc. All rights reserved.
//
// 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.
#ifndef RDC_MODULES_RDC_ROCP_RDCROCPCOUNTERSAMPLER_H_
#define RDC_MODULES_RDC_ROCP_RDCROCPCOUNTERSAMPLER_H_
#include <rocprofiler-sdk/fwd.h>
#include <rocprofiler-sdk/registration.h>
#include <rocprofiler-sdk/rocprofiler.h>
#include <map>
#include <memory>
#include <unordered_map>
#include <vector>
namespace amd {
namespace rdc {
class CounterSampler {
public:
// Setup system profiling for an agent
explicit CounterSampler(rocprofiler_agent_id_t agent);
~CounterSampler();
// Decode the counter name of a record
const std::string& decode_record_name(const rocprofiler_record_counter_t& rec) const;
// Get the dimensions of a record (what CU/SE/etc the counter is for). High cost operation
// should be cached if possible.
std::unordered_map<std::string, size_t> get_record_dimensions(
const rocprofiler_record_counter_t& rec);
// Sample the counter values for a set of counters, returns the records in the out parameter.
void sample_counter_values(const std::vector<std::string>& counters,
std::vector<rocprofiler_record_counter_t>& out, uint64_t duration);
rocprofiler_agent_id_t get_agent() const { return agent_; }
// Get the supported counters for an agent
static std::unordered_map<std::string, rocprofiler_counter_id_t> get_supported_counters(
rocprofiler_agent_id_t agent);
// Get the available agents on the system
static std::vector<rocprofiler_agent_v0_t> get_available_agents();
static std::vector<std::shared_ptr<CounterSampler>>& get_samplers();
private:
rocprofiler_agent_id_t agent_ = {};
rocprofiler_context_id_t ctx_ = {};
rocprofiler_buffer_id_t buf_ = {};
rocprofiler_profile_config_id_t profile_ = {.handle = 0};
std::map<std::vector<std::string>, rocprofiler_profile_config_id_t> cached_profiles_;
std::map<uint64_t, uint64_t> profile_sizes_;
// Internal function used to set the profile for the agent when start_context is called
void set_profile(rocprofiler_context_id_t ctx, rocprofiler_agent_set_profile_callback_t cb) const;
// Get the size of a counter in number of records
size_t get_counter_size(rocprofiler_counter_id_t counter);
// Get the dimensions of a counter
std::vector<rocprofiler_record_dimension_info_t> get_counter_dimensions(
rocprofiler_counter_id_t counter);
static std::vector<std::shared_ptr<CounterSampler>> samplers_;
};
} // namespace rdc
} // namespace amd
#endif // RDC_MODULES_RDC_ROCP_RDCROCPCOUNTERSAMPLER_H_