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>
111 lines
3.7 KiB
C
111 lines
3.7 KiB
C
/***********************************************************************
|
|
Copyright (C) 2013 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_ARMv4_H
|
|
#define SILK_MACROS_ARMv4_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_armv4(opus_int32 a, opus_int16 b)
|
|
{
|
|
unsigned rd_lo;
|
|
int rd_hi;
|
|
__asm__(
|
|
"#silk_SMULWB\n\t"
|
|
"smull %0, %1, %2, %3\n\t"
|
|
: "=&r"(rd_lo), "=&r"(rd_hi)
|
|
: "%r"(a), "r"(SAFE_SHL(b,16))
|
|
);
|
|
return rd_hi;
|
|
}
|
|
#define silk_SMULWB(a, b) (silk_SMULWB_armv4(a, b))
|
|
|
|
/* a32 + (b32 * (opus_int32)((opus_int16)(c32))) >> 16 output have to be 32bit int */
|
|
#undef silk_SMLAWB
|
|
#define silk_SMLAWB(a, b, c) ((a) + silk_SMULWB(b, c))
|
|
|
|
/* (a32 * (b32 >> 16)) >> 16 */
|
|
#undef silk_SMULWT
|
|
static OPUS_INLINE opus_int32 silk_SMULWT_armv4(opus_int32 a, opus_int32 b)
|
|
{
|
|
unsigned rd_lo;
|
|
int rd_hi;
|
|
__asm__(
|
|
"#silk_SMULWT\n\t"
|
|
"smull %0, %1, %2, %3\n\t"
|
|
: "=&r"(rd_lo), "=&r"(rd_hi)
|
|
: "%r"(a), "r"(b&~0xFFFF)
|
|
);
|
|
return rd_hi;
|
|
}
|
|
#define silk_SMULWT(a, b) (silk_SMULWT_armv4(a, b))
|
|
|
|
/* a32 + (b32 * (c32 >> 16)) >> 16 */
|
|
#undef silk_SMLAWT
|
|
#define silk_SMLAWT(a, b, c) ((a) + silk_SMULWT(b, c))
|
|
|
|
/* (a32 * b32) >> 16 */
|
|
#undef silk_SMULWW
|
|
static OPUS_INLINE opus_int32 silk_SMULWW_armv4(opus_int32 a, opus_int32 b)
|
|
{
|
|
unsigned rd_lo;
|
|
int rd_hi;
|
|
__asm__(
|
|
"#silk_SMULWW\n\t"
|
|
"smull %0, %1, %2, %3\n\t"
|
|
: "=&r"(rd_lo), "=&r"(rd_hi)
|
|
: "%r"(a), "r"(b)
|
|
);
|
|
return SAFE_SHL(rd_hi,16)+(rd_lo>>16);
|
|
}
|
|
#define silk_SMULWW(a, b) (silk_SMULWW_armv4(a, b))
|
|
|
|
#undef silk_SMLAWW
|
|
static OPUS_INLINE opus_int32 silk_SMLAWW_armv4(opus_int32 a, opus_int32 b,
|
|
opus_int32 c)
|
|
{
|
|
unsigned rd_lo;
|
|
int rd_hi;
|
|
__asm__(
|
|
"#silk_SMLAWW\n\t"
|
|
"smull %0, %1, %2, %3\n\t"
|
|
: "=&r"(rd_lo), "=&r"(rd_hi)
|
|
: "%r"(b), "r"(c)
|
|
);
|
|
return a+SAFE_SHL(rd_hi,16)+(rd_lo>>16);
|
|
}
|
|
#define silk_SMLAWW(a, b, c) (silk_SMLAWW_armv4(a, b, c))
|
|
|
|
#undef SAFE_SHL
|
|
|
|
#endif /* SILK_MACROS_ARMv4_H */
|