Files
rocm-systems/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/metrics.hpp
T
Benjamin Welton d496bcef18 Fix dimension mismatch for multi-GPU systems with identical architect… (#1440)
* Fix dimension mismatch for multi-GPU systems with identical architectures

This change addresses an issue where counter dimensions were incorrectly
shared across all GPU agents with the same architecture name, even when
those agents had different hardware configurations (e.g., different CU counts).

Changes:
- Updated getBlockDimensions() to accept agent ID instead of architecture name
- Made dimension cache agent-specific instead of architecture-specific
- Updated set_dimensions() in AST evaluation to use specific agent ID
- Modified all API functions to handle agent-specific dimension lookups
- Updated tests to work with agent-specific dimensions

This fix ensures that dimensions accurately reflect the actual hardware
configuration of each individual GPU agent, preventing dimension mismatches
in multi-GPU systems where GPUs share the same architecture but have
different physical configurations.

Counter ID Representation Changes:
- Modified counter_id encoding to include agent information in bits 37-32
- Agent logical_node_id is encoded as (value + 1) to ensure agent 0 is detectable
- Counter records internally store only 16-bit base metric IDs (bits 15-0)
- Tool reconstructs agent-encoded counter IDs from base metric ID & agent info
- Instance record counter_id field uses bitwise AND mask to extract base metric ID
  (counter_id.handle & 0xFFFF) to fit in 16-bit storage
- Output generators (CSV, JSON, Perfetto) use agent-encoded IDs for consistency
- Updated counter_config.cpp and metrics.cpp to extract base metric ID when needed
- All counter lookups now properly handle agent-encoded vs base metric IDs

This ensures counter IDs are consistent between metadata and output records while
maintaining compact storage in instance records.
2025-10-27 07:58:20 -07:00

185 lines
5.6 KiB
C++

// MIT License
//
// Copyright (c) 2023-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.
#pragma once
#include <rocprofiler-sdk/agent.h>
#include <rocprofiler-sdk/fwd.h>
#include <fmt/core.h>
#include <fmt/ranges.h>
#include <hsa/hsa_ven_amd_aqlprofile.h>
#include <cstdint>
#include <optional>
#include <string>
#include <unordered_map>
#include <unordered_set>
#include <vector>
namespace rocprofiler
{
namespace counters
{
// Base metrics (w/o instance information) defined in gfx_metrics/derived.xml
class Metric
{
public:
Metric() = default;
Metric(const std::string&, // Get rid of this...
std::string name,
std::string block,
std::string event,
std::string dsc,
std::string expr,
std::string constant,
uint64_t id);
const std::string& name() const { return name_; }
const std::string& block() const { return block_; }
const std::string& event() const { return event_; }
const std::string& description() const { return description_; }
const std::string& expression() const { return expression_; }
const std::string& constant() const { return constant_; }
uint64_t id() const { return id_; }
uint32_t flags() const { return flags_; }
bool empty() const { return empty_; }
void setflags(uint32_t flags) { this->flags_ = flags; }
void set_id(uint64_t id) { this->id_ = id; }
friend bool operator<(Metric const& lhs, Metric const& rhs);
friend bool operator==(Metric const& lhs, Metric const& rhs);
private:
std::string name_ = {};
std::string block_ = {};
std::string event_ = {};
std::string description_ = {};
std::string expression_ = {};
std::string constant_ = {};
int64_t id_ = -1;
bool empty_ = false;
uint32_t flags_ = 0;
};
struct CustomCounterDefinition
{
std::string data = {};
bool append = {false};
bool loaded = {false};
};
using MetricMap = std::unordered_map<std::string, std::vector<Metric>>;
using MetricIdMap = std::unordered_map<uint64_t, Metric>;
using ArchToId = std::unordered_map<std::string, std::unordered_set<uint64_t>>;
using ArchMetric = std::pair<std::string, Metric>;
struct counter_metrics_t
{
const MetricMap arch_to_metric;
const MetricIdMap id_to_metric;
const ArchToId arch_to_id;
};
std::shared_ptr<const counter_metrics_t>
loadMetrics(bool reload = false, std::optional<ArchMetric> add_metric = std::nullopt);
/**
* Get the metrics that apply to a specific agent.
* The returned metrics will have counter IDs that are unique per agent
* (encoding both base metric ID and agent's logical_node_id).
*/
std::vector<Metric>
getMetricsForAgent(const rocprofiler_agent_t* agent);
/**
* Get the metric event ids for perfcounters options in thread trace
* applicable only for GFX9 agents and SQ block counters
*/
std::unordered_map<uint64_t, int>
getPerfCountersIdMap();
/**
* Checks if a metric is valid for a given agent
**/
bool
checkValidMetric(const std::string& agent, const Metric& metric);
/**
* Set a custom counter definition
*/
rocprofiler_status_t
setCustomCounterDefinition(const CustomCounterDefinition& def);
} // namespace counters
} // namespace rocprofiler
namespace fmt
{
// fmt::format support for metric
template <>
struct formatter<rocprofiler::counters::Metric>
{
template <typename ParseContext>
constexpr auto parse(ParseContext& ctx)
{
return ctx.begin();
}
template <typename Ctx>
auto format(rocprofiler::counters::Metric const& metric, Ctx& ctx) const
{
return fmt::format_to(
ctx.out(),
"Metric: {} [Block: {}, Event: {}, Expression: {}, Description: {}, id: {}]",
metric.name(),
metric.block(),
metric.event(),
metric.expression().empty() ? "<None>" : metric.expression(),
metric.description(),
metric.id());
}
};
// fmt::format support for MetricMap
template <>
struct formatter<rocprofiler::counters::MetricMap>
{
template <typename ParseContext>
constexpr auto parse(ParseContext& ctx)
{
return ctx.begin();
}
template <typename Ctx>
auto format(rocprofiler::counters::MetricMap const& map, Ctx& ctx) const
{
std::string out;
for(const auto& [gfxName, counters] : map)
{
out += fmt::format("Counters for {}\n\t{}\n", gfxName, fmt::join(counters, "\n\t"));
}
return fmt::format_to(ctx.out(), "{}", out);
}
};
} // namespace fmt