0683dde5d3
cargo-xwin drives the Windows MSVC cross-compile via clang-cl, under which CMake sets MSVC=1 — causing libopus 1.3.1's `if(NOT MSVC)` guards to skip the per-file `-msse4.1` / `-mssse3` COMPILE_FLAGS that its x86 SIMD source files need. Clang-cl (unlike real cl.exe) still honors Clang's target-feature system, so those files then fail to compile with "always_inline function '_mm_cvtepi16_epi32' requires target feature 'sse4.1'" errors across silk/NSQ_sse4_1.c, NSQ_del_dec_sse4_1.c, and VQ_WMat_EC_sse4_1.c. Earlier attempts to fix this downstream (cargo-xwin toolchain file, override.cmake CMAKE_C_COMPILE_OBJECT <FLAGS> replace, CFLAGS env vars) all failed because cargo-xwin rewrites override.cmake from scratch on every `cargo xwin build` invocation and cmake-rs's -DCMAKE_C_FLAGS= assembly happens before toolchain FORCE sets propagate. Fixing it upstream at the source: vendor audiopus_sys 0.2.2 into vendor/audiopus_sys, patch its bundled opus/CMakeLists.txt to introduce an MSVC_CL var (true only when CMAKE_C_COMPILER_ID == "MSVC", i.e. real cl.exe), and flip the eight `if(NOT MSVC)` SIMD guards to `if(NOT MSVC_CL)`. Clang-cl then gets the GCC-style per-file flags and the SSE4.1 sources build cleanly. Also flip the `if(MSVC)` global /arch block at line 445 to `if(MSVC_CL)` so only cl.exe applies /arch:AVX and clang-cl relies purely on per-file flags (no global/per-file mixing). Wire via [patch.crates-io] in the workspace root Cargo.toml; the patch is resolved relative to the workspace root as `vendor/audiopus_sys`. Upstream context: xiph/opus#256, xiph/opus PR #257 (both stale). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
113 lines
4.7 KiB
C
113 lines
4.7 KiB
C
/***********************************************************************
|
|
Copyright (C) 2014 Vidyo
|
|
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.
|
|
***********************************************************************/
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <arm_neon.h>
|
|
#include "main.h"
|
|
#include "stack_alloc.h"
|
|
#include "NSQ.h"
|
|
#include "celt/cpu_support.h"
|
|
#include "celt/arm/armcpu.h"
|
|
|
|
opus_int32 silk_noise_shape_quantizer_short_prediction_neon(const opus_int32 *buf32, const opus_int32 *coef32, opus_int order)
|
|
{
|
|
int32x4_t coef0 = vld1q_s32(coef32);
|
|
int32x4_t coef1 = vld1q_s32(coef32 + 4);
|
|
int32x4_t coef2 = vld1q_s32(coef32 + 8);
|
|
int32x4_t coef3 = vld1q_s32(coef32 + 12);
|
|
|
|
int32x4_t a0 = vld1q_s32(buf32 - 15);
|
|
int32x4_t a1 = vld1q_s32(buf32 - 11);
|
|
int32x4_t a2 = vld1q_s32(buf32 - 7);
|
|
int32x4_t a3 = vld1q_s32(buf32 - 3);
|
|
|
|
int32x4_t b0 = vqdmulhq_s32(coef0, a0);
|
|
int32x4_t b1 = vqdmulhq_s32(coef1, a1);
|
|
int32x4_t b2 = vqdmulhq_s32(coef2, a2);
|
|
int32x4_t b3 = vqdmulhq_s32(coef3, a3);
|
|
|
|
int32x4_t c0 = vaddq_s32(b0, b1);
|
|
int32x4_t c1 = vaddq_s32(b2, b3);
|
|
|
|
int32x4_t d = vaddq_s32(c0, c1);
|
|
|
|
int64x2_t e = vpaddlq_s32(d);
|
|
|
|
int64x1_t f = vadd_s64(vget_low_s64(e), vget_high_s64(e));
|
|
|
|
opus_int32 out = vget_lane_s32(vreinterpret_s32_s64(f), 0);
|
|
|
|
out += silk_RSHIFT( order, 1 );
|
|
|
|
return out;
|
|
}
|
|
|
|
|
|
opus_int32 silk_NSQ_noise_shape_feedback_loop_neon(const opus_int32 *data0, opus_int32 *data1, const opus_int16 *coef, opus_int order)
|
|
{
|
|
opus_int32 out;
|
|
if (order == 8)
|
|
{
|
|
int32x4_t a00 = vdupq_n_s32(data0[0]);
|
|
int32x4_t a01 = vld1q_s32(data1); /* data1[0] ... [3] */
|
|
|
|
int32x4_t a0 = vextq_s32 (a00, a01, 3); /* data0[0] data1[0] ...[2] */
|
|
int32x4_t a1 = vld1q_s32(data1 + 3); /* data1[3] ... [6] */
|
|
|
|
/*TODO: Convert these once in advance instead of once per sample, like
|
|
silk_noise_shape_quantizer_short_prediction_neon() does.*/
|
|
int16x8_t coef16 = vld1q_s16(coef);
|
|
int32x4_t coef0 = vmovl_s16(vget_low_s16(coef16));
|
|
int32x4_t coef1 = vmovl_s16(vget_high_s16(coef16));
|
|
|
|
/*This is not bit-exact with the C version, since we do not drop the
|
|
lower 16 bits of each multiply, but wait until the end to truncate
|
|
precision. This is an encoder-specific calculation (and unlike
|
|
silk_noise_shape_quantizer_short_prediction_neon(), is not meant to
|
|
simulate what the decoder will do). We still could use vqdmulhq_s32()
|
|
like silk_noise_shape_quantizer_short_prediction_neon() and save
|
|
half the multiplies, but the speed difference is not large, since we
|
|
then need two extra adds.*/
|
|
int64x2_t b0 = vmull_s32(vget_low_s32(a0), vget_low_s32(coef0));
|
|
int64x2_t b1 = vmlal_s32(b0, vget_high_s32(a0), vget_high_s32(coef0));
|
|
int64x2_t b2 = vmlal_s32(b1, vget_low_s32(a1), vget_low_s32(coef1));
|
|
int64x2_t b3 = vmlal_s32(b2, vget_high_s32(a1), vget_high_s32(coef1));
|
|
|
|
int64x1_t c = vadd_s64(vget_low_s64(b3), vget_high_s64(b3));
|
|
int64x1_t cS = vrshr_n_s64(c, 15);
|
|
int32x2_t d = vreinterpret_s32_s64(cS);
|
|
|
|
out = vget_lane_s32(d, 0);
|
|
vst1q_s32(data1, a0);
|
|
vst1q_s32(data1 + 4, a1);
|
|
return out;
|
|
}
|
|
return silk_NSQ_noise_shape_feedback_loop_c(data0, data1, coef, order);
|
|
}
|