Benjamin Welton
d496bcef18
* 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.
110 lines
4.3 KiB
C++
110 lines
4.3 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.
|
|
|
|
#include <rocprofiler-sdk/fwd.h>
|
|
#include <cstdint>
|
|
#include <unordered_set>
|
|
|
|
#include "lib/common/utility.hpp"
|
|
#include "lib/rocprofiler-sdk/agent.hpp"
|
|
#include "lib/rocprofiler-sdk/counters/controller.hpp"
|
|
#include "lib/rocprofiler-sdk/counters/core.hpp"
|
|
#include "lib/rocprofiler-sdk/counters/metrics.hpp"
|
|
|
|
extern "C" {
|
|
/**
|
|
* @brief Create Profile Configuration.
|
|
*
|
|
* @param [in] agent Agent identifier
|
|
* @param [in] counters_list List of GPU counters
|
|
* @param [in] counters_count Size of counters list
|
|
* @param [in/out] config_id Identifier for GPU counters group. If an existing
|
|
profile is supplied, that profiles counters will be copied
|
|
over to a new profile (returned via this id).
|
|
* @return ::rocprofiler_status_t
|
|
*/
|
|
rocprofiler_status_t
|
|
rocprofiler_create_counter_config(rocprofiler_agent_id_t agent_id,
|
|
rocprofiler_counter_id_t* counters_list,
|
|
size_t counters_count,
|
|
rocprofiler_counter_config_id_t* config_id)
|
|
{
|
|
std::unordered_set<uint64_t> already_added;
|
|
const auto* agent = ::rocprofiler::agent::get_agent(agent_id);
|
|
if(!agent) return ROCPROFILER_STATUS_ERROR_AGENT_NOT_FOUND;
|
|
|
|
std::shared_ptr<rocprofiler::counters::counter_config> config =
|
|
std::make_shared<rocprofiler::counters::counter_config>();
|
|
|
|
auto metrics_map = rocprofiler::counters::loadMetrics();
|
|
const auto& id_map = metrics_map->id_to_metric;
|
|
|
|
for(size_t i = 0; i < counters_count; i++)
|
|
{
|
|
auto& counter_id = counters_list[i];
|
|
|
|
// Extract base metric ID from counter_id (handles agent-encoded counter IDs)
|
|
auto base_metric_id = rocprofiler::counters::get_base_metric_from_counter_id(counter_id);
|
|
const auto* metric_ptr = rocprofiler::common::get_val(id_map, base_metric_id);
|
|
if(!metric_ptr) return ROCPROFILER_STATUS_ERROR_COUNTER_NOT_FOUND;
|
|
// Don't add duplicates
|
|
if(!already_added.emplace(metric_ptr->id()).second) continue;
|
|
|
|
if(!rocprofiler::counters::checkValidMetric(std::string(agent->name), *metric_ptr))
|
|
{
|
|
return ROCPROFILER_STATUS_ERROR_METRIC_NOT_VALID_FOR_AGENT;
|
|
}
|
|
config->metrics.push_back(*metric_ptr);
|
|
}
|
|
|
|
if(config_id->handle != 0)
|
|
{
|
|
// Copy existing counters from previous config
|
|
if(auto existing = rocprofiler::counters::get_counter_config(*config_id))
|
|
{
|
|
for(const auto& metric : existing->metrics)
|
|
{
|
|
if(!already_added.emplace(metric.id()).second) continue;
|
|
config->metrics.push_back(metric);
|
|
}
|
|
}
|
|
}
|
|
|
|
config->agent = agent;
|
|
if(auto status = rocprofiler::counters::create_counter_profile(config);
|
|
status != ROCPROFILER_STATUS_SUCCESS)
|
|
{
|
|
return status;
|
|
}
|
|
*config_id = config->id;
|
|
|
|
return ROCPROFILER_STATUS_SUCCESS;
|
|
}
|
|
|
|
rocprofiler_status_t
|
|
rocprofiler_destroy_counter_config(rocprofiler_counter_config_id_t config_id)
|
|
{
|
|
rocprofiler::counters::destroy_counter_profile(config_id.handle);
|
|
return ROCPROFILER_STATUS_SUCCESS;
|
|
}
|
|
}
|