From 50bc3ed803bd88b91faecc131200d0a3f2aa7d02 Mon Sep 17 00:00:00 2001 From: "Madsen, Jonathan" Date: Tue, 15 Apr 2025 16:02:12 -0500 Subject: [PATCH] [Misc] Rework header includes (#311) * Update header file includes * Fix includes for lib/rocprofiler-sdk/hip/hip.hpp * Minor touch ups * Minor include improvements * Doxygen tweak --------- Co-authored-by: Jonathan R. Madsen [ROCm/rocprofiler-sdk commit: c5a3edc3fae3010df0642462bbb0403f6ef66e0f] --- .../samples/common/defines.hpp | 1 + .../rocprofiler-sdk/cxx/codeobj/segment.hpp | 1 + .../include/rocprofiler-sdk/cxx/operators.hpp | 1 - .../rocprofiler-sdk/cxx/serialization.hpp | 12 ++++++++++- .../rocprofiler-sdk/deprecated/counters.h | 1 - .../include/rocprofiler-sdk/version.h.in | 3 --- .../common/container/record_header_buffer.cpp | 3 ++- .../common/container/record_header_buffer.hpp | 4 ++-- .../source/lib/output/agent_info.hpp | 2 +- .../source/lib/output/metadata.cpp | 2 +- .../source/lib/rocprofiler-sdk-att/dl.hpp | 4 +++- .../source/lib/rocprofiler-sdk/agent.cpp | 1 - .../rocprofiler-sdk/aql/packet_construct.cpp | 1 - .../rocprofiler-sdk/aql/tests/aql_test.cpp | 5 +++-- .../source/lib/rocprofiler-sdk/buffer.cpp | 1 - .../lib/rocprofiler-sdk/buffer_tracing.cpp | 1 - .../lib/rocprofiler-sdk/callback_tracing.cpp | 1 - .../source/lib/rocprofiler-sdk/context.cpp | 1 - .../lib/rocprofiler-sdk/context/context.cpp | 9 ++++---- .../lib/rocprofiler-sdk/context/context.hpp | 8 +++---- .../context/correlation_id.cpp | 1 - .../context/correlation_id.hpp | 2 -- .../lib/rocprofiler-sdk/context/domain.cpp | 1 - .../lib/rocprofiler-sdk/context/domain.hpp | 4 ++-- .../lib/rocprofiler-sdk/counter_config.cpp | 1 - .../source/lib/rocprofiler-sdk/counters.cpp | 14 ++++++------- .../rocprofiler-sdk/counters/controller.cpp | 10 ++++----- .../rocprofiler-sdk/counters/controller.hpp | 2 +- .../lib/rocprofiler-sdk/counters/core.cpp | 1 - .../counters/device_counting.hpp | 3 ++- .../rocprofiler-sdk/counters/dimensions.cpp | 18 ++++++++-------- .../rocprofiler-sdk/counters/evaluate_ast.cpp | 20 +++++++++--------- .../lib/rocprofiler-sdk/counters/ioctl.hpp | 3 ++- .../lib/rocprofiler-sdk/counters/metrics.cpp | 6 ++---- .../lib/rocprofiler-sdk/counters/metrics.hpp | 10 ++++----- .../counters/sample_processing.cpp | 1 - .../counters/tests/evaluate_ast_test.cpp | 21 ++++++++++--------- .../counters/tests/metrics_test.cpp | 18 ++++++++-------- .../device_counting_service.cpp | 7 ++++--- .../dispatch_counting_service.cpp | 2 +- .../rocprofiler-sdk/hip/details/format.hpp | 2 +- .../rocprofiler-sdk/hip/details/ostream.hpp | 2 +- .../source/lib/rocprofiler-sdk/hip/hip.hpp | 4 +++- .../source/lib/rocprofiler-sdk/hip/stream.hpp | 2 +- .../lib/rocprofiler-sdk/hsa/aql_packet.hpp | 2 +- .../lib/rocprofiler-sdk/hsa/async_copy.hpp | 2 -- .../rocprofiler-sdk/hsa/details/ostream.hpp | 2 +- .../source/lib/rocprofiler-sdk/hsa/hsa.hpp | 4 +++- .../lib/rocprofiler-sdk/hsa/hsa_barrier.hpp | 2 +- .../rocprofiler-sdk/hsa/memory_allocation.hpp | 2 -- .../hsa/profile_serializer.hpp | 5 +++-- .../rocprofiler-sdk/hsa/queue_controller.hpp | 6 +++--- .../rocprofiler-sdk/hsa/scratch_memory.hpp | 2 +- .../lib/rocprofiler-sdk/intercept_table.cpp | 14 ++++++------- .../rocprofiler-sdk/internal_threading.cpp | 9 ++++---- .../lib/rocprofiler-sdk/marker/marker.hpp | 3 +-- .../page_migration/page_migration.hpp | 2 +- .../source/lib/rocprofiler-sdk/rccl/rccl.hpp | 2 +- .../lib/rocprofiler-sdk/registration.cpp | 5 ++--- .../rocprofiler-sdk/rocdecode/rocdecode.hpp | 2 +- .../lib/rocprofiler-sdk/rocjpeg/rocjpeg.hpp | 2 +- .../lib/rocprofiler-sdk/rocprofiler.cpp | 4 ++-- .../rocprofiler-sdk/thread_trace/att_core.cpp | 8 +++---- .../thread_trace/att_service.cpp | 11 +++++----- 64 files changed, 149 insertions(+), 157 deletions(-) diff --git a/projects/rocprofiler-sdk/samples/common/defines.hpp b/projects/rocprofiler-sdk/samples/common/defines.hpp index 4e4e15abbc..d18f93c73e 100644 --- a/projects/rocprofiler-sdk/samples/common/defines.hpp +++ b/projects/rocprofiler-sdk/samples/common/defines.hpp @@ -21,6 +21,7 @@ // SOFTWARE. #pragma once + #define ROCPROFILER_VAR_NAME_COMBINE(X, Y) X##Y #define ROCPROFILER_VARIABLE(X, Y) ROCPROFILER_VAR_NAME_COMBINE(X, Y) diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/cxx/codeobj/segment.hpp b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/cxx/codeobj/segment.hpp index 747f75feee..b3720195c1 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/cxx/codeobj/segment.hpp +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/cxx/codeobj/segment.hpp @@ -21,6 +21,7 @@ // SOFTWARE. #pragma once + #include #include #include diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/cxx/operators.hpp b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/cxx/operators.hpp index f6a91f8b8d..4c631180fa 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/cxx/operators.hpp +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/cxx/operators.hpp @@ -28,7 +28,6 @@ #include #include #include -#include #include diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/cxx/serialization.hpp b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/cxx/serialization.hpp index ced0371a85..97f2dae792 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/cxx/serialization.hpp +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/cxx/serialization.hpp @@ -23,13 +23,23 @@ #pragma once +#include #include +#include #include +#include +#include +#include +#include +#include #include #include +#include +#include +#include #include +#include #include -#include #include #include #include diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/deprecated/counters.h b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/deprecated/counters.h index 5b7119f534..558f69bc99 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/deprecated/counters.h +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/deprecated/counters.h @@ -83,5 +83,4 @@ rocprofiler_query_counter_instance_count(rocprofiler_agent_id_t agent_id, size_t* instance_count) ROCPROFILER_API ROCPROFILER_NONNULL(3); -/** @} */ ROCPROFILER_EXTERN_C_FINI diff --git a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/version.h.in b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/version.h.in index db6011ad34..bad03569f4 100644 --- a/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/version.h.in +++ b/projects/rocprofiler-sdk/source/include/rocprofiler-sdk/version.h.in @@ -113,6 +113,3 @@ #define ROCPROFILER_VERSION \ ((10000 * ROCPROFILER_VERSION_MAJOR) + (100 * ROCPROFILER_VERSION_MINOR) + \ ROCPROFILER_VERSION_PATCH) - -// include the external version info -#include "ext_version.h" diff --git a/projects/rocprofiler-sdk/source/lib/common/container/record_header_buffer.cpp b/projects/rocprofiler-sdk/source/lib/common/container/record_header_buffer.cpp index fe9aa1ac6b..314e3aa11f 100644 --- a/projects/rocprofiler-sdk/source/lib/common/container/record_header_buffer.cpp +++ b/projects/rocprofiler-sdk/source/lib/common/container/record_header_buffer.cpp @@ -22,7 +22,8 @@ #include "lib/common/container/record_header_buffer.hpp" -#include +#include + #include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/common/container/record_header_buffer.hpp b/projects/rocprofiler-sdk/source/lib/common/container/record_header_buffer.hpp index 8fde0e65ae..b84be76aaf 100644 --- a/projects/rocprofiler-sdk/source/lib/common/container/record_header_buffer.hpp +++ b/projects/rocprofiler-sdk/source/lib/common/container/record_header_buffer.hpp @@ -22,10 +22,10 @@ #pragma once -#include - #include "lib/common/container/ring_buffer.hpp" +#include + #include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/output/agent_info.hpp b/projects/rocprofiler-sdk/source/lib/output/agent_info.hpp index db84ff065e..47b4b65c02 100644 --- a/projects/rocprofiler-sdk/source/lib/output/agent_info.hpp +++ b/projects/rocprofiler-sdk/source/lib/output/agent_info.hpp @@ -23,11 +23,11 @@ #pragma once #include +#include #include #include #include -#include "rocprofiler-sdk/fwd.h" namespace rocprofiler { diff --git a/projects/rocprofiler-sdk/source/lib/output/metadata.cpp b/projects/rocprofiler-sdk/source/lib/output/metadata.cpp index d1c333af5d..d0a8313137 100644 --- a/projects/rocprofiler-sdk/source/lib/output/metadata.cpp +++ b/projects/rocprofiler-sdk/source/lib/output/metadata.cpp @@ -32,13 +32,13 @@ #include #include -#include #include #include #include #include +#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/dl.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/dl.hpp index e805a11d20..4e5a25ee1c 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/dl.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-att/dl.hpp @@ -21,9 +21,11 @@ // SOFTWARE. #pragma once -#include + #include "att_decoder.h" +#include + namespace rocprofiler { namespace att_wrapper diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/agent.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/agent.cpp index 751abb403d..5482c61ca0 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/agent.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/agent.cpp @@ -32,7 +32,6 @@ #include #include -#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/packet_construct.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/packet_construct.cpp index 46446399ea..8558fdb7a0 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/packet_construct.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/packet_construct.cpp @@ -27,7 +27,6 @@ #include #include #include "glog/logging.h" -#include "rocprofiler-sdk/fwd.h" #define CHECK_HSA(fn, message) \ { \ diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/tests/aql_test.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/tests/aql_test.cpp index 8d8d7068ce..04d1ddc0f4 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/tests/aql_test.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/tests/aql_test.cpp @@ -26,15 +26,16 @@ #include "lib/rocprofiler-sdk/counters/tests/hsa_tables.hpp" #include "lib/rocprofiler-sdk/hsa/agent_cache.hpp" #include "lib/rocprofiler-sdk/hsa/queue_controller.hpp" -#include "rocprofiler-sdk/fwd.h" -#include +#include #include #include #include #include +#include + using namespace rocprofiler::counters::test_constants; namespace rocprofiler diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/buffer.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/buffer.cpp index 548fe1192b..ba57a53422 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/buffer.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/buffer.cpp @@ -33,7 +33,6 @@ #include "lib/rocprofiler-sdk/registration.hpp" #include -#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/buffer_tracing.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/buffer_tracing.cpp index 1dad9cf6bd..df5efb5284 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/buffer_tracing.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/buffer_tracing.cpp @@ -47,7 +47,6 @@ #include #include #include -#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/callback_tracing.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/callback_tracing.cpp index abd552a0ae..d695c1bc20 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/callback_tracing.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/callback_tracing.cpp @@ -46,7 +46,6 @@ #include #include #include -#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context.cpp index bcb214d19f..e04e530581 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context.cpp @@ -22,7 +22,6 @@ #include #include -#include #include "lib/rocprofiler-sdk/context/context.hpp" #include "lib/rocprofiler-sdk/context/domain.hpp" diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/context.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/context.cpp index 8d5872e7ab..c2455b06d9 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/context.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/context.cpp @@ -20,21 +20,20 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include -#include - +#include "lib/rocprofiler-sdk/context/context.hpp" #include "lib/common/container/small_vector.hpp" #include "lib/common/container/stable_vector.hpp" #include "lib/common/static_object.hpp" #include "lib/common/synchronized.hpp" #include "lib/common/utility.hpp" #include "lib/rocprofiler-sdk/buffer.hpp" -#include "lib/rocprofiler-sdk/context/context.hpp" #include "lib/rocprofiler-sdk/counters/core.hpp" #include "lib/rocprofiler-sdk/pc_sampling/service.hpp" #include "lib/rocprofiler-sdk/thread_trace/att_core.hpp" +#include +#include + #include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/context.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/context.hpp index e43557526d..b378f0a644 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/context.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/context.hpp @@ -22,10 +22,6 @@ #pragma once -#include -#include -#include - #include "lib/common/container/small_vector.hpp" #include "lib/common/synchronized.hpp" #include "lib/rocprofiler-sdk/context/correlation_id.hpp" @@ -35,7 +31,9 @@ #include "lib/rocprofiler-sdk/external_correlation.hpp" #include "lib/rocprofiler-sdk/pc_sampling/types.hpp" #include "lib/rocprofiler-sdk/thread_trace/att_core.hpp" -#include "rocprofiler-sdk/agent.h" + +#include +#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/correlation_id.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/correlation_id.cpp index 56dfe1863f..51d348f979 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/correlation_id.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/correlation_id.cpp @@ -28,7 +28,6 @@ #include "lib/rocprofiler-sdk/context/context.hpp" #include -#include namespace rocprofiler { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/correlation_id.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/correlation_id.hpp index d4e1267bd2..917973fae9 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/correlation_id.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/correlation_id.hpp @@ -22,8 +22,6 @@ #pragma once -#include - #include "lib/common/mpl.hpp" #include "lib/rocprofiler-sdk/external_correlation.hpp" diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/domain.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/domain.cpp index 12fd158102..e29b5e9e92 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/domain.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/domain.cpp @@ -23,7 +23,6 @@ #include "lib/rocprofiler-sdk/context/domain.hpp" #include -#include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/domain.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/domain.hpp index 96fff96c6a..c100a9dc37 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/domain.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/domain.hpp @@ -22,10 +22,10 @@ #pragma once -#include - #include "lib/common/mpl.hpp" +#include + #include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counter_config.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counter_config.cpp index 06a446624a..852a90f040 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counter_config.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counter_config.cpp @@ -21,7 +21,6 @@ // SOFTWARE. #include -#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters.cpp index ee736b7bf4..02aa9671c2 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters.cpp @@ -20,13 +20,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include -#include -#include - -#include - #include "lib/common/container/small_vector.hpp" #include "lib/common/logging.hpp" #include "lib/common/static_object.hpp" @@ -41,6 +34,13 @@ #include "lib/rocprofiler-sdk/hsa/queue.hpp" #include "lib/rocprofiler-sdk/hsa/queue_controller.hpp" +#include +#include +#include +#include + +#include + namespace rocprofiler { namespace counters diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/controller.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/controller.cpp index 2a81cfdd4c..7379cdf70c 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/controller.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/controller.cpp @@ -21,17 +21,15 @@ // SOFTWARE. #include "lib/rocprofiler-sdk/counters/controller.hpp" - -#include -#include -#include -#include - #include "lib/rocprofiler-sdk/buffer.hpp" #include "lib/rocprofiler-sdk/context/context.hpp" #include "lib/rocprofiler-sdk/counters/ioctl.hpp" #include "lib/rocprofiler-sdk/counters/metrics.hpp" +#include +#include +#include + namespace rocprofiler { namespace counters diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/controller.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/controller.hpp index a73b0dc4c1..e6f14a2586 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/controller.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/controller.hpp @@ -30,9 +30,9 @@ #include "lib/rocprofiler-sdk/counters/metrics.hpp" #include +#include #include #include -#include namespace rocprofiler { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/core.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/core.cpp index 1f3928659d..1fa042548d 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/core.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/core.cpp @@ -33,7 +33,6 @@ #include "lib/rocprofiler-sdk/kernel_dispatch/profiling_time.hpp" #include -#include namespace rocprofiler { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/device_counting.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/device_counting.hpp index e716f0536b..b891d55ce2 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/device_counting.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/device_counting.hpp @@ -24,9 +24,10 @@ #include "lib/rocprofiler-sdk/hsa/aql_packet.hpp" +#include #include #include -#include + #include namespace rocprofiler diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/dimensions.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/dimensions.cpp index 7de9ed28a3..0d3b7ab12c 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/dimensions.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/dimensions.cpp @@ -22,21 +22,21 @@ #include "dimensions.hpp" -#include -#include -#include - -#include - -#include -#include - #include "lib/common/static_object.hpp" #include "lib/common/utility.hpp" #include "lib/rocprofiler-sdk/aql/helpers.hpp" #include "lib/rocprofiler-sdk/aql/packet_construct.hpp" #include "lib/rocprofiler-sdk/counters/evaluate_ast.hpp" +#include +#include + +#include + +#include +#include +#include + namespace rocprofiler { namespace counters diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/evaluate_ast.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/evaluate_ast.cpp index 25cad9b1d9..65cfec5887 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/evaluate_ast.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/evaluate_ast.cpp @@ -23,6 +23,16 @@ #include "lib/rocprofiler-sdk/counters/evaluate_ast.hpp" #include "lib/common/static_object.hpp" #include "lib/common/synchronized.hpp" +#include "lib/common/utility.hpp" +#include "lib/rocprofiler-sdk/counters/dimensions.hpp" +#include "lib/rocprofiler-sdk/counters/id_decode.hpp" +#include "lib/rocprofiler-sdk/counters/parser/reader.hpp" + +#include +#include + +#include +#include #include #include @@ -33,16 +43,6 @@ #include #include -#include -#include -#include - -#include "lib/common/utility.hpp" -#include "lib/rocprofiler-sdk/counters/dimensions.hpp" -#include "lib/rocprofiler-sdk/counters/id_decode.hpp" -#include "lib/rocprofiler-sdk/counters/parser/reader.hpp" -#include "rocprofiler-sdk/fwd.h" - namespace rocprofiler { namespace counters diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/ioctl.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/ioctl.hpp index 6c7c49a2b7..d21a28c5ec 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/ioctl.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/ioctl.hpp @@ -19,9 +19,10 @@ // 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. + #pragma once -#include +#include namespace rocprofiler { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/metrics.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/metrics.cpp index cd533245a1..fe30358657 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/metrics.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/metrics.cpp @@ -22,8 +22,6 @@ #include "metrics.hpp" -#include - #include "lib/common/filesystem.hpp" #include "lib/common/logging.hpp" #include "lib/common/static_object.hpp" @@ -31,9 +29,9 @@ #include "lib/common/utility.hpp" #include "lib/rocprofiler-sdk/agent.hpp" -#include "glog/logging.h" +#include -#include "rocprofiler-sdk/fwd.h" +#include "glog/logging.h" #include "yaml-cpp/exceptions.h" #include "yaml-cpp/node/convert.h" #include "yaml-cpp/node/detail/impl.h" diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/metrics.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/metrics.hpp index c7870ad9f2..894a3944e0 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/metrics.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/metrics.hpp @@ -22,7 +22,11 @@ #pragma once -#include "rocprofiler-sdk/fwd.h" +#include + +#include +#include +#include #include #include @@ -31,10 +35,6 @@ #include #include -#include -#include -#include - namespace rocprofiler { namespace counters diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/sample_processing.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/sample_processing.cpp index bc2b4f96e5..29883ae0af 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/sample_processing.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/sample_processing.cpp @@ -35,7 +35,6 @@ #include "lib/rocprofiler-sdk/kernel_dispatch/profiling_time.hpp" #include -#include namespace rocprofiler { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/evaluate_ast_test.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/evaluate_ast_test.cpp index e2f38b4f4a..0eb792e5e9 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/evaluate_ast_test.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/evaluate_ast_test.cpp @@ -20,6 +20,17 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +#include "lib/rocprofiler-sdk/counters/evaluate_ast.hpp" +#include "lib/rocprofiler-sdk/agent.hpp" +#include "lib/rocprofiler-sdk/counters/id_decode.hpp" +#include "lib/rocprofiler-sdk/counters/metrics.hpp" +#include "lib/rocprofiler-sdk/counters/parser/reader.hpp" + +#include + +#include +#include + #include #include #include @@ -27,16 +38,6 @@ #include #include -#include -#include - -#include "lib/rocprofiler-sdk/agent.hpp" -#include "lib/rocprofiler-sdk/counters/evaluate_ast.hpp" -#include "lib/rocprofiler-sdk/counters/id_decode.hpp" -#include "lib/rocprofiler-sdk/counters/metrics.hpp" -#include "lib/rocprofiler-sdk/counters/parser/reader.hpp" -#include "rocprofiler-sdk/fwd.h" - namespace { ReduceOperation diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/metrics_test.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/metrics_test.cpp index fa3ea0fc5b..6e952506aa 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/metrics_test.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/metrics_test.cpp @@ -22,20 +22,20 @@ #include "metrics_test.h" -#include - -#include -#include -#include - -#include - #include "lib/common/logging.hpp" #include "lib/common/utility.hpp" #include "lib/rocprofiler-sdk/agent.hpp" #include "lib/rocprofiler-sdk/counters/dimensions.hpp" #include "lib/rocprofiler-sdk/counters/metrics.hpp" -#include "rocprofiler-sdk/fwd.h" + +#include +#include + +#include + +#include +#include +#include namespace { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/device_counting_service.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/device_counting_service.cpp index d1f31bcf4d..2cedecaeca 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/device_counting_service.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/device_counting_service.cpp @@ -20,13 +20,14 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include - #include "lib/rocprofiler-sdk/context/context.hpp" #include "lib/rocprofiler-sdk/counters/core.hpp" #include "lib/rocprofiler-sdk/counters/device_counting.hpp" #include "lib/rocprofiler-sdk/registration.hpp" -#include "rocprofiler-sdk/fwd.h" + +#include +#include +#include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/dispatch_counting_service.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/dispatch_counting_service.cpp index 5279513f81..6631fa7b3c 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/dispatch_counting_service.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/dispatch_counting_service.cpp @@ -23,7 +23,7 @@ #include "lib/rocprofiler-sdk/counters/controller.hpp" #include "lib/rocprofiler-sdk/counters/core.hpp" -#include +#include extern "C" { /** diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/details/format.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/details/format.hpp index 8c8c74b05f..6ddd1d5cb7 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/details/format.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/details/format.hpp @@ -24,7 +24,7 @@ #include "lib/rocprofiler-sdk/hip/details/ostream.hpp" -#include +#include #include // must be included after runtime api diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/details/ostream.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/details/ostream.hpp index 2ee15bd783..0cd734ca56 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/details/ostream.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/details/ostream.hpp @@ -22,7 +22,7 @@ #pragma once -#include +#include #include // must be included after runtime api diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/hip.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/hip.hpp index 40f7964384..f479ffb595 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/hip.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/hip.hpp @@ -22,7 +22,9 @@ #pragma once -#include +#include +#include +#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/stream.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/stream.hpp index 4e4aff0e26..3b46405720 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/stream.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/stream.hpp @@ -22,7 +22,7 @@ #pragma once -#include +#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/aql_packet.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/aql_packet.hpp index 600e2d20a3..e6cd8974a8 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/aql_packet.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/aql_packet.hpp @@ -25,7 +25,7 @@ #include "lib/common/container/small_vector.hpp" #include "lib/rocprofiler-sdk/aql/aql_profile_v2.h" -#include +#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/async_copy.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/async_copy.hpp index 1213e7b244..08dcb691c1 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/async_copy.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/async_copy.hpp @@ -22,8 +22,6 @@ #pragma once -#include - #include "lib/rocprofiler-sdk/hsa/hsa.hpp" namespace rocprofiler diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/details/ostream.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/details/ostream.hpp index e279fac43e..340fb5edbc 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/details/ostream.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/details/ostream.hpp @@ -22,7 +22,7 @@ #pragma once -#include +#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/hsa.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/hsa.hpp index 2bc7ca3181..212a6bada5 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/hsa.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/hsa.hpp @@ -24,7 +24,9 @@ #include "lib/rocprofiler-sdk/pc_sampling/defines.hpp" -#include +#include +#include +#include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/hsa_barrier.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/hsa_barrier.hpp index 611dddbf3b..b23b92f298 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/hsa_barrier.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/hsa_barrier.hpp @@ -25,7 +25,7 @@ #include "lib/common/synchronized.hpp" #include "lib/rocprofiler-sdk/hsa/rocprofiler_packet.hpp" -#include +#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/memory_allocation.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/memory_allocation.hpp index d9c3f122e8..6c9c757513 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/memory_allocation.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/memory_allocation.hpp @@ -22,8 +22,6 @@ #pragma once -#include - #include "lib/rocprofiler-sdk/hsa/hsa.hpp" namespace rocprofiler diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/profile_serializer.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/profile_serializer.hpp index 5532306366..d689e928c8 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/profile_serializer.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/profile_serializer.hpp @@ -22,12 +22,13 @@ #pragma once -#include - #include "lib/common/container/small_vector.hpp" #include "lib/rocprofiler-sdk/hsa/hsa_barrier.hpp" #include "lib/rocprofiler-sdk/hsa/queue.hpp" +#include +#include + #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/queue_controller.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/queue_controller.hpp index 969c797628..e07ec3a62a 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/queue_controller.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/queue_controller.hpp @@ -22,12 +22,12 @@ #pragma once -#include -#include - #include "lib/rocprofiler-sdk/hsa/profile_serializer.hpp" #include "lib/rocprofiler-sdk/hsa/queue.hpp" +#include +#include + #include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/scratch_memory.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/scratch_memory.hpp index 44f306213a..d63b98e126 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/scratch_memory.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/scratch_memory.hpp @@ -24,7 +24,7 @@ #include "lib/rocprofiler-sdk/hsa/hsa.hpp" -#include +#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/intercept_table.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/intercept_table.cpp index eff79e6349..08d4779f02 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/intercept_table.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/intercept_table.cpp @@ -20,23 +20,21 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include -#include - #include "lib/common/container/stable_vector.hpp" #include "lib/common/utility.hpp" #include "lib/rocprofiler-sdk/buffer.hpp" #include "lib/rocprofiler-sdk/context/context.hpp" #include "lib/rocprofiler-sdk/internal_threading.hpp" -#include "lib/rocprofiler-sdk/registration.hpp" - -#include -#include #include "lib/rocprofiler-sdk/rccl/rccl.hpp" +#include "lib/rocprofiler-sdk/registration.hpp" #include "lib/rocprofiler-sdk/rocdecode/rocdecode.hpp" #include "lib/rocprofiler-sdk/rocjpeg/rocjpeg.hpp" +#include +#include +#include +#include + #include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/internal_threading.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/internal_threading.cpp index 03ce0f8dcd..80437953ca 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/internal_threading.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/internal_threading.cpp @@ -20,18 +20,17 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include -#include - +#include "lib/rocprofiler-sdk/internal_threading.hpp" #include "lib/common/container/stable_vector.hpp" #include "lib/common/static_object.hpp" #include "lib/common/utility.hpp" #include "lib/rocprofiler-sdk/buffer.hpp" #include "lib/rocprofiler-sdk/context/context.hpp" -#include "lib/rocprofiler-sdk/internal_threading.hpp" #include "lib/rocprofiler-sdk/registration.hpp" +#include +#include + #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/marker/marker.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/marker/marker.hpp index 1b53b41efa..485a44a851 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/marker/marker.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/marker/marker.hpp @@ -22,9 +22,8 @@ #pragma once -#include - #include +#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/page_migration/page_migration.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/page_migration/page_migration.hpp index 8da26b9898..946e77f611 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/page_migration/page_migration.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/page_migration/page_migration.hpp @@ -24,7 +24,7 @@ #include "lib/common/container/small_vector.hpp" -#include +#include namespace rocprofiler { diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rccl/rccl.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rccl/rccl.hpp index 61478fa899..1b9881cf5c 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rccl/rccl.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rccl/rccl.hpp @@ -42,7 +42,7 @@ # include #endif -#include +#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/registration.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/registration.cpp index d6a2ce7763..b3dbd9d5d4 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/registration.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/registration.cpp @@ -53,16 +53,15 @@ #include "lib/rocprofiler-sdk/runtime_initialization.hpp" #include +#include #include +#include #include #include #include #include #include -#include -#include - #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocdecode/rocdecode.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocdecode/rocdecode.hpp index 8870e9c3e2..b4aa831f0c 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocdecode/rocdecode.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocdecode/rocdecode.hpp @@ -34,7 +34,7 @@ # include #endif -#include +#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocjpeg/rocjpeg.hpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocjpeg/rocjpeg.hpp index 97523eeb94..139e544a67 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocjpeg/rocjpeg.hpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocjpeg/rocjpeg.hpp @@ -32,7 +32,7 @@ # include #endif -#include +#include #include #include diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocprofiler.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocprofiler.cpp index dfb27bf4f3..555cc4f341 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocprofiler.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rocprofiler.cpp @@ -20,11 +20,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. +#include "lib/common/utility.hpp" + #include #include -#include "lib/common/utility.hpp" - namespace rocprofiler { namespace diff --git a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/thread_trace/att_core.cpp b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/thread_trace/att_core.cpp index fef6adfd8b..a8609d83a4 100644 --- a/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/thread_trace/att_core.cpp +++ b/projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/thread_trace/att_core.cpp @@ -20,10 +20,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include -#include - #include "lib/common/container/stable_vector.hpp" #include "lib/common/utility.hpp" #include "lib/rocprofiler-sdk/agent.hpp" @@ -33,6 +29,10 @@ #include "lib/rocprofiler-sdk/internal_threading.hpp" #include "lib/rocprofiler-sdk/registration.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 71d5835a17..01a264ba69 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 @@ -20,15 +20,16 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include -#include - #include "lib/rocprofiler-sdk/aql/helpers.hpp" #include "lib/rocprofiler-sdk/context/context.hpp" #include "lib/rocprofiler-sdk/hsa/agent_cache.hpp" #include "lib/rocprofiler-sdk/registration.hpp" -#include "rocprofiler-sdk/amd_detail/thread_trace.h" + +#include + +#include + +#include using DispatchThreadTracer = rocprofiler::thread_trace::DispatchThreadTracer; using DeviceThreadTracer = rocprofiler::thread_trace::DeviceThreadTracer;