IVGCVSW-3808 Deprecation notices for old ElementwiseBinary layers

 * Added Deprecation notices for old ElementwiseBinary layers.

Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: Iebbbaff38cc9c347b25eb2f9054c914a4f931c68

2 files changed, 25 insertions, 1 deletions

diff --git a/src/backends/neon/NeonBackend.cpp b/src/backends/neon/NeonBackend.cpp
index cea2aa3eba..c68f4ce95b 100644
--- a/src/backends/neon/NeonBackend.cpp
+++ b/src/backends/neon/NeonBackend.cpp
@@ -313,6 +313,7 @@ OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph
                             }
                             else if (base.GetType() == LayerType::Addition)
                             {
+                                ARMNN_NO_DEPRECATE_WARN_BEGIN
                                 AdditionLayer* baseLayer = PolymorphicDowncast<AdditionLayer*>(&base);
 
                                 arm_compute::Status status = NeonAdditionWorkloadValidate(
@@ -331,9 +332,11 @@ OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph
                                     untouched.erase(baseLayer->GetGuid());
                                     untouched.erase(activationLayer->GetGuid());
                                 }
+                                ARMNN_NO_DEPRECATE_WARN_END
                             }
                             else if (base.GetType() == LayerType::Division)
                             {
+                                ARMNN_NO_DEPRECATE_WARN_BEGIN
                                 DivisionLayer* baseLayer = PolymorphicDowncast<DivisionLayer*>(&base);
 
                                 arm_compute::Status status = NeonDivisionWorkloadValidate(
@@ -352,9 +355,11 @@ OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph
                                     untouched.erase(baseLayer->GetGuid());
                                     untouched.erase(activationLayer->GetGuid());
                                 }
+                                ARMNN_NO_DEPRECATE_WARN_END
                             }
                             else if (base.GetType() == LayerType::Multiplication)
                             {
+                                ARMNN_NO_DEPRECATE_WARN_BEGIN
                                 MultiplicationLayer* baseLayer = PolymorphicDowncast<MultiplicationLayer*>(&base);
 
                                 arm_compute::Status status = NeonMultiplicationWorkloadValidate(
@@ -373,9 +378,11 @@ OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph
                                     untouched.erase(baseLayer->GetGuid());
                                     untouched.erase(activationLayer->GetGuid());
                                 }
+                                ARMNN_NO_DEPRECATE_WARN_END
                             }
                             else if (base.GetType() == LayerType::Subtraction)
                             {
+                                ARMNN_NO_DEPRECATE_WARN_BEGIN
                                 SubtractionLayer* baseLayer = PolymorphicDowncast<SubtractionLayer*>(&base);
 
                                 arm_compute::Status status = NeonSubtractionWorkloadValidate(
@@ -394,6 +401,7 @@ OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph
                                     untouched.erase(baseLayer->GetGuid());
                                     untouched.erase(activationLayer->GetGuid());
                                 }
+                                ARMNN_NO_DEPRECATE_WARN_END
                             }
                             else if (base.GetType() == LayerType::ElementwiseBinary)
                             {
diff --git a/src/backends/neon/test/NeonCreateWorkloadTests.cpp b/src/backends/neon/test/NeonCreateWorkloadTests.cpp
index 66718cc481..19881c26a0 100644
--- a/src/backends/neon/test/NeonCreateWorkloadTests.cpp
+++ b/src/backends/neon/test/NeonCreateWorkloadTests.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright © 2017 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2017-2023 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 
@@ -128,70 +128,86 @@ TEST_CASE("CreateAdditionFloat16Workload")
 
 TEST_CASE("CreateAdditionFloatWorkload")
 {
+    ARMNN_NO_DEPRECATE_WARN_BEGIN
     NeonCreateElementwiseWorkloadTest<NeonAdditionWorkload,
                                       AdditionQueueDescriptor,
                                       AdditionLayer,
                                       DataType::Float32>();
+    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC
 TEST_CASE("CreateSubtractionFloat16Workload")
 {
+    ARMNN_NO_DEPRECATE_WARN_BEGIN
     NeonCreateElementwiseWorkloadTest<NeonSubtractionWorkload,
                                       SubtractionQueueDescriptor,
                                       SubtractionLayer,
                                       DataType::Float16>();
+    ARMNN_NO_DEPRECATE_WARN_END
 }
 #endif
 
 TEST_CASE("CreateSubtractionFloatWorkload")
 {
+    ARMNN_NO_DEPRECATE_WARN_BEGIN
     NeonCreateElementwiseWorkloadTest<NeonSubtractionWorkload,
                                       SubtractionQueueDescriptor,
                                       SubtractionLayer,
                                       DataType::Float32>();
+    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 TEST_CASE("CreateSubtractionUint8Workload")
 {
+    ARMNN_NO_DEPRECATE_WARN_BEGIN
     NeonCreateElementwiseWorkloadTest<NeonSubtractionWorkload,
                                       SubtractionQueueDescriptor,
                                       SubtractionLayer,
                                       DataType::QAsymmU8>();
+    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC
 TEST_CASE("CreateMultiplicationFloat16Workload")
 {
+    ARMNN_NO_DEPRECATE_WARN_BEGIN
     NeonCreateElementwiseWorkloadTest<NeonMultiplicationWorkload,
                                       MultiplicationQueueDescriptor,
                                       MultiplicationLayer,
                                       DataType::Float16>();
+    ARMNN_NO_DEPRECATE_WARN_END
 }
 #endif
 
 TEST_CASE("CreateMultiplicationFloatWorkload")
 {
+    ARMNN_NO_DEPRECATE_WARN_BEGIN
     NeonCreateElementwiseWorkloadTest<NeonMultiplicationWorkload,
                                       MultiplicationQueueDescriptor,
                                       MultiplicationLayer,
                                       DataType::Float32>();
+    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 TEST_CASE("CreateMultiplicationUint8Workload")
 {
+    ARMNN_NO_DEPRECATE_WARN_BEGIN
     NeonCreateElementwiseWorkloadTest<NeonMultiplicationWorkload,
                                       MultiplicationQueueDescriptor,
                                       MultiplicationLayer,
                                       DataType::QAsymmU8>();
+    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 TEST_CASE("CreateDivisionFloatWorkloadTest")
 {
+    ARMNN_NO_DEPRECATE_WARN_BEGIN
     NeonCreateElementwiseWorkloadTest<NeonDivisionWorkload,
                                       DivisionQueueDescriptor,
                                       DivisionLayer,
                                       armnn::DataType::Float32>();
+    ARMNN_NO_DEPRECATE_WARN_END
 }
 
 template <typename BatchNormalizationWorkloadType, typename armnn::DataType DataType>