Jonathan R. Madsen
2f9b1767e9
* Handle hsa_queue_destroy after finalization
- fixes issue where hsa_queue_destroy(...) is invoked after rocprofiler-sdk has finalized
- hsa::get_queue_controller() returns pointer
- if queue controller is a null pointer, skip invoking QueueController::destroy_queue
* Update HIP/HSA/marker update_table logging
* Update rocprofv3 tests
- remove HSA_TOOLS_LIB env variable
- remove setting ROCPROFILER_LOG_LEVEL env variable
- add timeouts to tests which are missing them
* Disable thread sanitizer deadlock detection
* Update CI workflow
- rename vega20-ubuntu job to core-ci
- enable navi32 in core-ci and sanitizers
* Update run-ci.py
- set gcovr html medium and high threshold
* Update lib/rocprofiler-sdk/hsa/queue_controller.cpp
- remove this capture from enable/disable serialization
* Update lib/rocprofiler-sdk/hsa/{hsa_barrier,profile_serializer}.*
- hsa_barrier::set_barrier accepts const-ref to queue map
- profile_serializer::enable and profile_serializer::disable accept const-ref to queue map
* Logging for HIP/HSA/marker/profile_serializer
* Logging for HIP/HSA/marker/queue_controller
* Improve test_retired_correlation_ids asserts
* Fix tests/counter-collection/validate.py
- scale expected SQ_WAVES counter value based on warp size of GPU
* Tweak github comment for code coverage
* Remove gcovr html high/medium threshold args
* Fix tests/counter-collection/validate.py
- round before casting to int in test_counter_values
* operator bool for profile_serializer
- only wait on CV if profile_serializer is used
* Logging updates (profile_serializer + code_object)
* Update counter-collection validate.py
* QueueController does not wait on CV if finalizing/finalized
* Update CI workflow
- remove navi32 from core job
* Improve HIP/HSA/marker tracing get_functor/functor
- remove lambda wrapper around functor
* Update lib/rocprofiler-sdk/hsa/queue_controller.cpp
- do not acquire cvmutex lock during finalization
* Update lib/rocprofiler-sdk/hsa/hsa_barrier.*
- move ctor and dtor to implementation
- skip signal store screlease and destroy if already finalized
* Update CI workflow
- remove navi32 runners
* bwelton fixes for hangs
* CMake improvements + simplified demangle
- remove amd-comgr from common target (and thus removed from roctx DT_NEEDED)
---------
Co-authored-by: Benjamin Welton <bewelton@amd.com>
221 строка
20 KiB
C++
221 строка
20 KiB
C++
// MIT License
|
|
//
|
|
// Copyright (c) 2023 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 "lib/common/defines.hpp"
|
|
|
|
#define MARKER_API_INFO_DEFINITION_0(MARKER_TABLE, MARKER_API_ID, MARKER_FUNC, MARKER_FUNC_PTR) \
|
|
namespace rocprofiler \
|
|
{ \
|
|
namespace marker \
|
|
{ \
|
|
template <> \
|
|
struct roctx_api_info<MARKER_TABLE, MARKER_API_ID> : roctx_domain_info<MARKER_TABLE> \
|
|
{ \
|
|
static constexpr auto table_idx = MARKER_TABLE; \
|
|
static constexpr auto operation_idx = MARKER_API_ID; \
|
|
static constexpr auto name = #MARKER_FUNC; \
|
|
\
|
|
using domain_type = roctx_domain_info<table_idx>; \
|
|
using this_type = roctx_api_info<table_idx, operation_idx>; \
|
|
using base_type = roctx_api_impl<table_idx, operation_idx>; \
|
|
\
|
|
using domain_type::callback_domain_idx; \
|
|
using domain_type::buffered_domain_idx; \
|
|
using domain_type::args_type; \
|
|
using domain_type::retval_type; \
|
|
using domain_type::callback_data_type; \
|
|
\
|
|
static constexpr auto offset() \
|
|
{ \
|
|
return offsetof(roctx_table_lookup<table_idx>::type, MARKER_FUNC_PTR); \
|
|
} \
|
|
\
|
|
static_assert(offsetof(roctx_table_lookup<table_idx>::type, MARKER_FUNC_PTR) == \
|
|
(sizeof(size_t) + (operation_idx * sizeof(void*))), \
|
|
"ABI error for " #MARKER_FUNC); \
|
|
\
|
|
static auto& get_table() { return roctx_table_lookup<table_idx>{}(); } \
|
|
\
|
|
template <typename TableT> \
|
|
static auto& get_table(TableT& _v) \
|
|
{ \
|
|
return roctx_table_lookup<table_idx>{}(_v); \
|
|
} \
|
|
\
|
|
template <typename TableT> \
|
|
static auto& get_table_func(TableT& _table) \
|
|
{ \
|
|
if constexpr(std::is_pointer<TableT>::value) \
|
|
{ \
|
|
assert(_table != nullptr && "nullptr to MARKER table for " #MARKER_FUNC \
|
|
" function"); \
|
|
return _table->MARKER_FUNC_PTR; \
|
|
} \
|
|
else \
|
|
{ \
|
|
return _table.MARKER_FUNC_PTR; \
|
|
} \
|
|
} \
|
|
\
|
|
static auto& get_table_func() { return get_table_func(get_table()); } \
|
|
\
|
|
template <typename DataT> \
|
|
static auto& get_api_data_args(DataT& _data) \
|
|
{ \
|
|
return _data.MARKER_FUNC; \
|
|
} \
|
|
\
|
|
template <typename RetT, typename... Args> \
|
|
static auto get_functor(RetT (*)(Args...)) \
|
|
{ \
|
|
return &base_type::functor<RetT, Args...>; \
|
|
} \
|
|
\
|
|
static std::vector<void*> as_arg_addr(callback_data_type) { return std::vector<void*>{}; } \
|
|
\
|
|
static std::vector<common::stringified_argument> as_arg_list(callback_data_type, int32_t) \
|
|
{ \
|
|
return {}; \
|
|
} \
|
|
}; \
|
|
} \
|
|
}
|
|
|
|
#define MARKER_API_INFO_DEFINITION_V( \
|
|
MARKER_TABLE, MARKER_API_ID, MARKER_FUNC, MARKER_FUNC_PTR, ...) \
|
|
namespace rocprofiler \
|
|
{ \
|
|
namespace marker \
|
|
{ \
|
|
template <> \
|
|
struct roctx_api_info<MARKER_TABLE, MARKER_API_ID> : roctx_domain_info<MARKER_TABLE> \
|
|
{ \
|
|
static constexpr auto table_idx = MARKER_TABLE; \
|
|
static constexpr auto operation_idx = MARKER_API_ID; \
|
|
static constexpr auto name = #MARKER_FUNC; \
|
|
\
|
|
using domain_type = roctx_domain_info<table_idx>; \
|
|
using this_type = roctx_api_info<table_idx, operation_idx>; \
|
|
using base_type = roctx_api_impl<table_idx, operation_idx>; \
|
|
\
|
|
static constexpr auto callback_domain_idx = domain_type::callback_domain_idx; \
|
|
static constexpr auto buffered_domain_idx = domain_type::buffered_domain_idx; \
|
|
\
|
|
using domain_type::args_type; \
|
|
using domain_type::retval_type; \
|
|
using domain_type::callback_data_type; \
|
|
\
|
|
static constexpr auto offset() \
|
|
{ \
|
|
return offsetof(roctx_table_lookup<table_idx>::type, MARKER_FUNC_PTR); \
|
|
} \
|
|
\
|
|
static_assert(offsetof(roctx_table_lookup<table_idx>::type, MARKER_FUNC_PTR) == \
|
|
(sizeof(size_t) + (operation_idx * sizeof(void*))), \
|
|
"ABI error for " #MARKER_FUNC); \
|
|
\
|
|
static auto& get_table() { return roctx_table_lookup<table_idx>{}(); } \
|
|
\
|
|
template <typename TableT> \
|
|
static auto& get_table(TableT& _v) \
|
|
{ \
|
|
return roctx_table_lookup<table_idx>{}(_v); \
|
|
} \
|
|
\
|
|
template <typename TableT> \
|
|
static auto& get_table_func(TableT& _table) \
|
|
{ \
|
|
if constexpr(std::is_pointer<TableT>::value) \
|
|
{ \
|
|
assert(_table != nullptr && "nullptr to MARKER table for " #MARKER_FUNC \
|
|
" function"); \
|
|
return _table->MARKER_FUNC_PTR; \
|
|
} \
|
|
else \
|
|
{ \
|
|
return _table.MARKER_FUNC_PTR; \
|
|
} \
|
|
} \
|
|
\
|
|
static auto& get_table_func() { return get_table_func(get_table()); } \
|
|
\
|
|
template <typename DataT> \
|
|
static auto& get_api_data_args(DataT& _data) \
|
|
{ \
|
|
return _data.MARKER_FUNC; \
|
|
} \
|
|
\
|
|
template <typename RetT, typename... Args> \
|
|
static auto get_functor(RetT (*)(Args...)) \
|
|
{ \
|
|
return &base_type::functor<RetT, Args...>; \
|
|
} \
|
|
\
|
|
static std::vector<void*> as_arg_addr(callback_data_type trace_data) \
|
|
{ \
|
|
return std::vector<void*>{ \
|
|
GET_ADDR_MEMBER_FIELDS(get_api_data_args(trace_data.args), __VA_ARGS__)}; \
|
|
} \
|
|
\
|
|
static auto as_arg_list(callback_data_type trace_data, int32_t max_deref) \
|
|
{ \
|
|
return utils::stringize( \
|
|
max_deref, \
|
|
GET_NAMED_MEMBER_FIELDS(get_api_data_args(trace_data.args), __VA_ARGS__)); \
|
|
} \
|
|
}; \
|
|
} \
|
|
}
|
|
|
|
#define MARKER_API_TABLE_LOOKUP_DEFINITION(TABLE_ID, TYPE) \
|
|
namespace rocprofiler \
|
|
{ \
|
|
namespace marker \
|
|
{ \
|
|
namespace \
|
|
{ \
|
|
template <> \
|
|
auto* get_table<TABLE_ID>() \
|
|
{ \
|
|
return get_table_impl<TYPE>(); \
|
|
} \
|
|
} \
|
|
\
|
|
template <> \
|
|
struct roctx_table_lookup<TABLE_ID> \
|
|
{ \
|
|
using type = TYPE; \
|
|
auto& operator()(type& _v) const { return _v; } \
|
|
auto& operator()(type* _v) const { return *_v; } \
|
|
auto& operator()() const { return (*this)(get_table<TABLE_ID>()); } \
|
|
}; \
|
|
\
|
|
template <> \
|
|
struct roctx_table_id_lookup<TYPE> \
|
|
{ \
|
|
static constexpr auto value = TABLE_ID; \
|
|
}; \
|
|
} \
|
|
}
|