commit 07df3d4b85f42245abf97e1a889e1fb3ef8af359
author morgolock <pablo.tello@arm.com> Thu Feb 27 11:46:28 2020 +0000
committer Pablo Marquez <pablo.tello@arm.com> Fri Feb 28 11:29:30 2020 +0000
tree 243f111c776d2e19fbdd555ccef28e5369705b41
parent cd5b4a30d4208f9eadce7e9942526e000f72ee97

COMPMID-3079: Implement Hard-Swish in NEON.

Change-Id: I019e36f65b4d821009bada9c6cdebc096d893b54
Signed-off-by: morgolock <pablo.tello@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/2802
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>

tests/validation/NEON/ActivationLayer.cpp

diff --git a/tests/validation/NEON/ActivationLayer.cpp b/tests/validation/NEON/ActivationLayer.cpp
index 1b92789..e3082cb 100644
--- a/tests/validation/NEON/ActivationLayer.cpp
+++ b/tests/validation/NEON/ActivationLayer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 ARM Limited.
+ * Copyright (c) 2017-2020 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -117,8 +117,10 @@
     DataType::F32,
 });
 
+const auto NeonActivationFunctionsDataset = concat(datasets::ActivationFunctions(), framework::dataset::make("ActivationFunction", ActivationLayerInfo::ActivationFunction::HARD_SWISH) );
+
 /** Input data sets. */
-const auto ActivationDataset = combine(combine(framework::dataset::make("InPlace", { false, true }), datasets::ActivationFunctions()), framework::dataset::make("AlphaBeta", { 0.5f, 1.f }));
+const auto ActivationDataset = combine(combine(framework::dataset::make("InPlace", { false, true }), NeonActivationFunctionsDataset), framework::dataset::make("AlphaBeta", { 0.5f, 1.f }));
 } // namespace
 
 TEST_SUITE(NEON)

tests/validation/reference/ActivationLayer.h

diff --git a/tests/validation/reference/ActivationLayer.h b/tests/validation/reference/ActivationLayer.h
index cd861d7..f41e871 100644
--- a/tests/validation/reference/ActivationLayer.h
+++ b/tests/validation/reference/ActivationLayer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 ARM Limited.
+ * Copyright (c) 2017-2020 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -81,6 +81,9 @@
         case ActivationLayerInfo::ActivationFunction::IDENTITY:
             ret = x;
             break;
+        case ActivationLayerInfo::ActivationFunction::HARD_SWISH:
+            ret = x * ((std::min(std::max((x + 3), 0.0f), 6.0f)) * 0.166666667f);
+            break;
         default:
             ARM_COMPUTE_ERROR("Unsupported activation function");
             break;