From 3fc9374295b3dee25bacd4968ee03c79b1c57543 Mon Sep 17 00:00:00 2001 From: "Baraldi, Giovanni" Date: Thu, 17 Apr 2025 21:43:15 +0200 Subject: [PATCH] SWDEV-527202: Moving ATT to experimental (#335) * Moving ATT to experimental * Formatting + rebase * Addressing review comments * Formatting * Update source/lib/att-tool/waitcnt/analysis.cpp --------- Co-authored-by: Giovanni Baraldi Co-authored-by: Madsen, Jonathan [ROCm/rocprofiler-sdk commit: 46818b01679a8ced8c68dce4560a0f66df8a2938] --- .../include/rocprofiler-sdk/CMakeLists.txt | 1 - .../rocprofiler-sdk/amd_detail/CMakeLists.txt | 12 ------ .../experimental/CMakeLists.txt | 4 +- .../experimental/thread-trace/CMakeLists.txt | 6 +++ .../thread-trace/agent.h} | 2 +- .../thread-trace/core.h} | 0 .../thread-trace/dispatch.h} | 2 +- .../thread_trace.h | 6 +-- .../rocprofiler-sdk/source/lib/CMakeLists.txt | 3 +- .../CMakeLists.txt | 6 +-- .../att_decoder.h | 0 .../att_lib_wrapper.cpp | 0 .../att_lib_wrapper.hpp | 2 +- .../code.cpp | 0 .../code.hpp | 0 .../counters.cpp | 0 .../counters.hpp | 0 .../{rocprofiler-sdk-att => att-tool}/dl.cpp | 2 +- .../{rocprofiler-sdk-att => att-tool}/dl.hpp | 0 .../filenames.cpp | 0 .../filenames.hpp | 0 .../occupancy.cpp | 40 ++++++------------ .../occupancy.hpp | 0 .../outputfile.hpp | 2 +- .../perfcounter.cpp | 0 .../perfcounter.hpp | 0 .../profile_interface.cpp | 0 .../profile_interface.hpp | 0 .../tests/CMakeLists.txt | 0 .../tests/att_decoder_test.cpp | 6 +-- .../tests/dummy_decoder.cpp | 0 .../tests/standalone_tool_main.cpp | 8 ++-- .../util.hpp | 0 .../waitcnt/CMakeLists.txt | 0 .../waitcnt/analysis.cpp | 3 +- .../waitcnt/analysis.hpp | 6 +-- .../waitcnt/gfx10.cpp | 2 +- .../waitcnt/gfx12.cpp | 2 +- .../waitcnt/gfx9.cpp | 2 +- .../waitcnt/tests/CMakeLists.txt | 0 .../tests/att_decoder_waitcnt_test.cpp | 2 +- .../wave.cpp | 0 .../wave.hpp | 0 .../wstates.cpp | 0 .../wstates.hpp | 0 .../source/lib/output/metadata.cpp | 2 +- .../source/lib/output/metadata.hpp | 2 +- .../rocprofiler-sdk-codeobj/CMakeLists.txt | 36 ---------------- .../lib/rocprofiler-sdk-tool/config.hpp | 2 +- .../source/lib/rocprofiler-sdk-tool/tool.cpp | 5 +-- .../rocprofiler-sdk/thread_trace/att_core.hpp | 2 +- .../thread_trace/att_service.cpp | 2 +- .../source/lib/tests/CMakeLists.txt | 1 + .../tests => tests/codeobj}/CMakeLists.txt | 4 +- .../codeobj}/codeobj_library_test.cpp | 2 +- .../tests => tests/codeobj}/hipcc_output.s | 0 .../tests => tests/codeobj}/smallkernel.bin | Bin .../tests/thread-trace/trace_callbacks.hpp | 2 +- 58 files changed, 62 insertions(+), 117 deletions(-) delete mode 100644 projects/rocprofiler-sdk/source/include/rocprofiler-sdk/amd_detail/CMakeLists.txt create mode 100644 projects/rocprofiler-sdk/source/include/rocprofiler-sdk/experimental/thread-trace/CMakeLists.txt rename projects/rocprofiler-sdk/source/include/rocprofiler-sdk/{amd_detail/thread_trace_agent.h => experimental/thread-trace/agent.h} (98%) rename projects/rocprofiler-sdk/source/include/rocprofiler-sdk/{amd_detail/thread_trace_core.h => experimental/thread-trace/core.h} (100%) rename projects/rocprofiler-sdk/source/include/rocprofiler-sdk/{amd_detail/thread_trace_dispatch.h => experimental/thread-trace/dispatch.h} (98%) rename projects/rocprofiler-sdk/source/include/rocprofiler-sdk/{amd_detail => experimental}/thread_trace.h (86%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/CMakeLists.txt (84%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/att_decoder.h (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/att_lib_wrapper.cpp (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/att_lib_wrapper.hpp (98%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/code.cpp (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/code.hpp (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/counters.cpp (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/counters.hpp (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/dl.cpp (98%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/dl.hpp (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/filenames.cpp (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/filenames.hpp (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/occupancy.cpp (81%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/occupancy.hpp (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/outputfile.hpp (97%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/perfcounter.cpp (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/perfcounter.hpp (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/profile_interface.cpp (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/profile_interface.hpp (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/tests/CMakeLists.txt (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/tests/att_decoder_test.cpp (96%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/tests/dummy_decoder.cpp (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/tests/standalone_tool_main.cpp (96%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/util.hpp (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/waitcnt/CMakeLists.txt (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/waitcnt/analysis.cpp (98%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/waitcnt/analysis.hpp (95%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/waitcnt/gfx10.cpp (99%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/waitcnt/gfx12.cpp (99%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/waitcnt/gfx9.cpp (98%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/waitcnt/tests/CMakeLists.txt (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/waitcnt/tests/att_decoder_waitcnt_test.cpp (99%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/wave.cpp (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/wave.hpp (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/wstates.cpp (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-att => att-tool}/wstates.hpp (100%) delete mode 100644 projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-codeobj/CMakeLists.txt rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-codeobj/tests => tests/codeobj}/CMakeLists.txt (88%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-codeobj/tests => tests/codeobj}/codeobj_library_test.cpp (99%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-codeobj/tests => tests/codeobj}/hipcc_output.s (100%) rename projects/rocprofiler-sdk/source/lib/{rocprofiler-sdk-codeobj/tests => tests/codeobj}/smallkernel.bin (100%) diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/CMakeLists.txt b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/CMakeLists.txt index a9184cbd22..465d524ac0 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/CMakeLists.txt +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/CMakeLists.txt @@ -54,6 +54,5 @@ add_subdirectory(rocdecode) add_subdirectory(rocjpeg) add_subdirectory(cxx) add_subdirectory(kfd) -add_subdirectory(amd_detail) add_subdirectory(experimental) add_subdirectory(deprecated) 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 deleted file mode 100644 index 8d00d13409..0000000000 --- a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/amd_detail/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -# -# -# Installation of amd_detail headers -# -# -set(ROCPROFILER_AMD_DETAIL_HEADER_FILES thread_trace.h thread_trace_core.h - thread_trace_dispatch.h thread_trace_agent.h) - -install( - FILES ${ROCPROFILER_AMD_DETAIL_HEADER_FILES} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler-sdk/amd_detail/ - COMPONENT development) diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/experimental/CMakeLists.txt b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/experimental/CMakeLists.txt index eafdfca01e..bd545ac142 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/experimental/CMakeLists.txt +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/experimental/CMakeLists.txt @@ -1,6 +1,8 @@ -set(ROCPROFILER_EXPERIMENTAL_HEADER_FILES counters.h) +set(ROCPROFILER_EXPERIMENTAL_HEADER_FILES counters.h thread_trace.h) install( FILES ${ROCPROFILER_EXPERIMENTAL_HEADER_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler-sdk/experimental COMPONENT development) + +add_subdirectory(thread-trace) diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/experimental/thread-trace/CMakeLists.txt b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/experimental/thread-trace/CMakeLists.txt new file mode 100644 index 0000000000..1ee64d90f5 --- /dev/null +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/experimental/thread-trace/CMakeLists.txt @@ -0,0 +1,6 @@ +set(ROCPROFILER_EXPERIMENTAL_THREAD_TRACE_HEADER_FILES core.h agent.h dispatch.h) + +install( + FILES ${ROCPROFILER_EXPERIMENTAL_THREAD_TRACE_HEADER_FILES} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler-sdk/experimental/thread-trace + COMPONENT development) diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/amd_detail/thread_trace_agent.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/experimental/thread-trace/agent.h similarity index 98% rename from projects/rocprofiler-sdk/source/include/rocprofiler-sdk/amd_detail/thread_trace_agent.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/experimental/thread-trace/agent.h index 38d9373532..dd3b666b12 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/amd_detail/thread_trace_agent.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/experimental/thread-trace/agent.h @@ -23,8 +23,8 @@ #pragma once #include -#include #include +#include #include #include diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/amd_detail/thread_trace_core.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/experimental/thread-trace/core.h similarity index 100% rename from projects/rocprofiler-sdk/source/include/rocprofiler-sdk/amd_detail/thread_trace_core.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/experimental/thread-trace/core.h diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/amd_detail/thread_trace_dispatch.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/experimental/thread-trace/dispatch.h similarity index 98% rename from projects/rocprofiler-sdk/source/include/rocprofiler-sdk/amd_detail/thread_trace_dispatch.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/experimental/thread-trace/dispatch.h index 935e5f6fb0..2ee1a63691 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/amd_detail/thread_trace_dispatch.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/experimental/thread-trace/dispatch.h @@ -23,8 +23,8 @@ #pragma once #include -#include #include +#include #include #include diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/amd_detail/thread_trace.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/experimental/thread_trace.h similarity index 86% rename from projects/rocprofiler-sdk/source/include/rocprofiler-sdk/amd_detail/thread_trace.h rename to projects/rocprofiler-sdk/source/include/rocprofiler-sdk/experimental/thread_trace.h index 2cb6813a7f..15e748e89b 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/amd_detail/thread_trace.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/experimental/thread_trace.h @@ -22,6 +22,6 @@ #pragma once -#include -#include -#include +#include +#include +#include diff --git a/projects/rocprofiler-sdk/source/lib/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/CMakeLists.txt index a5019423bb..88607e47c4 100644 --- a/projects/rocprofiler-sdk/source/lib/CMakeLists.txt +++ b/projects/rocprofiler-sdk/source/lib/CMakeLists.txt @@ -7,9 +7,8 @@ add_subdirectory(output) add_subdirectory(rocprofiler-sdk) set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "tools") -add_subdirectory(rocprofiler-sdk-codeobj) +add_subdirectory(att-tool) add_subdirectory(rocprofiler-sdk-roctx) -add_subdirectory(rocprofiler-sdk-att) add_subdirectory(rocprofiler-sdk-tool) if(ROCPROFILER_BUILD_TESTS) diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/att-tool/CMakeLists.txt similarity index 84% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/CMakeLists.txt rename to projects/rocprofiler-sdk/source/lib/att-tool/CMakeLists.txt index b799400329..81b6522a6c 100755 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/CMakeLists.txt +++ b/projects/rocprofiler-sdk/source/lib/att-tool/CMakeLists.txt @@ -22,12 +22,12 @@ target_sources(rocprofiler-sdk-att-parser PRIVATE ${ATT_TOOL_SOURCE_FILES}) target_link_libraries( rocprofiler-sdk-att-parser - PRIVATE rocprofiler-sdk::rocprofiler-sdk-codeobj - rocprofiler-sdk::rocprofiler-sdk-headers + PRIVATE rocprofiler-sdk::rocprofiler-sdk-headers rocprofiler-sdk::rocprofiler-sdk-json rocprofiler-sdk::rocprofiler-sdk-common-library rocprofiler-sdk::rocprofiler-sdk-amd-comgr - rocprofiler-sdk::rocprofiler-sdk-dw) + rocprofiler-sdk::rocprofiler-sdk-dw + rocprofiler-sdk::rocprofiler-sdk-elf) add_subdirectory(waitcnt) diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/att_decoder.h b/projects/rocprofiler-sdk/source/lib/att-tool/att_decoder.h similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/att_decoder.h rename to projects/rocprofiler-sdk/source/lib/att-tool/att_decoder.h diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/att_lib_wrapper.cpp b/projects/rocprofiler-sdk/source/lib/att-tool/att_lib_wrapper.cpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/att_lib_wrapper.cpp rename to projects/rocprofiler-sdk/source/lib/att-tool/att_lib_wrapper.cpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/att_lib_wrapper.hpp b/projects/rocprofiler-sdk/source/lib/att-tool/att_lib_wrapper.hpp similarity index 98% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/att_lib_wrapper.hpp rename to projects/rocprofiler-sdk/source/lib/att-tool/att_lib_wrapper.hpp index 3506bc213b..c8b4edf600 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/att_lib_wrapper.hpp +++ b/projects/rocprofiler-sdk/source/lib/att-tool/att_lib_wrapper.hpp @@ -22,8 +22,8 @@ #pragma once +#include "lib/att-tool/util.hpp" #include "lib/common/filesystem.hpp" -#include "lib/rocprofiler-sdk-att/util.hpp" #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/code.cpp b/projects/rocprofiler-sdk/source/lib/att-tool/code.cpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/code.cpp rename to projects/rocprofiler-sdk/source/lib/att-tool/code.cpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/code.hpp b/projects/rocprofiler-sdk/source/lib/att-tool/code.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/code.hpp rename to projects/rocprofiler-sdk/source/lib/att-tool/code.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/counters.cpp b/projects/rocprofiler-sdk/source/lib/att-tool/counters.cpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/counters.cpp rename to projects/rocprofiler-sdk/source/lib/att-tool/counters.cpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/counters.hpp b/projects/rocprofiler-sdk/source/lib/att-tool/counters.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/counters.hpp rename to projects/rocprofiler-sdk/source/lib/att-tool/counters.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/dl.cpp b/projects/rocprofiler-sdk/source/lib/att-tool/dl.cpp similarity index 98% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/dl.cpp rename to projects/rocprofiler-sdk/source/lib/att-tool/dl.cpp index c27ee74d0c..0788ee98d8 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/dl.cpp +++ b/projects/rocprofiler-sdk/source/lib/att-tool/dl.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "lib/rocprofiler-sdk-att/dl.hpp" +#include "lib/att-tool/dl.hpp" #include "lib/common/environment.hpp" #include "lib/common/filesystem.hpp" #include "lib/common/logging.hpp" diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/dl.hpp b/projects/rocprofiler-sdk/source/lib/att-tool/dl.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/dl.hpp rename to projects/rocprofiler-sdk/source/lib/att-tool/dl.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/filenames.cpp b/projects/rocprofiler-sdk/source/lib/att-tool/filenames.cpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/filenames.cpp rename to projects/rocprofiler-sdk/source/lib/att-tool/filenames.cpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/filenames.hpp b/projects/rocprofiler-sdk/source/lib/att-tool/filenames.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/filenames.hpp rename to projects/rocprofiler-sdk/source/lib/att-tool/filenames.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/occupancy.cpp b/projects/rocprofiler-sdk/source/lib/att-tool/occupancy.cpp similarity index 81% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/occupancy.cpp rename to projects/rocprofiler-sdk/source/lib/att-tool/occupancy.cpp index 90b9d16b8d..190755c4a4 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/occupancy.cpp +++ b/projects/rocprofiler-sdk/source/lib/att-tool/occupancy.cpp @@ -37,20 +37,6 @@ namespace att_wrapper { namespace { -union occupancy_data_v1 -{ - struct - { - uint64_t kernel_id : 12; - uint64_t simd : 2; - uint64_t slot : 4; - uint64_t enable : 1; - uint64_t cu : 4; - uint64_t time : 41; - }; - uint64_t raw; -}; - std::map kernel_ids{{pcinfo_t{0, 0}, 0}}; std::atomic current_id{1}; @@ -61,19 +47,6 @@ get_kernel_id(pcinfo_t pc) return kernel_ids.emplace(pc, current_id.fetch_add(1)).first->second; } - -uint64_t -convert(const att_occupancy_info_v2_t& v2) -{ - occupancy_data_v1 v1{}; - v1.time = v2.time / OCCUPANCY_RES; - v1.simd = v2.simd; - v1.slot = v2.slot; - v1.enable = v2.start; - v1.cu = v2.cu; - v1.kernel_id = get_kernel_id(v2.pc); - return v1.raw; -} } // namespace namespace OccupancyFile @@ -90,7 +63,16 @@ OccupancyFile(const Fspath& dir, { nlohmann::json list; for(const auto& event : eventlist) - list.push_back(convert(event)); + { + nlohmann::json json_event; + json_event.push_back(event.time); + json_event.push_back(event.cu); + json_event.push_back(event.simd); + json_event.push_back(event.slot); + json_event.push_back(event.start); + json_event.push_back(get_kernel_id(event.pc)); + list.push_back(json_event); + } jocc[std::to_string(se)] = list; } @@ -107,6 +89,8 @@ OccupancyFile(const Fspath& dir, jocc["dispatches"][std::to_string(id)] = ss.str(); } + jocc["version"] = "3.0.0"; + OutputFile(dir / "occupancy.json") << jocc; } } // namespace OccupancyFile diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/occupancy.hpp b/projects/rocprofiler-sdk/source/lib/att-tool/occupancy.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/occupancy.hpp rename to projects/rocprofiler-sdk/source/lib/att-tool/occupancy.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/outputfile.hpp b/projects/rocprofiler-sdk/source/lib/att-tool/outputfile.hpp similarity index 97% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/outputfile.hpp rename to projects/rocprofiler-sdk/source/lib/att-tool/outputfile.hpp index c433eca0bd..ac6135cff8 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/outputfile.hpp +++ b/projects/rocprofiler-sdk/source/lib/att-tool/outputfile.hpp @@ -24,8 +24,8 @@ #pragma once +#include "lib/att-tool/att_lib_wrapper.hpp" #include "lib/common/logging.hpp" -#include "lib/rocprofiler-sdk-att/att_lib_wrapper.hpp" #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/perfcounter.cpp b/projects/rocprofiler-sdk/source/lib/att-tool/perfcounter.cpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/perfcounter.cpp rename to projects/rocprofiler-sdk/source/lib/att-tool/perfcounter.cpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/perfcounter.hpp b/projects/rocprofiler-sdk/source/lib/att-tool/perfcounter.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/perfcounter.hpp rename to projects/rocprofiler-sdk/source/lib/att-tool/perfcounter.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/profile_interface.cpp b/projects/rocprofiler-sdk/source/lib/att-tool/profile_interface.cpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/profile_interface.cpp rename to projects/rocprofiler-sdk/source/lib/att-tool/profile_interface.cpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/profile_interface.hpp b/projects/rocprofiler-sdk/source/lib/att-tool/profile_interface.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/profile_interface.hpp rename to projects/rocprofiler-sdk/source/lib/att-tool/profile_interface.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/tests/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/att-tool/tests/CMakeLists.txt similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/tests/CMakeLists.txt rename to projects/rocprofiler-sdk/source/lib/att-tool/tests/CMakeLists.txt diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/tests/att_decoder_test.cpp b/projects/rocprofiler-sdk/source/lib/att-tool/tests/att_decoder_test.cpp similarity index 96% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/tests/att_decoder_test.cpp rename to projects/rocprofiler-sdk/source/lib/att-tool/tests/att_decoder_test.cpp index acf998ac3e..05f6018e4a 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/tests/att_decoder_test.cpp +++ b/projects/rocprofiler-sdk/source/lib/att-tool/tests/att_decoder_test.cpp @@ -20,10 +20,10 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +#include "lib/att-tool/att_lib_wrapper.hpp" +#include "lib/att-tool/code.hpp" +#include "lib/att-tool/outputfile.hpp" #include "lib/common/logging.hpp" -#include "lib/rocprofiler-sdk-att/att_lib_wrapper.hpp" -#include "lib/rocprofiler-sdk-att/code.hpp" -#include "lib/rocprofiler-sdk-att/outputfile.hpp" #include "lib/rocprofiler-sdk/registration.hpp" #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/tests/dummy_decoder.cpp b/projects/rocprofiler-sdk/source/lib/att-tool/tests/dummy_decoder.cpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/tests/dummy_decoder.cpp rename to projects/rocprofiler-sdk/source/lib/att-tool/tests/dummy_decoder.cpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/tests/standalone_tool_main.cpp b/projects/rocprofiler-sdk/source/lib/att-tool/tests/standalone_tool_main.cpp similarity index 96% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/tests/standalone_tool_main.cpp rename to projects/rocprofiler-sdk/source/lib/att-tool/tests/standalone_tool_main.cpp index 1c41e7e95e..8164024e70 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/tests/standalone_tool_main.cpp +++ b/projects/rocprofiler-sdk/source/lib/att-tool/tests/standalone_tool_main.cpp @@ -20,9 +20,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +#include "lib/att-tool/att_lib_wrapper.hpp" +#include "lib/att-tool/outputfile.hpp" #include "lib/common/logging.hpp" -#include "lib/rocprofiler-sdk-att/att_lib_wrapper.hpp" -#include "lib/rocprofiler-sdk-att/outputfile.hpp" #include "lib/rocprofiler-sdk/registration.hpp" #include @@ -118,9 +118,9 @@ main(int argc, char** argv) std::vector att_files{}; std::vector codeobj_files{}; - std::map snapshot_files{}; + std::vector snapshot_files{}; for(auto elem : sdk_json["strings"]["code_object_snapshot_filenames"]) - snapshot_files[elem["key"]] = elem["value"]; + snapshot_files.push_back(elem); for(auto& codeobj : sdk_json["code_objects"]) if(!std::string{codeobj["uri"]}.empty()) diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/util.hpp b/projects/rocprofiler-sdk/source/lib/att-tool/util.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/util.hpp rename to projects/rocprofiler-sdk/source/lib/att-tool/util.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/CMakeLists.txt similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/CMakeLists.txt rename to projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/CMakeLists.txt diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/analysis.cpp b/projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/analysis.cpp similarity index 98% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/analysis.cpp rename to projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/analysis.cpp index 8105b30126..85e0ac6af8 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/analysis.cpp +++ b/projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/analysis.cpp @@ -20,7 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "lib/rocprofiler-sdk-att/waitcnt/analysis.hpp" +#include "lib/att-tool/waitcnt/analysis.hpp" + #include namespace rocprofiler diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/analysis.hpp b/projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/analysis.hpp similarity index 95% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/analysis.hpp rename to projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/analysis.hpp index dd392b8f7e..487619f38f 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/analysis.hpp +++ b/projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/analysis.hpp @@ -22,9 +22,9 @@ #pragma once -#include "lib/rocprofiler-sdk-att/att_decoder.h" -#include "lib/rocprofiler-sdk-att/att_lib_wrapper.hpp" -#include "lib/rocprofiler-sdk-att/code.hpp" +#include "lib/att-tool/att_decoder.h" +#include "lib/att-tool/att_lib_wrapper.hpp" +#include "lib/att-tool/code.hpp" #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/gfx10.cpp b/projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/gfx10.cpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/gfx10.cpp rename to projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/gfx10.cpp index d57f1d7070..9fa7c81b08 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/gfx10.cpp +++ b/projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/gfx10.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "lib/rocprofiler-sdk-att/waitcnt/analysis.hpp" +#include "lib/att-tool/waitcnt/analysis.hpp" #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/gfx12.cpp b/projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/gfx12.cpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/gfx12.cpp rename to projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/gfx12.cpp index 14de766207..d59819439b 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/gfx12.cpp +++ b/projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/gfx12.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "lib/rocprofiler-sdk-att/waitcnt/analysis.hpp" +#include "lib/att-tool/waitcnt/analysis.hpp" #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/gfx9.cpp b/projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/gfx9.cpp similarity index 98% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/gfx9.cpp rename to projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/gfx9.cpp index 6db6d68d7a..2eba6cbf69 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/gfx9.cpp +++ b/projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/gfx9.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "lib/rocprofiler-sdk-att/waitcnt/analysis.hpp" +#include "lib/att-tool/waitcnt/analysis.hpp" #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/tests/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/tests/CMakeLists.txt similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/tests/CMakeLists.txt rename to projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/tests/CMakeLists.txt diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/tests/att_decoder_waitcnt_test.cpp b/projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/tests/att_decoder_waitcnt_test.cpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/tests/att_decoder_waitcnt_test.cpp rename to projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/tests/att_decoder_waitcnt_test.cpp index 57837f9c08..ea644bf4fa 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/waitcnt/tests/att_decoder_waitcnt_test.cpp +++ b/projects/rocprofiler-sdk/source/lib/att-tool/waitcnt/tests/att_decoder_waitcnt_test.cpp @@ -20,8 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +#include "lib/att-tool/waitcnt/analysis.hpp" #include "lib/common/logging.hpp" -#include "lib/rocprofiler-sdk-att/waitcnt/analysis.hpp" #include "lib/rocprofiler-sdk/registration.hpp" #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/wave.cpp b/projects/rocprofiler-sdk/source/lib/att-tool/wave.cpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/wave.cpp rename to projects/rocprofiler-sdk/source/lib/att-tool/wave.cpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/wave.hpp b/projects/rocprofiler-sdk/source/lib/att-tool/wave.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/wave.hpp rename to projects/rocprofiler-sdk/source/lib/att-tool/wave.hpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/wstates.cpp b/projects/rocprofiler-sdk/source/lib/att-tool/wstates.cpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/wstates.cpp rename to projects/rocprofiler-sdk/source/lib/att-tool/wstates.cpp diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/wstates.hpp b/projects/rocprofiler-sdk/source/lib/att-tool/wstates.hpp similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/wstates.hpp rename to projects/rocprofiler-sdk/source/lib/att-tool/wstates.hpp diff --git a/projects/rocprofiler-sdk/source/lib/output/metadata.cpp b/projects/rocprofiler-sdk/source/lib/output/metadata.cpp index d0a8313137..87cf7b9423 100644 --- a/projects/rocprofiler-sdk/source/lib/output/metadata.cpp +++ b/projects/rocprofiler-sdk/source/lib/output/metadata.cpp @@ -22,13 +22,13 @@ #include "metadata.hpp" +#include "lib/att-tool/att_lib_wrapper.hpp" #include "lib/common/filesystem.hpp" #include "lib/common/logging.hpp" #include "lib/common/string_entry.hpp" #include "lib/output/agent_info.hpp" #include "lib/output/host_symbol_info.hpp" #include "lib/output/kernel_symbol_info.hpp" -#include "lib/rocprofiler-sdk-att/att_lib_wrapper.hpp" #include #include diff --git a/projects/rocprofiler-sdk/source/lib/output/metadata.hpp b/projects/rocprofiler-sdk/source/lib/output/metadata.hpp index 43f5dbf27c..cdab00614f 100644 --- a/projects/rocprofiler-sdk/source/lib/output/metadata.hpp +++ b/projects/rocprofiler-sdk/source/lib/output/metadata.hpp @@ -28,11 +28,11 @@ #include "kernel_symbol_info.hpp" #include "pc_sample_transform.hpp" +#include "lib/att-tool/att_lib_wrapper.hpp" #include "lib/common/container/small_vector.hpp" #include "lib/common/demangle.hpp" #include "lib/common/logging.hpp" #include "lib/common/synchronized.hpp" -#include "lib/rocprofiler-sdk-att/att_lib_wrapper.hpp" #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-codeobj/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-codeobj/CMakeLists.txt deleted file mode 100644 index 623437249e..0000000000 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-codeobj/CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -# ############################################################################## -# # Copyright (c) 2024-2025 Advanced Micro Devices, Inc. # # Permission is hereby -# granted, free of charge, to any person obtaining a copy # of this software and -# associated documentation files (the "Software"), to # deal in the Software -# without restriction, including without limitation the # rights to use, copy, -# modify, merge, publish, distribute, sublicense, and/or # sell copies of the -# Software, and to permit persons to whom the Software is # furnished to do so, -# subject to the following conditions: # # The above copyright notice and this -# permission notice shall be included in # all copies or substantial portions of -# the Software. # # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -# KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO -# EVENT SHALL THE # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -# DAMAGES OR OTHER # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -# OTHERWISE, ARISING # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -# USE OR OTHER DEALINGS # IN THE SOFTWARE. -# ############################################################################## - -set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "development") - -add_library(rocprofiler-sdk-codeobj INTERFACE) -add_library(rocprofiler-sdk::rocprofiler-sdk-codeobj ALIAS rocprofiler-sdk-codeobj) - -target_include_directories( - rocprofiler-sdk-codeobj - INTERFACE $ - $) - -target_link_libraries( - rocprofiler-sdk-codeobj - INTERFACE rocprofiler-sdk::rocprofiler-sdk-amd-comgr - rocprofiler-sdk::rocprofiler-sdk-dw rocprofiler-sdk::rocprofiler-sdk-elf) - -if(ROCPROFILER_BUILD_TESTS) - add_subdirectory(tests) -endif() diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/config.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/config.hpp index 3f40d0d15d..947a429264 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/config.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/config.hpp @@ -23,13 +23,13 @@ #pragma once +#include "lib/att-tool/att_lib_wrapper.hpp" #include "lib/common/environment.hpp" #include "lib/common/filesystem.hpp" #include "lib/common/mpl.hpp" #include "lib/common/units.hpp" #include "lib/output/format_path.hpp" #include "lib/output/output_config.hpp" -#include "lib/rocprofiler-sdk-att/att_lib_wrapper.hpp" #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/tool.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/tool.cpp index 9e08420ad1..96309c6698 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/tool.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/tool.cpp @@ -24,6 +24,7 @@ #include "helper.hpp" #include "stream_stack.hpp" +#include "lib/att-tool/att_lib_wrapper.hpp" #include "lib/common/environment.hpp" #include "lib/common/filesystem.hpp" #include "lib/common/logging.hpp" @@ -48,14 +49,12 @@ #include "lib/output/stream_info.hpp" #include "lib/output/tmp_file.hpp" #include "lib/output/tmp_file_buffer.hpp" -#include "lib/rocprofiler-sdk-att/att_lib_wrapper.hpp" #include -#include -#include #include #include #include +#include #include #include #include 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 317b2acec0..39d13de16a 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 @@ -29,7 +29,7 @@ #include "lib/rocprofiler-sdk/hsa/queue_info_session.hpp" #include "lib/rocprofiler-sdk/thread_trace/code_object.hpp" -#include +#include #include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/thread_trace/att_service.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/thread_trace/att_service.cpp index 01a264ba69..3a2bd2aeea 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/thread_trace/att_service.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/thread_trace/att_service.cpp @@ -25,7 +25,7 @@ #include "lib/rocprofiler-sdk/hsa/agent_cache.hpp" #include "lib/rocprofiler-sdk/registration.hpp" -#include +#include #include diff --git a/projects/rocprofiler-sdk/source/lib/tests/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/tests/CMakeLists.txt index 95eb96df37..d170f7a5ec 100644 --- a/projects/rocprofiler-sdk/source/lib/tests/CMakeLists.txt +++ b/projects/rocprofiler-sdk/source/lib/tests/CMakeLists.txt @@ -3,3 +3,4 @@ # add_subdirectory(buffering) add_subdirectory(common) +add_subdirectory(codeobj) diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-codeobj/tests/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/tests/codeobj/CMakeLists.txt similarity index 88% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-codeobj/tests/CMakeLists.txt rename to projects/rocprofiler-sdk/source/lib/tests/codeobj/CMakeLists.txt index 6c063c2a0b..51985f50d7 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-codeobj/tests/CMakeLists.txt +++ b/projects/rocprofiler-sdk/source/lib/tests/codeobj/CMakeLists.txt @@ -15,7 +15,9 @@ target_link_libraries( rocprofiler-sdk::rocprofiler-sdk-common-library GTest::gtest GTest::gtest_main - rocprofiler-sdk::rocprofiler-sdk-codeobj) + rocprofiler-sdk::rocprofiler-sdk-amd-comgr + rocprofiler-sdk::rocprofiler-sdk-dw + rocprofiler-sdk::rocprofiler-sdk-elf) gtest_add_tests( TARGET codeobj-library-test diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-codeobj/tests/codeobj_library_test.cpp b/projects/rocprofiler-sdk/source/lib/tests/codeobj/codeobj_library_test.cpp similarity index 99% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-codeobj/tests/codeobj_library_test.cpp rename to projects/rocprofiler-sdk/source/lib/tests/codeobj/codeobj_library_test.cpp index a663510652..8512ce8ee1 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-codeobj/tests/codeobj_library_test.cpp +++ b/projects/rocprofiler-sdk/source/lib/tests/codeobj/codeobj_library_test.cpp @@ -29,7 +29,7 @@ #ifndef CODEOBJ_BINARY_DIR static_assert(false && "Please define CODEOBJ_BINARY_DIR to codeobj tests binary, " - "e.g. ../source/lib/rocprofiler-sdk-codeobj/tests/"); + "e.g. ../source/lib/tests/codeobj/"); #endif namespace rocprofiler diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-codeobj/tests/hipcc_output.s b/projects/rocprofiler-sdk/source/lib/tests/codeobj/hipcc_output.s similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-codeobj/tests/hipcc_output.s rename to projects/rocprofiler-sdk/source/lib/tests/codeobj/hipcc_output.s diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-codeobj/tests/smallkernel.bin b/projects/rocprofiler-sdk/source/lib/tests/codeobj/smallkernel.bin similarity index 100% rename from projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-codeobj/tests/smallkernel.bin rename to projects/rocprofiler-sdk/source/lib/tests/codeobj/smallkernel.bin diff --git a/projects/rocprofiler-sdk/tests/thread-trace/trace_callbacks.hpp b/projects/rocprofiler-sdk/tests/thread-trace/trace_callbacks.hpp index fd24440d99..414d6c984a 100644 --- a/projects/rocprofiler-sdk/tests/thread-trace/trace_callbacks.hpp +++ b/projects/rocprofiler-sdk/tests/thread-trace/trace_callbacks.hpp @@ -22,9 +22,9 @@ #pragma once -#include #include #include +#include #include #include #include