aboutsummaryrefslogtreecommitdiff
path: root/src/cpu/kernels/elementwise_binary/generic
diff options
context:
space:
mode:
Diffstat (limited to 'src/cpu/kernels/elementwise_binary/generic')
-rw-r--r--src/cpu/kernels/elementwise_binary/generic/sve/fp16.cpp7
-rw-r--r--src/cpu/kernels/elementwise_binary/generic/sve/fp32.cpp3
-rw-r--r--src/cpu/kernels/elementwise_binary/generic/sve/impl.cpp3
-rw-r--r--src/cpu/kernels/elementwise_binary/generic/sve/impl.h2
-rw-r--r--src/cpu/kernels/elementwise_binary/generic/sve/integer.cpp3
-rw-r--r--src/cpu/kernels/elementwise_binary/generic/sve2/impl.h2
-rw-r--r--src/cpu/kernels/elementwise_binary/generic/sve2/qasymm8.cpp3
-rw-r--r--src/cpu/kernels/elementwise_binary/generic/sve2/qasymm8_signed.cpp3
8 files changed, 10 insertions, 16 deletions
diff --git a/src/cpu/kernels/elementwise_binary/generic/sve/fp16.cpp b/src/cpu/kernels/elementwise_binary/generic/sve/fp16.cpp
index d764f56623..8adacbfe67 100644
--- a/src/cpu/kernels/elementwise_binary/generic/sve/fp16.cpp
+++ b/src/cpu/kernels/elementwise_binary/generic/sve/fp16.cpp
@@ -21,7 +21,9 @@
* 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_binary/generic/sve/impl.h"
namespace arm_compute
@@ -58,4 +60,5 @@ template void sve_fp16_comparison_elementwise_binary<ComparisonOperation::LessEq
} // namespace cpu
} // 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_binary/generic/sve/fp32.cpp b/src/cpu/kernels/elementwise_binary/generic/sve/fp32.cpp
index bb33fd2814..0f80813d15 100644
--- a/src/cpu/kernels/elementwise_binary/generic/sve/fp32.cpp
+++ b/src/cpu/kernels/elementwise_binary/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_binary/generic/sve/impl.h"
namespace arm_compute
@@ -57,4 +57,3 @@ template void sve_fp32_comparison_elementwise_binary<ComparisonOperation::LessEq
} // namespace cpu
} // namespace arm_compute
-#endif //defined(ARM_COMPUTE_ENABLE_SVE)
diff --git a/src/cpu/kernels/elementwise_binary/generic/sve/impl.cpp b/src/cpu/kernels/elementwise_binary/generic/sve/impl.cpp
index b3046e90a8..40564d25f9 100644
--- a/src/cpu/kernels/elementwise_binary/generic/sve/impl.cpp
+++ b/src/cpu/kernels/elementwise_binary/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/elementwise_binary/generic/sve/impl.h"
#include "src/core/NEON/SVEMath.h"
#include <arm_sve.h>
@@ -312,4 +312,3 @@ svint16_t elementwise_div<svint16_t>(svbool_t &pg, const svint16_t &a, const svi
} // namespace cpu
} // namespace arm_compute
-#endif /* defined(ARM_COMPUTE_ENABLE_SVE) */
diff --git a/src/cpu/kernels/elementwise_binary/generic/sve/impl.h b/src/cpu/kernels/elementwise_binary/generic/sve/impl.h
index b7425c8626..606090d417 100644
--- a/src/cpu/kernels/elementwise_binary/generic/sve/impl.h
+++ b/src/cpu/kernels/elementwise_binary/generic/sve/impl.h
@@ -23,7 +23,6 @@
*/
#ifndef SRC_CORE_SVE_KERNELS_ELEMENTWISE_LIST_H
#define SRC_CORE_SVE_KERNELS_ELEMENTWISE_LIST_H
-#if defined(ARM_COMPUTE_ENABLE_SVE)
#include "arm_compute/core/Helpers.h"
#include "src/core/NEON/wrapper/intrinsics/intrinsics.h"
@@ -161,5 +160,4 @@ template <ComparisonOperation op, typename ScalarType, typename OutputScalarType
void elementwise_comparison_op(const ITensor *in1, const ITensor *in2, ITensor *out, const Window &window);
} // namespace cpu
} // namespace arm_compute
-#endif // defined(ARM_COMPUTE_ENABLE_SVE)
#endif /* SRC_CORE_SVE_KERNELS_ELEMENTWISE_LIST_H */
diff --git a/src/cpu/kernels/elementwise_binary/generic/sve/integer.cpp b/src/cpu/kernels/elementwise_binary/generic/sve/integer.cpp
index a4f4d0fc82..8f7e27184b 100644
--- a/src/cpu/kernels/elementwise_binary/generic/sve/integer.cpp
+++ b/src/cpu/kernels/elementwise_binary/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_binary/generic/sve/impl.h"
namespace arm_compute
@@ -94,4 +94,3 @@ template void sve_s32_comparison_elementwise_binary<ComparisonOperation::LessEqu
} // namespace cpu
} // namespace arm_compute
-#endif //defined(ARM_COMPUTE_ENABLE_SVE)
diff --git a/src/cpu/kernels/elementwise_binary/generic/sve2/impl.h b/src/cpu/kernels/elementwise_binary/generic/sve2/impl.h
index c35ca2d6c3..f34d05eb37 100644
--- a/src/cpu/kernels/elementwise_binary/generic/sve2/impl.h
+++ b/src/cpu/kernels/elementwise_binary/generic/sve2/impl.h
@@ -24,7 +24,6 @@
#ifndef SRC_CORE_SVE_KERNELS_ELEMENTWISE_QUANTIZED_LIST_H
#define SRC_CORE_SVE_KERNELS_ELEMENTWISE_QUANTIZED_LIST_H
-#if defined(ARM_COMPUTE_ENABLE_SVE2)
#include "src/cpu/kernels/elementwise_binary/generic/sve/impl.h"
namespace arm_compute
{
@@ -359,5 +358,4 @@ void elementwise_comparison_quantized_op(const ITensor *in1, const ITensor *in2,
} // namespace cpu
} // namespace arm_compute
-#endif /* defined(ARM_COMPUTE_ENABLE_SVE2) */
#endif /* SRC_CORE_SVE_KERNELS_ELEMENTWISE_QUANTIZED_LIST_H */ \ No newline at end of file
diff --git a/src/cpu/kernels/elementwise_binary/generic/sve2/qasymm8.cpp b/src/cpu/kernels/elementwise_binary/generic/sve2/qasymm8.cpp
index 63c75c3d4d..479f053685 100644
--- a/src/cpu/kernels/elementwise_binary/generic/sve2/qasymm8.cpp
+++ b/src/cpu/kernels/elementwise_binary/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/elementwise_binary/generic/sve2/impl.h"
namespace arm_compute
@@ -58,4 +58,3 @@ template void sve2_qasymm8_comparison_elementwise_binary<ComparisonOperation::Le
} // namespace cpu
} // namespace arm_compute
-#endif //defined(ARM_COMPUTE_ENABLE_SVE2)
diff --git a/src/cpu/kernels/elementwise_binary/generic/sve2/qasymm8_signed.cpp b/src/cpu/kernels/elementwise_binary/generic/sve2/qasymm8_signed.cpp
index fe332df386..ce6250be35 100644
--- a/src/cpu/kernels/elementwise_binary/generic/sve2/qasymm8_signed.cpp
+++ b/src/cpu/kernels/elementwise_binary/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/elementwise_binary/generic/sve2/impl.h"
namespace arm_compute
@@ -58,4 +58,3 @@ template void sve2_qasymm8_signed_comparison_elementwise_binary<ComparisonOperat
} // namespace cpu
} // namespace arm_compute
-#endif //defined(ARM_COMPUTE_ENABLE_SVE2)