max/x264
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Provide x264_getauxval() wrapper for getauxvaul() and elf_aux_info()

Browse Source
This commit is contained in:
Brad Smith
2024-10-16 11:09:57 -04:00
parent 3a8b5be2a2
commit 1243d9ffb0
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/cpu.c
+19 -13
View File
@@ -27,6 +27,9 @@
#include "base.h"
#if HAVE_GETAUXVAL || HAVE_ELF_AUX_INFO
#include <sys/auxv.h>
#endif
#if SYS_CYGWIN || SYS_SunOS || SYS_OPENBSD
#include <unistd.h>
#endif
@@ -107,6 +110,19 @@ const x264_cpu_name_t x264_cpu_names[] =
{"", 0},
};
static unsigned long x264_getauxval( unsigned long type )
{
#if HAVE_GETAUXVAL
return getauxval( type );
#elif HAVE_ELF_AUX_INFO
unsigned long aux = 0;
elf_aux_info( type, &aux, sizeof(aux) );
return aux;
#else
return 0;
#endif
}
#if (HAVE_ALTIVEC && SYS_LINUX) || (HAVE_ARMV6 && !HAVE_NEON)
#include <signal.h>
#include <setjmp.h>
@@ -421,7 +437,6 @@ uint32_t x264_cpu_detect( void )
#elif HAVE_AARCH64
#if defined(__linux__) || HAVE_ELF_AUX_INFO
#include <sys/auxv.h>
#define HWCAP_AARCH64_SVE (1 << 22)
#define HWCAP2_AARCH64_SVE2 (1 << 1)
@@ -430,16 +445,8 @@ static uint32_t detect_flags( void )
{
uint32_t flags = 0;
#if HAVE_ELF_AUX_INFO
unsigned long hwcap = 0;
unsigned long hwcap2 = 0;
elf_aux_info( AT_HWCAP, &hwcap, sizeof(hwcap) );
elf_aux_info( AT_HWCAP2, &hwcap2, sizeof(hwcap2) );
#else
unsigned long hwcap = getauxval( AT_HWCAP );
unsigned long hwcap2 = getauxval( AT_HWCAP2 );
#endif
unsigned long hwcap = x264_getauxval( AT_HWCAP );
unsigned long hwcap2 = x264_getauxval( AT_HWCAP2 );
if ( hwcap & HWCAP_AARCH64_SVE )
flags |= X264_CPU_SVE;
@@ -482,7 +489,6 @@ uint32_t x264_cpu_detect( void )
}
#elif HAVE_LSX
#include <sys/auxv.h>
#define LA_HWCAP_LSX ( 1U << 4 )
#define LA_HWCAP_LASX ( 1U << 5 )
@@ -490,7 +496,7 @@ uint32_t x264_cpu_detect( void )
uint32_t x264_cpu_detect( void )
{
uint32_t flags = 0;
uint32_t hwcap = (uint32_t)getauxval( AT_HWCAP );
uint32_t hwcap = (uint32_t)x264_getauxval( AT_HWCAP );
if( hwcap & LA_HWCAP_LSX )
flags |= X264_CPU_LSX;
configure
Vendored
+5 -1
View File
@@ -411,7 +411,7 @@ NL="
# list of all preprocessor HAVE values we can define
CONFIG_HAVE="MALLOC_H ALTIVEC ALTIVEC_H MMX ARMV6 ARMV6T2 NEON AARCH64 BEOSTHREAD POSIXTHREAD WIN32THREAD THREAD LOG2F SWSCALE \
LAVF FFMS GPAC AVS GPL VECTOREXT INTERLACED CPU_COUNT OPENCL THP LSMASH X86_INLINE_ASM AS_FUNC INTEL_DISPATCHER \
MSA LSX MMAP WINRT VSX ARM_INLINE_ASM STRTOK_R CLOCK_GETTIME BITDEPTH8 BITDEPTH10 SVE SVE2 ELF_AUX_INFO"
MSA LSX MMAP WINRT VSX ARM_INLINE_ASM STRTOK_R CLOCK_GETTIME BITDEPTH8 BITDEPTH10 SVE SVE2 ELF_AUX_INFO GETAUXVAL"
# parse options
@@ -1143,6 +1143,10 @@ elif cc_check 'time.h' '-lrt' 'clock_gettime(CLOCK_MONOTONIC, 0);' ; then
LDFLAGS="$LDFLAGS -lrt"
fi
if cc_check 'sys/auxv.h' '' 'getauxval(AT_HWCAP);' ; then
define HAVE_GETAUXVAL
fi
if cc_check 'sys/auxv.h' '' 'unsigned long auxv = 0; elf_aux_info(AT_HWCAP, &auxv, sizeof(auxv));' ; then
define HAVE_ELF_AUX_INFO
fi