diff options
author | Sheri Zhang <sheri.zhang@arm.com> | 2021-01-20 12:20:20 +0000 |
---|---|---|
committer | Sheri Zhang <sheri.zhang@arm.com> | 2021-01-22 16:37:11 +0000 |
commit | 360f576603680ebd8a2d535da0ac6ffe9fac507f (patch) | |
tree | ecf627529692b9c58333e95bb9288931ad54da2b /src/core/NEON/kernels/NEScaleKernel.cpp | |
parent | f9943c882f874c1cf6b5f6d24ef02faa0061de08 (diff) | |
download | ComputeLibrary-360f576603680ebd8a2d535da0ac6ffe9fac507f.tar.gz |
Fix Scale CTS failures
- Move back to use template for NEON implementaion to be more mantainable
Resolves: COMPMID-4112
Signed-off-by: Sheri Zhang <sheri.zhang@arm.com>
Change-Id: I27b60674d743e3d7ec5bb065898cb75cb40bcf0e
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4900
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Reviewed-by: Manuel Bottini <manuel.bottini@arm.com>
Diffstat (limited to 'src/core/NEON/kernels/NEScaleKernel.cpp')
-rw-r--r-- | src/core/NEON/kernels/NEScaleKernel.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/core/NEON/kernels/NEScaleKernel.cpp b/src/core/NEON/kernels/NEScaleKernel.cpp index 1fbd5fb60a..39ed6317a1 100644 --- a/src/core/NEON/kernels/NEScaleKernel.cpp +++ b/src/core/NEON/kernels/NEScaleKernel.cpp @@ -28,7 +28,8 @@ #include "arm_compute/core/utils/misc/Utility.h" #include "src/core/AccessWindowStatic.h" #include "src/core/CPP/Validate.h" -#include "src/core/NEON/kernels/scale/impl/list.h" +#include "src/core/NEON/kernels/scale/impl/NEON/list.h" +#include "src/core/NEON/kernels/scale/impl/SVE/list.h" #include "src/core/NEON/wrapper/wrapper.h" #include "src/core/common/Registrars.h" #include "src/core/helpers/AutoConfiguration.h" @@ -93,15 +94,15 @@ static const ScaleKernel available_kernels[] = #else /* !defined(__ARM_FEATURE_SVE) */ #if defined(__ARM_FEATURE_FP16_VECTOR_ARITHMETIC) { - "fp16_neon_scale", + "common_neon_scale", [](const ScaleSelectorData & data) { return data.dt == DataType::F16; }, - REGISTER_FP16_NEON(arm_compute::cpu::fp16_neon_scale) + REGISTER_FP16_NEON(arm_compute::cpu::common_neon_scale<float16_t>) }, #endif /* !defined(__ARM_FEATURE_FP16_VECTOR_ARITHMETIC) */ { - "f32_neon_scale", + "common_neon_scale", [](const ScaleSelectorData & data) { return data.dt == DataType::F32; }, - REGISTER_FP32_NEON(arm_compute::cpu::fp32_neon_scale) + REGISTER_FP32_NEON(arm_compute::cpu::common_neon_scale<float>) }, { "qasymm8_neon_scale", @@ -114,14 +115,14 @@ static const ScaleKernel available_kernels[] = REGISTER_QASYMM8_SIGNED_NEON(arm_compute::cpu::qasymm8_signed_neon_scale) }, { - "u8_neon_scale", + "common_neon_scale", [](const ScaleSelectorData & data) { return data.dt == DataType::U8; }, - REGISTER_INTEGER_NEON(arm_compute::cpu::u8_neon_scale) + REGISTER_INTEGER_NEON(arm_compute::cpu::common_neon_scale<uint8_t>) }, { - "s16_neon_scale", + "common_neon_scale", [](const ScaleSelectorData & data) { return data.dt == DataType::S16; }, - REGISTER_INTEGER_NEON(arm_compute::cpu::s16_neon_scale) + REGISTER_INTEGER_NEON(arm_compute::cpu::common_neon_scale<int16_t>) }, #endif /* !defined(__ARM_FEATURE_SVE) */ }; |