Reorganize thread trace codeobj headers (#1001)

* include/rocprofiler-sdk/cxx/codeobj - Relocated from include/rocprofiler-sdk/amd_detail/rocprofiler-sdk-codeobj * Update include/rocprofiler-sdk/cxx - cmake updates - correct namespace rocprofiler::codeobj rocprofiler::sdk::codeobj * Update codeobj tests and samples
ROCm · Aug 1, 2024 · 20e07ca · 20e07ca
1 parent 94b5d9b
commit 20e07ca
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 48 deletions.
diff --git a/samples/advanced_thread_trace/client.cpp b/samples/advanced_thread_trace/client.cpp
@@ -37,7 +37,7 @@
 #include <rocprofiler-sdk/fwd.h>
 #include <rocprofiler-sdk/registration.h>
 #include <rocprofiler-sdk/rocprofiler.h>
-#include <rocprofiler-sdk/amd_detail/rocprofiler-sdk-codeobj/code_printing.hpp>
+#include <rocprofiler-sdk/cxx/codeobj/code_printing.hpp>
 #include <shared_mutex>
 
 #include "common/defines.hpp"
@@ -106,9 +106,9 @@ namespace client
 using code_obj_load_data_t = rocprofiler_callback_tracing_code_object_load_data_t;
 using kernel_symbol_data_t = rocprofiler_callback_tracing_code_object_kernel_symbol_register_data_t;
 
-using Instruction             = rocprofiler::codeobj::disassembly::Instruction;
-using CodeobjAddressTranslate = rocprofiler::codeobj::disassembly::CodeobjAddressTranslate;
-using SymbolInfo              = rocprofiler::codeobj::disassembly::SymbolInfo;
+using Instruction             = rocprofiler::sdk::codeobj::disassembly::Instruction;
+using CodeobjAddressTranslate = rocprofiler::sdk::codeobj::disassembly::CodeobjAddressTranslate;
+using SymbolInfo              = rocprofiler::sdk::codeobj::disassembly::SymbolInfo;
 
 rocprofiler_client_id_t* client_id  = nullptr;
 rocprofiler_context_id_t client_ctx = {};

diff --git a/samples/code_object_isa_decode/client.cpp b/samples/code_object_isa_decode/client.cpp
@@ -38,7 +38,7 @@
 #include <rocprofiler-sdk/fwd.h>
 #include <rocprofiler-sdk/registration.h>
 #include <rocprofiler-sdk/rocprofiler.h>
-#include <rocprofiler-sdk/amd_detail/rocprofiler-sdk-codeobj/code_printing.hpp>
+#include <rocprofiler-sdk/cxx/codeobj/code_printing.hpp>
 
 #include "common/defines.hpp"
 #include "common/filesystem.hpp"
@@ -90,8 +90,8 @@ using code_obj_load_data_t = rocprofiler_callback_tracing_code_object_load_data_
 using kernel_symbol_data_t = rocprofiler_callback_tracing_code_object_kernel_symbol_register_data_t;
 using kernel_symbol_map_t  = std::unordered_map<std::string, std::pair<uint64_t, size_t>>;
 
-using Instruction             = rocprofiler::codeobj::disassembly::Instruction;
-using CodeobjAddressTranslate = rocprofiler::codeobj::disassembly::CodeobjAddressTranslate;
+using Instruction             = rocprofiler::sdk::codeobj::disassembly::Instruction;
+using CodeobjAddressTranslate = rocprofiler::sdk::codeobj::disassembly::CodeobjAddressTranslate;
 
 rocprofiler_client_id_t*      client_id          = nullptr;
 rocprofiler_client_finalize_t client_fini_func   = nullptr;

diff --git a/source/include/rocprofiler-sdk/amd_detail/CMakeLists.txt b/source/include/rocprofiler-sdk/amd_detail/CMakeLists.txt
@@ -10,5 +10,3 @@ 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/source/include/rocprofiler-sdk/amd_detail/rocprofiler-sdk-codeobj/CMakeLists.txt b/source/include/rocprofiler-sdk/amd_detail/rocprofiler-sdk-codeobj/CMakeLists.txt
diff --git a/source/include/rocprofiler-sdk/cxx/CMakeLists.txt b/source/include/rocprofiler-sdk/cxx/CMakeLists.txt
@@ -11,4 +11,5 @@ install(
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler-sdk/cxx
     COMPONENT development)
 
+add_subdirectory(codeobj)
 add_subdirectory(details)
diff --git a/source/include/rocprofiler-sdk/cxx/codeobj/CMakeLists.txt b/source/include/rocprofiler-sdk/cxx/codeobj/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(ROCPROFILER_CXX_CODEOBJ_HEADERS code_printing.hpp disassembly.hpp segment.hpp)
+
+install(
+    FILES ${ROCPROFILER_CXX_CODEOBJ_HEADERS}
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler-sdk/cxx/codeobj
+    COMPONENT development)
diff --git a/...rocprofiler-sdk-codeobj/code_printing.hpp → ...rofiler-sdk/cxx/codeobj/code_printing.hpp b/...rocprofiler-sdk-codeobj/code_printing.hpp → ...rofiler-sdk/cxx/codeobj/code_printing.hpp
@@ -40,6 +40,8 @@
 
 namespace rocprofiler
 {
+namespace sdk
+{
 namespace codeobj
 {
 namespace disassembly
@@ -423,4 +425,5 @@ class CodeobjAddressTranslate : public CodeobjMap
 
 }  // namespace disassembly
 }  // namespace codeobj
+}  // namespace sdk
 }  // namespace rocprofiler
