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
diff --git a/profiling/common/include/IProfilingGuidGenerator.hpp b/profiling/common/include/IProfilingGuidGenerator.hpp
index 34ee967..2fdffc4 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 @@
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 8e3e0b0..0c43524 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 @@
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 4d0dd9b..fef1798 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 @@
using ProfilingGuid::ProfilingGuid;
};
-} // namespace profiling
+} // namespace pipe
-
-
-} // namespace armnn
+} // namespace arm
@@ -82,9 +80,9 @@
{
/// 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 @@
/// 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 @@
/// 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 2b7302b..bfee764 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 @@
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 0000000..8ee8db1
--- /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 fe6d119..b476ddd 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(
m_GuidGenerator.GenerateStaticId("ARMNN_PROFILING_EOL"));
-} // namespace profiling
+} // namespace pipe
-} // namespace armnn
+} // namespace arm