From b3a07812bdc3186526193ad7cb64750bd47a0c98 Mon Sep 17 00:00:00 2001
From: yoann-heitz <yoann.heitz@polymtl.ca>
Date: Thu, 23 Sep 2021 10:35:40 -0400
Subject: [PATCH] Move kfd_api_trace_entry_t to roctracer_trace_entries.h

---
 inc/roctracer_trace_entries.h | 13 +++++++++++++
 test/tool/tracer_tool.cpp     | 12 ------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/inc/roctracer_trace_entries.h b/inc/roctracer_trace_entries.h
index f5a1350a..ab54593c 100644
--- a/inc/roctracer_trace_entries.h
+++ b/inc/roctracer_trace_entries.h
@@ -8,6 +8,7 @@
 #include <roctracer_roctx.h>
 #include <roctracer_hsa.h>
 #include <roctracer_hip.h>
+#include <roctracer_kfd.h>
 #include <ext/prof_protocol.h>
 #include <ext/hsa_rt_utils.hpp>
 
@@ -73,4 +74,16 @@ struct hip_activity_trace_entry_t {
   uint32_t pid;
 };
 
+struct kfd_api_trace_entry_t {
+  std::atomic<uint32_t> valid;
+  roctracer::entry_type_t type;
+  uint32_t domain;
+  uint32_t cid;
+  timestamp_t begin;
+  timestamp_t end;
+  uint32_t pid;
+  uint32_t tid;
+  kfd_api_data_t data;
+};
+
 #endif
\ No newline at end of file
diff --git a/test/tool/tracer_tool.cpp b/test/tool/tracer_tool.cpp
index 2fbac7cd..b616ee47 100644
--- a/test/tool/tracer_tool.cpp
+++ b/test/tool/tracer_tool.cpp
@@ -665,18 +665,6 @@ void pool_activity_callback(const char* begin, const char* end, void* arg) {
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 // KFD API tracing
 
-struct kfd_api_trace_entry_t {
-  std::atomic<uint32_t> valid;
-  roctracer::entry_type_t type;
-  uint32_t domain;
-  uint32_t cid;
-  timestamp_t begin;
-  timestamp_t end;
-  uint32_t pid;
-  uint32_t tid;
-  kfd_api_data_t data;
-};
-
 void kfd_api_flush_cb(kfd_api_trace_entry_t* entry);
 constexpr roctracer::TraceBuffer<kfd_api_trace_entry_t>::flush_prm_t kfd_api_flush_prm = {roctracer::DFLT_ENTRY_TYPE, kfd_api_flush_cb};
 roctracer::TraceBuffer<kfd_api_trace_entry_t>* kfd_api_trace_buffer = NULL;