diff options
Diffstat (limited to 'src')
67 files changed, 150 insertions, 579 deletions
diff --git a/src/armnn/ArmNNProfilingServiceInitialiser.hpp b/src/armnn/ArmNNProfilingServiceInitialiser.hpp index e8a0ae0649..8c88fed35f 100644 --- a/src/armnn/ArmNNProfilingServiceInitialiser.hpp +++ b/src/armnn/ArmNNProfilingServiceInitialiser.hpp @@ -5,8 +5,8 @@ #pragma once -#include <IInitialiseProfilingService.hpp> -#include <IProfilingService.hpp> +#include <client/include/IInitialiseProfilingService.hpp> +#include <client/include/IProfilingService.hpp> namespace armnn { diff --git a/src/armnn/BackendRegistry.cpp b/src/armnn/BackendRegistry.cpp index 01f632fb22..9d6a89f254 100644 --- a/src/armnn/BackendRegistry.cpp +++ b/src/armnn/BackendRegistry.cpp @@ -6,7 +6,8 @@ #include <armnn/BackendRegistry.hpp> #include <armnn/Exceptions.hpp> #include <armnn/profiling/ArmNNProfiling.hpp> -#include <IProfilingService.hpp> + +#include <client/include/IProfilingService.hpp> namespace armnn { diff --git a/src/armnn/Layer.cpp b/src/armnn/Layer.cpp index 5818eefa39..805612d1cb 100644 --- a/src/armnn/Layer.cpp +++ b/src/armnn/Layer.cpp @@ -5,11 +5,14 @@ #include "Layer.hpp" #include "Graph.hpp" -#include <IProfilingService.hpp> -#include <armnn/utility/NumericCast.hpp> + #include <armnn/backends/TensorHandle.hpp> #include <armnn/backends/WorkloadData.hpp> +#include <armnn/utility/NumericCast.hpp> + +#include <client/include/IProfilingService.hpp> + #include <fmt/format.h> #include <numeric> diff --git a/src/armnn/LoadedNetwork.hpp b/src/armnn/LoadedNetwork.hpp index 85f90c116f..829405516a 100644 --- a/src/armnn/LoadedNetwork.hpp +++ b/src/armnn/LoadedNetwork.hpp @@ -9,18 +9,19 @@ #include "Profiling.hpp" #include <armnn/Tensor.hpp> + #include <armnn/backends/IBackendInternal.hpp> #include <armnn/backends/IMemoryOptimizerStrategy.hpp> -#include <backendsCommon/TensorHandleFactoryRegistry.hpp> #include <armnn/backends/Workload.hpp> #include <armnn/backends/WorkloadFactory.hpp> + #include <backendsCommon/DefaultAllocator.hpp> #include <backendsCommon/MemoryManager.hpp> +#include <backendsCommon/TensorHandleFactoryRegistry.hpp> #include <backendsCommon/memoryOptimizerStrategyLibrary/strategies/SingleAxisPriorityList.hpp> - -#include <IProfilingService.hpp> -#include <TimelineUtilityMethods.hpp> +#include <client/include/IProfilingService.hpp> +#include <client/include/TimelineUtilityMethods.hpp> #include <common/include/LabelsAndEventClasses.hpp> diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index 58e8b503ee..339da0d1b8 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -26,7 +26,7 @@ #include <armnn/utility/IgnoreUnused.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> -#include <IProfilingService.hpp> +#include <client/include/IProfilingService.hpp> #include <common/include/ProfilingGuid.hpp> diff --git a/src/armnn/Runtime.hpp b/src/armnn/Runtime.hpp index 9a20902291..51a8afff71 100644 --- a/src/armnn/Runtime.hpp +++ b/src/armnn/Runtime.hpp @@ -14,9 +14,9 @@ #include <armnn/backends/DynamicBackend.hpp> -#include <IInitialiseProfilingService.hpp> -#include <IProfilingService.hpp> -#include <IReportStructure.hpp> +#include <client/include/IInitialiseProfilingService.hpp> +#include <client/include/IProfilingService.hpp> +#include <client/include/IReportStructure.hpp> #include <mutex> #include <unordered_map> diff --git a/src/armnn/test/DebugCallbackTest.cpp b/src/armnn/test/DebugCallbackTest.cpp index 69b9736f92..600447c53a 100644 --- a/src/armnn/test/DebugCallbackTest.cpp +++ b/src/armnn/test/DebugCallbackTest.cpp @@ -60,7 +60,7 @@ TEST_CASE("RuntimeRegisterDebugCallback") std::vector<unsigned int> slotIndexes; auto mockCallback = [&](LayerGuid guid, unsigned int slotIndex, ITensorHandle* tensor) { - IgnoreUnused(guid); + armnn::IgnoreUnused(guid); slotIndexes.push_back(slotIndex); tensorShapes.push_back(tensor->GetShape()); callCount++; diff --git a/src/armnnUtils/ProfilingOptionsConverter.hpp b/src/armnnUtils/ProfilingOptionsConverter.hpp index 3bf1f1920d..a2a36b9bd8 100644 --- a/src/armnnUtils/ProfilingOptionsConverter.hpp +++ b/src/armnnUtils/ProfilingOptionsConverter.hpp @@ -6,7 +6,8 @@ #pragma once #include <armnn/IRuntime.hpp> -#include <armnn/profiling/ProfilingOptions.hpp> + +#include <client/include/ProfilingOptions.hpp> namespace arm { diff --git a/src/backends/aclCommon/CMakeLists.txt b/src/backends/aclCommon/CMakeLists.txt index 1e3d827ce0..05fbe6cca9 100644 --- a/src/backends/aclCommon/CMakeLists.txt +++ b/src/backends/aclCommon/CMakeLists.txt @@ -23,3 +23,4 @@ target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/armn target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/backends/aclCommon/test/CMakeLists.txt b/src/backends/aclCommon/test/CMakeLists.txt index 7eb232a643..ee27def133 100644 --- a/src/backends/aclCommon/test/CMakeLists.txt +++ b/src/backends/aclCommon/test/CMakeLists.txt @@ -17,3 +17,4 @@ target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR} target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/backends/backendsCommon/CMakeLists.txt b/src/backends/backendsCommon/CMakeLists.txt index dfd35018d9..e94e657bca 100644 --- a/src/backends/backendsCommon/CMakeLists.txt +++ b/src/backends/backendsCommon/CMakeLists.txt @@ -61,3 +61,4 @@ target_include_directories(armnnBackendsCommon PRIVATE ${PROJECT_SOURCE_DIR}/src target_include_directories(armnnBackendsCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnBackendsCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnBackendsCommon PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnBackendsCommon PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/backends/backendsCommon/test/BackendProfilingTests.cpp b/src/backends/backendsCommon/test/BackendProfilingTests.cpp index 9b80a8fa72..5227691664 100644 --- a/src/backends/backendsCommon/test/BackendProfilingTests.cpp +++ b/src/backends/backendsCommon/test/BackendProfilingTests.cpp @@ -4,8 +4,6 @@ // #include "ArmNNProfilingServiceInitialiser.hpp" -#include "CounterIdMap.hpp" -#include "Holder.hpp" #include "MockBackendId.hpp" #include "PeriodicCounterCapture.hpp" #include "PeriodicCounterSelectionCommandHandler.hpp" @@ -20,8 +18,6 @@ #include <armnn/Logging.hpp> #include <armnn/profiling/ArmNNProfiling.hpp> -#include <armnn/profiling/ISendTimelinePacket.hpp> -#include <armnn/profiling/ProfilingOptions.hpp> #include <armnn/utility/IgnoreUnused.hpp> @@ -29,6 +25,11 @@ #include <backends/BackendProfiling.hpp> +#include <client/include/CounterIdMap.hpp> +#include <client/include/Holder.hpp> +#include <client/include/ISendTimelinePacket.hpp> +#include <client/include/ProfilingOptions.hpp> + #include <common/include/CounterDirectory.hpp> #include <doctest/doctest.h> diff --git a/src/backends/backendsCommon/test/CMakeLists.txt b/src/backends/backendsCommon/test/CMakeLists.txt index a668c51b43..8ec65b3c17 100644 --- a/src/backends/backendsCommon/test/CMakeLists.txt +++ b/src/backends/backendsCommon/test/CMakeLists.txt @@ -208,6 +208,7 @@ target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/third-party) # Dummy shared object for testing. @@ -237,6 +238,7 @@ target_include_directories(ValidTestDynamicBackend PRIVATE ${PROJECT_SOURCE_DIR} target_include_directories(ValidTestDynamicBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(ValidTestDynamicBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(ValidTestDynamicBackend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(ValidTestDynamicBackend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(ValidTestDynamicBackend armnn) set_target_properties(ValidTestDynamicBackend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -246,6 +248,7 @@ target_include_directories(InvalidTestDynamicBackend1 PRIVATE ${PROJECT_SOURCE_D target_include_directories(InvalidTestDynamicBackend1 PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(InvalidTestDynamicBackend1 PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(InvalidTestDynamicBackend1 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(InvalidTestDynamicBackend1 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(InvalidTestDynamicBackend1 armnn) set_target_properties(InvalidTestDynamicBackend1 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -255,6 +258,7 @@ target_include_directories(InvalidTestDynamicBackend2 PRIVATE ${PROJECT_SOURCE_D target_include_directories(InvalidTestDynamicBackend2 PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(InvalidTestDynamicBackend2 PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(InvalidTestDynamicBackend2 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(InvalidTestDynamicBackend2 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(InvalidTestDynamicBackend2 armnn) set_target_properties(InvalidTestDynamicBackend2 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -264,6 +268,7 @@ target_include_directories(InvalidTestDynamicBackend3 PRIVATE ${PROJECT_SOURCE_D target_include_directories(InvalidTestDynamicBackend3 PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(InvalidTestDynamicBackend3 PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(InvalidTestDynamicBackend3 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(InvalidTestDynamicBackend3 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(InvalidTestDynamicBackend3 armnn) set_target_properties(InvalidTestDynamicBackend3 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -273,6 +278,7 @@ target_include_directories(InvalidTestDynamicBackend4 PRIVATE ${PROJECT_SOURCE_D target_include_directories(InvalidTestDynamicBackend4 PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(InvalidTestDynamicBackend4 PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(InvalidTestDynamicBackend4 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(InvalidTestDynamicBackend4 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(InvalidTestDynamicBackend4 armnn) set_target_properties(InvalidTestDynamicBackend4 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -282,6 +288,7 @@ target_include_directories(InvalidTestDynamicBackend5 PRIVATE ${PROJECT_SOURCE_D target_include_directories(InvalidTestDynamicBackend5 PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(InvalidTestDynamicBackend5 PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(InvalidTestDynamicBackend5 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(InvalidTestDynamicBackend5 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(InvalidTestDynamicBackend5 armnn) set_target_properties(InvalidTestDynamicBackend5 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -291,6 +298,7 @@ target_include_directories(InvalidTestDynamicBackend6 PRIVATE ${PROJECT_SOURCE_D target_include_directories(InvalidTestDynamicBackend6 PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(InvalidTestDynamicBackend6 PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(InvalidTestDynamicBackend6 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(InvalidTestDynamicBackend6 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(InvalidTestDynamicBackend6 armnn) set_target_properties(InvalidTestDynamicBackend6 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -300,6 +308,7 @@ target_include_directories(InvalidTestDynamicBackend7 PRIVATE ${PROJECT_SOURCE_D target_include_directories(InvalidTestDynamicBackend7 PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(InvalidTestDynamicBackend7 PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(InvalidTestDynamicBackend7 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(InvalidTestDynamicBackend6 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(InvalidTestDynamicBackend7 armnn) set_target_properties(InvalidTestDynamicBackend7 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -348,6 +357,7 @@ target_include_directories(Arm_TestValid2_backend PRIVATE ${PROJECT_SOURCE_DIR}/ target_include_directories(Arm_TestValid2_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(Arm_TestValid2_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(Arm_TestValid2_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(Arm_TestValid2_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(Arm_TestValid2_backend armnn) set_target_properties(Arm_TestValid2_backend PROPERTIES PREFIX "") set_target_properties(Arm_TestValid2_backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath5) @@ -360,6 +370,7 @@ target_include_directories(Arm_TestValid3_backend PRIVATE ${PROJECT_SOURCE_DIR}/ target_include_directories(Arm_TestValid3_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(Arm_TestValid3_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(Arm_TestValid3_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(Arm_TestValid3_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(Arm_TestValid3_backend armnn) set_target_properties(Arm_TestValid3_backend PROPERTIES PREFIX "") set_target_properties(Arm_TestValid3_backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath5) @@ -370,6 +381,7 @@ target_include_directories(Arm_TestInvalid8_backend PRIVATE ${PROJECT_SOURCE_DIR target_include_directories(Arm_TestInvalid8_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(Arm_TestInvalid8_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(Arm_TestInvalid8_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(Arm_TestInvalid8_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(Arm_TestInvalid8_backend armnn) set_target_properties(Arm_TestInvalid8_backend PROPERTIES PREFIX "") set_target_properties(Arm_TestInvalid8_backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath5) @@ -380,6 +392,7 @@ target_include_directories(Arm_TestValid4_backend PRIVATE ${PROJECT_SOURCE_DIR}/ target_include_directories(Arm_TestValid4_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(Arm_TestValid4_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(Arm_TestValid4_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(Arm_TestValid4_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(Arm_TestValid4_backend armnn) set_target_properties(Arm_TestValid4_backend PROPERTIES PREFIX "") set_target_properties(Arm_TestValid4_backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath6) @@ -390,6 +403,7 @@ target_include_directories(Arm_TestValid5_backend PRIVATE ${PROJECT_SOURCE_DIR}/ target_include_directories(Arm_TestValid5_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(Arm_TestValid5_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(Arm_TestValid5_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(Arm_TestValid5_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(Arm_TestValid5_backend armnn) set_target_properties(Arm_TestValid5_backend PROPERTIES PREFIX "") set_target_properties(Arm_TestValid5_backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath6) @@ -400,6 +414,7 @@ target_include_directories(Arm_TestInvalid9_backend PRIVATE ${PROJECT_SOURCE_DIR target_include_directories(Arm_TestInvalid9_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(Arm_TestInvalid9_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(Arm_TestInvalid9_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(Arm_TestInvalid9_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(Arm_TestInvalid9_backend armnn) set_target_properties(Arm_TestInvalid9_backend PROPERTIES PREFIX "") set_target_properties(Arm_TestInvalid9_backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath6) @@ -410,6 +425,7 @@ target_include_directories(Arm_TestInvalid10_backend PRIVATE ${PROJECT_SOURCE_DI target_include_directories(Arm_TestInvalid10_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(Arm_TestInvalid10_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(Arm_TestInvalid10_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(Arm_TestInvalid10_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(Arm_TestInvalid10_backend armnn) set_target_properties(Arm_TestInvalid10_backend PROPERTIES PREFIX "") set_target_properties(Arm_TestInvalid10_backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath9) @@ -420,6 +436,7 @@ target_include_directories(Arm_TestInvalid11_backend PRIVATE ${PROJECT_SOURCE_DI target_include_directories(Arm_TestInvalid11_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(Arm_TestInvalid11_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(Arm_TestInvalid11_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(Arm_TestInvalid11_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(Arm_TestInvalid11_backend armnn) set_target_properties(Arm_TestInvalid11_backend PROPERTIES PREFIX "") set_target_properties(Arm_TestInvalid11_backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath9) diff --git a/src/backends/backendsCommon/test/DefaultAsyncExecuteTest.cpp b/src/backends/backendsCommon/test/DefaultAsyncExecuteTest.cpp index 2e4fc1ea1f..b1ee89ac3c 100644 --- a/src/backends/backendsCommon/test/DefaultAsyncExecuteTest.cpp +++ b/src/backends/backendsCommon/test/DefaultAsyncExecuteTest.cpp @@ -10,6 +10,8 @@ #include <doctest/doctest.h> +#include <thread> + using namespace armnn; @@ -255,4 +257,4 @@ TEST_CASE("TestDefaultAsyncExeuteWithThreads") } -}
\ No newline at end of file +} diff --git a/src/backends/cl/CMakeLists.txt b/src/backends/cl/CMakeLists.txt index 845ba70eaa..aeb90b069c 100644 --- a/src/backends/cl/CMakeLists.txt +++ b/src/backends/cl/CMakeLists.txt @@ -72,3 +72,4 @@ target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armn target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/backends/cl/test/CMakeLists.txt b/src/backends/cl/test/CMakeLists.txt index 434cdb83d1..ec1d0a6c2f 100644 --- a/src/backends/cl/test/CMakeLists.txt +++ b/src/backends/cl/test/CMakeLists.txt @@ -43,4 +43,4 @@ target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR} target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) - +target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/backends/cl/workloads/CMakeLists.txt b/src/backends/cl/workloads/CMakeLists.txt index 423a4a69d1..6bb8d68d07 100644 --- a/src/backends/cl/workloads/CMakeLists.txt +++ b/src/backends/cl/workloads/CMakeLists.txt @@ -137,3 +137,4 @@ target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR} target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/backends/dynamic/reference/CMakeLists.txt b/src/backends/dynamic/reference/CMakeLists.txt index 16e22fba02..67e3495841 100644 --- a/src/backends/dynamic/reference/CMakeLists.txt +++ b/src/backends/dynamic/reference/CMakeLists.txt @@ -27,5 +27,6 @@ target_include_directories(Arm_CpuRef_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/ target_include_directories(Arm_CpuRef_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(Arm_CpuRef_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(Arm_CpuRef_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(Arm_CpuRef_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) set_target_properties(Arm_CpuRef_backend PROPERTIES PREFIX "") target_link_libraries(Arm_CpuRef_backend armnn) diff --git a/src/backends/neon/CMakeLists.txt b/src/backends/neon/CMakeLists.txt index 4654de5cab..16164de3fb 100644 --- a/src/backends/neon/CMakeLists.txt +++ b/src/backends/neon/CMakeLists.txt @@ -44,3 +44,4 @@ target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/ar target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/backends/neon/test/CMakeLists.txt b/src/backends/neon/test/CMakeLists.txt index f7438ea6c9..8339abbd7d 100644 --- a/src/backends/neon/test/CMakeLists.txt +++ b/src/backends/neon/test/CMakeLists.txt @@ -58,4 +58,4 @@ target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DI target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) - +target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/backends/neon/workloads/CMakeLists.txt b/src/backends/neon/workloads/CMakeLists.txt index bae51b9c79..41c5f5a950 100644 --- a/src/backends/neon/workloads/CMakeLists.txt +++ b/src/backends/neon/workloads/CMakeLists.txt @@ -143,3 +143,4 @@ target_include_directories(armnnNeonBackendWorkloads PRIVATE ${PROJECT_SOURCE_DI target_include_directories(armnnNeonBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnNeonBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnNeonBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnNeonBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/backends/reference/CMakeLists.txt b/src/backends/reference/CMakeLists.txt index 3a3d7f4dc5..688a2d759d 100644 --- a/src/backends/reference/CMakeLists.txt +++ b/src/backends/reference/CMakeLists.txt @@ -41,3 +41,4 @@ target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/arm target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/backends/reference/test/CMakeLists.txt b/src/backends/reference/test/CMakeLists.txt index 2476c31de6..358d58ffea 100644 --- a/src/backends/reference/test/CMakeLists.txt +++ b/src/backends/reference/test/CMakeLists.txt @@ -29,4 +29,5 @@ target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/third-party/doctest) diff --git a/src/backends/reference/workloads/CMakeLists.txt b/src/backends/reference/workloads/CMakeLists.txt index 46c2706742..c18342fb73 100644 --- a/src/backends/reference/workloads/CMakeLists.txt +++ b/src/backends/reference/workloads/CMakeLists.txt @@ -212,3 +212,4 @@ target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/dynamic/sample/CMakeLists.txt b/src/dynamic/sample/CMakeLists.txt index a100d1b2c8..e0c666b77b 100644 --- a/src/dynamic/sample/CMakeLists.txt +++ b/src/dynamic/sample/CMakeLists.txt @@ -34,5 +34,6 @@ target_include_directories(Arm_SampleDynamic_backend PRIVATE ${PROJECT_SOURCE_DI target_include_directories(Arm_SampleDynamic_backend PRIVATE ${PROJECT_SOURCE_DIR}/../../../src/backends) target_include_directories(Arm_SampleDynamic_backend PRIVATE ${PROJECT_SOURCE_DIR}/../../../src/profiling) target_include_directories(Arm_SampleDynamic_backend PRIVATE ${PROJECT_SOURCE_DIR}/../../../profiling/common/include) +target_include_directories(Arm_SampleDynamic_backend PRIVATE ${PROJECT_SOURCE_DIR}/../../../profiling/client/include) target_include_directories(Arm_SampleDynamic_backend PRIVATE ${PROJECT_SOURCE_DIR}/../../../profiling) target_link_libraries(Arm_SampleDynamic_backend ${ARMNN_PATH}) diff --git a/src/profiling/ActivateTimelineReportingCommandHandler.cpp b/src/profiling/ActivateTimelineReportingCommandHandler.cpp index 58a88256ea..9589dd808b 100644 --- a/src/profiling/ActivateTimelineReportingCommandHandler.cpp +++ b/src/profiling/ActivateTimelineReportingCommandHandler.cpp @@ -4,7 +4,9 @@ // #include "ActivateTimelineReportingCommandHandler.hpp" -#include "TimelineUtilityMethods.hpp" + +#include <client/include/TimelineUtilityMethods.hpp> + #include <common/include/ProfilingException.hpp> #include <fmt/format.h> diff --git a/src/profiling/ActivateTimelineReportingCommandHandler.hpp b/src/profiling/ActivateTimelineReportingCommandHandler.hpp index 21e1fe6186..c9fed73594 100644 --- a/src/profiling/ActivateTimelineReportingCommandHandler.hpp +++ b/src/profiling/ActivateTimelineReportingCommandHandler.hpp @@ -7,9 +7,10 @@ #include "ProfilingStateMachine.hpp" #include "SendTimelinePacket.hpp" -#include "IReportStructure.hpp" #include "INotifyBackends.hpp" +#include <client/include/IReportStructure.hpp> + #include <common/include/CommandHandlerFunctor.hpp> #include <common/include/Optional.hpp> #include <common/include/Packet.hpp> diff --git a/src/profiling/ConnectionAcknowledgedCommandHandler.cpp b/src/profiling/ConnectionAcknowledgedCommandHandler.cpp index 70c260b043..9f20b9cb80 100644 --- a/src/profiling/ConnectionAcknowledgedCommandHandler.cpp +++ b/src/profiling/ConnectionAcknowledgedCommandHandler.cpp @@ -4,7 +4,8 @@ // #include "ConnectionAcknowledgedCommandHandler.hpp" -#include "TimelineUtilityMethods.hpp" + +#include <client/include/TimelineUtilityMethods.hpp> #include <common/include/ProfilingException.hpp> diff --git a/src/profiling/ConnectionAcknowledgedCommandHandler.hpp b/src/profiling/ConnectionAcknowledgedCommandHandler.hpp index d69e0be5c1..e409ee62f2 100644 --- a/src/profiling/ConnectionAcknowledgedCommandHandler.hpp +++ b/src/profiling/ConnectionAcknowledgedCommandHandler.hpp @@ -5,12 +5,14 @@ #pragma once -#include <armnn/backends/profiling/IBackendProfilingContext.hpp> -#include "IProfilingServiceStatus.hpp" -#include "ISendCounterPacket.hpp" -#include "armnn/profiling/ISendTimelinePacket.hpp" #include "ProfilingStateMachine.hpp" +#include <client/include/IProfilingServiceStatus.hpp> +#include <client/include/ISendCounterPacket.hpp> +#include <client/include/ISendTimelinePacket.hpp> + +#include <client/include/backends/IBackendProfilingContext.hpp> + #include <common/include/CommandHandlerFunctor.hpp> #include <common/include/Packet.hpp> diff --git a/src/profiling/CounterIdMap.cpp b/src/profiling/CounterIdMap.cpp index 80b63a36eb..cb637c3974 100644 --- a/src/profiling/CounterIdMap.cpp +++ b/src/profiling/CounterIdMap.cpp @@ -2,7 +2,8 @@ // Copyright © 2020 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include "CounterIdMap.hpp" + +#include <client/include/CounterIdMap.hpp> #include <common/include/ProfilingException.hpp> diff --git a/src/profiling/CounterIdMap.hpp b/src/profiling/CounterIdMap.hpp deleted file mode 100644 index cce7184c46..0000000000 --- a/src/profiling/CounterIdMap.hpp +++ /dev/null @@ -1,51 +0,0 @@ -// -// Copyright © 2020 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// -#pragma once - -#include <map> -#include <string> - -namespace arm -{ -namespace pipe -{ - -class ICounterMappings -{ -public: - virtual uint16_t GetGlobalId(uint16_t backendCounterId, const std::string& backendId) const = 0; - virtual const std::pair<uint16_t, std::string>& GetBackendId(uint16_t globalCounterId) const = 0; - virtual ~ICounterMappings() {} -}; - -class IRegisterCounterMapping -{ -public: - virtual void RegisterMapping(uint16_t globalCounterId, - uint16_t backendCounterId, - const std::string& backendId) = 0; - virtual void Reset() = 0; - virtual ~IRegisterCounterMapping() {} -}; - -class CounterIdMap : public ICounterMappings, public IRegisterCounterMapping -{ - -public: - CounterIdMap() = default; - virtual ~CounterIdMap() {} - void RegisterMapping(uint16_t globalCounterId, - uint16_t backendCounterId, - const std::string& backendId) override; - void Reset() override; - uint16_t GetGlobalId(uint16_t backendCounterId, const std::string& backendId) const override; - const std::pair<uint16_t, std::string>& GetBackendId(uint16_t globalCounterId) const override; -private: - std::map<uint16_t, std::pair<uint16_t, std::string>> m_GlobalCounterIdMap; - std::map<std::pair<uint16_t, std::string>, uint16_t> m_BackendCounterIdMap; -}; - -} // namespace pipe -} // namespace arm diff --git a/src/profiling/FileOnlyProfilingConnection.hpp b/src/profiling/FileOnlyProfilingConnection.hpp index 9d40420ec8..c7e60f564e 100644 --- a/src/profiling/FileOnlyProfilingConnection.hpp +++ b/src/profiling/FileOnlyProfilingConnection.hpp @@ -5,12 +5,12 @@ #pragma once -#include <armnn/profiling/ILocalPacketHandler.hpp> -#include <armnn/profiling/ProfilingOptions.hpp> - #include "IProfilingConnection.hpp" #include "ProfilingUtils.hpp" +#include <client/include/ILocalPacketHandler.hpp> +#include <client/include/ProfilingOptions.hpp> + #include <common/include/Assert.hpp> #include <common/include/Packet.hpp> diff --git a/src/profiling/Holder.cpp b/src/profiling/Holder.cpp index 6517a24900..d144e244d9 100644 --- a/src/profiling/Holder.cpp +++ b/src/profiling/Holder.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT // -#include "Holder.hpp" +#include <client/include/Holder.hpp> namespace arm { diff --git a/src/profiling/Holder.hpp b/src/profiling/Holder.hpp deleted file mode 100644 index 10d393ff9b..0000000000 --- a/src/profiling/Holder.hpp +++ /dev/null @@ -1,68 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -#include <mutex> -#include <vector> -#include <set> -#include "ProfilingUtils.hpp" - -namespace arm -{ - -namespace pipe -{ - -class CaptureData -{ -public: - CaptureData() - : m_CapturePeriod(0) - , m_CounterIds() - , m_ActiveBackends(){} - CaptureData(uint32_t capturePeriod, std::vector<uint16_t>& counterIds, std::set<std::string> activeBackends) - : m_CapturePeriod(capturePeriod) - , m_CounterIds(counterIds) - , m_ActiveBackends(activeBackends){} - CaptureData(const CaptureData& captureData) - : m_CapturePeriod(captureData.m_CapturePeriod) - , m_CounterIds(captureData.m_CounterIds) - , m_ActiveBackends(captureData.m_ActiveBackends){} - - CaptureData& operator=(const CaptureData& other); - - void SetActiveBackends(const std::set<std::string>& activeBackends); - void SetCapturePeriod(uint32_t capturePeriod); - void SetCounterIds(const std::vector<uint16_t>& counterIds); - uint32_t GetCapturePeriod() const; - const std::vector<uint16_t>& GetCounterIds() const; - const std::set<std::string>& GetActiveBackends() const; - bool IsCounterIdInCaptureData(uint16_t counterId); - -private: - uint32_t m_CapturePeriod; - std::vector<uint16_t> m_CounterIds; - std::set<std::string> m_ActiveBackends; -}; - -class Holder -{ -public: - Holder() - : m_CaptureData() {} - CaptureData GetCaptureData() const; - void SetCaptureData(uint32_t capturePeriod, - const std::vector<uint16_t>& counterIds, - const std::set<std::string>& activeBackends); - -private: - mutable std::mutex m_CaptureThreadMutex; - CaptureData m_CaptureData; -}; - -} // namespace pipe - -} // namespace arm diff --git a/src/profiling/ICounterValues.hpp b/src/profiling/ICounterValues.hpp deleted file mode 100644 index a851c6b3f3..0000000000 --- a/src/profiling/ICounterValues.hpp +++ /dev/null @@ -1,47 +0,0 @@ -// -// Copyright © 2019 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -#include <cstdint> - -namespace arm -{ - -namespace pipe -{ - -class IReadCounterValues -{ -public: - virtual ~IReadCounterValues() {} - - virtual bool IsCounterRegistered(uint16_t counterUid) const = 0; - virtual bool IsCounterRegistered(const std::string& counterName) const = 0; - virtual uint16_t GetCounterCount() const = 0; - virtual uint32_t GetAbsoluteCounterValue(uint16_t counterUid) const = 0; - virtual uint32_t GetDeltaCounterValue(uint16_t counterUid) = 0; -}; - -class IWriteCounterValues -{ -public: - virtual ~IWriteCounterValues() {} - - virtual void SetCounterValue(uint16_t counterUid, uint32_t value) = 0; - virtual uint32_t AddCounterValue(uint16_t counterUid, uint32_t value) = 0; - virtual uint32_t SubtractCounterValue(uint16_t counterUid, uint32_t value) = 0; - virtual uint32_t IncrementCounterValue(uint16_t counterUid) = 0; -}; - -class IReadWriteCounterValues : public IReadCounterValues, public IWriteCounterValues -{ -public: - virtual ~IReadWriteCounterValues() {} -}; - -} // namespace pipe - -} // namespace arm diff --git a/src/profiling/IInitialiseProfilingService.hpp b/src/profiling/IInitialiseProfilingService.hpp deleted file mode 100644 index fc3f4b9a5d..0000000000 --- a/src/profiling/IInitialiseProfilingService.hpp +++ /dev/null @@ -1,26 +0,0 @@ -// -// Copyright © 2022 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -namespace arm -{ - -namespace pipe -{ - -// forward declaration -class IProfilingService; - -class IInitialiseProfilingService -{ -public: - virtual ~IInitialiseProfilingService() {} - virtual void InitialiseProfilingService(IProfilingService& profilingService) = 0; -}; - -} // namespace pipe - -} // namespace arm diff --git a/src/profiling/IProfilingConnection.hpp b/src/profiling/IProfilingConnection.hpp index 988503294a..9a25854b7f 100644 --- a/src/profiling/IProfilingConnection.hpp +++ b/src/profiling/IProfilingConnection.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/profiling/ILocalPacketHandler.hpp> +#include <client/include/ILocalPacketHandler.hpp> #include <common/include/Packet.hpp> diff --git a/src/profiling/IProfilingConnectionFactory.hpp b/src/profiling/IProfilingConnectionFactory.hpp index 1599914bac..8676077878 100644 --- a/src/profiling/IProfilingConnectionFactory.hpp +++ b/src/profiling/IProfilingConnectionFactory.hpp @@ -7,7 +7,7 @@ #include "IProfilingConnection.hpp" -#include <armnn/profiling/ProfilingOptions.hpp> +#include <client/include/ProfilingOptions.hpp> #include <memory> diff --git a/src/profiling/IProfilingService.cpp b/src/profiling/IProfilingService.cpp index b7a394c12f..d147871e47 100644 --- a/src/profiling/IProfilingService.cpp +++ b/src/profiling/IProfilingService.cpp @@ -3,9 +3,10 @@ // SPDX-License-Identifier: MIT // -#include "IProfilingService.hpp" #include "ProfilingService.hpp" +#include <client/include/IProfilingService.hpp> + namespace arm { diff --git a/src/profiling/IProfilingService.hpp b/src/profiling/IProfilingService.hpp deleted file mode 100644 index 353059aec3..0000000000 --- a/src/profiling/IProfilingService.hpp +++ /dev/null @@ -1,81 +0,0 @@ -// -// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -#include "CounterIdMap.hpp" -#include "Holder.hpp" -#include "ICounterValues.hpp" -#include "IInitialiseProfilingService.hpp" -#include "IProfilingServiceStatus.hpp" -#include "ISendCounterPacket.hpp" -#include "IReportStructure.hpp" -#include "ProfilingState.hpp" - -#include <armnn/backends/profiling/IBackendProfilingContext.hpp> -#include <armnn/profiling/ProfilingOptions.hpp> - -#include <common/include/ICounterRegistry.hpp> -#include <common/include/Optional.hpp> -#include <common/include/ProfilingGuidGenerator.hpp> - - -namespace arm -{ - -namespace pipe -{ - -class IProfilingService : public IProfilingGuidGenerator, - public IProfilingServiceStatus, - public IReadWriteCounterValues -{ -public: - static std::unique_ptr<IProfilingService> CreateProfilingService( - uint16_t maxGlobalCounterId, - IInitialiseProfilingService& initialiser, - const std::string& softwareInfo, - const std::string& softwareVersion, - const std::string& hardwareVersion, - arm::pipe::Optional<IReportStructure&> reportStructure = arm::pipe::EmptyOptional()); - virtual ~IProfilingService() {}; - virtual std::unique_ptr<ISendTimelinePacket> GetSendTimelinePacket() const = 0; - virtual const ICounterMappings& GetCounterMappings() const = 0; - virtual ISendCounterPacket& GetSendCounterPacket() = 0; - virtual bool IsProfilingEnabled() const = 0; - virtual bool IsTimelineReportingEnabled() const = 0; - virtual CaptureData GetCaptureData() = 0; - virtual ProfilingState GetCurrentState() const = 0; - // Resets the profiling options, optionally clears the profiling service entirely - virtual void ResetExternalProfilingOptions(const ProfilingOptions& options, - bool resetProfilingService = false) = 0; - virtual ProfilingState ConfigureProfilingService(const ProfilingOptions& options, - bool resetProfilingService = false) = 0; - // Store a profiling context returned from a backend that support profiling. - virtual void AddBackendProfilingContext(const std::string& backendId, - std::shared_ptr<IBackendProfilingContext> profilingContext) = 0; - virtual ICounterRegistry& GetCounterRegistry() = 0; - virtual IRegisterCounterMapping& GetCounterMappingRegistry() = 0; - virtual bool IsCategoryRegistered(const std::string& categoryName) const = 0; - virtual void InitializeCounterValue(uint16_t counterUid) = 0; - - // IProfilingGuidGenerator functions - /// Return the next random Guid in the sequence - ProfilingDynamicGuid NextGuid() override; - /// Create a ProfilingStaticGuid based on a hash of the string - ProfilingStaticGuid GenerateStaticId(const std::string& str) override; - static ProfilingDynamicGuid GetNextGuid(); - static ProfilingStaticGuid GetStaticId(const std::string& str); - void ResetGuidGenerator(); - - virtual void Disconnect() = 0; - -private: - static ProfilingGuidGenerator m_GuidGenerator; -}; - -} // namespace pipe - -} // namespace arm diff --git a/src/profiling/IProfilingServiceStatus.hpp b/src/profiling/IProfilingServiceStatus.hpp deleted file mode 100644 index 3366bdd445..0000000000 --- a/src/profiling/IProfilingServiceStatus.hpp +++ /dev/null @@ -1,30 +0,0 @@ -// -// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -#include <armnn/profiling/ILocalPacketHandler.hpp> - -#include <common/include/Packet.hpp> - -#include <cstdint> - -namespace arm -{ - -namespace pipe -{ - -class IProfilingServiceStatus -{ -public: - virtual void NotifyProfilingServiceActive() = 0; - virtual void WaitForProfilingServiceActivation(unsigned int timeout) = 0; - virtual ~IProfilingServiceStatus() {}; -}; - -} // namespace pipe - -} // namespace arm diff --git a/src/profiling/IReportStructure.hpp b/src/profiling/IReportStructure.hpp deleted file mode 100644 index 8891cbd3b0..0000000000 --- a/src/profiling/IReportStructure.hpp +++ /dev/null @@ -1,26 +0,0 @@ -// -// Copyright © 2020 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -namespace arm -{ - -namespace pipe -{ - -class IProfilingService; - -class IReportStructure -{ -public: - virtual ~IReportStructure() {} - virtual void ReportStructure(arm::pipe::IProfilingService& profilingService) = 0; -}; - -} // namespace pipe - -} // namespace arm - diff --git a/src/profiling/ISendCounterPacket.hpp b/src/profiling/ISendCounterPacket.hpp deleted file mode 100644 index 522dc7c7cb..0000000000 --- a/src/profiling/ISendCounterPacket.hpp +++ /dev/null @@ -1,40 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -#include <armnn/backends/profiling/IBackendProfiling.hpp> -#include <common/include/ICounterDirectory.hpp> - -namespace arm -{ - -namespace pipe -{ - -class ISendCounterPacket -{ -public: - using IndexValuePairsVector = std::vector<CounterValue>; - - virtual ~ISendCounterPacket() {} - - /// Create and write a StreamMetaDataPacket in the buffer - virtual void SendStreamMetaDataPacket() = 0; - - /// Create and write a CounterDirectoryPacket from the parameters to the buffer. - virtual void SendCounterDirectoryPacket(const ICounterDirectory& counterDirectory) = 0; - - /// Create and write a PeriodicCounterCapturePacket from the parameters to the buffer. - virtual void SendPeriodicCounterCapturePacket(uint64_t timestamp, const IndexValuePairsVector& values) = 0; - - /// Create and write a PeriodicCounterSelectionPacket from the parameters to the buffer. - virtual void SendPeriodicCounterSelectionPacket(uint32_t capturePeriod, - const std::vector<uint16_t>& selectedCounterIds) = 0; -}; - -} // namespace pipe - -} // namespace arm diff --git a/src/profiling/PeriodicCounterCapture.hpp b/src/profiling/PeriodicCounterCapture.hpp index 9a678a85ab..88084172ca 100644 --- a/src/profiling/PeriodicCounterCapture.hpp +++ b/src/profiling/PeriodicCounterCapture.hpp @@ -6,12 +6,13 @@ #pragma once #include "IPeriodicCounterCapture.hpp" -#include "Holder.hpp" #include "SendCounterPacket.hpp" -#include "ICounterValues.hpp" -#include "CounterIdMap.hpp" -#include <armnn/backends/profiling/IBackendProfilingContext.hpp> +#include <client/include/CounterIdMap.hpp> +#include <client/include/Holder.hpp> +#include <client/include/ICounterValues.hpp> + +#include <client/include/backends/IBackendProfilingContext.hpp> #include <common/include/Packet.hpp> diff --git a/src/profiling/PeriodicCounterSelectionCommandHandler.cpp b/src/profiling/PeriodicCounterSelectionCommandHandler.cpp index d405e296fc..06f2c6588b 100644 --- a/src/profiling/PeriodicCounterSelectionCommandHandler.cpp +++ b/src/profiling/PeriodicCounterSelectionCommandHandler.cpp @@ -6,7 +6,8 @@ #include "PeriodicCounterSelectionCommandHandler.hpp" #include "ProfilingUtils.hpp" -#include <armnn/profiling/ProfilingOptions.hpp> +#include <client/include/ProfilingOptions.hpp> + #include <common/include/NumericCast.hpp> #include <fmt/format.h> diff --git a/src/profiling/PeriodicCounterSelectionCommandHandler.hpp b/src/profiling/PeriodicCounterSelectionCommandHandler.hpp index e0feddf9a5..6e544c9097 100644 --- a/src/profiling/PeriodicCounterSelectionCommandHandler.hpp +++ b/src/profiling/PeriodicCounterSelectionCommandHandler.hpp @@ -5,14 +5,15 @@ #pragma once -#include "CounterIdMap.hpp" -#include "Holder.hpp" #include "ProfilingStateMachine.hpp" #include "SendCounterPacket.hpp" #include "IPeriodicCounterCapture.hpp" -#include "ICounterValues.hpp" -#include "armnn/backends/profiling/IBackendProfilingContext.hpp" +#include <client/include/CounterIdMap.hpp> +#include <client/include/Holder.hpp> +#include <client/include/ICounterValues.hpp> + +#include <client/include/backends/IBackendProfilingContext.hpp> #include <common/include/CommandHandlerFunctor.hpp> #include <common/include/Logging.hpp> diff --git a/src/profiling/ProfilingConnectionDumpToFileDecorator.hpp b/src/profiling/ProfilingConnectionDumpToFileDecorator.hpp index 5807947463..8f4812e9dd 100644 --- a/src/profiling/ProfilingConnectionDumpToFileDecorator.hpp +++ b/src/profiling/ProfilingConnectionDumpToFileDecorator.hpp @@ -8,7 +8,7 @@ #include "IProfilingConnection.hpp" #include "ProfilingUtils.hpp" -#include <armnn/profiling/ProfilingOptions.hpp> +#include <client/include/ProfilingOptions.hpp> #include <fstream> #include <memory> diff --git a/src/profiling/ProfilingService.hpp b/src/profiling/ProfilingService.hpp index 58bfd3afcf..b84b39d0df 100644 --- a/src/profiling/ProfilingService.hpp +++ b/src/profiling/ProfilingService.hpp @@ -9,12 +9,8 @@ #include "BufferManager.hpp" #include "CommandHandler.hpp" #include "ConnectionAcknowledgedCommandHandler.hpp" -#include "CounterIdMap.hpp" #include "DeactivateTimelineReportingCommandHandler.hpp" -#include "ICounterValues.hpp" #include "INotifyBackends.hpp" -#include "IProfilingService.hpp" -#include "IReportStructure.hpp" #include "PeriodicCounterCapture.hpp" #include "PeriodicCounterSelectionCommandHandler.hpp" #include "PerJobCounterSelectionCommandHandler.hpp" @@ -26,9 +22,13 @@ #include "SendTimelinePacket.hpp" #include "TimelinePacketWriterFactory.hpp" -#include <armnn/backends/profiling/IBackendProfilingContext.hpp> +#include <client/include/CounterIdMap.hpp> +#include <client/include/ICounterValues.hpp> +#include <client/include/ILocalPacketHandler.hpp> +#include <client/include/IProfilingService.hpp> +#include <client/include/IReportStructure.hpp> -#include <armnn/profiling/ILocalPacketHandler.hpp> +#include <client/include/backends/IBackendProfilingContext.hpp> #include <common/include/CounterDirectory.hpp> diff --git a/src/profiling/ProfilingState.hpp b/src/profiling/ProfilingState.hpp deleted file mode 100644 index 0fc1903118..0000000000 --- a/src/profiling/ProfilingState.hpp +++ /dev/null @@ -1,24 +0,0 @@ -// -// Copyright © 2022 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -namespace arm -{ - -namespace pipe -{ - -enum class ProfilingState -{ - Uninitialised, - NotConnected, - WaitingForAck, - Active -}; - -} // namespace pipe - -} // namespace arm diff --git a/src/profiling/ProfilingStateMachine.hpp b/src/profiling/ProfilingStateMachine.hpp index 1f6e358411..b507f1a50b 100644 --- a/src/profiling/ProfilingStateMachine.hpp +++ b/src/profiling/ProfilingStateMachine.hpp @@ -5,12 +5,12 @@ #pragma once -#include "ProfilingState.hpp" - -#include <atomic> +#include <client/include/ProfilingState.hpp> #include <common/include/IgnoreUnused.hpp> +#include <atomic> + namespace arm { diff --git a/src/profiling/ProfilingUtils.hpp b/src/profiling/ProfilingUtils.hpp index 593dd6b924..cd5167c094 100644 --- a/src/profiling/ProfilingUtils.hpp +++ b/src/profiling/ProfilingUtils.hpp @@ -5,14 +5,13 @@ #pragma once -#include <common/include/ICounterDirectory.hpp> -#include <common/include/ProfilingException.hpp> - -#include <armnn/profiling/ISendTimelinePacket.hpp> - #include "IPacketBuffer.hpp" +#include <client/include/ISendTimelinePacket.hpp> + +#include <common/include/ICounterDirectory.hpp> #include <common/include/Packet.hpp> +#include <common/include/ProfilingException.hpp> #include <algorithm> #include <cstring> diff --git a/src/profiling/RegisterBackendCounters.hpp b/src/profiling/RegisterBackendCounters.hpp index 3d3b11a626..f48f1ca8f0 100644 --- a/src/profiling/RegisterBackendCounters.hpp +++ b/src/profiling/RegisterBackendCounters.hpp @@ -5,10 +5,10 @@ #pragma once -#include "CounterIdMap.hpp" -#include "IProfilingService.hpp" +#include <client/include/CounterIdMap.hpp> +#include <client/include/IProfilingService.hpp> -#include "armnn/backends/profiling/IBackendProfiling.hpp" +#include <client/include/backends/IBackendProfiling.hpp> #include <common/include/CounterDirectory.hpp> diff --git a/src/profiling/RequestCounterDirectoryCommandHandler.hpp b/src/profiling/RequestCounterDirectoryCommandHandler.hpp index ee2874dfda..2582fb2e0a 100644 --- a/src/profiling/RequestCounterDirectoryCommandHandler.hpp +++ b/src/profiling/RequestCounterDirectoryCommandHandler.hpp @@ -5,10 +5,11 @@ #pragma once -#include "ISendCounterPacket.hpp" -#include "armnn/profiling/ISendTimelinePacket.hpp" #include "ProfilingStateMachine.hpp" +#include <client/include/ISendCounterPacket.hpp> +#include <client/include/ISendTimelinePacket.hpp> + #include <common/include/CommandHandlerFunctor.hpp> #include <common/include/Packet.hpp> diff --git a/src/profiling/SendCounterPacket.hpp b/src/profiling/SendCounterPacket.hpp index 047dd3c7c9..ace7ed1485 100644 --- a/src/profiling/SendCounterPacket.hpp +++ b/src/profiling/SendCounterPacket.hpp @@ -6,9 +6,10 @@ #pragma once #include "IBufferManager.hpp" -#include "ISendCounterPacket.hpp" #include "ProfilingUtils.hpp" +#include <client/include/ISendCounterPacket.hpp> + #include <type_traits> namespace arm diff --git a/src/profiling/SendThread.hpp b/src/profiling/SendThread.hpp index f68a74c1d3..b96a6d54f3 100644 --- a/src/profiling/SendThread.hpp +++ b/src/profiling/SendThread.hpp @@ -7,12 +7,13 @@ #include "IBufferManager.hpp" #include "IConsumer.hpp" -#include "ISendCounterPacket.hpp" #include "ISendThread.hpp" #include "IProfilingConnection.hpp" #include "ProfilingStateMachine.hpp" #include "ProfilingUtils.hpp" +#include <client/include/ISendCounterPacket.hpp> + #include <common/include/ICounterDirectory.hpp> #include <atomic> diff --git a/src/profiling/SendTimelinePacket.hpp b/src/profiling/SendTimelinePacket.hpp index ca3022fc4f..f20671fe35 100644 --- a/src/profiling/SendTimelinePacket.hpp +++ b/src/profiling/SendTimelinePacket.hpp @@ -6,9 +6,10 @@ #pragma once #include "IBufferManager.hpp" -#include "armnn/profiling/ISendTimelinePacket.hpp" #include "ProfilingUtils.hpp" +#include <client/include/ISendTimelinePacket.hpp> + #include <common/include/Assert.hpp> #include <memory> diff --git a/src/profiling/TimelinePacketWriterFactory.hpp b/src/profiling/TimelinePacketWriterFactory.hpp index 00550ee381..607770f723 100644 --- a/src/profiling/TimelinePacketWriterFactory.hpp +++ b/src/profiling/TimelinePacketWriterFactory.hpp @@ -6,7 +6,8 @@ #pragma once #include "IBufferManager.hpp" -#include "armnn/profiling/ISendTimelinePacket.hpp" + +#include <client/include/ISendTimelinePacket.hpp> #include <memory> diff --git a/src/profiling/TimelineUtilityMethods.cpp b/src/profiling/TimelineUtilityMethods.cpp index 9c7780e719..27c13caef2 100644 --- a/src/profiling/TimelineUtilityMethods.cpp +++ b/src/profiling/TimelineUtilityMethods.cpp @@ -2,7 +2,9 @@ // Copyright © 2019 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // -#include "TimelineUtilityMethods.hpp" +#include "ProfilingUtils.hpp" + +#include <client/include/TimelineUtilityMethods.hpp> #include <common/include/LabelsAndEventClasses.hpp> #include <common/include/Threads.hpp> diff --git a/src/profiling/TimelineUtilityMethods.hpp b/src/profiling/TimelineUtilityMethods.hpp deleted file mode 100644 index cfdc26a72b..0000000000 --- a/src/profiling/TimelineUtilityMethods.hpp +++ /dev/null @@ -1,98 +0,0 @@ -// -// Copyright © 2019 Arm Ltd and Contributors. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -#include "IProfilingService.hpp" -#include "armnn/profiling/ISendTimelinePacket.hpp" - -namespace arm -{ - -namespace pipe -{ - -class TimelineUtilityMethods -{ -public: - - // static factory method which will return a pointer to a timelie utility methods - // object if profiling is enabled. Otherwise will return a null unique_ptr - static std::unique_ptr<TimelineUtilityMethods> GetTimelineUtils(IProfilingService& profilingService); - - TimelineUtilityMethods( - std::unique_ptr<ISendTimelinePacket>& sendTimelinePacket) - : m_SendTimelinePacket(std::move(sendTimelinePacket)) {} - - TimelineUtilityMethods(TimelineUtilityMethods&& other) - : m_SendTimelinePacket(std::move(other.m_SendTimelinePacket)) {} - - TimelineUtilityMethods(const TimelineUtilityMethods& other) = delete; - - TimelineUtilityMethods& operator=(const TimelineUtilityMethods& other) = delete; - - TimelineUtilityMethods& operator=(TimelineUtilityMethods&& other) = default; - - ~TimelineUtilityMethods() = default; - - static void SendWellKnownLabelsAndEventClasses(ISendTimelinePacket& timelinePacket); - - ProfilingDynamicGuid CreateNamedTypedEntity(const std::string& name, const std::string& type); - - void CreateNamedTypedEntity(ProfilingGuid entityGuid, const std::string& name, const std::string& type); - - void CreateNamedTypedEntity(ProfilingGuid entityGuid, const std::string& name, ProfilingStaticGuid typeGuid); - - void MarkEntityWithLabel(ProfilingGuid entityGuid, const std::string& labelName, ProfilingStaticGuid labelLinkGuid); - - ProfilingStaticGuid DeclareLabel(const std::string& labelName); - - void NameEntity(ProfilingGuid entityGuid, const std::string& name); - - void TypeEntity(ProfilingGuid entityGuid, const std::string& type); - - ProfilingDynamicGuid CreateNamedTypedChildEntity(ProfilingGuid parentEntityGuid, - const std::string& entityName, - const std::string& entityType); - - void CreateNamedTypedChildEntity(ProfilingGuid entityGuid, - ProfilingGuid parentEntityGuid, - const std::string& entityName, - const std::string& entityType); - - void CreateNamedTypedChildEntity(ProfilingGuid entityGuid, - ProfilingGuid parentEntityGuid, - const std::string& entityName, - ProfilingStaticGuid typeGuid); - - ProfilingDynamicGuid CreateRelationship(ProfilingRelationshipType relationshipType, - ProfilingGuid headGuid, - ProfilingGuid tailGuid, - ProfilingGuid relationshipCategory); - - ProfilingDynamicGuid CreateConnectionRelationship(ProfilingRelationshipType relationshipType, - ProfilingGuid headGuid, - ProfilingGuid tailGuid); - - void CreateTypedEntity(ProfilingGuid entityGuid, ProfilingStaticGuid typeGuid); - - void MarkEntityWithType(ProfilingGuid entityGuid, ProfilingStaticGuid typeNameGuid); - - ProfilingDynamicGuid RecordEvent(ProfilingGuid entityGuid, ProfilingStaticGuid eventClassGuid); - - ProfilingDynamicGuid RecordWorkloadInferenceAndStartOfLifeEvent(ProfilingGuid workloadGuid, - ProfilingGuid inferenceGuid); - - void RecordEndOfLifeEvent(ProfilingGuid entityGuid); - - void Commit() { m_SendTimelinePacket->Commit(); } - -private: - std::unique_ptr<ISendTimelinePacket> m_SendTimelinePacket; -}; - -} // namespace pipe - -} // namespace arm diff --git a/src/profiling/backends/BackendProfiling.hpp b/src/profiling/backends/BackendProfiling.hpp index bedda5d763..8ca88d2012 100644 --- a/src/profiling/backends/BackendProfiling.hpp +++ b/src/profiling/backends/BackendProfiling.hpp @@ -6,7 +6,8 @@ #pragma once #include "ProfilingService.hpp" -#include <armnn/backends/profiling/IBackendProfiling.hpp> + +#include <client/include/backends/IBackendProfiling.hpp> namespace arm { diff --git a/src/profiling/test/PrintPacketHeaderHandler.hpp b/src/profiling/test/PrintPacketHeaderHandler.hpp index a05e733c07..c5f426c761 100644 --- a/src/profiling/test/PrintPacketHeaderHandler.hpp +++ b/src/profiling/test/PrintPacketHeaderHandler.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/profiling/ILocalPacketHandler.hpp> +#include <client/include/ILocalPacketHandler.hpp> #include <common/include/Packet.hpp> diff --git a/src/profiling/test/ProfilingMocks.hpp b/src/profiling/test/ProfilingMocks.hpp index 80ac1fed0e..6576a98521 100644 --- a/src/profiling/test/ProfilingMocks.hpp +++ b/src/profiling/test/ProfilingMocks.hpp @@ -5,9 +5,7 @@ #pragma once -#include <Holder.hpp> #include <IProfilingConnectionFactory.hpp> -#include <IProfilingServiceStatus.hpp> #include <ProfilingService.hpp> #include <ProfilingUtils.hpp> #include <SendCounterPacket.hpp> @@ -16,6 +14,9 @@ #include <armnn/BackendId.hpp> #include <armnn/profiling/ArmNNProfiling.hpp> +#include <client/include/Holder.hpp> +#include <client/include/IProfilingServiceStatus.hpp> + #include <common/include/Assert.hpp> #include <common/include/CommonProfilingUtils.hpp> #include <common/include/IgnoreUnused.hpp> diff --git a/src/profiling/test/ProfilingTests.cpp b/src/profiling/test/ProfilingTests.cpp index 22b2ae233a..6e1a5276ca 100644 --- a/src/profiling/test/ProfilingTests.cpp +++ b/src/profiling/test/ProfilingTests.cpp @@ -9,9 +9,6 @@ #include <ArmNNProfilingServiceInitialiser.hpp> #include <CommandHandler.hpp> #include <ConnectionAcknowledgedCommandHandler.hpp> -#include <CounterIdMap.hpp> -#include <Holder.hpp> -#include <ICounterValues.hpp> #include <PeriodicCounterCapture.hpp> #include <PeriodicCounterSelectionCommandHandler.hpp> #include <ProfilingStateMachine.hpp> @@ -27,10 +24,14 @@ #include <armnn/Utils.hpp> #include <armnn/profiling/ArmNNProfiling.hpp> -#include <armnn/profiling/ProfilingOptions.hpp> #include <backends/BackendProfiling.hpp> +#include <client/include/CounterIdMap.hpp> +#include <client/include/Holder.hpp> +#include <client/include/ICounterValues.hpp> +#include <client/include/ProfilingOptions.hpp> + #include <common/include/CommandHandlerKey.hpp> #include <common/include/CommandHandlerRegistry.hpp> #include <common/include/CounterDirectory.hpp> diff --git a/src/profiling/test/RequestCountersPacketHandler.hpp b/src/profiling/test/RequestCountersPacketHandler.hpp index 7068a4f253..08aeb26053 100644 --- a/src/profiling/test/RequestCountersPacketHandler.hpp +++ b/src/profiling/test/RequestCountersPacketHandler.hpp @@ -5,10 +5,11 @@ #pragma once -#include <armnn/profiling/ILocalPacketHandler.hpp> -#include <armnn/profiling/ProfilingOptions.hpp> #include "ProfilingUtils.hpp" +#include <client/include/ILocalPacketHandler.hpp> +#include <client/include/ProfilingOptions.hpp> + #include <common/include/Packet.hpp> namespace arm diff --git a/src/profiling/test/TestTimelinePacketHandler.hpp b/src/profiling/test/TestTimelinePacketHandler.hpp index 7166707e80..76d42f096f 100644 --- a/src/profiling/test/TestTimelinePacketHandler.hpp +++ b/src/profiling/test/TestTimelinePacketHandler.hpp @@ -5,16 +5,17 @@ #pragma once -#include <armnn/profiling/ILocalPacketHandler.hpp> -#include <server/include/timelineDecoder/ITimelineDecoder.hpp> - #include "ProfilingUtils.hpp" -#include <server/include/timelineDecoder/TimelineCaptureCommandHandler.hpp> -#include <server/include/timelineDecoder/TimelineDirectoryCaptureCommandHandler.hpp> #include "TimelineModel.hpp" +#include <client/include/ILocalPacketHandler.hpp> + #include <common/include/Packet.hpp> +#include <server/include/timelineDecoder/ITimelineDecoder.hpp> +#include <server/include/timelineDecoder/TimelineCaptureCommandHandler.hpp> +#include <server/include/timelineDecoder/TimelineDirectoryCaptureCommandHandler.hpp> + #include <condition_variable> #include <map> #include <mutex> @@ -89,4 +90,4 @@ private: } // namespace pipe -} // namespace arm
\ No newline at end of file +} // namespace arm diff --git a/src/profiling/test/TimelineUtilityMethodsTests.cpp b/src/profiling/test/TimelineUtilityMethodsTests.cpp index 66cb0e92e8..c4aa0575d6 100644 --- a/src/profiling/test/TimelineUtilityMethodsTests.cpp +++ b/src/profiling/test/TimelineUtilityMethodsTests.cpp @@ -8,11 +8,12 @@ #include <ArmNNProfilingServiceInitialiser.hpp> #include <SendTimelinePacket.hpp> -#include <TimelineUtilityMethods.hpp> #include <ProfilingService.hpp> #include <armnn/profiling/ArmNNProfiling.hpp> +#include <client/include/TimelineUtilityMethods.hpp> + #include <common/include/LabelsAndEventClasses.hpp> #include <memory> diff --git a/src/timelineDecoder/CMakeLists.txt b/src/timelineDecoder/CMakeLists.txt index af5addadfe..3aabf5be76 100644 --- a/src/timelineDecoder/CMakeLists.txt +++ b/src/timelineDecoder/CMakeLists.txt @@ -11,6 +11,7 @@ if(BUILD_TIMELINE_DECODER) include_directories(${PROJECT_SOURCE_DIR}/src/profiling ${PROJECT_SOURCE_DIR}/profiling/common/include + ${PROJECT_SOURCE_DIR}/profiling/client/include ${PROJECT_SOURCE_DIR}/profiling/server/include/timelineDecoder ${PROJECT_SOURCE_DIR}/src/armnnUtils) |