ref: 243029faff45872fa47d2053bf3375bcfee6dfd9
parent: ef665996ae59a43575272449d0120a67457a7856
parent: 8c29d332c9a0d9db19b916d4910935d5ee6b6338
author: Nico Weber <[email protected]>
date: Wed Jun 22 15:06:47 EDT 2016
Merge "win: Include <intrin.h> instead of manually declaring intrinsics."
--- a/vpx_ports/x86.h
+++ b/vpx_ports/x86.h
@@ -12,6 +12,11 @@
#ifndef VPX_PORTS_X86_H_
#define VPX_PORTS_X86_H_
#include <stdlib.h>
+
+#if defined(_MSC_VER)
+#include <intrin.h> /* For __cpuidex, __rdtsc */
+#endif
+
#include "vpx_config.h"
#include "vpx/vpx_integer.h"
@@ -77,8 +82,6 @@
#else /* end __SUNPRO__ */
#if ARCH_X86_64
#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 {\int regs[4];\
__cpuidex(regs, func, func2); \
@@ -85,8 +88,6 @@
a = regs[0]; b = regs[1]; c = regs[2]; d = regs[3];\
} while(0)
#else
-void __cpuid(int CPUInfo[4], int info_type);
-#pragma intrinsic(__cpuid)
#define cpuid(func, func2, a, b, c, d) do {\int regs[4];\
__cpuid(regs, func); \
@@ -212,10 +213,6 @@
return flags & mask;
}
-#if ARCH_X86_64 && defined(_MSC_VER)
-unsigned __int64 __rdtsc(void);
-#pragma intrinsic(__rdtsc)
-#endif
// Note:
// 32-bit CPU cycle counter is light-weighted for most function performance
// measurement. For large function (CPU time > a couple of seconds), 64-bit