Add support for AQL dimensions (#262)
* Add support for AQL dimension changes Adds support for returning dimensions from AQLProfile through rocprofiler to tools. Includes a much larger expanded test suite that covers nearly all files in counter collection. Specific changes below: samples/counter_collection/print_functional_counters: Modified to check the validity of dimensions returned in comparison to the actual underlying data obtained from a kernel execution. rocprofiler-sdk/aql/helpers: adds function calls to support fetching dimension information from AQLProfile. rocprofiler-sdk/aql/packet_construct: modified to allow for events to be exported to aid evaluate_ast in decoding the output buffer. lib/rocprofiler-sdk/counters: Instance count now derived from dimension sizes. rocprofiler_query_counter_dimensions now moved to a callback format to improve usability. rocprofiler-sdk/counters/core: Code migrations and exports of functions for testing. rocprofiler-sdk/counters/dimensions: Generates a dimension cache to be used when querying dimension information for a counter id. rocprofiler-sdk/counters/evaluate_ast: Modified to pass back correct dimension information and to check/determine output dimensions for derived counters. rocprofiler-sdk/counters/id_decode: Modified to have a map between dimension name -> dimension along with a conversion from the aql profile id for a dimension (string) -> integer based id (happens only once during init). rocprofiler-sdk/hsa/queue: Modified to allow for making testing easier. Specifically to allow Queue to now be mocked in unit tests for counter collection. * Merge with changes for serialization * Added suggestions * source formatting (clang-format v11) (#457) Co-authored-by: bwelton <bwelton@users.noreply.github.com> * Minor fix * Test change --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: bwelton <bwelton@users.noreply.github.com>
This commit is contained in:
@@ -22,28 +22,71 @@
|
||||
|
||||
#include "lib/rocprofiler-sdk/counters/id_decode.hpp"
|
||||
|
||||
#include <hsa/hsa_ven_amd_aqlprofile.h>
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
|
||||
#include "lib/common/static_object.hpp"
|
||||
#include "lib/common/utility.hpp"
|
||||
#include "lib/rocprofiler-sdk/aql/aql_profile_v2.h"
|
||||
|
||||
namespace rocprofiler
|
||||
{
|
||||
namespace counters
|
||||
{
|
||||
const std::unordered_map<rocprofiler_profile_counter_instance_types, std::string>&
|
||||
const std::unordered_map<rocprofiler_profile_counter_instance_types, std::string_view>&
|
||||
dimension_map()
|
||||
{
|
||||
static std::unordered_map<rocprofiler_profile_counter_instance_types, std::string> map = {
|
||||
{ROCPROFILER_DIMENSION_NONE, "DIMENSION_NONE"},
|
||||
{ROCPROFILER_DIMENSION_XCC, "DIMENSION_XCC"},
|
||||
{ROCPROFILER_DIMENSION_SHADER_ENGINE, "DIMENSION_SHADER_ENGINE"},
|
||||
{ROCPROFILER_DIMENSION_AGENT, "DIMENSION_AGENT"},
|
||||
{ROCPROFILER_DIMENSION_PMC_CHANNEL, "DIMENSION_PMC_CHANNEL"},
|
||||
{ROCPROFILER_DIMENSION_CU, "DIMENSION_CU"},
|
||||
static std::unordered_map<rocprofiler_profile_counter_instance_types, std::string_view> map = {
|
||||
{ROCPROFILER_DIMENSION_NONE, std::string_view("DIMENSION_NONE")},
|
||||
{ROCPROFILER_DIMENSION_XCC, std::string_view("DIMENSION_XCC")},
|
||||
{ROCPROFILER_DIMENSION_SHADER_ENGINE, std::string_view("DIMENSION_SHADER_ENGINE")},
|
||||
{ROCPROFILER_DIMENSION_AGENT, std::string_view("DIMENSION_AGENT")},
|
||||
{ROCPROFILER_DIMENSION_SHADER_ARRAY, std::string_view("DIMENSION_SHADER_ARRAY")},
|
||||
{ROCPROFILER_DIMENSION_CU, std::string_view("DIMENSION_CU")},
|
||||
{ROCPROFILER_DIMENSION_INSTANCE, std::string_view("DIMENSION_INSTANCE")},
|
||||
};
|
||||
return map;
|
||||
}
|
||||
|
||||
const std::unordered_map<int, rocprofiler_profile_counter_instance_types>&
|
||||
aqlprofile_id_to_rocprof_instance()
|
||||
{
|
||||
using dims_map_t = std::unordered_map<int, rocprofiler_profile_counter_instance_types>;
|
||||
|
||||
static auto*& aql_to_rocprof_dims =
|
||||
common::static_object<dims_map_t>::construct([]() -> dims_map_t {
|
||||
dims_map_t data;
|
||||
|
||||
aqlprofile_iterate_event_ids(
|
||||
[](int id, const char* name, void* userdata) -> hsa_status_t {
|
||||
const std::unordered_map<std::string_view,
|
||||
rocprofiler_profile_counter_instance_types>
|
||||
aql_string_to_dim = {
|
||||
{"XCD", ROCPROFILER_DIMENSION_XCC},
|
||||
{"SE", ROCPROFILER_DIMENSION_SHADER_ENGINE},
|
||||
{"SA", ROCPROFILER_DIMENSION_SHADER_ARRAY},
|
||||
{"CU", ROCPROFILER_DIMENSION_CU},
|
||||
{"INSTANCE", ROCPROFILER_DIMENSION_INSTANCE},
|
||||
};
|
||||
|
||||
if(const auto* inst_type =
|
||||
rocprofiler::common::get_val(aql_string_to_dim, name))
|
||||
{
|
||||
// Supported instance type
|
||||
auto& map = *static_cast<
|
||||
std::unordered_map<int, rocprofiler_profile_counter_instance_types>*>(
|
||||
userdata);
|
||||
map.emplace(id, *inst_type);
|
||||
}
|
||||
return HSA_STATUS_SUCCESS;
|
||||
},
|
||||
static_cast<void*>(&data));
|
||||
return data;
|
||||
}());
|
||||
|
||||
return *aql_to_rocprof_dims;
|
||||
}
|
||||
|
||||
} // namespace counters
|
||||
} // namespace rocprofiler
|
||||
|
||||
Reference in New Issue
Block a user