diff options
| author | fbarchard@google.com <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90> | 2013-10-21 18:10:59 +0000 |
|---|---|---|
| committer | fbarchard@google.com <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90> | 2013-10-21 18:10:59 +0000 |
| commit | e35422d94bda549997db4fc0f9b6836b325e1888 (patch) | |
| tree | ef0b56be0882e0a5ba6edf9fa1c25e27b6f76295 /util/cpuid.c | |
| parent | 78ad8d1f98a4328890b41b5b9099fe63920aa2a6 (diff) | |
| download | libyuv-e35422d94bda549997db4fc0f9b6836b325e1888.tar.gz | |
Fix AVX2 detect and a performance stall for gcc/clang.
BUG=276
TEST=Cpu unittest
R=nfullagar@google.com, ryanpetrie@google.com
Review URL: https://webrtc-codereview.appspot.com/2401004
git-svn-id: http://libyuv.googlecode.com/svn/trunk@817 16f28f9a-4ce2-e073-06de-1de4eb20be90
Diffstat (limited to 'util/cpuid.c')
| -rw-r--r-- | util/cpuid.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/util/cpuid.c b/util/cpuid.c index 79c821fd..db22871e 100644 --- a/util/cpuid.c +++ b/util/cpuid.c @@ -25,7 +25,7 @@ int main(int argc, const char* argv[]) { #if defined(__i386__) || defined(__x86_64__) || \ defined(_M_IX86) || defined(_M_X64) if (has_x86) { - int family, model, cpu_info[4]; + uint32 family, model, cpu_info[4]; // Vendor ID: // AuthenticAMD AMD processor // CentaurHauls Centaur processor @@ -37,7 +37,7 @@ int main(int argc, const char* argv[]) { // RiseRiseRise Rise Technology processor // SiS SiS SiS SiS processor // UMC UMC UMC UMC processor - CpuId(cpu_info, 0); + CpuId(0, 0, &cpu_info[0]); cpu_info[0] = cpu_info[1]; // Reorder output cpu_info[1] = cpu_info[3]; cpu_info[3] = 0; @@ -50,7 +50,7 @@ int main(int argc, const char* argv[]) { // 13:12 - Processor Type // 19:16 - Extended Model // 27:20 - Extended Family - CpuId(cpu_info, 1); + CpuId(1, 0, &cpu_info[0]); family = ((cpu_info[0] >> 8) & 0x0f) | ((cpu_info[0] >> 16) & 0xff0); model = ((cpu_info[0] >> 4) & 0x0f) | ((cpu_info[0] >> 12) & 0xf0); printf("Cpu Family %d (0x%x), Model %d (0x%x)\n", family, family, |