diff --git a/...l/rocprofiler-sdk-codeobj/disassembly.hpp → ...cprofiler-sdk/cxx/codeobj/disassembly.hpp b/...l/rocprofiler-sdk-codeobj/disassembly.hpp → ...cprofiler-sdk/cxx/codeobj/disassembly.hpp
@@ -70,6 +70,8 @@
 
 namespace rocprofiler
 {
+namespace sdk
+{
 namespace codeobj
 {
 namespace disassembly
@@ -333,4 +335,5 @@ class DisassemblyInstance
 
 }  // namespace disassembly
 }  // namespace codeobj
+}  // namespace sdk
 }  // namespace rocprofiler
diff --git a/...etail/rocprofiler-sdk-codeobj/segment.hpp → ...e/rocprofiler-sdk/cxx/codeobj/segment.hpp b/...etail/rocprofiler-sdk-codeobj/segment.hpp → ...e/rocprofiler-sdk/cxx/codeobj/segment.hpp
@@ -31,6 +31,8 @@
 
 namespace rocprofiler
 {
+namespace sdk
+{
 namespace codeobj
 {
 namespace segment
@@ -89,4 +91,5 @@ class CodeobjTableTranslator : public std::set<address_range_t>
 
 }  // namespace segment
 }  // namespace codeobj
+}  // namespace sdk
 }  // namespace rocprofiler
diff --git a/source/lib/rocprofiler-sdk-codeobj/tests/codeobj_library_test.cpp b/source/lib/rocprofiler-sdk-codeobj/tests/codeobj_library_test.cpp
@@ -23,7 +23,7 @@
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 #include <fstream>
-#include <rocprofiler-sdk/amd_detail/rocprofiler-sdk-codeobj/code_printing.hpp>
+#include <rocprofiler-sdk/cxx/codeobj/code_printing.hpp>
 #include <string_view>
 #include <vector>
 
@@ -84,7 +84,7 @@ GetCodeobjContents()
 
 TEST(codeobj_library, segment_test)
 {
-    using CodeobjTableTranslator = rocprofiler::codeobj::segment::CodeobjTableTranslator;
+    using CodeobjTableTranslator = rocprofiler::sdk::codeobj::segment::CodeobjTableTranslator;
 
     CodeobjTableTranslator     table;
     std::unordered_set<size_t> used_addr{};
@@ -122,10 +122,10 @@ TEST(codeobj_library, segment_test)
     }
 }
 
-namespace disassembly         = rocprofiler::codeobj::disassembly;
+namespace disassembly         = rocprofiler::sdk::codeobj::disassembly;
 namespace codeobjhelper       = rocprofiler::testing::codeobjhelper;
