aboutsummaryrefslogtreecommitdiff
path: root/src/backends
diff options
context:
space:
mode:
Diffstat (limited to 'src/backends')
-rw-r--r--src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp8
-rw-r--r--src/backends/neon/test/NeonTimerTest.cpp5
2 files changed, 10 insertions, 3 deletions
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);
}