coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-07 09:16:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

ERMS detect fix

Browse Source 
BUG=213
TEST=cpuid tool and unittest
Review URL: https://webrtc-codereview.appspot.com/1201005

git-svn-id: http://libyuv.googlecode.com/svn/trunk@639 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2013-04-03 23:21:27 +00:00
parent 5ff0e973a9
commit 2f620e18ed
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 638 Version: 639
License: BSD License: BSD
License File: LICENSE License File: LICENSE

2
include/libyuv/version.h
View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 638 #define LIBYUV_VERSION 639
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

16
source/cpu_id.cc
View File

@ -80,7 +80,9 @@ __declspec(naked) __declspec(align(16))
static uint32 XGetBV(unsigned int xcr) { static uint32 XGetBV(unsigned int xcr) {
__asm { __asm {
mov ecx, [esp + 4] // xcr mov ecx, [esp + 4] // xcr
push edx
_asm _emit 0x0f _asm _emit 0x01 _asm _emit 0xd0 // xgetbv for vs2005. _asm _emit 0x0f _asm _emit 0x01 _asm _emit 0xd0 // xgetbv for vs2005.
pop edx
ret ret
} }
} }
@ -165,18 +167,14 @@ int InitCpuFlags(void) {
((cpu_info[2] & 0x00000200) ? kCpuHasSSSE3 : 0) | ((cpu_info[2] & 0x00000200) ? kCpuHasSSSE3 : 0) |
((cpu_info[2] & 0x00080000) ? kCpuHasSSE41 : 0) | ((cpu_info[2] & 0x00080000) ? kCpuHasSSE41 : 0) |
((cpu_info[2] & 0x00100000) ? kCpuHasSSE42 : 0) | ((cpu_info[2] & 0x00100000) ? kCpuHasSSE42 : 0) |
(((cpu_info[2] & 0x18000000) == 0x18000000) ? kCpuHasAVX : 0) |
kCpuHasX86; kCpuHasX86;
#ifdef HAS_XGETBV #ifdef HAS_XGETBV
if (cpu_info_ & kCpuHasAVX) { if ((cpu_info[2] & 0x18000000) == 0x18000000 && // AVX and OSSave
(XGetBV(kXCR_XFEATURE_ENABLED_MASK) & 0x06) == 0x06) { // Save YMM
__cpuid(cpu_info, 7); __cpuid(cpu_info, 7);
if ((cpu_info[1] & 0x00000020) && cpu_info_ |= ((cpu_info[1] & 0x00000020) ? kCpuHasAVX2 : 0) |
((XGetBV(kXCR_XFEATURE_ENABLED_MASK) & 0x06) == 0x06)) { ((cpu_info[1] & 0x00000200) ? kCpuHasERMS : 0) |
cpu_info_ |= kCpuHasAVX2; kCpuHasAVX;
}
if (cpu_info[1] & 0x00000200) {
cpu_info_ |= kCpuHasERMS;
}
} }
#endif #endif
// Environment variable overrides for testing. // Environment variable overrides for testing.