From 85ad78c1d44b749ad7a1d09c26c3d7f7f35a3f3d Mon Sep 17 00:00:00 2001 From: Narumol Prangnawarat Date: Mon, 18 Nov 2019 15:34:23 +0000 Subject: IVGCVSW-4068 Add Guid to Workload * Add Guid to Workload * Remove circular dependency Signed-off-by: Narumol Prangnawarat Signed-off-by: janeil01 Change-Id: I15342fa7481c6bdc050e057dce2d74bba07fe2dd --- src/armnn/Runtime.cpp | 2 +- src/backends/aclCommon/CMakeLists.txt | 1 + src/backends/aclCommon/test/CMakeLists.txt | 1 + src/backends/backendsCommon/CMakeLists.txt | 1 + src/backends/backendsCommon/Workload.hpp | 10 +++++++++- src/backends/backendsCommon/test/CMakeLists.txt | 17 +++++++++++++++++ src/backends/cl/CMakeLists.txt | 2 ++ src/backends/cl/test/CMakeLists.txt | 1 + src/backends/cl/workloads/CMakeLists.txt | 1 + src/backends/dynamic/reference/CMakeLists.txt | 1 + src/backends/neon/CMakeLists.txt | 1 + src/backends/neon/test/CMakeLists.txt | 1 + src/backends/neon/workloads/CMakeLists.txt | 1 + src/backends/reference/CMakeLists.txt | 1 + src/backends/reference/test/CMakeLists.txt | 1 + src/backends/reference/workloads/CMakeLists.txt | 1 + src/profiling/IProfilingConnectionFactory.hpp | 4 ++-- src/profiling/ProfilingConnectionFactory.hpp | 4 ---- src/profiling/ProfilingService.hpp | 2 +- src/profiling/test/ProfilingTests.hpp | 1 + src/profiling/test/SendTimelinePacketTests.cpp | 4 ++-- tests/profiling/gatordmock/tests/GatordMockTests.cpp | 2 +- 22 files changed, 48 insertions(+), 12 deletions(-) diff --git a/src/armnn/Runtime.cpp b/src/armnn/Runtime.cpp index c95b2c45e2..4dd5a22320 100644 --- a/src/armnn/Runtime.cpp +++ b/src/armnn/Runtime.cpp @@ -10,7 +10,7 @@ #include #include -#include "../profiling/ProfilingService.hpp" +#include #include diff --git a/src/backends/aclCommon/CMakeLists.txt b/src/backends/aclCommon/CMakeLists.txt index d518c5e305..d4ff541985 100644 --- a/src/backends/aclCommon/CMakeLists.txt +++ b/src/backends/aclCommon/CMakeLists.txt @@ -20,3 +20,4 @@ add_library(armnnAclCommon OBJECT ${armnnAclCommon_sources}) target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) diff --git a/src/backends/aclCommon/test/CMakeLists.txt b/src/backends/aclCommon/test/CMakeLists.txt index 7ba9306cd1..087e56669b 100644 --- a/src/backends/aclCommon/test/CMakeLists.txt +++ b/src/backends/aclCommon/test/CMakeLists.txt @@ -14,3 +14,4 @@ add_library(armnnAclCommonUnitTests OBJECT ${armnnAclCommonUnitTests_sources}) target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) diff --git a/src/backends/backendsCommon/CMakeLists.txt b/src/backends/backendsCommon/CMakeLists.txt index 8c1cdce587..93f7545f91 100644 --- a/src/backends/backendsCommon/CMakeLists.txt +++ b/src/backends/backendsCommon/CMakeLists.txt @@ -54,3 +54,4 @@ add_library(armnnBackendsCommon OBJECT ${armnnBackendsCommon_sources}) target_include_directories(armnnBackendsCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnBackendsCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) target_include_directories(armnnBackendsCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(armnnBackendsCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) diff --git a/src/backends/backendsCommon/Workload.hpp b/src/backends/backendsCommon/Workload.hpp index 3efd7dbfd4..b5851ad7b9 100644 --- a/src/backends/backendsCommon/Workload.hpp +++ b/src/backends/backendsCommon/Workload.hpp @@ -7,7 +7,9 @@ #include "WorkloadData.hpp" #include "WorkloadInfo.hpp" +#include #include +#include #include @@ -23,6 +25,8 @@ public: virtual void PostAllocationConfigure() = 0; virtual void Execute() const = 0; + virtual profiling::ProfilingGuid GetGuid() const = 0; + virtual void RegisterDebugCallback(const DebugCallbackFunction& func) {} }; @@ -40,7 +44,8 @@ class BaseWorkload : public IWorkload public: BaseWorkload(const QueueDescriptor& descriptor, const WorkloadInfo& info) - : m_Data(descriptor) + : m_Data(descriptor), + m_Guid(profiling::ProfilingService::Instance().NextGuid()) { m_Data.Validate(info); } @@ -49,8 +54,11 @@ public: const QueueDescriptor& GetData() const { return m_Data; } + profiling::ProfilingGuid GetGuid() const final { return m_Guid; } + protected: const QueueDescriptor m_Data; + const profiling::ProfilingGuid m_Guid; }; // TypedWorkload used diff --git a/src/backends/backendsCommon/test/CMakeLists.txt b/src/backends/backendsCommon/test/CMakeLists.txt index 69e4fa0c13..82df782317 100644 --- a/src/backends/backendsCommon/test/CMakeLists.txt +++ b/src/backends/backendsCommon/test/CMakeLists.txt @@ -157,6 +157,7 @@ add_library(armnnBackendsCommonUnitTests OBJECT ${armnnBackendsCommonUnitTests_s target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) # Dummy shared object for testing. # This is a simple library used to test the utility functions that will be used to handle the shared objects. @@ -183,6 +184,7 @@ add_library_ex(ValidTestDynamicBackend MODULE ${testDynamicBackend_sources}) target_compile_definitions(ValidTestDynamicBackend PRIVATE -DVALID_TEST_DYNAMIC_BACKEND_1) target_include_directories(ValidTestDynamicBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(ValidTestDynamicBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(ValidTestDynamicBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_link_libraries(ValidTestDynamicBackend armnn) set_target_properties(ValidTestDynamicBackend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -190,6 +192,7 @@ add_library_ex(InvalidTestDynamicBackend1 MODULE ${testDynamicBackend_sources}) target_compile_definitions(InvalidTestDynamicBackend1 PRIVATE -DINVALID_TEST_DYNAMIC_BACKEND_1) target_include_directories(InvalidTestDynamicBackend1 PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(InvalidTestDynamicBackend1 PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(InvalidTestDynamicBackend1 PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_link_libraries(InvalidTestDynamicBackend1 armnn) set_target_properties(InvalidTestDynamicBackend1 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -197,6 +200,7 @@ add_library_ex(InvalidTestDynamicBackend2 MODULE ${testDynamicBackend_sources}) target_compile_definitions(InvalidTestDynamicBackend2 PRIVATE -DINVALID_TEST_DYNAMIC_BACKEND_2) target_include_directories(InvalidTestDynamicBackend2 PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(InvalidTestDynamicBackend2 PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(InvalidTestDynamicBackend2 PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_link_libraries(InvalidTestDynamicBackend2 armnn) set_target_properties(InvalidTestDynamicBackend2 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -204,6 +208,7 @@ add_library_ex(InvalidTestDynamicBackend3 MODULE ${testDynamicBackend_sources}) target_compile_definitions(InvalidTestDynamicBackend3 PRIVATE -DINVALID_TEST_DYNAMIC_BACKEND_3) target_include_directories(InvalidTestDynamicBackend3 PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(InvalidTestDynamicBackend3 PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(InvalidTestDynamicBackend3 PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_link_libraries(InvalidTestDynamicBackend3 armnn) set_target_properties(InvalidTestDynamicBackend3 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -211,6 +216,7 @@ add_library_ex(InvalidTestDynamicBackend4 MODULE ${testDynamicBackend_sources}) target_compile_definitions(InvalidTestDynamicBackend4 PRIVATE -DINVALID_TEST_DYNAMIC_BACKEND_4) target_include_directories(InvalidTestDynamicBackend4 PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(InvalidTestDynamicBackend4 PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(InvalidTestDynamicBackend4 PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_link_libraries(InvalidTestDynamicBackend4 armnn) set_target_properties(InvalidTestDynamicBackend4 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -218,6 +224,7 @@ add_library_ex(InvalidTestDynamicBackend5 MODULE ${testDynamicBackend_sources}) target_compile_definitions(InvalidTestDynamicBackend5 PRIVATE -DINVALID_TEST_DYNAMIC_BACKEND_5) target_include_directories(InvalidTestDynamicBackend5 PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(InvalidTestDynamicBackend5 PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(InvalidTestDynamicBackend5 PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_link_libraries(InvalidTestDynamicBackend5 armnn) set_target_properties(InvalidTestDynamicBackend5 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -225,6 +232,7 @@ add_library_ex(InvalidTestDynamicBackend6 MODULE ${testDynamicBackend_sources}) target_compile_definitions(InvalidTestDynamicBackend6 PRIVATE -DINVALID_TEST_DYNAMIC_BACKEND_6) target_include_directories(InvalidTestDynamicBackend6 PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(InvalidTestDynamicBackend6 PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(InvalidTestDynamicBackend6 PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_link_libraries(InvalidTestDynamicBackend6 armnn) set_target_properties(InvalidTestDynamicBackend6 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -232,6 +240,7 @@ add_library_ex(InvalidTestDynamicBackend7 MODULE ${testDynamicBackend_sources}) target_compile_definitions(InvalidTestDynamicBackend7 PRIVATE -DINVALID_TEST_DYNAMIC_BACKEND_7) target_include_directories(InvalidTestDynamicBackend7 PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(InvalidTestDynamicBackend7 PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(InvalidTestDynamicBackend7 PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_link_libraries(InvalidTestDynamicBackend7 armnn) set_target_properties(InvalidTestDynamicBackend7 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -278,6 +287,7 @@ add_library_ex(Arm_TestValid2_backend MODULE ${testDynamicBackend_sources}) target_compile_definitions(Arm_TestValid2_backend PRIVATE -DVALID_TEST_DYNAMIC_BACKEND_2) target_include_directories(Arm_TestValid2_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) 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_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) @@ -288,6 +298,7 @@ add_library_ex(Arm_TestValid3_backend MODULE ${testDynamicBackend_sources}) target_compile_definitions(Arm_TestValid3_backend PRIVATE -DVALID_TEST_DYNAMIC_BACKEND_3) target_include_directories(Arm_TestValid3_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) 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_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) @@ -296,6 +307,7 @@ add_library_ex(Arm_TestInvalid8_backend MODULE ${testDynamicBackend_sources}) target_compile_definitions(Arm_TestInvalid8_backend PRIVATE -DINVALID_TEST_DYNAMIC_BACKEND_8) target_include_directories(Arm_TestInvalid8_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) 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_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) @@ -304,6 +316,7 @@ add_library_ex(Arm_TestValid4_backend MODULE ${testDynamicBackend_sources}) target_compile_definitions(Arm_TestValid4_backend PRIVATE -DVALID_TEST_DYNAMIC_BACKEND_4) target_include_directories(Arm_TestValid4_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) 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_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) @@ -312,6 +325,7 @@ add_library_ex(Arm_TestValid5_backend MODULE ${testDynamicBackend_sources}) target_compile_definitions(Arm_TestValid5_backend PRIVATE -DVALID_TEST_DYNAMIC_BACKEND_5) target_include_directories(Arm_TestValid5_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) 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_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) @@ -320,6 +334,7 @@ add_library_ex(Arm_TestInvalid9_backend MODULE ${testDynamicBackend_sources}) target_compile_definitions(Arm_TestInvalid9_backend PRIVATE -DINVALID_TEST_DYNAMIC_BACKEND_9) target_include_directories(Arm_TestInvalid9_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) 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_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) @@ -328,6 +343,7 @@ add_library_ex(Arm_TestInvalid10_backend MODULE ${testDynamicBackend_sources}) target_compile_definitions(Arm_TestInvalid10_backend PRIVATE -DINVALID_TEST_DYNAMIC_BACKEND_10) target_include_directories(Arm_TestInvalid10_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) 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_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) @@ -336,6 +352,7 @@ add_library_ex(Arm_TestInvalid11_backend MODULE ${testDynamicBackend_sources}) target_compile_definitions(Arm_TestInvalid11_backend PRIVATE -DINVALID_TEST_DYNAMIC_BACKEND_11) target_include_directories(Arm_TestInvalid11_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) 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_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/cl/CMakeLists.txt b/src/backends/cl/CMakeLists.txt index ad4a15f2e8..64b04636f7 100644 --- a/src/backends/cl/CMakeLists.txt +++ b/src/backends/cl/CMakeLists.txt @@ -42,3 +42,5 @@ add_library(armnnClBackend OBJECT ${armnnClBackend_sources}) target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) + diff --git a/src/backends/cl/test/CMakeLists.txt b/src/backends/cl/test/CMakeLists.txt index 8f608d1ade..f900fc55ef 100644 --- a/src/backends/cl/test/CMakeLists.txt +++ b/src/backends/cl/test/CMakeLists.txt @@ -27,3 +27,4 @@ add_library(armnnClBackendUnitTests OBJECT ${armnnClBackendUnitTests_sources}) target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) diff --git a/src/backends/cl/workloads/CMakeLists.txt b/src/backends/cl/workloads/CMakeLists.txt index 94c4a3e967..c844512af7 100644 --- a/src/backends/cl/workloads/CMakeLists.txt +++ b/src/backends/cl/workloads/CMakeLists.txt @@ -102,3 +102,4 @@ add_library(armnnClBackendWorkloads OBJECT ${armnnClBackendWorkloads_sources}) target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) diff --git a/src/backends/dynamic/reference/CMakeLists.txt b/src/backends/dynamic/reference/CMakeLists.txt index 6c040ecc81..006c7ebb70 100644 --- a/src/backends/dynamic/reference/CMakeLists.txt +++ b/src/backends/dynamic/reference/CMakeLists.txt @@ -25,5 +25,6 @@ add_library(Arm_CpuRef_backend MODULE ${armnnRefDynamicBackend_sources} ${RefBac target_include_directories(Arm_CpuRef_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(Arm_CpuRef_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) target_include_directories(Arm_CpuRef_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(Arm_CpuRef_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) 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 f99f1ac3e7..f7b065069b 100644 --- a/src/backends/neon/CMakeLists.txt +++ b/src/backends/neon/CMakeLists.txt @@ -40,3 +40,4 @@ add_library(armnnNeonBackend OBJECT ${armnnNeonBackend_sources}) target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) diff --git a/src/backends/neon/test/CMakeLists.txt b/src/backends/neon/test/CMakeLists.txt index 56d745c2ec..35920c18c2 100644 --- a/src/backends/neon/test/CMakeLists.txt +++ b/src/backends/neon/test/CMakeLists.txt @@ -25,3 +25,4 @@ add_library(armnnNeonBackendUnitTests OBJECT ${armnnNeonBackendUnitTests_sources target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) diff --git a/src/backends/neon/workloads/CMakeLists.txt b/src/backends/neon/workloads/CMakeLists.txt index 19ac9c9d00..cf3789e5ac 100644 --- a/src/backends/neon/workloads/CMakeLists.txt +++ b/src/backends/neon/workloads/CMakeLists.txt @@ -98,3 +98,4 @@ add_library(armnnNeonBackendWorkloads OBJECT ${armnnNeonBackendWorkloads_sources target_include_directories(armnnNeonBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnNeonBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) target_include_directories(armnnNeonBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(armnnNeonBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) diff --git a/src/backends/reference/CMakeLists.txt b/src/backends/reference/CMakeLists.txt index a6c76c113e..0dbaa339c5 100644 --- a/src/backends/reference/CMakeLists.txt +++ b/src/backends/reference/CMakeLists.txt @@ -39,3 +39,4 @@ add_library(armnnRefBackend OBJECT ${armnnRefBackend_sources}) target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) diff --git a/src/backends/reference/test/CMakeLists.txt b/src/backends/reference/test/CMakeLists.txt index 2a7aa1501a..191325db83 100644 --- a/src/backends/reference/test/CMakeLists.txt +++ b/src/backends/reference/test/CMakeLists.txt @@ -22,3 +22,4 @@ add_library(armnnRefBackendUnitTests OBJECT ${armnnRefBackendUnitTests_sources}) target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) diff --git a/src/backends/reference/workloads/CMakeLists.txt b/src/backends/reference/workloads/CMakeLists.txt index 29abfedcef..dbbdd89fd4 100644 --- a/src/backends/reference/workloads/CMakeLists.txt +++ b/src/backends/reference/workloads/CMakeLists.txt @@ -174,3 +174,4 @@ add_library(armnnRefBackendWorkloads OBJECT ${armnnRefBackendWorkloads_sources}) target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) +target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) diff --git a/src/profiling/IProfilingConnectionFactory.hpp b/src/profiling/IProfilingConnectionFactory.hpp index 173421092e..c2bbc70d8b 100644 --- a/src/profiling/IProfilingConnectionFactory.hpp +++ b/src/profiling/IProfilingConnectionFactory.hpp @@ -7,7 +7,7 @@ #include "IProfilingConnection.hpp" -#include +#include #include @@ -20,7 +20,7 @@ namespace profiling class IProfilingConnectionFactory { public: - using ExternalProfilingOptions = Runtime::CreationOptions::ExternalProfilingOptions; + using ExternalProfilingOptions = IRuntime::CreationOptions::ExternalProfilingOptions; using IProfilingConnectionPtr = std::unique_ptr; virtual ~IProfilingConnectionFactory() {} diff --git a/src/profiling/ProfilingConnectionFactory.hpp b/src/profiling/ProfilingConnectionFactory.hpp index b3a1658548..c6d4c6faf0 100644 --- a/src/profiling/ProfilingConnectionFactory.hpp +++ b/src/profiling/ProfilingConnectionFactory.hpp @@ -7,10 +7,6 @@ #include "IProfilingConnectionFactory.hpp" -#include - -#include - namespace armnn { diff --git a/src/profiling/ProfilingService.hpp b/src/profiling/ProfilingService.hpp index d4ff9085f5..ee199d55ab 100644 --- a/src/profiling/ProfilingService.hpp +++ b/src/profiling/ProfilingService.hpp @@ -30,7 +30,7 @@ namespace profiling class ProfilingService : public IReadWriteCounterValues, public IProfilingGuidGenerator { public: - using ExternalProfilingOptions = Runtime::CreationOptions::ExternalProfilingOptions; + using ExternalProfilingOptions = IRuntime::CreationOptions::ExternalProfilingOptions; using IProfilingConnectionFactoryPtr = std::unique_ptr; using IProfilingConnectionPtr = std::unique_ptr; using CounterIndices = std::vector*>; diff --git a/src/profiling/test/ProfilingTests.hpp b/src/profiling/test/ProfilingTests.hpp index 21c98723be..86b5c315e2 100644 --- a/src/profiling/test/ProfilingTests.hpp +++ b/src/profiling/test/ProfilingTests.hpp @@ -12,6 +12,7 @@ #include #include +#include #include #include diff --git a/src/profiling/test/SendTimelinePacketTests.cpp b/src/profiling/test/SendTimelinePacketTests.cpp index 771e117955..8071eece7d 100644 --- a/src/profiling/test/SendTimelinePacketTests.cpp +++ b/src/profiling/test/SendTimelinePacketTests.cpp @@ -410,7 +410,7 @@ BOOST_AUTO_TEST_CASE(SendTimelinePacketTests3) BOOST_AUTO_TEST_CASE(GetGuidsFromProfilingService) { - armnn::Runtime::CreationOptions::ExternalProfilingOptions options; + armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; options.m_EnableProfiling = true; ProfilingService& profilingService = ProfilingService::Instance(); profilingService.ResetExternalProfilingOptions(options, true); @@ -429,7 +429,7 @@ BOOST_AUTO_TEST_CASE(GetGuidsFromProfilingService) BOOST_AUTO_TEST_CASE(GetTimelinePackerWriterFromProfilingService) { - armnn::Runtime::CreationOptions::ExternalProfilingOptions options; + armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; options.m_EnableProfiling = true; ProfilingService& profilingService = ProfilingService::Instance(); profilingService.ResetExternalProfilingOptions(options, true); diff --git a/tests/profiling/gatordmock/tests/GatordMockTests.cpp b/tests/profiling/gatordmock/tests/GatordMockTests.cpp index 26c0361200..017a95c99f 100644 --- a/tests/profiling/gatordmock/tests/GatordMockTests.cpp +++ b/tests/profiling/gatordmock/tests/GatordMockTests.cpp @@ -141,7 +141,7 @@ BOOST_AUTO_TEST_CASE(GatorDMockEndToEnd) mockService.OpenListeningSocket(udsNamespace); // Enable the profiling service. - armnn::Runtime::CreationOptions::ExternalProfilingOptions options; + armnn::IRuntime::CreationOptions::ExternalProfilingOptions options; options.m_EnableProfiling = true; profiling::ProfilingService& profilingService = profiling::ProfilingService::Instance(); profilingService.ResetExternalProfilingOptions(options, true); -- cgit v1.2.1