-using CodeobjDecoderComponent = rocprofiler::codeobj::disassembly::CodeobjDecoderComponent;
-using LoadedCodeobjDecoder    = rocprofiler::codeobj::disassembly::LoadedCodeobjDecoder;
+using CodeobjDecoderComponent = rocprofiler::sdk::codeobj::disassembly::CodeobjDecoderComponent;
+using LoadedCodeobjDecoder    = rocprofiler::sdk::codeobj::disassembly::LoadedCodeobjDecoder;
 
 TEST(codeobj_library, file_opens)
 {
@@ -192,7 +192,7 @@ TEST(codeobj_library, loaded_codeobj_component)
 
 TEST(codeobj_library, codeobj_map_test)
 {
-    using marker_id_t = rocprofiler::codeobj::segment::marker_id_t;
+    using marker_id_t = rocprofiler::sdk::codeobj::segment::marker_id_t;
 
     const std::vector<char>& objdata = rocprofiler::testing::codeobjhelper::GetCodeobjContents();
     constexpr size_t         laddr1  = 0x1000;
@@ -221,7 +221,7 @@ TEST(codeobj_library, codeobj_map_test)
 
 TEST(codeobj_library, codeobj_table_test)
 {
-    using marker_id_t = rocprofiler::codeobj::segment::marker_id_t;
+    using marker_id_t = rocprofiler::sdk::codeobj::segment::marker_id_t;
 
     const std::vector<std::string>& hiplines = codeobjhelper::GetHipccOutput();
     const std::vector<char>&        objdata  = codeobjhelper::GetCodeobjContents();

diff --git a/tests/pc_sampling/address_translation.hpp b/tests/pc_sampling/address_translation.hpp
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <rocprofiler-sdk/amd_detail/rocprofiler-sdk-codeobj/code_printing.hpp>
+#include <rocprofiler-sdk/cxx/codeobj/code_printing.hpp>
 
 #include <algorithm>
 #include <cassert>
@@ -38,9 +38,9 @@ namespace client
 {
 namespace address_translation
 {
-using Instruction             = rocprofiler::codeobj::disassembly::Instruction;
-using CodeobjAddressTranslate = rocprofiler::codeobj::disassembly::CodeobjAddressTranslate;
-using marker_id_t             = rocprofiler::codeobj::disassembly::marker_id_t;
+using Instruction             = rocprofiler::sdk::codeobj::disassembly::Instruction;
+using CodeobjAddressTranslate = rocprofiler::sdk::codeobj::disassembly::CodeobjAddressTranslate;
+using marker_id_t             = rocprofiler::sdk::codeobj::disassembly::marker_id_t;
 
 /**
  * @brief Pair (code_object_id, pc_addr) uniquely identifies an instruction.

diff --git a/tests/thread-trace/trace_callbacks.cpp b/tests/thread-trace/trace_callbacks.cpp
@@ -29,7 +29,7 @@
 #include <rocprofiler-sdk/fwd.h>
 #include <rocprofiler-sdk/registration.h>
 #include <rocprofiler-sdk/rocprofiler.h>
-#include <rocprofiler-sdk/amd_detail/rocprofiler-sdk-codeobj/code_printing.hpp>
+#include <rocprofiler-sdk/cxx/codeobj/code_printing.hpp>
 #include "common.hpp"
 
 #include <atomic>
@@ -50,8 +50,8 @@ namespace Callbacks
 {
 using code_obj_load_data_t = rocprofiler_callback_tracing_code_object_load_data_t;
 using kernel_symbol_data_t = rocprofiler_callback_tracing_code_object_kernel_symbol_register_data_t;
-using CodeobjAddressTranslate = rocprofiler::codeobj::disassembly::CodeobjAddressTranslate;
-using Instruction             = rocprofiler::codeobj::disassembly::Instruction;
+using CodeobjAddressTranslate = rocprofiler::sdk::codeobj::disassembly::CodeobjAddressTranslate;
+using Instruction             = rocprofiler::sdk::codeobj::disassembly::Instruction;
 
 CodeobjAddressTranslate* codeobjTranslate = nullptr;