generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "win: Include <intrin.h> instead of manually declaring intrinsics."

Browse Source
This commit is contained in:
Nico Weber
2016-06-22 19:06:47 +00:00
committed by Gerrit Code Review
parent ef665996ae 8c29d332c9
commit 243029faff
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vpx_ports/x86.h
View File

@@ -12,6 +12,11 @@
#ifndef VPX_PORTS_X86_H_ #ifndef VPX_PORTS_X86_H_
#define VPX_PORTS_X86_H_ #define VPX_PORTS_X86_H_
#include <stdlib.h> #include <stdlib.h>
#if defined(_MSC_VER)
#include <intrin.h> /* For __cpuidex, __rdtsc */
#endif
#include "vpx_config.h" #include "vpx_config.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
@@ -77,16 +82,12 @@ typedef enum {
#else /* end __SUNPRO__ */ #else /* end __SUNPRO__ */
#if ARCH_X86_64 #if ARCH_X86_64
#if defined(_MSC_VER) && _MSC_VER > 1500 #if defined(_MSC_VER) && _MSC_VER > 1500
void __cpuidex(int CPUInfo[4], int info_type, int ecxvalue);
#pragma intrinsic(__cpuidex)
#define cpuid(func, func2, a, b, c, d) do {\ #define cpuid(func, func2, a, b, c, d) do {\
int regs[4];\ int regs[4];\
__cpuidex(regs, func, func2); \ __cpuidex(regs, func, func2); \
a = regs[0]; b = regs[1]; c = regs[2]; d = regs[3];\ a = regs[0]; b = regs[1]; c = regs[2]; d = regs[3];\
} while(0) } while(0)
#else #else
void __cpuid(int CPUInfo[4], int info_type);
#pragma intrinsic(__cpuid)
#define cpuid(func, func2, a, b, c, d) do {\ #define cpuid(func, func2, a, b, c, d) do {\
int regs[4];\ int regs[4];\
__cpuid(regs, func); \ __cpuid(regs, func); \
@@ -212,10 +213,6 @@ x86_simd_caps(void) {
return flags & mask; return flags & mask;
} }
#if ARCH_X86_64 && defined(_MSC_VER)
unsigned __int64 __rdtsc(void);
#pragma intrinsic(__rdtsc)
#endif
// Note: // Note:
// 32-bit CPU cycle counter is light-weighted for most function performance // 32-bit CPU cycle counter is light-weighted for most function performance
// measurement. For large function (CPU time > a couple of seconds), 64-bit // measurement. For large function (CPU time > a couple of seconds), 64-bit