diff options
author | Jim Flynn <jim.flynn@arm.com> | 2022-03-20 21:52:17 +0000 |
---|---|---|
committer | Jim Flynn <jim.flynn@arm.com> | 2022-03-23 20:32:03 +0000 |
commit | 277618302d0f131eac0b6ac2015dd3eb09aa6ff9 (patch) | |
tree | e468fa1362640484b508812596fb5c1b62186882 /include/armnn/backends | |
parent | a3bc0b4976395226c0fa0898b26098c4534edbdb (diff) | |
download | armnn-277618302d0f131eac0b6ac2015dd3eb09aa6ff9.tar.gz |
IVGCVSW-6706 Move headers to profiling/client/include
!android-nn-driver:7337
Change-Id: Ide401623829cc99fb9b51e9bbce3482ce706a8dd
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'include/armnn/backends')
-rw-r--r-- | include/armnn/backends/IBackendInternal.hpp | 5 | ||||
-rw-r--r-- | include/armnn/backends/Workload.hpp | 3 | ||||
-rw-r--r-- | include/armnn/backends/profiling/IBackendProfiling.hpp | 106 | ||||
-rw-r--r-- | include/armnn/backends/profiling/IBackendProfilingContext.hpp | 30 |
4 files changed, 5 insertions, 139 deletions
diff --git a/include/armnn/backends/IBackendInternal.hpp b/include/armnn/backends/IBackendInternal.hpp index 06fa5edde8..98f0eaacd7 100644 --- a/include/armnn/backends/IBackendInternal.hpp +++ b/include/armnn/backends/IBackendInternal.hpp @@ -16,8 +16,9 @@ #include <armnn/backends/ITensorHandleFactory.hpp> #include <armnn/backends/OptimizationViews.hpp> #include <armnn/backends/SubgraphView.hpp> -#include <armnn/backends/profiling/IBackendProfiling.hpp> -#include <armnn/backends/profiling/IBackendProfilingContext.hpp> + +#include <client/include/backends/IBackendProfiling.hpp> +#include <client/include/backends/IBackendProfilingContext.hpp> #include <vector> #include <memory> diff --git a/include/armnn/backends/Workload.hpp b/include/armnn/backends/Workload.hpp index e180577ffe..d426486f89 100644 --- a/include/armnn/backends/Workload.hpp +++ b/include/armnn/backends/Workload.hpp @@ -12,7 +12,8 @@ #include <armnn/Logging.hpp> #include <Profiling.hpp> -#include <IProfilingService.hpp> + +#include <client/include/IProfilingService.hpp> #include <algorithm> diff --git a/include/armnn/backends/profiling/IBackendProfiling.hpp b/include/armnn/backends/profiling/IBackendProfiling.hpp deleted file mode 100644 index 9affab2ade..0000000000 --- a/include/armnn/backends/profiling/IBackendProfiling.hpp +++ /dev/null @@ -1,106 +0,0 @@ -// -// Copyright © 2020 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// -#pragma once - -#include <armnn/profiling/ISendTimelinePacket.hpp> - -#include <common/include/IProfilingGuidGenerator.hpp> -#include <common/include/Optional.hpp> - -#include <memory> -#include <vector> - -namespace arm -{ - -namespace pipe -{ - -struct CounterValue -{ - CounterValue(uint16_t id, uint32_t value) : - counterId(id), counterValue(value) {} - uint16_t counterId; - uint32_t counterValue; -}; - -struct Timestamp -{ - uint64_t timestamp; - std::vector<CounterValue> counterValues; -}; - -struct CounterStatus -{ - CounterStatus(uint16_t backendCounterId, - uint16_t globalCounterId, - bool enabled, - uint32_t samplingRateInMicroseconds) - : m_BackendCounterId(backendCounterId), - m_GlobalCounterId(globalCounterId), - m_Enabled(enabled), - m_SamplingRateInMicroseconds(samplingRateInMicroseconds) {} - uint16_t m_BackendCounterId; - uint16_t m_GlobalCounterId; - bool m_Enabled; - uint32_t m_SamplingRateInMicroseconds; -}; - -class IRegisterBackendCounters -{ -public: - virtual void RegisterCategory(const std::string& categoryName) = 0; - - virtual uint16_t RegisterDevice(const std::string& deviceName, - uint16_t cores = 0, - const arm::pipe::Optional<std::string>& parentCategoryName - = arm::pipe::EmptyOptional()) = 0; - - virtual uint16_t RegisterCounterSet(const std::string& counterSetName, - uint16_t count = 0, - const arm::pipe::Optional<std::string>& parentCategoryName - = arm::pipe::EmptyOptional()) = 0; - - virtual uint16_t RegisterCounter(const uint16_t uid, - const std::string& parentCategoryName, - uint16_t counterClass, - uint16_t interpolation, - double multiplier, - const std::string& name, - const std::string& description, - const arm::pipe::Optional<std::string>& units = arm::pipe::EmptyOptional(), - const arm::pipe::Optional<uint16_t>& numberOfCores = arm::pipe::EmptyOptional(), - const arm::pipe::Optional<uint16_t>& deviceUid = arm::pipe::EmptyOptional(), - const arm::pipe::Optional<uint16_t>& counterSetUid = arm::pipe::EmptyOptional()) = 0; - - virtual ~IRegisterBackendCounters() {} -}; - -class IBackendProfiling -{ -public: - virtual ~IBackendProfiling() - {} - - virtual std::unique_ptr<IRegisterBackendCounters> - GetCounterRegistrationInterface(uint16_t currentMaxGlobalCounterID) = 0; - - virtual std::unique_ptr<ISendTimelinePacket> GetSendTimelinePacket() = 0; - - virtual IProfilingGuidGenerator& GetProfilingGuidGenerator() = 0; - - virtual void ReportCounters(const std::vector<Timestamp>& counterValues) = 0; - - virtual CounterStatus GetCounterStatus(uint16_t backendCounterId) = 0; - - virtual std::vector<CounterStatus> GetActiveCounters() = 0; - - virtual bool IsProfilingEnabled() const = 0; - -}; - -} // namespace pipe - -} // namespace arm diff --git a/include/armnn/backends/profiling/IBackendProfilingContext.hpp b/include/armnn/backends/profiling/IBackendProfilingContext.hpp deleted file mode 100644 index a1ed05e43d..0000000000 --- a/include/armnn/backends/profiling/IBackendProfilingContext.hpp +++ /dev/null @@ -1,30 +0,0 @@ -// -// Copyright © 2020 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// -#pragma once - -#include "IBackendProfiling.hpp" -#include <vector> - -namespace arm -{ -namespace pipe -{ - -class IBackendProfilingContext -{ -public: - virtual ~IBackendProfilingContext() - {} - virtual uint16_t RegisterCounters(uint16_t currentMaxGlobalCounterID) = 0; - virtual arm::pipe::Optional<std::string> ActivateCounters( - uint32_t capturePeriod, const std::vector<uint16_t>& counterIds) = 0; - virtual std::vector<Timestamp> ReportCounterValues() = 0; - virtual bool EnableProfiling(bool flag) = 0; - virtual bool EnableTimelineReporting(bool flag) = 0; -}; - -using IBackendProfilingContextUniquePtr = std::unique_ptr<IBackendProfilingContext>; -} // namespace pipe -} // namespace arm |