From: Matthew Bentham <matthew.bentham@arm.com>
Date: Mon, 10 Dec 2018 13:14:37 +0000 (+0000)
Subject: IVGCVSW-2346 Fix test wrt NEFillBorderKernel
X-Git-Tag: submit/tizen/20200316.035456~1006
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=679efdae8319ec15058725ed41a23a5463644e07;p=platform%2Fupstream%2Farmnn.git

IVGCVSW-2346 Fix test wrt NEFillBorderKernel

NEFillBorderKernel may not be issued for some activation workloads
depending on the version of the Compute Library.

Change-Id: I01b8960f9eb7a0192cd351eddbb416ac05248b34
---

diff --git a/src/backends/neon/test/NeonTimerTest.cpp b/src/backends/neon/test/NeonTimerTest.cpp
index 3503c96..6f54147 100644
--- a/src/backends/neon/test/NeonTimerTest.cpp
+++ b/src/backends/neon/test/NeonTimerTest.cpp
@@ -98,11 +98,14 @@ BOOST_AUTO_TEST_CASE(NeonTimerMeasure)
 
     std::vector<Measurement> measurements = neonTimer.GetMeasurements();
 
-    BOOST_CHECK_EQUAL(measurements.size(), 2);
-    BOOST_CHECK_EQUAL(measurements[0].m_Name, "NeonKernelTimer/0: NEFillBorderKernel");
-    BOOST_CHECK(measurements[0].m_Value > 0.0);
-    BOOST_CHECK_EQUAL(measurements[1].m_Name, "NeonKernelTimer/1: NEActivationLayerKernel");
-    BOOST_CHECK(measurements[1].m_Value > 0.0);
+    BOOST_CHECK(measurements.size() <= 2);
+    if (measurements.size() > 1)
+    {
+        BOOST_CHECK_EQUAL(measurements[0].m_Name, "NeonKernelTimer/0: NEFillBorderKernel");
+        BOOST_CHECK(measurements[0].m_Value > 0.0);
+    }
+    BOOST_CHECK_EQUAL(measurements[measurements.size()-1].m_Name, "NeonKernelTimer/1: NEActivationLayerKernel");
+    BOOST_CHECK(measurements[measurements.size()-1].m_Value > 0.0);
 }
 
 BOOST_AUTO_TEST_SUITE_END()