opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-21 00:46:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

libavutil/ppc: Include the hardware feature flags like the other archs

Browse Source 
Also include the hardware feature flags like the other archs do and
clean up the code a bit.

Tested on Linux POWER9.

Signed-off-by: Brad Smith <brad@comstyle.com>
This commit is contained in:
Brad Smith
2024-10-21 11:57:44 -04:00
parent d724584d68
commit d6b2d08fc7
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
libavutil/ppc/cpu.c
View File

@ -46,6 +46,17 @@
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/cpu_internal.h" #include "libavutil/cpu_internal.h"
#ifndef AT_HWCAP
#define AT_HWCAP 16
#endif
#ifndef AT_HWCAP2
#define AT_HWCAP2 26
#endif
#define HWCAP_PPC_VSX (1 << 7)
#define HWCAP_PPC_ALTIVEC (1 << 28)
#define HWCAP2_PPC_ARCH_2_07 (1 << 31)
/** /**
* This function MAY rely on signal() or fork() in order to make sure AltiVec * This function MAY rely on signal() or fork() in order to make sure AltiVec
* is present. * is present.
@ -65,20 +76,14 @@ int ff_get_cpu_flags_ppc(void)
int flags = 0; int flags = 0;
unsigned long hwcap = ff_getauxval(AT_HWCAP); unsigned long hwcap = ff_getauxval(AT_HWCAP);
#ifdef PPC_FEATURE2_ARCH_2_07
unsigned long hwcap2 = ff_getauxval(AT_HWCAP2); unsigned long hwcap2 = ff_getauxval(AT_HWCAP2);
#endif
if (hwcap & PPC_FEATURE_HAS_ALTIVEC) if (hwcap & HWCAP_PPC_ALTIVEC)
flags |= AV_CPU_FLAG_ALTIVEC; flags |= AV_CPU_FLAG_ALTIVEC;
#ifdef PPC_FEATURE_HAS_VSX if (hwcap & HWCAP_PPC_VSX)
if (hwcap & PPC_FEATURE_HAS_VSX)
flags |= AV_CPU_FLAG_VSX; flags |= AV_CPU_FLAG_VSX;
#endif if (hwcap2 & HWCAP2_PPC_ARCH_2_07)
#ifdef PPC_FEATURE2_ARCH_2_07
if (hwcap2 & PPC_FEATURE2_ARCH_2_07)
flags |= AV_CPU_FLAG_POWER8; flags |= AV_CPU_FLAG_POWER8;
#endif
return flags; return flags;
#elif defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__) #elif defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__)
@ -112,23 +117,17 @@ int ff_get_cpu_flags_ppc(void)
if (buf[i] == AT_NULL) if (buf[i] == AT_NULL)
goto out; goto out;
if (buf[i] == AT_HWCAP) { if (buf[i] == AT_HWCAP) {
if (buf[i + 1] & PPC_FEATURE_HAS_ALTIVEC) if (buf[i + 1] & HWCAP_PPC_ALTIVEC)
ret = AV_CPU_FLAG_ALTIVEC; ret = AV_CPU_FLAG_ALTIVEC;
#ifdef PPC_FEATURE_HAS_VSX if (buf[i + 1] & HWCAP_PPC_VSX)
if (buf[i + 1] & PPC_FEATURE_HAS_VSX)
ret |= AV_CPU_FLAG_VSX; ret |= AV_CPU_FLAG_VSX;
#endif
if (ret & AV_CPU_FLAG_VSX) if (ret & AV_CPU_FLAG_VSX)
av_assert0(ret & AV_CPU_FLAG_ALTIVEC); av_assert0(ret & AV_CPU_FLAG_ALTIVEC);
} }
#ifdef AT_HWCAP2 /* not introduced until glibc 2.18 */
else if (buf[i] == AT_HWCAP2) { else if (buf[i] == AT_HWCAP2) {
#ifdef PPC_FEATURE2_ARCH_2_07 if (buf[i + 1] & HWCAP2_PPC_ARCH_2_07)
if (buf[i + 1] & PPC_FEATURE2_ARCH_2_07)
ret |= AV_CPU_FLAG_POWER8; ret |= AV_CPU_FLAG_POWER8;
#endif
} }
#endif /* AT_HWCAP2 */
} }
} }