commit 5aa9fd7ac6bf8dad576fa4a0a32aa3dae98d11ab
author Cathal Corbett <cathal.corbett@arm.com> Fri Feb 25 15:33:28 2022 +0000
committer Cathal Corbett <cathal.corbett@arm.com> Tue Mar 01 11:44:14 2022 +0000
tree 23a3a0d5ca5143924277f34c98d36cf7b99430a7
parent 1fc448ad2455ad31b96a3891f847125a3295d75a

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

src/profiling/test/TimelineUtilityMethodsTests.cpp

diff --git a/src/profiling/test/TimelineUtilityMethodsTests.cpp b/src/profiling/test/TimelineUtilityMethodsTests.cpp
index 47e1182..b0b7bff 100644
--- a/src/profiling/test/TimelineUtilityMethodsTests.cpp
+++ b/src/profiling/test/TimelineUtilityMethodsTests.cpp
@@ -17,7 +17,7 @@
 #include <doctest/doctest.h>
 
 using namespace armnn;
-using namespace armnn::profiling;
+using namespace arm::pipe;
 
 TEST_SUITE("TimelineUtilityMethodsTests")
 {
@@ -214,20 +214,20 @@
     profilingService.NextGuid();
 
     CHECK_THROWS_AS(timelineUtilityMethods.CreateNamedTypedChildEntity(parentEntityGuid, "", entityType),
-                      InvalidArgumentException);
+                      arm::pipe::InvalidArgumentException);
     CHECK_THROWS_AS(timelineUtilityMethods.CreateNamedTypedChildEntity(parentEntityGuid, entityName, ""),
-                      InvalidArgumentException);
+                    arm::pipe::InvalidArgumentException);
     CHECK_THROWS_AS(timelineUtilityMethods.CreateNamedTypedChildEntity(
-        childEntityGuid, parentEntityGuid, "", entityType), InvalidArgumentException);
+        childEntityGuid, parentEntityGuid, "", entityType), arm::pipe::InvalidArgumentException);
     CHECK_THROWS_AS(timelineUtilityMethods.CreateNamedTypedChildEntity(
-        childEntityGuid, parentEntityGuid, entityName, ""), InvalidArgumentException);
+        childEntityGuid, parentEntityGuid, entityName, ""), arm::pipe::InvalidArgumentException);
 
     CHECK_NOTHROW(childEntityGuid = timelineUtilityMethods.CreateNamedTypedChildEntity(parentEntityGuid,
                                                                                               entityName,
                                                                                               entityType));
     CHECK(childEntityGuid != ProfilingGuid(0));
 
-    // Commit all packets at once
+    // Commit all packets at onceTimelineUtilityMethodsTests.cpp
     timelineUtilityMethods.Commit();
 
     // Get the readable buffer
@@ -296,7 +296,7 @@
     profilingService.NextGuid();
 
     // Try declaring an invalid (empty) label
-    CHECK_THROWS_AS(timelineUtilityMethods.DeclareLabel(""), InvalidArgumentException);
+    CHECK_THROWS_AS(timelineUtilityMethods.DeclareLabel(""), arm::pipe::InvalidArgumentException);
 
     // Try declaring an invalid (wrong SWTrace format) label
     CHECK_THROWS_AS(timelineUtilityMethods.DeclareLabel("inv@lid lab€l"), RuntimeException);
@@ -322,20 +322,20 @@
     TimelineUtilityMethods timelineUtilityMethods(sendTimelinePacket);
 
     // Invalid name
-    CHECK_THROWS_AS(timelineUtilityMethods.CreateNamedTypedEntity("", "Type"), InvalidArgumentException);
+    CHECK_THROWS_AS(timelineUtilityMethods.CreateNamedTypedEntity("", "Type"), arm::pipe::InvalidArgumentException);
 
     // Invalid type
-    CHECK_THROWS_AS(timelineUtilityMethods.CreateNamedTypedEntity("Name", ""), InvalidArgumentException);
+    CHECK_THROWS_AS(timelineUtilityMethods.CreateNamedTypedEntity("Name", ""), arm::pipe::InvalidArgumentException);
 
     ProfilingDynamicGuid guid = profilingService.NextGuid();
 
     // CreatedNamedTypedEntity with Guid - Invalid name
     CHECK_THROWS_AS(timelineUtilityMethods.CreateNamedTypedEntity(guid, "", "Type"),
-                      InvalidArgumentException);
+                    arm::pipe::InvalidArgumentException);
 
     // CreatedNamedTypedEntity with Guid - Invalid type
     CHECK_THROWS_AS(timelineUtilityMethods.CreateNamedTypedEntity(guid, "Name", ""),
-                      InvalidArgumentException);
+                    arm::pipe::InvalidArgumentException);
 
 }