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/add/generic/sve/fp16.cpp | 3 +-- src/cpu/kernels/add/generic/sve/fp32.cpp | 3 +-- src/cpu/kernels/add/generic/sve/impl.cpp | 3 +-- src/cpu/kernels/add/generic/sve/impl.h | 3 +-- src/cpu/kernels/add/generic/sve/integer.cpp | 3 +-- src/cpu/kernels/add/generic/sve2/qasymm8.cpp | 3 +-- src/cpu/kernels/add/generic/sve2/qasymm8_signed.cpp | 3 +-- src/cpu/kernels/add/generic/sve2/qsymm16.cpp | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) (limited to 'src/cpu/kernels/add/generic') diff --git a/src/cpu/kernels/add/generic/sve/fp16.cpp b/src/cpu/kernels/add/generic/sve/fp16.cpp index 7dc3142d3d..65a1369bfc 100644 --- a/src/cpu/kernels/add/generic/sve/fp16.cpp +++ b/src/cpu/kernels/add/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 "src/cpu/kernels/add/generic/sve/impl.h" @@ -37,4 +37,3 @@ void add_fp16_sve(const ITensor *src0, const ITensor *src1, ITensor *dst, const } } // namespace arm_compute #endif /* (__ARM_FEATURE_FP16_VECTOR_ARITHMETIC) && defined(ENABLE_FP16_KERNELS) */ -#endif /* #if defined(ARM_COMPUTE_ENABLE_SVE) */ \ No newline at end of file diff --git a/src/cpu/kernels/add/generic/sve/fp32.cpp b/src/cpu/kernels/add/generic/sve/fp32.cpp index 5383b887ba..b37799113a 100644 --- a/src/cpu/kernels/add/generic/sve/fp32.cpp +++ b/src/cpu/kernels/add/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 "arm_compute/core/ITensor.h" #include "src/cpu/kernels/add/generic/sve/impl.h" @@ -36,4 +36,3 @@ void add_fp32_sve(const ITensor *src0, const ITensor *src1, ITensor *dst, const } } } // namespace arm_compute -#endif //ARM_COMPUTE_ENABLE_SVE \ No newline at end of file diff --git a/src/cpu/kernels/add/generic/sve/impl.cpp b/src/cpu/kernels/add/generic/sve/impl.cpp index 615f346dff..e8606436fd 100644 --- a/src/cpu/kernels/add/generic/sve/impl.cpp +++ b/src/cpu/kernels/add/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/add/generic/sve/impl.h" #include "arm_compute/core/Helpers.h" #include "arm_compute/core/utils/misc/Traits.h" @@ -133,4 +133,3 @@ template void add_same_sve(const ITensor *src0, const ITensor *src1, #endif /* (__ARM_FEATURE_FP16_VECTOR_ARITHMETIC) && defined(ENABLE_FP16_KERNELS) */ } // namespace cpu } // namespace arm_compute -#endif // ARM_COMPUTE_ENABLE_SVE \ No newline at end of file diff --git a/src/cpu/kernels/add/generic/sve/impl.h b/src/cpu/kernels/add/generic/sve/impl.h index 219dbc9b2e..0136f14246 100644 --- a/src/cpu/kernels/add/generic/sve/impl.h +++ b/src/cpu/kernels/add/generic/sve/impl.h @@ -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) + #ifndef SRC_CORE_SVE_KERNELS_ADD_IMPL_H #define SRC_CORE_SVE_KERNELS_ADD_IMPL_H #include "arm_compute/core/ITensor.h" @@ -37,4 +37,3 @@ void add_same_sve(const ITensor *src0, const ITensor *src1, ITensor *dst, const } // namespace cpu } // namespace arm_compute #endif // SRC_CORE_SVE_KERNELS_ADD_IMPL_H -#endif // ARM_COMPUTE_ENABLE_SVE \ No newline at end of file diff --git a/src/cpu/kernels/add/generic/sve/integer.cpp b/src/cpu/kernels/add/generic/sve/integer.cpp index 1d25d3463a..3642dccd7b 100644 --- a/src/cpu/kernels/add/generic/sve/integer.cpp +++ b/src/cpu/kernels/add/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 "arm_compute/core/ITensor.h" #include "src/cpu/kernels/add/generic/sve/impl.h" @@ -46,4 +46,3 @@ void add_s32_sve(const ITensor *src0, const ITensor *src1, ITensor *dst, const C } } } // namespace arm_compute -#endif //(ARM_COMPUTE_ENABLE_SVE) \ No newline at end of file diff --git a/src/cpu/kernels/add/generic/sve2/qasymm8.cpp b/src/cpu/kernels/add/generic/sve2/qasymm8.cpp index 5fe9b95a48..1dec214aa0 100644 --- a/src/cpu/kernels/add/generic/sve2/qasymm8.cpp +++ b/src/cpu/kernels/add/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 "arm_compute/core/ITensor.h" #include "arm_compute/core/Types.h" @@ -179,4 +179,3 @@ void add_qasymm8_sve2(const ITensor *src0, const ITensor *src1, ITensor *dst, co } } // namespace cpu } // namespace arm_compute -#endif //ARM_COMPUTE_ENABLE_SVE2 \ No newline at end of file diff --git a/src/cpu/kernels/add/generic/sve2/qasymm8_signed.cpp b/src/cpu/kernels/add/generic/sve2/qasymm8_signed.cpp index 9135dfdcf6..dae8899753 100644 --- a/src/cpu/kernels/add/generic/sve2/qasymm8_signed.cpp +++ b/src/cpu/kernels/add/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 "arm_compute/core/ITensor.h" #include "arm_compute/core/Types.h" @@ -178,4 +178,3 @@ void add_qasymm8_signed_sve2(const ITensor *src0, const ITensor *src1, ITensor * } } // namespace cpu } // namespace arm_compute -#endif //(ARM_COMPUTE_ENABLE_SVE2) \ No newline at end of file diff --git a/src/cpu/kernels/add/generic/sve2/qsymm16.cpp b/src/cpu/kernels/add/generic/sve2/qsymm16.cpp index 723d2a6c98..8c48ded942 100644 --- a/src/cpu/kernels/add/generic/sve2/qsymm16.cpp +++ b/src/cpu/kernels/add/generic/sve2/qsymm16.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 "arm_compute/core/ITensor.h" #include "arm_compute/core/Types.h" @@ -153,4 +153,3 @@ void add_qsymm16_sve2(const ITensor *src0, const ITensor *src1, ITensor *dst, co } } // namespace cpu } // namespace arm_compute -#endif //ARM_COMPUTE_ENABLE_SVE2 \ No newline at end of file -- cgit v1.2.1