IVGCVSW-6847 replace armnn:Optional with arm::pipe::Optional in profi…

…ling code Change-Id: I048c538d4f8c21770aec2b2751c934d9fa15a4dc Signed-off-by: Jim Flynn <jim.flynn@arm.com>
ARM-software · Mar 14, 2022 · decd08b · decd08b
1 parent 77b284e
commit decd08b
Show file tree

Hide file tree

Showing 30 changed files with 656 additions and 328 deletions.
diff --git a/include/armnn/backends/profiling/IBackendProfiling.hpp b/include/armnn/backends/profiling/IBackendProfiling.hpp
@@ -4,11 +4,10 @@
 //
 #pragma once
 
-#include <armnn/Optional.hpp>
-
 #include <armnn/profiling/ISendTimelinePacket.hpp>
 
 #include <common/include/IProfilingGuidGenerator.hpp>
+#include <common/include/Optional.hpp>
 
 #include <memory>
 #include <vector>
@@ -56,25 +55,25 @@ class IRegisterBackendCounters
 
     virtual uint16_t RegisterDevice(const std::string& deviceName,
                                     uint16_t cores = 0,
-                                    const armnn::Optional<std::string>& parentCategoryName
-                                        = armnn::EmptyOptional()) = 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 armnn::Optional<std::string>& parentCategoryName
-                                            = armnn::EmptyOptional()) = 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 armnn::Optional<std::string>& units      = armnn::EmptyOptional(),
-                                     const armnn::Optional<uint16_t>& numberOfCores = armnn::EmptyOptional(),
-                                     const armnn::Optional<uint16_t>& deviceUid     = armnn::EmptyOptional(),
-                                     const armnn::Optional<uint16_t>& counterSetUid = armnn::EmptyOptional()) = 0;
+        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() {}
 };

diff --git a/include/armnn/backends/profiling/IBackendProfilingContext.hpp b/include/armnn/backends/profiling/IBackendProfilingContext.hpp
@@ -18,8 +18,8 @@ class IBackendProfilingContext
     virtual ~IBackendProfilingContext()
     {}
     virtual uint16_t RegisterCounters(uint16_t currentMaxGlobalCounterID) = 0;
-    virtual armnn::Optional<std::string> ActivateCounters(uint32_t capturePeriod, const std::vector<uint16_t>&
-        counterIds) = 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;

diff --git a/include/armnnTestUtils/MockBackend.hpp b/include/armnnTestUtils/MockBackend.hpp
@@ -162,19 +162,19 @@ class MockBackendProfilingContext : public arm::pipe::IBackendProfilingContext
         return nextMaxGlobalCounterId;
     }
 
-    Optional<std::string> ActivateCounters(uint32_t capturePeriod, const std::vector<uint16_t>& counterIds)
+    arm::pipe::Optional<std::string> ActivateCounters(uint32_t capturePeriod, const std::vector<uint16_t>& counterIds)
     {
         if (capturePeriod == 0 || counterIds.size() == 0)
         {
             m_ActiveCounters.clear();
         }
         else if (capturePeriod == 15939u)
         {
-            return armnn::Optional<std::string>("ActivateCounters example test error");
+            return arm::pipe::Optional<std::string>("ActivateCounters example test error");
         }
         m_CapturePeriod  = capturePeriod;
         m_ActiveCounters = counterIds;
-        return armnn::Optional<std::string>();
+        return arm::pipe::Optional<std::string>();
     }
 
     std::vector<arm::pipe::Timestamp> ReportCounterValues()