From 08bcc6e46227fca01aa3de3f3512f8b692d8d36b Mon Sep 17 00:00:00 2001 From: Mikhael Skvortsov Date: Sat, 26 Apr 2025 15:24:49 +0300 Subject: [PATCH] Optimizations for Xtensa LX7 Signed-off-by: Jean-Marc Valin --- silk/SigProc_FIX.h | 4 ++ silk/macros.h | 4 ++ silk/xtensa/SigProc_FIX_lx7.h | 44 ++++++++++++++++++++ silk/xtensa/macros_lx7.h | 78 +++++++++++++++++++++++++++++++++++ 4 files changed, 130 insertions(+) create mode 100644 silk/xtensa/SigProc_FIX_lx7.h create mode 100644 silk/xtensa/macros_lx7.h diff --git a/silk/SigProc_FIX.h b/silk/SigProc_FIX.h index fbdfa82e..2ac0d345 100644 --- a/silk/SigProc_FIX.h +++ b/silk/SigProc_FIX.h @@ -635,6 +635,10 @@ static OPUS_INLINE opus_int64 silk_max_64(opus_int64 a, opus_int64 b) #include "mips/sigproc_fix_mipsr1.h" #endif +#ifdef OPUS_XTENSA_LX7 +#include "xtensa/SigProc_FIX_lx7.h" +#endif + #ifdef __cplusplus } diff --git a/silk/macros.h b/silk/macros.h index 3c67b6e5..1915e220 100644 --- a/silk/macros.h +++ b/silk/macros.h @@ -147,5 +147,9 @@ static OPUS_INLINE opus_int32 silk_CLZ32(opus_int32 in32) #include "arm/macros_arm64.h" #endif +#ifdef OPUS_XTENSA_LX7 +#include "xtensa/macros_lx7.h" +#endif + #endif /* SILK_MACROS_H */ diff --git a/silk/xtensa/SigProc_FIX_lx7.h b/silk/xtensa/SigProc_FIX_lx7.h new file mode 100644 index 00000000..97391a00 --- /dev/null +++ b/silk/xtensa/SigProc_FIX_lx7.h @@ -0,0 +1,44 @@ +/*********************************************************************** +Copyright (C) 2025 Xiph.Org Foundation and contributors. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +- Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. +- Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. +- Neither the name of Internet Society, IETF or IETF Trust, nor the +names of specific contributors, may be used to endorse or promote +products derived from this software without specific prior written +permission. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +***********************************************************************/ + +#ifndef SILK_SIGPROC_FIX_LX7_H +#define SILK_SIGPROC_FIX_LX7_H + +#undef silk_SAT16 +static inline short int silk_SAT16_lx7(opus_int32 a) +{ + opus_int32 res; + __asm__( + "clamps %0, %1, 15\n\t" + : "=r"(res) + : "r"(a) + ); + return res; +} +#define silk_SAT16(a) (silk_SAT16_lx7(a)) + +#endif diff --git a/silk/xtensa/macros_lx7.h b/silk/xtensa/macros_lx7.h new file mode 100644 index 00000000..fed6c9ef --- /dev/null +++ b/silk/xtensa/macros_lx7.h @@ -0,0 +1,78 @@ +/*********************************************************************** +Copyright (C) 2025 Xiph.Org Foundation and contributors. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +- Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. +- Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. +- Neither the name of Internet Society, IETF or IETF Trust, nor the +names of specific contributors, may be used to endorse or promote +products derived from this software without specific prior written +permission. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +***********************************************************************/ + +#ifndef SILK_MACROS_LX7_H +#define SILK_MACROS_LX7_H + +/* This macro only avoids the undefined behaviour from a left shift of + a negative value. It should only be used in macros that can't include + SigProc_FIX.h. In other cases, use silk_LSHIFT32(). */ +#define SAFE_SHL(a, b) ((opus_int32)((opus_uint32)(a) << (b))) + +/* (a32 * (opus_int32)((opus_int16)(b32))) >> 16 output have to be 32bit int */ +#undef silk_SMULWB +static OPUS_INLINE opus_int32 silk_SMULWB_lx7(opus_int32 a32, opus_int32 b32) +{ + opus_int32 res; + __asm__( + "mulsh %0, %1, %2\n\t" + : "=r"(res) + : "r"(a32), "r"(SAFE_SHL(b32, 16)) + ); + return res; +} +#define silk_SMULWB(a32, b32) (silk_SMULWB_lx7(a32, b32)) + +/* a32 + (b32 * (opus_int32)((opus_int16)(c32))) >> 16 output have to be 32bit int */ +#undef silk_SMLAWB +#define silk_SMLAWB(a32, b32, c32) ((a32) + silk_SMULWB(b32, c32)) + +/* (a32 * (b32 >> 16)) >> 16 */ +#undef silk_SMULWT +static OPUS_INLINE opus_int32 silk_SMULWT_lx7(opus_int32 a32, opus_int32 b32) +{ + opus_int32 res; + __asm__( + "mulsh %0, %1, %2\n\t" + : "=r"(res) + : "r"(a32), "r"(SAFE_SHL(b32 >> 16, 16)) + ); + return res; +} + +/* a32 + (b32 * (c32 >> 16)) >> 16 */ +#undef silk_SMLAWT +#define silk_SMLAWT(a32, b32, c32) ((a32) + silk_SMULWT_lx7(b32, c32)) + +#undef silk_CLZ32 +static OPUS_INLINE opus_int32 silk_CLZ32_lx7(opus_int32 in32) +{ + return __builtin_clz(in32); +} +#define silk_CLZ32(in32) (silk_CLZ32_lx7(in32)) + +#endif