commit 060bad50ff29af335deaae8ca5692a653984d2fd
author Narumol Prangnawarat <narumol.prangnawarat@arm.com> Fri Nov 20 16:17:48 2020 +0000
committer Narumol Prangnawarat <narumol.prangnawarat@arm.com> Mon Nov 23 12:54:23 2020 +0000
tree 4c074b55cf9cb05f70c6ac15a3b6051e7a9cc6a1
parent 1672542bcbfdffadef15f7e844236a1a3da089b5

IVGCVSW-5569 Fix Unittest failure while building using EthosNAcc backend

 * Correct the id when EthosN is enable

Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: I5203e615f809e56c7597ffeeec56b5ad38d4ff17

src/backends/backendsCommon/test/BackendProfilingTests.cpp

diff --git a/src/backends/backendsCommon/test/BackendProfilingTests.cpp b/src/backends/backendsCommon/test/BackendProfilingTests.cpp
index 377ca22..4b0d26e 100644
--- a/src/backends/backendsCommon/test/BackendProfilingTests.cpp
+++ b/src/backends/backendsCommon/test/BackendProfilingTests.cpp
@@ -123,15 +123,22 @@
     // Create a runtime
     armnn::Runtime runtime(options);
 
+    unsigned int shiftedId = 0;
+
+#if defined(ETHOSN_SUPPORT_ENABLED)
+    // Shift the id as ETHOSN is enabled.
+    shiftedId = 4;
+#endif
+
     // Check if the MockBackends 3 dummy counters {0, 1, 2-5 (four cores)} are registered
     armnn::BackendId mockId = armnn::MockBackendId();
     const armnn::profiling::ICounterMappings& counterMap = GetProfilingService(&runtime).GetCounterMappings();
-    BOOST_CHECK(counterMap.GetGlobalId(0, mockId) == 5);
-    BOOST_CHECK(counterMap.GetGlobalId(1, mockId) == 6);
-    BOOST_CHECK(counterMap.GetGlobalId(2, mockId) == 7);
-    BOOST_CHECK(counterMap.GetGlobalId(3, mockId) == 8);
-    BOOST_CHECK(counterMap.GetGlobalId(4, mockId) == 9);
-    BOOST_CHECK(counterMap.GetGlobalId(5, mockId) == 10);
+    BOOST_CHECK(counterMap.GetGlobalId(0, mockId) == 5 + shiftedId);
+    BOOST_CHECK(counterMap.GetGlobalId(1, mockId) == 6 + shiftedId);
+    BOOST_CHECK(counterMap.GetGlobalId(2, mockId) == 7 + shiftedId);
+    BOOST_CHECK(counterMap.GetGlobalId(3, mockId) == 8 + shiftedId);
+    BOOST_CHECK(counterMap.GetGlobalId(4, mockId) == 9 + shiftedId);
+    BOOST_CHECK(counterMap.GetGlobalId(5, mockId) == 10 + shiftedId);
     options.m_ProfilingOptions.m_EnableProfiling = false;
     GetProfilingService(&runtime).ResetExternalProfilingOptions(options.m_ProfilingOptions, true);
 }