diff options
| author | Pablo Tello <pablo.tello@arm.com> | 2018-03-20 16:46:55 +0000 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:49:16 +0000 |
| commit | 99ef8407cd5b27fdec6f8dfaf8b55f820b6dea71 (patch) | |
| tree | 7d7448ebc71d20c15611076375eb0cbb22f83f5a /src/core/NEON/kernels/arm_gemm/merges | |
| parent | 2d9de0a3fa6ad858e70040124f362799a962bb6a (diff) | |
| download | ComputeLibrary-99ef8407cd5b27fdec6f8dfaf8b55f820b6dea71.tar.gz | |
COMPMID-881: Updated arm_gemm to the lastest
Change-Id: Iba2664f33320e79bd15ca9c1399e65e4cc165be6
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/125265
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Diffstat (limited to 'src/core/NEON/kernels/arm_gemm/merges')
| -rw-r--r-- | src/core/NEON/kernels/arm_gemm/merges/a64_merge_float_to_half_12x8.hpp | 5 | ||||
| -rw-r--r-- | src/core/NEON/kernels/arm_gemm/merges/list.hpp | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/NEON/kernels/arm_gemm/merges/a64_merge_float_to_half_12x8.hpp b/src/core/NEON/kernels/arm_gemm/merges/a64_merge_float_to_half_12x8.hpp index 12a090112d..9708fe189d 100644 --- a/src/core/NEON/kernels/arm_gemm/merges/a64_merge_float_to_half_12x8.hpp +++ b/src/core/NEON/kernels/arm_gemm/merges/a64_merge_float_to_half_12x8.hpp @@ -23,7 +23,8 @@ */ #pragma once -#if defined(__aarch64__) && defined(__ARM_FEATURE_FP16_SCALAR_ARITHMETIC) +// This should be possible on any AArch64 target, but some old compilers don't support __fp16 arguments. +#if defined(__aarch64__) && defined(__ARM_FP16_ARGS) #include <arm_neon.h> @@ -270,4 +271,4 @@ inline void MergeResults<12, 8>(__fp16 *out, const float *in, int ldout, int y0, } } -#endif // __aarch64__ && __ARM_FEATURE_FP16_SCALAR_ARITHMETIC +#endif // __aarch64__ && __ARM_FP16_ARGS diff --git a/src/core/NEON/kernels/arm_gemm/merges/list.hpp b/src/core/NEON/kernels/arm_gemm/merges/list.hpp index 7d56e58f44..d93f1b0e6e 100644 --- a/src/core/NEON/kernels/arm_gemm/merges/list.hpp +++ b/src/core/NEON/kernels/arm_gemm/merges/list.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - #include "a32_merge_float_8x6.hpp" #include "a64_merge_float_12x8.hpp" #include "a64_merge_float_to_half_12x8.hpp" |