Fix Unittest failures in CL Master

* This change is caused by ACL patch: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5855

Signed-off-by: Nikhil Raj <nikhil.raj@arm.com>
Change-Id: I222ff6dea155be38899145a5d096093db1b5e716

3 files changed, 11 insertions, 4 deletions

diff --git a/scripts/get_compute_library.sh b/scripts/get_compute_library.sh
index fefce7dd31..956e4827cb 100755
--- a/scripts/get_compute_library.sh
+++ b/scripts/get_compute_library.sh
@@ -10,7 +10,7 @@ CMD=$( basename $0 )
 #DEFAULT_CLFRAMEWORKREVISION="branches/arm_compute_21_05" # Release 21.05
 #
 # For pinning to a revision use this:
-DEFAULT_CLFRAMEWORKREVISION="08302c17cd57356b35d46e17dc8d8f76672da5cf" #Add CPU discovery capabilities.
+DEFAULT_CLFRAMEWORKREVISION="24b892072a2bd8190ba63d09fb0082113d7d032a" #Port NECol2ImKernel.
 
 usage() {
     echo "Usage: $CMD (Use the default clframework SHA)"
diff --git a/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp b/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp
index 92c8e14e4b..c4c9f7f31c 100644
--- a/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp
+++ b/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp
@@ -259,6 +259,12 @@ void RunSoftmaxProfilerJsonPrinterTest(const std::vector<armnn::BackendId>& back
     }
     else if (firstBackend == armnn::Compute::CpuAcc)
     {
-        CHECK(result.find("NeonKernelTimer/: CpuLogitsDLogSoftmaxKernel_#") != std::string::npos);
+        CHECK(result.find("NeonKernelTimer") != std::string::npos);     // Validate backend
+
+        bool softmaxCheck = ((result.find("softmax") != std::string::npos) ||            // Validate softmax
+                             (result.find("Softmax") != std::string::npos) ||
+                             (result.find("SoftMax") != std::string::npos));
+        CHECK(softmaxCheck);
+
     }
 }
diff --git a/src/backends/neon/test/NeonTimerTest.cpp b/src/backends/neon/test/NeonTimerTest.cpp
index d2bb97c056..87e15679df 100644
--- a/src/backends/neon/test/NeonTimerTest.cpp
+++ b/src/backends/neon/test/NeonTimerTest.cpp
@@ -105,8 +105,9 @@ TEST_CASE("NeonTimerMeasure")
     std::ostringstream oss_cpu;
     oss_neon << "NeonKernelTimer/" << measurements.size()-1 << ": NEActivationLayerKernel";
     oss_cpu << "NeonKernelTimer/" << measurements.size()-1 << ": CpuActivationKernel";
-    CHECK((measurements[measurements.size()-1].m_Name == oss_neon.str() ||
-                measurements[measurements.size()-1].m_Name == oss_cpu.str()));
+    bool kernelCheck = ((measurements[measurements.size()-1].m_Name.find(oss_neon.str()) != std::string::npos)
+                        || (measurements[measurements.size()-1].m_Name.find(oss_cpu.str()) != std::string::npos));
+    CHECK(kernelCheck);
     CHECK(measurements[measurements.size()-1].m_Value > 0.0);
 }