RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

3rdparty: opus: limit assembly to SSE and SSE2

Browse Source 
Otherwise whole engine builds with SSE4.1 and AVX support with LTO enabled. =/
This commit is contained in:
Alibek Omarov
2025-08-03 04:33:35 +05:00
parent b14a1b664f
commit 2557d5acaa
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
3rdparty/opus/wscript vendored
View File

@@ -64,13 +64,6 @@ def configure(conf):
conf.define('OPUS_ARM_MAY_HAVE_NEON_INTR', 1) conf.define('OPUS_ARM_MAY_HAVE_NEON_INTR', 1)
conf.define('OPUS_ARM_PRESUME_NEON', 1) conf.define('OPUS_ARM_PRESUME_NEON', 1)
elif conf.env.DEST_CPU.startswith('x86'): elif conf.env.DEST_CPU.startswith('x86'):
if conf.check(header_name='cpuid.h', mandatory=False):
conf.define('CPU_INFO_BY_C', 1)
else:
conf.define('CPU_INFO_BY_ASM', 1)
conf.define('OPUS_HAVE_RTCD', 1)
if conf.check(header_name='xmmintrin.h', mandatory = False): if conf.check(header_name='xmmintrin.h', mandatory = False):
if conf.env.COMPILER_CC != 'msvc': if conf.env.COMPILER_CC != 'msvc':
conf.env.CFLAGS += ['-msse'] conf.env.CFLAGS += ['-msse']
@@ -85,15 +78,24 @@ def configure(conf):
if conf.env.DEST_SIZEOF_VOID_P > 4: if conf.env.DEST_SIZEOF_VOID_P > 4:
conf.define('OPUS_X86_PRESUME_SSE2', 1) conf.define('OPUS_X86_PRESUME_SSE2', 1)
if conf.check(header_name='smmintrin.h', mandatory = False): # on x86_64 we enable both SSE and SSE2, so RTCD can be disabled (it's actually doesn't even build with RTCD enabled)
if conf.env.COMPILER_CC != 'msvc': if conf.env.DEST_SIZEOF_VOID_P == 4:
conf.env.CFLAGS += ['-msse4.1'] if conf.check(header_name='cpuid.h', mandatory=False):
conf.define('OPUS_X86_MAY_HAVE_SSE4_1', 1) conf.define('CPU_INFO_BY_C', 1)
else:
conf.define('CPU_INFO_BY_ASM', 1)
if conf.check(header_name='immintrin.h', mandatory = False): conf.define('OPUS_HAVE_RTCD', 1)
if conf.env.COMPILER_CC != 'msvc':
conf.env.CFLAGS += ['-mavx'] # if conf.check(header_name='smmintrin.h', mandatory = False):
conf.define('OPUS_X86_MAY_HAVE_AVX', 1) # if conf.env.COMPILER_CC != 'msvc':
# conf.env.CFLAGS += ['-msse4.1']
# conf.define('OPUS_X86_MAY_HAVE_SSE4_1', 1)
# if conf.check(header_name='immintrin.h', mandatory = False):
# if conf.env.COMPILER_CC != 'msvc':
# conf.env.CFLAGS += ['-mavx']
# conf.define('OPUS_X86_MAY_HAVE_AVX', 1)
# TODO: ARM/x86 intrinsics detection # TODO: ARM/x86 intrinsics detection
# TODO: maybe call autotools/cmake/meson instead? # TODO: maybe call autotools/cmake/meson instead?
@@ -118,7 +120,12 @@ def build(bld):
sources += bld.path.ant_glob(['opus/silk/arm/*.c', 'opus/celt/arm/*.c']) sources += bld.path.ant_glob(['opus/silk/arm/*.c', 'opus/celt/arm/*.c'])
includes += ['opus/silk/arm', 'opus/celt/arm'] includes += ['opus/silk/arm', 'opus/celt/arm']
elif bld.env.DEST_CPU.startswith('x86'): elif bld.env.DEST_CPU.startswith('x86'):
sources += bld.path.ant_glob(['opus/silk/x86/*.c', 'opus/celt/x86/*.c']) sources += ['opus/silk/x86/x86_silk_map.c',
'opus/celt/x86/pitch_sse.c',
'opus/celt/x86/pitch_sse2.c',
'opus/celt/x86/vq_sse2.c',
'opus/celt/x86/x86_celt_map.c',
'opus/celt/x86/x86cpu.c']
includes += ['opus/silk/x86', 'opus/celt/x86'] includes += ['opus/silk/x86', 'opus/celt/x86']
defines = ['OPUS_BUILD', 'FLOAT_APPROX', 'PACKAGE_VERSION="1.4.0"', 'CUSTOM_MODES', 'ENABLE_HARDENING'] defines = ['OPUS_BUILD', 'FLOAT_APPROX', 'PACKAGE_VERSION="1.4.0"', 'CUSTOM_MODES', 'ENABLE_HARDENING']