AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Run clang-format on all source files

Browse Source 
Change-Id: Ifb52ca306286b6b2d473821bed9db28e9f616d50
This commit is contained in:
Laurent Morichetti
2022-04-18 15:09:58 -07:00
committed by Laurent Morichetti
parent 89f6880371
commit 15ab5d9cda
40 changed files with 1332 additions and 1228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
inc/ext/prof_protocol.h
+43 -47
View File
@@ -25,35 +25,30 @@
// Traced API domains
typedef enum {
ACTIVITY_DOMAIN_HSA_API = 0, // HSA API domain
ACTIVITY_DOMAIN_HSA_OPS = 1, // HSA async activity domain
ACTIVITY_DOMAIN_HIP_OPS = 2, // HIP async activity domain
ACTIVITY_DOMAIN_HCC_OPS = ACTIVITY_DOMAIN_HIP_OPS, // HCC async activity domain
ACTIVITY_DOMAIN_HIP_VDI = ACTIVITY_DOMAIN_HIP_OPS, // HIP VDI async activity domain
ACTIVITY_DOMAIN_HIP_API = 3, // HIP API domain
ACTIVITY_DOMAIN_KFD_API = 4, // KFD API domain
ACTIVITY_DOMAIN_EXT_API = 5, // External ID domain
ACTIVITY_DOMAIN_ROCTX = 6, // ROCTX domain
ACTIVITY_DOMAIN_HSA_EVT = 7, // HSA events
ACTIVITY_DOMAIN_HSA_API = 0, // HSA API domain
ACTIVITY_DOMAIN_HSA_OPS = 1, // HSA async activity domain
ACTIVITY_DOMAIN_HIP_OPS = 2, // HIP async activity domain
ACTIVITY_DOMAIN_HCC_OPS = ACTIVITY_DOMAIN_HIP_OPS, // HCC async activity domain
ACTIVITY_DOMAIN_HIP_VDI = ACTIVITY_DOMAIN_HIP_OPS, // HIP VDI async activity domain
ACTIVITY_DOMAIN_HIP_API = 3, // HIP API domain
ACTIVITY_DOMAIN_KFD_API = 4, // KFD API domain
ACTIVITY_DOMAIN_EXT_API = 5, // External ID domain
ACTIVITY_DOMAIN_ROCTX = 6, // ROCTX domain
ACTIVITY_DOMAIN_HSA_EVT = 7, // HSA events
ACTIVITY_DOMAIN_NUMBER
} activity_domain_t;
// Extension API opcodes
typedef enum {
ACTIVITY_EXT_OP_MARK = 0,
ACTIVITY_EXT_OP_EXTERN_ID = 1
} activity_ext_op_t;
typedef enum { ACTIVITY_EXT_OP_MARK = 0, ACTIVITY_EXT_OP_EXTERN_ID = 1 } activity_ext_op_t;
// API calback type
typedef void (*activity_rtapi_callback_t)(uint32_t domain, uint32_t cid, const void* data, void* arg);
typedef void (*activity_rtapi_callback_t)(uint32_t domain, uint32_t cid, const void* data,
void* arg);
typedef uint32_t activity_kind_t;
typedef uint32_t activity_op_t;
// API callback phase
typedef enum {
ACTIVITY_API_PHASE_ENTER = 0,
ACTIVITY_API_PHASE_EXIT = 1
} activity_api_phase_t;
typedef enum { ACTIVITY_API_PHASE_ENTER = 0, ACTIVITY_API_PHASE_EXIT = 1 } activity_api_phase_t;
// Trace record types
// Correlation id
@@ -61,39 +56,40 @@ typedef uint64_t activity_correlation_id_t;
// Activity record type
typedef struct activity_record_s {
uint32_t domain; // activity domain id
activity_kind_t kind; // activity kind
activity_op_t op; // activity op
union {
struct {
activity_correlation_id_t correlation_id; // activity ID
uint64_t begin_ns; // host begin timestamp
uint64_t end_ns; // host end timestamp
};
struct {
uint32_t se; // sampled SE
uint64_t cycle; // sample cycle
uint64_t pc; // sample PC
} pc_sample;
uint32_t domain; // activity domain id
activity_kind_t kind; // activity kind
activity_op_t op; // activity op
union {
struct {
activity_correlation_id_t correlation_id; // activity ID
uint64_t begin_ns; // host begin timestamp
uint64_t end_ns; // host end timestamp
};
union {
struct {
int device_id; // device id
uint64_t queue_id; // queue id
};
struct {
uint32_t process_id; // device id
uint32_t thread_id; // thread id
};
struct {
activity_correlation_id_t external_id; // external correlatino id
};
struct {
uint32_t se; // sampled SE
uint64_t cycle; // sample cycle
uint64_t pc; // sample PC
} pc_sample;
};
union {
struct {
int device_id; // device id
uint64_t queue_id; // queue id
};
size_t bytes; // data size bytes
struct {
uint32_t process_id; // device id
uint32_t thread_id; // thread id
};
struct {
activity_correlation_id_t external_id; // external correlatino id
};
};
size_t bytes; // data size bytes
} activity_record_t;
// Activity sync calback type
typedef void* (*activity_sync_callback_t)(uint32_t cid, activity_record_t* record, const void* data, void* arg);
typedef void* (*activity_sync_callback_t)(uint32_t cid, activity_record_t* record, const void* data,
void* arg);
// Activity async calback type
typedef void (*activity_id_callback_t)(activity_correlation_id_t id);
typedef void (*activity_async_callback_t)(uint32_t op, void* record, void* arg);
inc/roctracer.h
+66 -81
View File
@@ -81,17 +81,15 @@ typedef activity_domain_t roctracer_domain_t;
// Return Op string by given domain and Op code
// NULL returned on the error and the library errno is set
const char* roctracer_op_string(
uint32_t domain, // tracing domain
uint32_t op, // activity op ID
uint32_t kind); // activity kind
const char* roctracer_op_string(uint32_t domain, // tracing domain
uint32_t op, // activity op ID
uint32_t kind); // activity kind
// Return Op code and kind by given string
roctracer_status_t roctracer_op_code(
uint32_t domain, // tracing domain
const char* str, // [in] op string
uint32_t* op, // [out] op code
uint32_t* kind); // [out] op kind code if not NULL
roctracer_status_t roctracer_op_code(uint32_t domain, // tracing domain
const char* str, // [in] op string
uint32_t* op, // [out] op code
uint32_t* kind); // [out] op kind code if not NULL
////////////////////////////////////////////////////////////////////////////////
// Callback API
@@ -106,24 +104,22 @@ typedef activity_rtapi_callback_t roctracer_rtapi_callback_t;
// Enable runtime API callbacks
roctracer_status_t roctracer_enable_op_callback(
activity_domain_t domain, // tracing domain
uint32_t op, // API call ID
activity_rtapi_callback_t callback, // callback function pointer
void* arg); // [in/out] callback arg
activity_domain_t domain, // tracing domain
uint32_t op, // API call ID
activity_rtapi_callback_t callback, // callback function pointer
void* arg); // [in/out] callback arg
roctracer_status_t roctracer_enable_domain_callback(
activity_domain_t domain, // tracing domain
activity_rtapi_callback_t callback, // callback function pointer
void* arg); // [in/out] callback arg
activity_domain_t domain, // tracing domain
activity_rtapi_callback_t callback, // callback function pointer
void* arg); // [in/out] callback arg
roctracer_status_t roctracer_enable_callback(
activity_rtapi_callback_t callback, // callback function pointer
void* arg); // [in/out] callback arg
activity_rtapi_callback_t callback, // callback function pointer
void* arg); // [in/out] callback arg
// Disable runtime API callbacks
roctracer_status_t roctracer_disable_op_callback(
activity_domain_t domain, // tracing domain
uint32_t op); // API call ID
roctracer_status_t roctracer_disable_domain_callback(
activity_domain_t domain); // tracing domain
roctracer_status_t roctracer_disable_op_callback(activity_domain_t domain, // tracing domain
uint32_t op); // API call ID
roctracer_status_t roctracer_disable_domain_callback(activity_domain_t domain); // tracing domain
roctracer_status_t roctracer_disable_callback();
////////////////////////////////////////////////////////////////////////////////
@@ -140,33 +136,32 @@ typedef activity_record_t roctracer_record_t;
// Return next record
static inline roctracer_status_t roctracer_next_record(
const activity_record_t* record, // [in] record ptr
const activity_record_t** next) // [out] next record ptr
const activity_record_t* record, // [in] record ptr
const activity_record_t** next) // [out] next record ptr
{
*next = record + 1;
return ROCTRACER_STATUS_SUCCESS;
}
// Tracer allocator type
typedef void (*roctracer_allocator_t)(
char** ptr, // memory pointer
size_t size, // memory size
void* arg); // allocator arg
typedef void (*roctracer_allocator_t)(char** ptr, // memory pointer
size_t size, // memory size
void* arg); // allocator arg
// Pool callback type
typedef void (*roctracer_buffer_callback_t)(
const char* begin, // [in] available buffered trace records
const char* end, // [in] end of buffered trace records
void* arg); // [in/out] callback arg
const char* begin, // [in] available buffered trace records
const char* end, // [in] end of buffered trace records
void* arg); // [in/out] callback arg
// Tracer properties
typedef struct {
uint32_t mode; // roctracer mode
size_t buffer_size; // buffer size
roctracer_allocator_t alloc_fun; // memory alocator function pointer
void* alloc_arg; // memory alocator function pointer
roctracer_buffer_callback_t buffer_callback_fun; // tracer record callback function
void* buffer_callback_arg; // tracer record callback arg
uint32_t mode; // roctracer mode
size_t buffer_size; // buffer size
roctracer_allocator_t alloc_fun; // memory alocator function pointer
void* alloc_arg; // memory alocator function pointer
roctracer_buffer_callback_t buffer_callback_fun; // tracer record callback function
void* buffer_callback_arg; // tracer record callback arg
} roctracer_properties_t;
// Tracer memory pool type
@@ -175,78 +170,69 @@ typedef void roctracer_pool_t;
// Create tracer memory pool
// The first invocation sets the default pool
roctracer_status_t roctracer_open_pool_expl(
const roctracer_properties_t* properties, // tracer pool properties
roctracer_pool_t** pool); // [out] returns tracer pool if not NULL,
// otherwise sets the default one if it is not set yet
const roctracer_properties_t* properties, // tracer pool properties
roctracer_pool_t** pool); // [out] returns tracer pool if not NULL,
// otherwise sets the default one if it is not set yet
static inline roctracer_status_t roctracer_open_pool(
const roctracer_properties_t* properties) // tracer pool properties
const roctracer_properties_t* properties) // tracer pool properties
{
return roctracer_open_pool_expl(properties, NULL);
return roctracer_open_pool_expl(properties, NULL);
}
// otherwise the error is generated
// otherwise the error is generated
// Close tracer memory pool
roctracer_status_t roctracer_close_pool_expl(
roctracer_pool_t* pool); // [in] memory pool, NULL is a default one
static inline roctracer_status_t roctracer_close_pool()
{
return roctracer_close_pool_expl(NULL);
}
roctracer_pool_t* pool); // [in] memory pool, NULL is a default one
static inline roctracer_status_t roctracer_close_pool() { return roctracer_close_pool_expl(NULL); }
// Return current default pool
// Set new default pool if the argument is not NULL
roctracer_pool_t* roctracer_default_pool_expl(
roctracer_pool_t* pool); // [in] new default pool if not NULL
static inline roctracer_pool_t* roctracer_default_pool()
{
return roctracer_default_pool_expl(NULL);
roctracer_pool_t* pool); // [in] new default pool if not NULL
static inline roctracer_pool_t* roctracer_default_pool() {
return roctracer_default_pool_expl(NULL);
}
// Enable activity records logging
roctracer_status_t roctracer_enable_op_activity_expl(
activity_domain_t domain, // tracing domain
uint32_t op, // activity op ID
roctracer_pool_t* pool); // memory pool, NULL is a default one
activity_domain_t domain, // tracing domain
uint32_t op, // activity op ID
roctracer_pool_t* pool); // memory pool, NULL is a default one
static inline roctracer_status_t roctracer_enable_op_activity(
activity_domain_t domain, // tracing domain
uint32_t op) // activity op ID
activity_domain_t domain, // tracing domain
uint32_t op) // activity op ID
{
return roctracer_enable_op_activity_expl(domain, op, NULL);
return roctracer_enable_op_activity_expl(domain, op, NULL);
}
roctracer_status_t roctracer_enable_domain_activity_expl(
activity_domain_t domain, // tracing domain
roctracer_pool_t* pool); // memory pool, NULL is a default one
activity_domain_t domain, // tracing domain
roctracer_pool_t* pool); // memory pool, NULL is a default one
static inline roctracer_status_t roctracer_enable_domain_activity(
activity_domain_t domain) // tracing domain
activity_domain_t domain) // tracing domain
{
return roctracer_enable_domain_activity_expl(domain, NULL);
return roctracer_enable_domain_activity_expl(domain, NULL);
}
roctracer_status_t roctracer_enable_activity_expl(
roctracer_pool_t* pool); // memory pool, NULL is a default one
static inline roctracer_status_t roctracer_enable_activity()
{
return roctracer_enable_activity_expl(NULL);
roctracer_pool_t* pool); // memory pool, NULL is a default one
static inline roctracer_status_t roctracer_enable_activity() {
return roctracer_enable_activity_expl(NULL);
}
// Disable activity records logging
roctracer_status_t roctracer_disable_op_activity(
activity_domain_t domain, // tracing domain
uint32_t op); // activity op ID
roctracer_status_t roctracer_disable_domain_activity(
activity_domain_t domain); // tracing domain
roctracer_status_t roctracer_disable_op_activity(activity_domain_t domain, // tracing domain
uint32_t op); // activity op ID
roctracer_status_t roctracer_disable_domain_activity(activity_domain_t domain); // tracing domain
roctracer_status_t roctracer_disable_activity();
// Flush available activity records
roctracer_status_t roctracer_flush_activity_expl(
roctracer_pool_t* pool); // memory pool, NULL is a default one
static inline roctracer_status_t roctracer_flush_activity()
{
return roctracer_flush_activity_expl(NULL);
roctracer_pool_t* pool); // memory pool, NULL is a default one
static inline roctracer_status_t roctracer_flush_activity() {
return roctracer_flush_activity_expl(NULL);
}
// Get system timestamp
roctracer_status_t roctracer_get_timestamp(
uint64_t* timestamp); // [out] return timestamp
roctracer_status_t roctracer_get_timestamp(uint64_t* timestamp); // [out] return timestamp
// Load/Unload methods
bool roctracer_load();
@@ -254,9 +240,8 @@ void roctracer_unload();
void roctracer_flush_buf();
// Set properties
roctracer_status_t roctracer_set_properties(
roctracer_domain_t domain, // tracing domain
void* propertes); // tracing properties
roctracer_status_t roctracer_set_properties(roctracer_domain_t domain, // tracing domain
void* propertes); // tracing properties
#ifdef __cplusplus
} // extern "C" block
inc/roctracer_cb_table.h
+3 -4
View File
@@ -28,9 +28,8 @@
namespace roctracer {
// Generic callbacks table
template <int N>
class CbTable {
public:
template <int N> class CbTable {
public:
typedef std::mutex mutex_t;
CbTable() {
@@ -63,7 +62,7 @@ class CbTable {
return ret;
}
private:
private:
activity_rtapi_callback_t callback_[N];
void* arg_[N];
mutex_t mutex_;
inc/roctracer_ext.h
+2 -1
View File
@@ -62,7 +62,8 @@ roctracer_status_t roctracer_activity_push_external_correlation_id(activity_corr
// Notifies that the calling thread is leaving an external API region.
// Pop an external correlation id for the calling thread.
// 'lastId' returns the last external correlation if not NULL
roctracer_status_t roctracer_activity_pop_external_correlation_id(activity_correlation_id_t* last_id);
roctracer_status_t roctracer_activity_pop_external_correlation_id(
activity_correlation_id_t* last_id);
#ifdef __cplusplus
} // extern "C" block
inc/roctracer_hcc.h
+4 -9
View File
@@ -21,19 +21,14 @@
#ifndef INC_ROCTRACER_HCC_H_
#define INC_ROCTRACER_HCC_H_
enum {
HIP_OP_ID_DISPATCH = 0,
HIP_OP_ID_COPY = 1,
HIP_OP_ID_BARRIER = 2,
HIP_OP_ID_NUMBER = 3
};
enum { HIP_OP_ID_DISPATCH = 0, HIP_OP_ID_COPY = 1, HIP_OP_ID_BARRIER = 2, HIP_OP_ID_NUMBER = 3 };
#ifdef __cplusplus
extern "C" {
#endif
typedef void (hipInitAsyncActivityCallback_t)(void* id_callback, void* op_callback, void* arg);
typedef bool (hipEnableAsyncActivityCallback_t)(unsigned op, bool enable);
typedef const char* (hipGetOpName_t)(unsigned op);
typedef void(hipInitAsyncActivityCallback_t)(void* id_callback, void* op_callback, void* arg);
typedef bool(hipEnableAsyncActivityCallback_t)(unsigned op, bool enable);
typedef const char*(hipGetOpName_t)(unsigned op);
#ifdef __cplusplus
}
#endif
inc/roctracer_hip.h
+2 -2
View File
@@ -25,12 +25,12 @@
#include <iostream>
inline static std::ostream& operator<<(std::ostream& out, const unsigned char& v) {
out << (unsigned int)v;
out << (unsigned int)v;
return out;
}
inline static std::ostream& operator<<(std::ostream& out, const char& v) {
out << (unsigned char)v;
out << (unsigned char)v;
return out;
}
#endif // __cplusplus
inc/roctracer_hsa.h
+6 -8
View File
@@ -42,9 +42,7 @@ enum hsa_op_id_t {
namespace roctracer {
namespace hsa_support {
enum {
HSA_OP_ID_async_copy = 0
};
enum { HSA_OP_ID_async_copy = 0 };
extern CoreApiTable CoreApiTable_saved;
extern AmdExtTable AmdExtTable_saved;
@@ -57,18 +55,18 @@ struct ops_properties_t {
const char* output_prefix;
};
}; // namespace hsa_support
}; // namespace hsa_support
typedef hsa_support::ops_properties_t hsa_ops_properties_t;
}; // namespace roctracer
}; // namespace roctracer
#include "hsa_ostream_ops.h"
#else // !__cplusplus
#else // !__cplusplus
typedef void* hsa_amd_queue_intercept_handler;
typedef void* hsa_amd_runtime_queue_notifier;
#endif //! __cplusplus
#endif //! __cplusplus
#include <hsa_prof_str.h>
#endif // INC_ROCTRACER_HSA_H_
#endif // INC_ROCTRACER_HSA_H_
inc/roctracer_roctx.h
+2 -2
View File
@@ -47,8 +47,8 @@ enum roctx_api_id_t {
typedef struct roctx_api_data_s {
union {
struct {
const char* message;
roctx_range_id_t id;
const char* message;
roctx_range_id_t id;
};
struct {
const char* message;
inc/roctx.h
+2 -2
View File
@@ -59,8 +59,8 @@ void roctxMarkA(const char* message);
////////////////////////////////////////////////////////////////////////////////
// Ranges annotating API
// Returns the 0 based level of a nested range being started by given message associated to this range.
// A negative value is returned on the error.
// Returns the 0 based level of a nested range being started by given message associated to this
// range. A negative value is returned on the error.
int roctxRangePushA(const char* message);
#define roctxRangePush(message) roctxRangePushA(message)