diff options
| author | James Zern <jzern@google.com> | 2023-05-02 18:37:59 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2023-05-03 10:04:34 -0700 |
| commit | 57b9afa58f849a8165ce3132c21087ae451d862c (patch) | |
| tree | d4a96c777075be87da2705267a7be4ff9ce4e463 /vpx_dsp/arm/vpx_convolve8_neon.c | |
| parent | 33aba6ecc16c71b6f380cfd3d24eab11690deb99 (diff) | |
| download | libvpx-57b9afa58f849a8165ce3132c21087ae451d862c.tar.gz | |
s/__aarch64__/VPX_ARCH_AARCH64/
This allows AArch64 to be correctly detected when building with Visual
Studio (cl.exe) and fixes a crash in vp9_diamond_search_sad_neon.c.
There are still test failures, however.
Microsoft's compiler doesn't define __ARM_FEATURE_*. To use those paths
we may need to rely on _M_ARM64_EXTENSION.
Bug: webm:1788
Bug: b/277255076
Change-Id: I4d26f5f84dbd0cbcd1cdf0d7d932ebcf109febe5
Diffstat (limited to 'vpx_dsp/arm/vpx_convolve8_neon.c')
| -rw-r--r-- | vpx_dsp/arm/vpx_convolve8_neon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vpx_dsp/arm/vpx_convolve8_neon.c b/vpx_dsp/arm/vpx_convolve8_neon.c index b4cdd58c7..b312cc747 100644 --- a/vpx_dsp/arm/vpx_convolve8_neon.c +++ b/vpx_dsp/arm/vpx_convolve8_neon.c @@ -31,7 +31,7 @@ // instructions. This optimization is much faster in speed unit test, but slowed // down the whole decoder by 5%. -#if defined(__aarch64__) && \ +#if VPX_ARCH_AARCH64 && \ (defined(__ARM_FEATURE_DOTPROD) || defined(__ARM_FEATURE_MATMUL_INT8)) DECLARE_ALIGNED(16, static const uint8_t, dot_prod_permute_tbl[48]) = { @@ -1261,7 +1261,7 @@ void vpx_convolve8_avg_vert_neon(const uint8_t *src, ptrdiff_t src_stride, #endif // defined(__ARM_FEATURE_MATMUL_INT8) -#else // !(defined(__aarch64__) && +#else // !(VPX_ARCH_AARCH64 && // (defined(__ARM_FEATURE_DOTPROD) || // defined(__ARM_FEATURE_MATMUL_INT8))) @@ -2105,6 +2105,6 @@ void vpx_convolve8_avg_vert_neon(const uint8_t *src, ptrdiff_t src_stride, } } -#endif // #if defined(__aarch64__) && +#endif // #if VPX_ARCH_AARCH64 && // (defined(__ARM_FEATURE_DOTPROD) || // defined(__ARM_FEATURE_MATMUL_INT8)) |