aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/x86
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2021-12-21 17:39:02 -0300
committerJames Almer <jamrial@gmail.com>2021-12-21 17:51:17 -0300
commit8c2d2fd6ccca4e389cb9dac4ab190965e97868a4 (patch)
treee6c22fb28341c1644fa517759c83407f86d75860 /libavutil/x86
parenteebe406c808e6061ee76e93a616537b5369dbf40 (diff)
downloadffmpeg-8c2d2fd6ccca4e389cb9dac4ab190965e97868a4.tar.gz
avutil/cpu: move slow gather checks below in the function
Put them together with other similar slow flag checks. Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil/x86')
-rw-r--r--libavutil/x86/cpu.c23
1 files changed, 9 insertions, 14 deletions
diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c
index 441b4695d5..7b13fcae91 100644
--- a/libavutil/x86/cpu.c
+++ b/libavutil/x86/cpu.c
@@ -146,21 +146,8 @@ int ff_get_cpu_flags_x86(void)
if (max_std_level >= 7) {
cpuid(7, eax, ebx, ecx, edx);
#if HAVE_AVX2
- if ((rval & AV_CPU_FLAG_AVX) && (ebx & 0x00000020)) {
+ if ((rval & AV_CPU_FLAG_AVX) && (ebx & 0x00000020))
rval |= AV_CPU_FLAG_AVX2;
- cpuid(1, eax, ebx, ecx, std_caps);
- family = ((eax >> 8) & 0xf) + ((eax >> 20) & 0xff);
- model = ((eax >> 4) & 0xf) + ((eax >> 12) & 0xf0);
- /* Haswell has slow gather */
- if (!strncmp(vendor.c, "GenuineIntel", 12))
- if (family == 6 && model < 70)
- rval |= AV_CPU_FLAG_SLOW_GATHER;
- /* Zen 3 and earlier have slow gather */
- if (!strncmp(vendor.c, "AuthenticAMD", 12))
- if (family <= 0x19)
- rval |= AV_CPU_FLAG_SLOW_GATHER;
- }
-
#if HAVE_AVX512 /* F, CD, BW, DQ, VL */
if ((xcr0_lo & 0xe0) == 0xe0) { /* OPMASK/ZMM state */
if ((rval & AV_CPU_FLAG_AVX2) && (ebx & 0xd0030000) == 0xd0030000)
@@ -209,6 +196,10 @@ int ff_get_cpu_flags_x86(void)
used unless explicitly disabled by checking AV_CPU_FLAG_AVXSLOW. */
if ((family == 0x15 || family == 0x16) && (rval & AV_CPU_FLAG_AVX))
rval |= AV_CPU_FLAG_AVXSLOW;
+
+ /* Zen 3 and earlier have slow gather */
+ if ((family <= 0x19) && (rval & AV_CPU_FLAG_AVX2))
+ rval |= AV_CPU_FLAG_SLOW_GATHER;
}
/* XOP and FMA4 use the AVX instruction coding scheme, so they can't be
@@ -248,6 +239,10 @@ int ff_get_cpu_flags_x86(void)
if ((rval & AV_CPU_FLAG_SSSE3) && !(rval & AV_CPU_FLAG_SSE4) &&
family == 6 && model < 23)
rval |= AV_CPU_FLAG_SSSE3SLOW;
+
+ /* Haswell has slow gather */
+ if ((rval & AV_CPU_FLAG_AVX2) && family == 6 && model < 70)
+ rval |= AV_CPU_FLAG_SLOW_GATHER;
}
#endif /* cpuid */