From c160884b4447eac71255202fcc34985f531b2f30 Mon Sep 17 00:00:00 2001
From: Giovanni Lenzi Baraldi <gbaraldi@amd.com>
Date: Wed, 29 May 2024 11:28:01 -0300
Subject: [PATCH] Moving ATT to amd_detail (#885)

* Moving ATT to amd_detail

* Formatting

[ROCm/rocprofiler-sdk commit: 385980e279595de779eff7229f77b422a9b75d69]
---
 .../samples/advanced_thread_trace/client.cpp               | 1 +
 .../source/include/rocprofiler-sdk/CMakeLists.txt          | 1 -
 .../include/rocprofiler-sdk/amd_detail/CMakeLists.txt      | 7 +++++++
 .../rocprofiler-sdk/{ => amd_detail}/thread_trace.h        | 0
 .../source/include/rocprofiler-sdk/rocprofiler.h           | 1 -
 .../source/lib/rocprofiler-sdk/thread_trace/att_core.hpp   | 2 +-
 .../source/lib/rocprofiler-sdk/thread_trace/att_parser.cpp | 1 +
 .../rocprofiler-sdk/tests/thread-trace/verify_data.cpp     | 1 +
 8 files changed, 11 insertions(+), 3 deletions(-)
 rename projects/rocprofiler-sdk/source/include/rocprofiler-sdk/{ => amd_detail}/thread_trace.h (100%)

diff --git a/projects/rocprofiler-sdk/samples/advanced_thread_trace/client.cpp b/projects/rocprofiler-sdk/samples/advanced_thread_trace/client.cpp
index ab8f76d0ea..871d8f5495 100644
--- a/projects/rocprofiler-sdk/samples/advanced_thread_trace/client.cpp
+++ b/projects/rocprofiler-sdk/samples/advanced_thread_trace/client.cpp
@@ -31,6 +31,7 @@
  * @brief Example rocprofiler client (tool)
  */
 
+#include <rocprofiler-sdk/amd_detail/thread_trace.h>
 #include <rocprofiler-sdk/buffer.h>
 #include <rocprofiler-sdk/callback_tracing.h>
 #include <rocprofiler-sdk/fwd.h>
diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/CMakeLists.txt b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/CMakeLists.txt
index 457ed4e554..0b6915aec7 100644
--- a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/CMakeLists.txt
+++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/CMakeLists.txt
@@ -30,7 +30,6 @@ set(ROCPROFILER_HEADER_FILES
     profile_config.h
     registration.h
     spm.h
-    thread_trace.h
     ${CMAKE_CURRENT_BINARY_DIR}/version.h)
 
 install(
diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/amd_detail/CMakeLists.txt b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/amd_detail/CMakeLists.txt
index 473ff3bd13..8bfe7fe5cb 100644
--- a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/amd_detail/CMakeLists.txt
+++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/amd_detail/CMakeLists.txt
@@ -3,4 +3,11 @@
 #   Installation of amd_detail headers
 #
 #
+set(ROCPROFILER_AMD_DETAIL_HEADER_FILES thread_trace.h)
+
+install(
+    FILES ${ROCPROFILER_AMD_DETAIL_HEADER_FILES}
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler-sdk/amd_detail/
+    COMPONENT development)
+
 add_subdirectory(rocprofiler-sdk-codeobj)
diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/thread_trace.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/amd_detail/thread_trace.h
similarity index 100%
rename from projects/rocprofiler-sdk/source/include/rocprofiler-sdk/thread_trace.h
rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/amd_detail/thread_trace.h
diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/rocprofiler.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/rocprofiler.h
index 4c1d06e0b2..bbf0e3ae8c 100644
--- a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/rocprofiler.h
+++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/rocprofiler.h
@@ -80,7 +80,6 @@ ROCPROFILER_EXTERN_C_FINI
 // #include "rocprofiler-sdk/marker.h"
 #include "rocprofiler-sdk/pc_sampling.h"
 #include "rocprofiler-sdk/profile_config.h"
-#include "rocprofiler-sdk/thread_trace.h"
 // #include "rocprofiler-sdk/spm.h"
 
 ROCPROFILER_EXTERN_C_INIT
diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/thread_trace/att_core.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/thread_trace/att_core.hpp
index 2cfca4abc3..d46fd7268f 100644
--- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/thread_trace/att_core.hpp
+++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/thread_trace/att_core.hpp
@@ -24,8 +24,8 @@
 
 #include "lib/rocprofiler-sdk/hsa/agent_cache.hpp"
 
+#include <rocprofiler-sdk/amd_detail/thread_trace.h>
 #include <rocprofiler-sdk/intercept_table.h>
-#include <rocprofiler-sdk/thread_trace.h>
 
 #include <cstdint>
 #include <memory>
diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/thread_trace/att_parser.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/thread_trace/att_parser.cpp
index f5d2a70871..611bcb84e0 100644
--- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/thread_trace/att_parser.cpp
+++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/thread_trace/att_parser.cpp
@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include <rocprofiler-sdk/amd_detail/thread_trace.h>
 #include <rocprofiler-sdk/rocprofiler.h>
 #include <atomic>
 #include <string_view>
diff --git a/projects/rocprofiler-sdk/tests/thread-trace/verify_data.cpp b/projects/rocprofiler-sdk/tests/thread-trace/verify_data.cpp
index 126a0ecabe..59917613b6 100644
--- a/projects/rocprofiler-sdk/tests/thread-trace/verify_data.cpp
+++ b/projects/rocprofiler-sdk/tests/thread-trace/verify_data.cpp
@@ -31,6 +31,7 @@
  * @brief Example rocprofiler client (tool)
  */
 
+#include <rocprofiler-sdk/amd_detail/thread_trace.h>
 #include <rocprofiler-sdk/fwd.h>
 #include <rocprofiler-sdk/registration.h>
 #include <rocprofiler-sdk/rocprofiler.h>