From 362bfed749f362044d6923f9e6c8fe693340edea Mon Sep 17 00:00:00 2001 From: Evgeny Date: Sat, 7 Mar 2020 20:35:24 -0600 Subject: [PATCH] activity entry struct fix [ROCm/roctracer commit: c1455827b7f055eed974174787b31993a16b4240] --- projects/roctracer/inc/ext/prof_protocol.h | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/projects/roctracer/inc/ext/prof_protocol.h b/projects/roctracer/inc/ext/prof_protocol.h index 6a13724e95..c29ff0e65a 100644 --- a/projects/roctracer/inc/ext/prof_protocol.h +++ b/projects/roctracer/inc/ext/prof_protocol.h @@ -65,9 +65,18 @@ typedef struct activity_record_s { uint32_t domain; // activity domain id activity_kind_t kind; // activity kind activity_op_t op; // activity op - activity_correlation_id_t correlation_id; // activity ID - uint64_t begin_ns; // host begin timestamp - uint64_t end_ns; // host end timestamp + 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; + }; union { struct { int device_id; // device id @@ -80,11 +89,6 @@ typedef struct activity_record_s { 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; }; size_t bytes; // data size bytes } activity_record_t;