From 4cbcb840caca1346de5f2271b67e4ede17b72734 Mon Sep 17 00:00:00 2001
From: alerah01 <alex.rahlis@arm.com>
Date: Mon, 28 Feb 2022 06:38:08 +0200
Subject: Removing SVE / SVE2 guards from decoupled kernels

Jira: COMPMID-5172

Signed-off-by: alerah01 <alex.rahlis@arm.com>
Change-Id: I1b9ace8e573f85830f29728a27adfe39a0cab113
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/7241
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
---
 src/cpu/kernels/elementwise_unary/generic/sve/fp16.cpp    | 4 ++--
 src/cpu/kernels/elementwise_unary/generic/sve/fp32.cpp    | 3 +--
 src/cpu/kernels/elementwise_unary/generic/sve/impl.cpp    | 3 +--
 src/cpu/kernels/elementwise_unary/generic/sve/impl.h      | 4 ++--
 src/cpu/kernels/elementwise_unary/generic/sve/integer.cpp | 3 +--
 5 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/cpu/kernels/elementwise_unary')

diff --git a/src/cpu/kernels/elementwise_unary/generic/sve/fp16.cpp b/src/cpu/kernels/elementwise_unary/generic/sve/fp16.cpp
index 4dd4a1905c..ba29b3d855 100644
--- a/src/cpu/kernels/elementwise_unary/generic/sve/fp16.cpp
+++ b/src/cpu/kernels/elementwise_unary/generic/sve/fp16.cpp
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#if defined(ARM_COMPUTE_ENABLE_SVE)
+#if defined(__ARM_FEATURE_FP16_VECTOR_ARITHMETIC) && defined(ENABLE_FP16_KERNELS)
 #include "arm_compute/core/Helpers.h"
 #include "src/cpu/kernels/elementwise_unary/generic/sve/impl.h"
 
@@ -35,4 +35,4 @@ void sve_fp16_elementwise_unary(const ITensor *in, ITensor *out, const Window &w
 }
 }
 } // namespace arm_compute
-#endif //defined(ARM_COMPUTE_ENABLE_SVE)
+#endif /* defined(__ARM_FEATURE_FP16_VECTOR_ARITHMETIC) && defined(ENABLE_FP16_KERNELS) */
\ No newline at end of file
diff --git a/src/cpu/kernels/elementwise_unary/generic/sve/fp32.cpp b/src/cpu/kernels/elementwise_unary/generic/sve/fp32.cpp
index 3498a0b1ea..c5222c5e4e 100644
--- a/src/cpu/kernels/elementwise_unary/generic/sve/fp32.cpp
+++ b/src/cpu/kernels/elementwise_unary/generic/sve/fp32.cpp
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#if defined(ARM_COMPUTE_ENABLE_SVE)
+
 #include "arm_compute/core/Helpers.h"
 #include "src/cpu/kernels/elementwise_unary/generic/sve/impl.h"
 
@@ -35,4 +35,3 @@ void sve_fp32_elementwise_unary(const ITensor *in, ITensor *out, const Window &w
 }
 }
 } // namespace arm_compute
-#endif //ARM_COMPUTE_ENABLE_SVE
diff --git a/src/cpu/kernels/elementwise_unary/generic/sve/impl.cpp b/src/cpu/kernels/elementwise_unary/generic/sve/impl.cpp
index 0c04a56be0..a948862906 100644
--- a/src/cpu/kernels/elementwise_unary/generic/sve/impl.cpp
+++ b/src/cpu/kernels/elementwise_unary/generic/sve/impl.cpp
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#if defined(ARM_COMPUTE_ENABLE_SVE)
+
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/utils/misc/Traits.h"
 #include "src/core/NEON/wrapper/intrinsics/intrinsics.h"
@@ -106,4 +106,3 @@ template void elementwise_sve_op<int32_t>(const ITensor *in, ITensor *out, const
 
 } // namespace cpu
 } // namespace arm_compute
-#endif //defined(ARM_COMPUTE_ENABLE_SVE)
diff --git a/src/cpu/kernels/elementwise_unary/generic/sve/impl.h b/src/cpu/kernels/elementwise_unary/generic/sve/impl.h
index 08f4438696..f2068dc63f 100644
--- a/src/cpu/kernels/elementwise_unary/generic/sve/impl.h
+++ b/src/cpu/kernels/elementwise_unary/generic/sve/impl.h
@@ -23,7 +23,7 @@
  */
 #ifndef SRC_CORE_SVE_KERNELS_ELEMENTWISE_UNARY_LIST_H
 #define SRC_CORE_SVE_KERNELS_ELEMENTWISE_UNARY_LIST_H
-#if defined(ARM_COMPUTE_ENABLE_SVE)
+
 namespace arm_compute
 {
 namespace cpu
@@ -32,5 +32,5 @@ template <typename ScalarType>
 void elementwise_sve_op(const ITensor *in, ITensor *out, const Window &window, ElementWiseUnary op);
 } // namespace cpu
 } // namespace arm_compute
-#endif // defined(ARM_COMPUTE_ENABLE_SVE)
+
 #endif // SRC_CORE_NEON_KERNELS_ELEMENTWISE_UNARY_LIST_H
\ No newline at end of file
diff --git a/src/cpu/kernels/elementwise_unary/generic/sve/integer.cpp b/src/cpu/kernels/elementwise_unary/generic/sve/integer.cpp
index c3e3adfc9e..984056a426 100644
--- a/src/cpu/kernels/elementwise_unary/generic/sve/integer.cpp
+++ b/src/cpu/kernels/elementwise_unary/generic/sve/integer.cpp
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#if defined(ARM_COMPUTE_ENABLE_SVE)
+
 #include "arm_compute/core/Helpers.h"
 #include "src/cpu/kernels/elementwise_unary/generic/sve/impl.h"
 
@@ -35,4 +35,3 @@ void sve_s32_elementwise_unary(const ITensor *in, ITensor *out, const Window &wi
 }
 }
 } // namespace arm_compute
-#endif //ARM_COMPUTE_ENABLE_SVE
-- 
cgit v1.2.1