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>
152 lines
4.2 KiB
C
152 lines
4.2 KiB
C
/* Copyright (C) 2007-2009 Xiph.Org Foundation
|
|
Copyright (C) 2003-2008 Jean-Marc Valin
|
|
Copyright (C) 2007-2008 CSIRO
|
|
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.
|
|
*/
|
|
|
|
#ifndef FIXED_ARMv5E_H
|
|
#define FIXED_ARMv5E_H
|
|
|
|
#include "fixed_armv4.h"
|
|
|
|
/** 16x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */
|
|
#undef MULT16_32_Q16
|
|
static OPUS_INLINE opus_val32 MULT16_32_Q16_armv5e(opus_val16 a, opus_val32 b)
|
|
{
|
|
int res;
|
|
__asm__(
|
|
"#MULT16_32_Q16\n\t"
|
|
"smulwb %0, %1, %2\n\t"
|
|
: "=r"(res)
|
|
: "r"(b),"r"(a)
|
|
);
|
|
return res;
|
|
}
|
|
#define MULT16_32_Q16(a, b) (MULT16_32_Q16_armv5e(a, b))
|
|
|
|
|
|
/** 16x32 multiplication, followed by a 15-bit shift right. Results fits in 32 bits */
|
|
#undef MULT16_32_Q15
|
|
static OPUS_INLINE opus_val32 MULT16_32_Q15_armv5e(opus_val16 a, opus_val32 b)
|
|
{
|
|
int res;
|
|
__asm__(
|
|
"#MULT16_32_Q15\n\t"
|
|
"smulwb %0, %1, %2\n\t"
|
|
: "=r"(res)
|
|
: "r"(b), "r"(a)
|
|
);
|
|
return SHL32(res,1);
|
|
}
|
|
#define MULT16_32_Q15(a, b) (MULT16_32_Q15_armv5e(a, b))
|
|
|
|
|
|
/** 16x32 multiply, followed by a 15-bit shift right and 32-bit add.
|
|
b must fit in 31 bits.
|
|
Result fits in 32 bits. */
|
|
#undef MAC16_32_Q15
|
|
static OPUS_INLINE opus_val32 MAC16_32_Q15_armv5e(opus_val32 c, opus_val16 a,
|
|
opus_val32 b)
|
|
{
|
|
int res;
|
|
__asm__(
|
|
"#MAC16_32_Q15\n\t"
|
|
"smlawb %0, %1, %2, %3;\n"
|
|
: "=r"(res)
|
|
: "r"(SHL32(b,1)), "r"(a), "r"(c)
|
|
);
|
|
return res;
|
|
}
|
|
#define MAC16_32_Q15(c, a, b) (MAC16_32_Q15_armv5e(c, a, b))
|
|
|
|
/** 16x32 multiply, followed by a 16-bit shift right and 32-bit add.
|
|
Result fits in 32 bits. */
|
|
#undef MAC16_32_Q16
|
|
static OPUS_INLINE opus_val32 MAC16_32_Q16_armv5e(opus_val32 c, opus_val16 a,
|
|
opus_val32 b)
|
|
{
|
|
int res;
|
|
__asm__(
|
|
"#MAC16_32_Q16\n\t"
|
|
"smlawb %0, %1, %2, %3;\n"
|
|
: "=r"(res)
|
|
: "r"(b), "r"(a), "r"(c)
|
|
);
|
|
return res;
|
|
}
|
|
#define MAC16_32_Q16(c, a, b) (MAC16_32_Q16_armv5e(c, a, b))
|
|
|
|
/** 16x16 multiply-add where the result fits in 32 bits */
|
|
#undef MAC16_16
|
|
static OPUS_INLINE opus_val32 MAC16_16_armv5e(opus_val32 c, opus_val16 a,
|
|
opus_val16 b)
|
|
{
|
|
int res;
|
|
__asm__(
|
|
"#MAC16_16\n\t"
|
|
"smlabb %0, %1, %2, %3;\n"
|
|
: "=r"(res)
|
|
: "r"(a), "r"(b), "r"(c)
|
|
);
|
|
return res;
|
|
}
|
|
#define MAC16_16(c, a, b) (MAC16_16_armv5e(c, a, b))
|
|
|
|
/** 16x16 multiplication where the result fits in 32 bits */
|
|
#undef MULT16_16
|
|
static OPUS_INLINE opus_val32 MULT16_16_armv5e(opus_val16 a, opus_val16 b)
|
|
{
|
|
int res;
|
|
__asm__(
|
|
"#MULT16_16\n\t"
|
|
"smulbb %0, %1, %2;\n"
|
|
: "=r"(res)
|
|
: "r"(a), "r"(b)
|
|
);
|
|
return res;
|
|
}
|
|
#define MULT16_16(a, b) (MULT16_16_armv5e(a, b))
|
|
|
|
#ifdef OPUS_ARM_INLINE_MEDIA
|
|
|
|
#undef SIG2WORD16
|
|
static OPUS_INLINE opus_val16 SIG2WORD16_armv6(opus_val32 x)
|
|
{
|
|
celt_sig res;
|
|
__asm__(
|
|
"#SIG2WORD16\n\t"
|
|
"ssat %0, #16, %1, ASR #12\n\t"
|
|
: "=r"(res)
|
|
: "r"(x+2048)
|
|
);
|
|
return EXTRACT16(res);
|
|
}
|
|
#define SIG2WORD16(x) (SIG2WORD16_armv6(x))
|
|
|
|
#endif /* OPUS_ARM_INLINE_MEDIA */
|
|
|
|
#endif
|