From 275dfed92af8e0f7dfbe3d8d22402f3fa8440388 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 29 Sep 2021 16:24:58 +0200 Subject: [PATCH] filter-chain: handle unaligned sum_simd Fall back to slow path if the input is not aligned, which can happen after resampling. Fixes #1659 --- src/modules/module-filter-chain/pffft.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/modules/module-filter-chain/pffft.c b/src/modules/module-filter-chain/pffft.c index f0157e077..27f692ba2 100644 --- a/src/modules/module-filter-chain/pffft.c +++ b/src/modules/module-filter-chain/pffft.c @@ -2128,15 +2128,19 @@ static void zconvolve_simd(PFFFT_Setup * s, const float *a, const float *b, static void sum_simd(const float *a, const float *b, float *ab, int len) { - const v4sf *RESTRICT va = (const v4sf *)a; - const v4sf *RESTRICT vb = (const v4sf *)b; - v4sf *RESTRICT vab = (v4sf *) ab; - int i; - const int end4 = len / SIMD_SZ; + int i = 0; - for (i = 0; i < end4; i += 1) - vab[i] = VADD(va[i],vb[i]); - for (i = i * 4; i < len; ++i) + if (VALIGNED(a) && VALIGNED(b) && VALIGNED(ab)) { + const v4sf *RESTRICT va = (const v4sf *)a; + const v4sf *RESTRICT vb = (const v4sf *)b; + v4sf *RESTRICT vab = (v4sf *) ab; + const int end4 = len / SIMD_SZ; + + for (; i < end4; i += 1) + vab[i] = VADD(va[i],vb[i]); + i *= 4; + } + for (; i < len; ++i) ab[i] = a[i] + b[i]; }