diff options
| author | James Almer <jamrial@gmail.com> | 2017-01-31 15:20:54 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-01-31 15:20:54 -0300 |
| commit | 8d5df204d002bef25aadc4d7667e32c4fecaa2b7 (patch) | |
| tree | f2a4230cae582daf8e90dd54632b50dc316afe97 /libavutil | |
| parent | 2eab48177d74782cf948e7ae13aef2ee5d7ab1c1 (diff) | |
| parent | 8e9cd81d291b1010c625b2766058aadf4affb537 (diff) | |
Merge commit '8e9cd81d291b1010c625b2766058aadf4affb537'
* commit '8e9cd81d291b1010c625b2766058aadf4affb537':
x86: cpu: Detect Conroe CPUs and their slow shuffle unit
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/x86/cpu.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c index f3a49c6772..1b80847d19 100644 --- a/libavutil/x86/cpu.c +++ b/libavutil/x86/cpu.c @@ -221,6 +221,12 @@ int ff_get_cpu_flags_x86(void) * functions on the Atom. */ if (family == 6 && model == 28) rval |= AV_CPU_FLAG_ATOM; + + /* Conroe has a slow shuffle unit. Check the model number to ensure not + * to include crippled low-end Penryns and Nehalems that lack SSE4. */ + if ((rval & AV_CPU_FLAG_SSSE3) && !(rval & AV_CPU_FLAG_SSE4) && + family == 6 && model < 23) + rval |= AV_CPU_FLAG_SSSE3SLOW; } #endif /* cpuid */ |