virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit '7d07ee5a9bd170a06d26fd967cf8de5d3b1ce331'

Browse Source 
* commit '7d07ee5a9bd170a06d26fd967cf8de5d3b1ce331':
  ppc: cpu: Add support for VSX and POWER8 extensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-31 22:47:29 +02:00
commit 58a4204873
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/cpu.h
View File

@ -57,6 +57,8 @@
#define AV_CPU_FLAG_BMI2 0x40000 ///< Bit Manipulation Instruction Set 2 #define AV_CPU_FLAG_BMI2 0x40000 ///< Bit Manipulation Instruction Set 2
#define AV_CPU_FLAG_ALTIVEC 0x0001 ///< standard #define AV_CPU_FLAG_ALTIVEC 0x0001 ///< standard
#define AV_CPU_FLAG_VSX 0x0002 ///< ISA 2.06
#define AV_CPU_FLAG_POWER8 0x0004 ///< ISA 2.07
#define AV_CPU_FLAG_ARMV5TE (1 << 0) #define AV_CPU_FLAG_ARMV5TE (1 << 0)
#define AV_CPU_FLAG_ARMV6 (1 << 1) #define AV_CPU_FLAG_ARMV6 (1 << 1)

20
libavutil/ppc/cpu.c
View File

@ -88,6 +88,14 @@ int ff_get_cpu_flags_ppc(void)
if (buf[i] == AT_HWCAP) { if (buf[i] == AT_HWCAP) {
if (buf[i + 1] & PPC_FEATURE_HAS_ALTIVEC) if (buf[i + 1] & PPC_FEATURE_HAS_ALTIVEC)
ret = AV_CPU_FLAG_ALTIVEC; ret = AV_CPU_FLAG_ALTIVEC;
#ifdef PPC_FEATURE_HAS_VSX
if (buf[i + 1] & PPC_FEATURE_HAS_VSX)
ret |= AV_CPU_FLAG_VSX;
#endif
#ifdef PPC_FEATURE_ARCH_2_07
if (buf[i + 1] & PPC_FEATURE_HAS_POWER8)
ret |= AV_CPU_FLAG_POWER8;
#endif
goto out; goto out;
} }
} }
@ -106,7 +114,7 @@ out:
#define PVR_POWER7 0x003F #define PVR_POWER7 0x003F
#define PVR_POWER8 0x004B #define PVR_POWER8 0x004B
#define PVR_CELL_PPU 0x0070 #define PVR_CELL_PPU 0x0070
int ret = 0;
int proc_ver; int proc_ver;
// Support of mfspr PVR emulation added in Linux 2.6.17. // Support of mfspr PVR emulation added in Linux 2.6.17.
__asm__ volatile("mfspr %0, 287" : "=r" (proc_ver)); __asm__ volatile("mfspr %0, 287" : "=r" (proc_ver));
@ -121,8 +129,14 @@ out:
proc_ver == PVR_POWER7 || proc_ver == PVR_POWER7 ||
proc_ver == PVR_POWER8 || proc_ver == PVR_POWER8 ||
proc_ver == PVR_CELL_PPU) proc_ver == PVR_CELL_PPU)
return AV_CPU_FLAG_ALTIVEC; ret = AV_CPU_FLAG_ALTIVEC;
return 0; if (proc_ver == PVR_POWER7 ||
proc_ver == PVR_POWER8)
ret |= AV_CPU_FLAG_VSX;
if (proc_ver == PVR_POWER8)
ret |= AV_CPU_FLAG_POWER8;
return ret;
#else #else
// Since we were compiled for AltiVec, just assume we have it // Since we were compiled for AltiVec, just assume we have it
// until someone comes up with a proper way (not involving signal hacks). // until someone comes up with a proper way (not involving signal hacks).

2
libavutil/ppc/cpu.h
View File

@ -24,5 +24,7 @@
#include "libavutil/cpu_internal.h" #include "libavutil/cpu_internal.h"
#define PPC_ALTIVEC(flags) CPUEXT(flags, ALTIVEC) #define PPC_ALTIVEC(flags) CPUEXT(flags, ALTIVEC)
#define PPC_VSX(flags) CPUEXT(flags, VSX)
#define PPC_POWER8(flags) CPUEXT(flags, POWER8)
#endif /* AVUTIL_PPC_CPU_H */ #endif /* AVUTIL_PPC_CPU_H */