From 4cbcb840caca1346de5f2271b67e4ede17b72734 Mon Sep 17 00:00:00 2001 From: alerah01 Date: Mon, 28 Feb 2022 06:38:08 +0200 Subject: Removing SVE / SVE2 guards from decoupled kernels Jira: COMPMID-5172 Signed-off-by: alerah01 Change-Id: I1b9ace8e573f85830f29728a27adfe39a0cab113 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/7241 Tested-by: Arm Jenkins Reviewed-by: Giorgio Arena Comments-Addressed: Arm Jenkins --- src/cpu/kernels/softmax/generic/sve/fp16.cpp | 4 ++-- src/cpu/kernels/softmax/generic/sve/fp32.cpp | 3 +-- src/cpu/kernels/softmax/generic/sve/impl.cpp | 3 +-- src/cpu/kernels/softmax/generic/sve/impl.h | 2 -- src/cpu/kernels/softmax/generic/sve/qasymm8.cpp | 3 +-- src/cpu/kernels/softmax/generic/sve/qasymm8_signed.cpp | 3 +-- src/cpu/kernels/softmax/generic/sve2/qasymm8.cpp | 3 +-- src/cpu/kernels/softmax/generic/sve2/qasymm8_signed.cpp | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) (limited to 'src/cpu/kernels/softmax') diff --git a/src/cpu/kernels/softmax/generic/sve/fp16.cpp b/src/cpu/kernels/softmax/generic/sve/fp16.cpp index 89be6c5244..7aefcb1441 100644 --- a/src/cpu/kernels/softmax/generic/sve/fp16.cpp +++ b/src/cpu/kernels/softmax/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/softmax/generic/sve/impl.h" namespace arm_compute @@ -40,4 +40,4 @@ void sve_fp16_logits(const ITensor *in, ITensor *out, const Window &window) } } } // namespace arm_compute -#endif //ARM_COMPUTE_ENABLE_SVE +#endif /* defined(__ARM_FEATURE_FP16_VECTOR_ARITHMETIC) && defined(ENABLE_FP16_KERNELS) */ diff --git a/src/cpu/kernels/softmax/generic/sve/fp32.cpp b/src/cpu/kernels/softmax/generic/sve/fp32.cpp index 79130bf35b..55c4aee426 100644 --- a/src/cpu/kernels/softmax/generic/sve/fp32.cpp +++ b/src/cpu/kernels/softmax/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/softmax/generic/sve/impl.h" @@ -41,4 +41,3 @@ void sve_fp32_logits(const ITensor *in, ITensor *out, const Window &window) } } } // namespace arm_compute -#endif //ARM_COMPUTE_ENABLE_SVE diff --git a/src/cpu/kernels/softmax/generic/sve/impl.cpp b/src/cpu/kernels/softmax/generic/sve/impl.cpp index f17e50e77d..f1442224e8 100644 --- a/src/cpu/kernels/softmax/generic/sve/impl.cpp +++ b/src/cpu/kernels/softmax/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 "src/cpu/kernels/softmax/generic/sve/impl.h" #include "src/core/NEON/wrapper/intrinsics/intrinsics.h" @@ -176,4 +176,3 @@ template void sve_softmax_logits_1d_float(const ITensor *in, const IT ITensor *out, const float beta, bool is_log, const Window &window); } // namespace cpu } // namespace arm_compute -#endif /* defined(ARM_COMPUTE_ENABLE_SVE) */ diff --git a/src/cpu/kernels/softmax/generic/sve/impl.h b/src/cpu/kernels/softmax/generic/sve/impl.h index 1051f59ff5..4f76ec6a26 100644 --- a/src/cpu/kernels/softmax/generic/sve/impl.h +++ b/src/cpu/kernels/softmax/generic/sve/impl.h @@ -24,7 +24,6 @@ #ifndef SRC_CORE_SVE_KERNELS_SOFTMAX_IMPL_H #define SRC_CORE_SVE_KERNELS_SOFTMAX_IMPL_H -#if defined(ARM_COMPUTE_ENABLE_SVE) #include "arm_compute/core/Helpers.h" namespace arm_compute { @@ -38,6 +37,5 @@ void sve_softmax_logits_1d_float(const ITensor *in, const ITensor *max, void *co ITensor *out, const float beta, bool is_log, const Window &window); } // namespace cpu } // namespace arm_compute -#endif /* defined(ARM_COMPUTE_ENABLE_SVE) */ #endif /* SRC_CORE_SVE_KERNELS_SOFTMAX_IMPL_H */ diff --git a/src/cpu/kernels/softmax/generic/sve/qasymm8.cpp b/src/cpu/kernels/softmax/generic/sve/qasymm8.cpp index 62afe4bf74..e9044d5fc9 100644 --- a/src/cpu/kernels/softmax/generic/sve/qasymm8.cpp +++ b/src/cpu/kernels/softmax/generic/sve/qasymm8.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/softmax/generic/sve/impl.h" @@ -35,4 +35,3 @@ void sve_qasymm8_logits(const ITensor *in, ITensor *out, const Window &window) } } } // namespace arm_compute -#endif //defined(ARM_COMPUTE_ENABLE_SVE) diff --git a/src/cpu/kernels/softmax/generic/sve/qasymm8_signed.cpp b/src/cpu/kernels/softmax/generic/sve/qasymm8_signed.cpp index 5547cc902f..ab45ce598d 100644 --- a/src/cpu/kernels/softmax/generic/sve/qasymm8_signed.cpp +++ b/src/cpu/kernels/softmax/generic/sve/qasymm8_signed.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/softmax/generic/sve/impl.h" @@ -35,4 +35,3 @@ void sve_qasymm8_signed_logits(const ITensor *in, ITensor *out, const Window &wi } } } // namespace arm_compute -#endif //defined(ARM_COMPUTE_ENABLE_SVE) diff --git a/src/cpu/kernels/softmax/generic/sve2/qasymm8.cpp b/src/cpu/kernels/softmax/generic/sve2/qasymm8.cpp index 8566a51432..810035eb9c 100644 --- a/src/cpu/kernels/softmax/generic/sve2/qasymm8.cpp +++ b/src/cpu/kernels/softmax/generic/sve2/qasymm8.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_SVE2) + #include "arm_compute/core/Helpers.h" #include "src/cpu/kernels/softmax/generic/sve2/impl.h" @@ -36,4 +36,3 @@ void sve2_qasymm8_softmax(const ITensor *in, const ITensor *max, void *const tmp } } } // namespace arm_compute -#endif //defined(ARM_COMPUTE_ENABLE_SVE2) diff --git a/src/cpu/kernels/softmax/generic/sve2/qasymm8_signed.cpp b/src/cpu/kernels/softmax/generic/sve2/qasymm8_signed.cpp index c2bdc50119..283b55e9ce 100644 --- a/src/cpu/kernels/softmax/generic/sve2/qasymm8_signed.cpp +++ b/src/cpu/kernels/softmax/generic/sve2/qasymm8_signed.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_SVE2) + #include "arm_compute/core/Helpers.h" #include "src/cpu/kernels/softmax/generic/sve2/impl.h" @@ -36,4 +36,3 @@ void sve2_qasymm8_signed_softmax(const ITensor *in, const ITensor *max, void *co } } } // namespace arm_compute -#endif //defined(ARM_COMPUTE_ENABLE_SVE2) -- cgit v1.2.1