diff options
author | Cathal Corbett <cathal.corbett@arm.com> | 2022-02-25 15:33:28 +0000 |
---|---|---|
committer | Cathal Corbett <cathal.corbett@arm.com> | 2022-03-01 11:44:14 +0000 |
commit | 5aa9fd7ac6bf8dad576fa4a0a32aa3dae98d11ab (patch) | |
tree | 23a3a0d5ca5143924277f34c98d36cf7b99430a7 /profiling/common | |
parent | 1fc448ad2455ad31b96a3891f847125a3295d75a (diff) | |
download | armnn-5aa9fd7ac6bf8dad576fa4a0a32aa3dae98d11ab.tar.gz |
IVGCVSW-6704 Change the namespace from armnn::profiling to arm::pipe
* Updated ABI version to 29 due to being the first ABI break in 22.05
!android-nn-driver:7226
Signed-off-by: Cathal Corbett <cathal.corbett@arm.com>
Change-Id: I9c50007dcd5b5e792757e7bd1213606df5ffec36
Diffstat (limited to 'profiling/common')
-rw-r--r-- | profiling/common/include/IProfilingGuidGenerator.hpp | 8 | ||||
-rw-r--r-- | profiling/common/include/LabelsAndEventClasses.hpp | 8 | ||||
-rw-r--r-- | profiling/common/include/ProfilingGuid.hpp | 22 | ||||
-rw-r--r-- | profiling/common/include/ProfilingGuidGenerator.hpp | 8 | ||||
-rw-r--r-- | profiling/common/include/TargetEndianess.hpp | 12 | ||||
-rw-r--r-- | profiling/common/src/LabelsAndEventClasses.cpp | 8 |
6 files changed, 38 insertions, 28 deletions
diff --git a/profiling/common/include/IProfilingGuidGenerator.hpp b/profiling/common/include/IProfilingGuidGenerator.hpp index 34ee9673b5..2fdffc4499 100644 --- a/profiling/common/include/IProfilingGuidGenerator.hpp +++ b/profiling/common/include/IProfilingGuidGenerator.hpp @@ -9,10 +9,10 @@ #include <string> -namespace armnn +namespace arm { -namespace profiling +namespace pipe { class IProfilingGuidGenerator @@ -27,6 +27,6 @@ public: virtual ~IProfilingGuidGenerator() {} }; -} // namespace profiling +} // namespace pipe -} // namespace armnn +} // namespace arm diff --git a/profiling/common/include/LabelsAndEventClasses.hpp b/profiling/common/include/LabelsAndEventClasses.hpp index 8e3e0b0c67..0c43524294 100644 --- a/profiling/common/include/LabelsAndEventClasses.hpp +++ b/profiling/common/include/LabelsAndEventClasses.hpp @@ -9,10 +9,10 @@ #include "DllExport.hpp" -namespace armnn +namespace arm { -namespace profiling +namespace pipe { class LabelsAndEventClasses @@ -64,6 +64,6 @@ private: static ProfilingGuidGenerator m_GuidGenerator; }; -} // namespace profiling +} // namespace pipe -} // namespace armnn +} // namespace arm diff --git a/profiling/common/include/ProfilingGuid.hpp b/profiling/common/include/ProfilingGuid.hpp index 4d0dd9b3c9..fef17988e4 100644 --- a/profiling/common/include/ProfilingGuid.hpp +++ b/profiling/common/include/ProfilingGuid.hpp @@ -8,10 +8,10 @@ #include <memory> #include <stdint.h> -namespace armnn +namespace arm { -namespace profiling +namespace pipe { static constexpr uint64_t MIN_STATIC_GUID = 1llu << 63; @@ -70,11 +70,9 @@ struct ProfilingStaticGuid : public ProfilingGuid using ProfilingGuid::ProfilingGuid; }; -} // namespace profiling +} // namespace pipe - - -} // namespace armnn +} // namespace arm @@ -82,9 +80,9 @@ namespace std { /// make ProfilingGuid hashable template <> -struct hash<armnn::profiling::ProfilingGuid> +struct hash<arm::pipe::ProfilingGuid> { - std::size_t operator()(armnn::profiling::ProfilingGuid const& guid) const noexcept + std::size_t operator()(arm::pipe::ProfilingGuid const& guid) const noexcept { return hash<uint64_t>()(uint64_t(guid)); } @@ -92,9 +90,9 @@ struct hash<armnn::profiling::ProfilingGuid> /// make ProfilingDynamicGuid hashable template <> -struct hash<armnn::profiling::ProfilingDynamicGuid> +struct hash<arm::pipe::ProfilingDynamicGuid> { - std::size_t operator()(armnn::profiling::ProfilingDynamicGuid const& guid) const noexcept + std::size_t operator()(arm::pipe::ProfilingDynamicGuid const& guid) const noexcept { return hash<uint64_t>()(uint64_t(guid)); } @@ -102,9 +100,9 @@ struct hash<armnn::profiling::ProfilingDynamicGuid> /// make ProfilingStaticGuid hashable template <> -struct hash<armnn::profiling::ProfilingStaticGuid> +struct hash<arm::pipe::ProfilingStaticGuid> { - std::size_t operator()(armnn::profiling::ProfilingStaticGuid const& guid) const noexcept + std::size_t operator()(arm::pipe::ProfilingStaticGuid const& guid) const noexcept { return hash<uint64_t>()(uint64_t(guid)); } diff --git a/profiling/common/include/ProfilingGuidGenerator.hpp b/profiling/common/include/ProfilingGuidGenerator.hpp index 2b7302bd61..bfee7642e9 100644 --- a/profiling/common/include/ProfilingGuidGenerator.hpp +++ b/profiling/common/include/ProfilingGuidGenerator.hpp @@ -11,10 +11,10 @@ #include <functional> #include <mutex> -namespace armnn +namespace arm { -namespace profiling +namespace pipe { class ProfilingGuidGenerator : public IProfilingGuidGenerator @@ -57,6 +57,6 @@ private: std::mutex m_SequenceMutex; }; -} // namespace profiling +} // namespace pipe -} // namespace armnn +} // namespace arm diff --git a/profiling/common/include/TargetEndianess.hpp b/profiling/common/include/TargetEndianess.hpp new file mode 100644 index 0000000000..8ee8db1d34 --- /dev/null +++ b/profiling/common/include/TargetEndianess.hpp @@ -0,0 +1,12 @@ +// +// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +enum class TargetEndianness +{ + BeWire, + LeWire +};
\ No newline at end of file diff --git a/profiling/common/src/LabelsAndEventClasses.cpp b/profiling/common/src/LabelsAndEventClasses.cpp index fe6d119c2f..b476ddd2f3 100644 --- a/profiling/common/src/LabelsAndEventClasses.cpp +++ b/profiling/common/src/LabelsAndEventClasses.cpp @@ -5,10 +5,10 @@ #include "LabelsAndEventClasses.hpp" -namespace armnn +namespace arm { -namespace profiling +namespace pipe { ProfilingGuidGenerator LabelsAndEventClasses::m_GuidGenerator; @@ -74,6 +74,6 @@ ProfilingStaticGuid LabelsAndEventClasses::ARMNN_PROFILING_EOL_EVENT_CLASS_NAME_ ProfilingStaticGuid LabelsAndEventClasses::ARMNN_PROFILING_EOL_EVENT_CLASS( m_GuidGenerator.GenerateStaticId("ARMNN_PROFILING_EOL")); -} // namespace profiling +} // namespace pipe -} // namespace armnn +} // namespace arm |