Revert "Cherry pick: fix AVX & AVX2 detection"

source/libvpx/vpx_ports/x86.h

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 
 #ifndef VPX_PORTS_X86_H_
 #define VPX_PORTS_X86_H_
 #include <stdlib.h>
 #include "vpx_config.h"
-#include "vpx/vpx_integer.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 typedef enum {
   VPX_CPU_UNKNOWN = -1,
   VPX_CPU_AMD,
   VPX_CPU_AMD_OLD,
   VPX_CPU_CENTAUR,
@@ skipping 71 matching lines @@
   __asm mov eax, func\
   __asm mov ecx, func2\
   __asm cpuid\
   __asm mov a, eax\
   __asm mov b, ebx\
   __asm mov c, ecx\
   __asm mov d, edx
 #endif
 #endif /* end others */
 
-// NaCl has no support for xgetbv or the raw opcode.
-#if !defined(__native_client__) && (defined(__i386__) || defined(__x86_64__))
-static INLINE uint64_t xgetbv(void) {
-  const uint32_t ecx = 0;
-  uint32_t eax, edx;
-  // Use the raw opcode for xgetbv for compatibility with older toolchains.
-  __asm__ volatile (
-    ".byte 0x0f, 0x01, 0xd0\n"
-    : "=a"(eax), "=d"(edx) : "c" (ecx));
-  return ((uint64_t)edx << 32) | eax;
-}
-#elif (defined(_M_X64) || defined(_M_IX86)) && \
-      defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 160040219  // >= VS2010 SP1
-#include <immintrin.h>
-#define xgetbv() _xgetbv(0)
-#elif defined(_MSC_VER) && defined(_M_IX86)
-static INLINE uint64_t xgetbv(void) {
-  uint32_t eax_, edx_;
-  __asm {
-    xor ecx, ecx  // ecx = 0
-    // Use the raw opcode for xgetbv for compatibility with older toolchains.
-    __asm _emit 0x0f __asm _emit 0x01 __asm _emit 0xd0
-    mov eax_, eax
-    mov edx_, edx
-  }
-  return ((uint64_t)edx_ << 32) | eax_;
-}
-#else
-#define xgetbv() 0U  // no AVX for older x64 or unrecognized toolchains.
-#endif
-
 #define HAS_MMX     0x01
 #define HAS_SSE     0x02
 #define HAS_SSE2    0x04
 #define HAS_SSE3    0x08
 #define HAS_SSSE3   0x10
 #define HAS_SSE4_1  0x20
 #define HAS_AVX     0x40
 #define HAS_AVX2    0x80
 #ifndef BIT
 #define BIT(n) (1<<n)
@@ skipping 32 matching lines @@
   if (reg_edx & BIT(25)) flags |= HAS_SSE; /* aka xmm */
 
   if (reg_edx & BIT(26)) flags |= HAS_SSE2; /* aka wmt */
 
   if (reg_ecx & BIT(0)) flags |= HAS_SSE3;
 
   if (reg_ecx & BIT(9)) flags |= HAS_SSSE3;
 
   if (reg_ecx & BIT(19)) flags |= HAS_SSE4_1;
 
-  // bits 27 (OSXSAVE) & 28 (256-bit AVX)
-  if (reg_ecx & (BIT(27) | BIT(28))) {
-    if ((xgetbv() & 0x6) == 0x6) {
-      flags |= HAS_AVX;
+  if (reg_ecx & BIT(28)) flags |= HAS_AVX;
 
-      /* Get the leaf 7 feature flags. Needed to check for AVX2 support */
-      cpuid(7, 0, reg_eax, reg_ebx, reg_ecx, reg_edx);
+  /* Get the leaf 7 feature flags. Needed to check for AVX2 support */
+  reg_eax = 7;
+  reg_ecx = 0;
+  cpuid(7, 0, reg_eax, reg_ebx, reg_ecx, reg_edx);
 
-      if (reg_ebx & BIT(5)) flags |= HAS_AVX2;
-    }
-  }
+  if (reg_ebx & BIT(5)) flags |= HAS_AVX2;
 
   return flags & mask;
 }
 
 #if ARCH_X86_64 && defined(_MSC_VER)
 unsigned __int64 __rdtsc(void);
 #pragma intrinsic(__rdtsc)
 #endif
 static INLINE unsigned int
 x86_readtsc(void) {
@@ skipping 80 matching lines @@
 }
 
 
 extern void vpx_reset_mmx_state(void);
 
 #ifdef __cplusplus
 }  // extern "C"
 #endif
 
 #endif  // VPX_PORTS_X86_H_