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>
[ROCm/rocprofiler-sdk commit: 3eb6a27bc6]
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
4daf20d431
Коммит
8e620cc11d
@@ -25,6 +25,12 @@
|
||||
#include <fmt/core.h>
|
||||
#include <glog/logging.h>
|
||||
|
||||
#include <rocprofiler-sdk/fwd.h>
|
||||
|
||||
#include "lib/common/synchronized.hpp"
|
||||
#include "lib/common/utility.hpp"
|
||||
#include "lib/rocprofiler-sdk/counters/id_decode.hpp"
|
||||
|
||||
namespace rocprofiler
|
||||
{
|
||||
namespace aql
|
||||
@@ -60,5 +66,52 @@ get_block_counters(hsa_agent_t agent, const hsa_ven_amd_aqlprofile_event_t& even
|
||||
}
|
||||
return max_block_counters;
|
||||
}
|
||||
|
||||
rocprofiler_status_t
|
||||
set_dim_id_from_sample(rocprofiler_counter_instance_id_t& id,
|
||||
hsa_agent_t agent,
|
||||
hsa_ven_amd_aqlprofile_event_t event,
|
||||
uint32_t sample_id)
|
||||
{
|
||||
auto callback =
|
||||
[](int, int sid, int, int coordinate, const char*, void* userdata) -> hsa_status_t {
|
||||
if(const auto* rocprof_id =
|
||||
rocprofiler::common::get_val(counters::aqlprofile_id_to_rocprof_instance(), sid))
|
||||
{
|
||||
counters::set_dim_in_rec(*static_cast<rocprofiler_counter_instance_id_t*>(userdata),
|
||||
*rocprof_id,
|
||||
static_cast<size_t>(coordinate));
|
||||
}
|
||||
return HSA_STATUS_SUCCESS;
|
||||
};
|
||||
|
||||
if(hsa_ven_amd_aqlprofile_iterate_event_coord(
|
||||
agent, event, sample_id, callback, static_cast<void*>(&id)) != HSA_STATUS_SUCCESS)
|
||||
{
|
||||
return ROCPROFILER_STATUS_ERROR_AQL_NO_EVENT_COORD;
|
||||
}
|
||||
return ROCPROFILER_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
rocprofiler_status_t
|
||||
get_dim_info(hsa_agent_t agent,
|
||||
hsa_ven_amd_aqlprofile_event_t event,
|
||||
uint32_t sample_id,
|
||||
std::map<int, uint64_t>& dims)
|
||||
{
|
||||
auto callback = [](int, int id, int extent, int, const char*, void* userdata) -> hsa_status_t {
|
||||
auto& map = *static_cast<std::map<int, uint64_t>*>(userdata);
|
||||
map.emplace(id, extent);
|
||||
return HSA_STATUS_SUCCESS;
|
||||
};
|
||||
|
||||
if(hsa_ven_amd_aqlprofile_iterate_event_coord(
|
||||
agent, event, sample_id, callback, static_cast<void*>(&dims)) != HSA_STATUS_SUCCESS)
|
||||
{
|
||||
return ROCPROFILER_STATUS_ERROR_AQL_NO_EVENT_COORD;
|
||||
}
|
||||
|
||||
return ROCPROFILER_STATUS_SUCCESS;
|
||||
}
|
||||
} // namespace aql
|
||||
} // namespace rocprofiler
|
||||
} // namespace rocprofiler
|
||||
Ссылка в новой задаче
Block a user