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>
161 lines
6.5 KiB
C
161 lines
6.5 KiB
C
/* Copyright (c) 2010 Xiph.Org Foundation
|
|
* Copyright (c) 2013 Parrot */
|
|
/*
|
|
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.
|
|
|
|
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.
|
|
*/
|
|
|
|
#if !defined(PITCH_ARM_H)
|
|
# define PITCH_ARM_H
|
|
|
|
# include "armcpu.h"
|
|
|
|
# if defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
|
|
opus_val32 celt_inner_prod_neon(const opus_val16 *x, const opus_val16 *y, int N);
|
|
void dual_inner_prod_neon(const opus_val16 *x, const opus_val16 *y01,
|
|
const opus_val16 *y02, int N, opus_val32 *xy1, opus_val32 *xy2);
|
|
|
|
# if !defined(OPUS_HAVE_RTCD) && defined(OPUS_ARM_PRESUME_NEON)
|
|
# define OVERRIDE_CELT_INNER_PROD (1)
|
|
# define OVERRIDE_DUAL_INNER_PROD (1)
|
|
# define celt_inner_prod(x, y, N, arch) ((void)(arch), PRESUME_NEON(celt_inner_prod)(x, y, N))
|
|
# define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) ((void)(arch), PRESUME_NEON(dual_inner_prod)(x, y01, y02, N, xy1, xy2))
|
|
# endif
|
|
# endif
|
|
|
|
# if !defined(OVERRIDE_CELT_INNER_PROD)
|
|
# if defined(OPUS_HAVE_RTCD) && (defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && !defined(OPUS_ARM_PRESUME_NEON_INTR))
|
|
extern opus_val32 (*const CELT_INNER_PROD_IMPL[OPUS_ARCHMASK+1])(const opus_val16 *x, const opus_val16 *y, int N);
|
|
# define OVERRIDE_CELT_INNER_PROD (1)
|
|
# define celt_inner_prod(x, y, N, arch) ((*CELT_INNER_PROD_IMPL[(arch)&OPUS_ARCHMASK])(x, y, N))
|
|
# elif defined(OPUS_ARM_PRESUME_NEON_INTR)
|
|
# define OVERRIDE_CELT_INNER_PROD (1)
|
|
# define celt_inner_prod(x, y, N, arch) ((void)(arch), celt_inner_prod_neon(x, y, N))
|
|
# endif
|
|
# endif
|
|
|
|
# if !defined(OVERRIDE_DUAL_INNER_PROD)
|
|
# if defined(OPUS_HAVE_RTCD) && (defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && !defined(OPUS_ARM_PRESUME_NEON_INTR))
|
|
extern void (*const DUAL_INNER_PROD_IMPL[OPUS_ARCHMASK+1])(const opus_val16 *x,
|
|
const opus_val16 *y01, const opus_val16 *y02, int N, opus_val32 *xy1, opus_val32 *xy2);
|
|
# define OVERRIDE_DUAL_INNER_PROD (1)
|
|
# define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) ((*DUAL_INNER_PROD_IMPL[(arch)&OPUS_ARCHMASK])(x, y01, y02, N, xy1, xy2))
|
|
# elif defined(OPUS_ARM_PRESUME_NEON_INTR)
|
|
# define OVERRIDE_DUAL_INNER_PROD (1)
|
|
# define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) ((void)(arch), dual_inner_prod_neon(x, y01, y02, N, xy1, xy2))
|
|
# endif
|
|
# endif
|
|
|
|
# if defined(FIXED_POINT)
|
|
|
|
# if defined(OPUS_ARM_MAY_HAVE_NEON)
|
|
opus_val32 celt_pitch_xcorr_neon(const opus_val16 *_x, const opus_val16 *_y,
|
|
opus_val32 *xcorr, int len, int max_pitch, int arch);
|
|
# endif
|
|
|
|
# if defined(OPUS_ARM_MAY_HAVE_MEDIA)
|
|
# define celt_pitch_xcorr_media MAY_HAVE_EDSP(celt_pitch_xcorr)
|
|
# endif
|
|
|
|
# if defined(OPUS_ARM_MAY_HAVE_EDSP)
|
|
opus_val32 celt_pitch_xcorr_edsp(const opus_val16 *_x, const opus_val16 *_y,
|
|
opus_val32 *xcorr, int len, int max_pitch, int arch);
|
|
# endif
|
|
|
|
# if defined(OPUS_HAVE_RTCD) && \
|
|
((defined(OPUS_ARM_MAY_HAVE_NEON) && !defined(OPUS_ARM_PRESUME_NEON)) || \
|
|
(defined(OPUS_ARM_MAY_HAVE_MEDIA) && !defined(OPUS_ARM_PRESUME_MEDIA)) || \
|
|
(defined(OPUS_ARM_MAY_HAVE_EDSP) && !defined(OPUS_ARM_PRESUME_EDSP)))
|
|
extern opus_val32
|
|
(*const CELT_PITCH_XCORR_IMPL[OPUS_ARCHMASK+1])(const opus_val16 *,
|
|
const opus_val16 *, opus_val32 *, int, int, int);
|
|
# define OVERRIDE_PITCH_XCORR (1)
|
|
# define celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \
|
|
((*CELT_PITCH_XCORR_IMPL[(arch)&OPUS_ARCHMASK])(_x, _y, \
|
|
xcorr, len, max_pitch, arch))
|
|
|
|
# elif defined(OPUS_ARM_PRESUME_EDSP) || \
|
|
defined(OPUS_ARM_PRESUME_MEDIA) || \
|
|
defined(OPUS_ARM_PRESUME_NEON)
|
|
# define OVERRIDE_PITCH_XCORR (1)
|
|
# define celt_pitch_xcorr (PRESUME_NEON(celt_pitch_xcorr))
|
|
|
|
# endif
|
|
|
|
# if defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
|
|
void xcorr_kernel_neon_fixed(
|
|
const opus_val16 *x,
|
|
const opus_val16 *y,
|
|
opus_val32 sum[4],
|
|
int len);
|
|
# endif
|
|
|
|
# if defined(OPUS_HAVE_RTCD) && \
|
|
(defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && !defined(OPUS_ARM_PRESUME_NEON_INTR))
|
|
|
|
extern void (*const XCORR_KERNEL_IMPL[OPUS_ARCHMASK + 1])(
|
|
const opus_val16 *x,
|
|
const opus_val16 *y,
|
|
opus_val32 sum[4],
|
|
int len);
|
|
|
|
# define OVERRIDE_XCORR_KERNEL (1)
|
|
# define xcorr_kernel(x, y, sum, len, arch) \
|
|
((*XCORR_KERNEL_IMPL[(arch) & OPUS_ARCHMASK])(x, y, sum, len))
|
|
|
|
# elif defined(OPUS_ARM_PRESUME_NEON_INTR)
|
|
# define OVERRIDE_XCORR_KERNEL (1)
|
|
# define xcorr_kernel(x, y, sum, len, arch) \
|
|
((void)arch, xcorr_kernel_neon_fixed(x, y, sum, len))
|
|
|
|
# endif
|
|
|
|
#else /* Start !FIXED_POINT */
|
|
/* Float case */
|
|
#if defined(OPUS_ARM_MAY_HAVE_NEON_INTR)
|
|
void celt_pitch_xcorr_float_neon(const opus_val16 *_x, const opus_val16 *_y,
|
|
opus_val32 *xcorr, int len, int max_pitch, int arch);
|
|
#endif
|
|
|
|
# if defined(OPUS_HAVE_RTCD) && \
|
|
(defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && !defined(OPUS_ARM_PRESUME_NEON_INTR))
|
|
extern void
|
|
(*const CELT_PITCH_XCORR_IMPL[OPUS_ARCHMASK+1])(const opus_val16 *,
|
|
const opus_val16 *, opus_val32 *, int, int, int);
|
|
|
|
# define OVERRIDE_PITCH_XCORR (1)
|
|
# define celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \
|
|
((*CELT_PITCH_XCORR_IMPL[(arch)&OPUS_ARCHMASK])(_x, _y, \
|
|
xcorr, len, max_pitch, arch))
|
|
|
|
# elif defined(OPUS_ARM_PRESUME_NEON_INTR)
|
|
|
|
# define OVERRIDE_PITCH_XCORR (1)
|
|
# define celt_pitch_xcorr celt_pitch_xcorr_float_neon
|
|
|
|
# endif
|
|
|
|
#endif /* end !FIXED_POINT */
|
|
|
|
#endif
|