diff options
| author | Jonathan Wright <jonathan.wright@arm.com> | 2021-01-12 11:33:28 +0000 |
|---|---|---|
| committer | Jonathan Wright <jonathan.wright@arm.com> | 2021-01-12 13:37:36 +0000 |
| commit | 518d81558c797486e125e37cb529d65b560a6ea0 (patch) | |
| tree | 9672a5c5cac55fcac716ee135f4583486c67e268 /simd/arm/neon-compat.h | |
| parent | 09efc26aff7983f4377a1743a197ca3d74796d7d (diff) | |
Cherry-pick Arm CLZ fixes from upstream
Cherry-pick two patches from upstream that fix the Neon intrinsics
Huffman encoding path and reduce the memory footprint on Windows on
Arm:
https://github.com/libjpeg-turbo/libjpeg-turbo/commit/d2c407995992be1f128704ae2479adfd7906c158
https://github.com/libjpeg-turbo/libjpeg-turbo/commit/74e6ea45e3547ae85cd43efcdfc24a6907a2154e
Re-enable the Neon intrinsics Huffman encoding path for WoA compiled
with clang-cl.
Bug: 1160249
Change-Id: I0849ca54b8f4f8f38c9b293ea48c9de1c60be86f
Diffstat (limited to 'simd/arm/neon-compat.h')
| -rw-r--r-- | simd/arm/neon-compat.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/simd/arm/neon-compat.h b/simd/arm/neon-compat.h index 3ce3bcb..543d860 100644 --- a/simd/arm/neon-compat.h +++ b/simd/arm/neon-compat.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2020, D. R. Commander. All Rights Reserved. - * Copyright (C) 2020, Arm Limited. All Rights Reserved. + * Copyright (C) 2020-2021, Arm Limited. All Rights Reserved. * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -28,10 +28,10 @@ /* Define compiler-independent count-leading-zeros macros */ #if defined(_MSC_VER) && !defined(__clang__) #define BUILTIN_CLZ(x) _CountLeadingZeros(x) -#define BUILTIN_CLZL(x) _CountLeadingZeros64(x) +#define BUILTIN_CLZLL(x) _CountLeadingZeros64(x) #elif defined(__clang__) || defined(__GNUC__) #define BUILTIN_CLZ(x) __builtin_clz(x) -#define BUILTIN_CLZL(x) __builtin_clzl(x) +#define BUILTIN_CLZLL(x) __builtin_clzll(x) #else #error "Unknown compiler" #endif |