Reviewers: Sven Panne,
Message:
PTAL
Description:
[x86] Blacklist AVX for Windows versions before 6.1 (Windows 7).
BUG=v8:3846
LOG=y
Please review this at https://codereview.chromium.org/869133002/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+41, -5 lines):
M src/ia32/assembler-ia32.cc
M src/x64/assembler-x64.cc
Index: src/ia32/assembler-ia32.cc
diff --git a/src/ia32/assembler-ia32.cc b/src/ia32/assembler-ia32.cc
index
9815f01b2ca7ab2cd15fbd1a09375347a60aeb50..19e69b319121dc786f6695706641a320e860874e
100644
--- a/src/ia32/assembler-ia32.cc
+++ b/src/ia32/assembler-ia32.cc
@@ -36,14 +36,19 @@
#include "src/ia32/assembler-ia32.h"
+#include <cstring>
+
+#if V8_TARGET_ARCH_IA32
+
#if V8_OS_MACOSX
#include <sys/sysctl.h>
#endif
-#if V8_TARGET_ARCH_IA32
-
#include "src/base/bits.h"
#include "src/base/cpu.h"
+#if V8_OS_WIN
+#include "src/base/win32-headers.h"
+#endif
#include "src/disassembler.h"
#include "src/macro-assembler.h"
#include "src/v8.h"
@@ -73,6 +78,19 @@ bool EnableAVX() {
*period_pos = '\0';
long kernel_version_major = strtol(buffer, nullptr, 10); // NOLINT
if (kernel_version_major <= 13) return false;
+#elif V8_OS_WIN
+ // The same problem seems to appear on Windows XP and Vista.
+ OSVERSIONINFOEX osvi;
+ DWORDLONG mask = 0;
+ memset(&osvi, 0, sizeof(osvi));
+ osvi.dwOSVersionInfoSize = sizeof(osvi);
+ osvi.dwMajorVersion = 6;
+ osvi.dwMinorVersion = 1;
+ VER_SET_CONDITION(mask, VER_MAJORVERSION, VER_GREATER_EQUAL);
+ VER_SET_CONDITION(mask, VER_MINORVERSION, VER_GREATER_EQUAL);
+ if (!VerifyVersionInfo(&osvi, VER_MAJORVERSION | VER_MINORVERSION,
mask)) {
+ return false;
+ }
#endif // V8_OS_MACOSX
return FLAG_enable_avx;
}
Index: src/x64/assembler-x64.cc
diff --git a/src/x64/assembler-x64.cc b/src/x64/assembler-x64.cc
index
e4d099392c1ceae5da6eea3389018e18d6dbea81..1806d5d639dd10c0b30a4cf273500cb073c0b3b0
100644
--- a/src/x64/assembler-x64.cc
+++ b/src/x64/assembler-x64.cc
@@ -4,13 +4,18 @@
#include "src/x64/assembler-x64.h"
+#include <cstring>
+
+#if V8_TARGET_ARCH_X64
+
#if V8_OS_MACOSX
#include <sys/sysctl.h>
#endif
-#if V8_TARGET_ARCH_X64
-
#include "src/base/bits.h"
+#if V8_OS_WIN
+#include "src/base/win32-headers.h"
+#endif
#include "src/macro-assembler.h"
#include "src/v8.h"
@@ -28,7 +33,7 @@ bool EnableAVX() {
// caused by ISRs, so we detect that here and disable AVX in that case.
char buffer[128];
size_t buffer_size = arraysize(buffer);
- int ctl_name[] = { CTL_KERN , KERN_OSRELEASE };
+ int ctl_name[] = {CTL_KERN, KERN_OSRELEASE};
if (sysctl(ctl_name, 2, buffer, &buffer_size, nullptr, 0) != 0) {
V8_Fatal(__FILE__, __LINE__, "V8 failed to get kernel version");
}
@@ -39,6 +44,19 @@ bool EnableAVX() {
*period_pos = '\0';
long kernel_version_major = strtol(buffer, nullptr, 10); // NOLINT
if (kernel_version_major <= 13) return false;
+#elif V8_OS_WIN
+ // The same problem seems to appear on Windows XP and Vista.
+ OSVERSIONINFOEX osvi;
+ DWORDLONG mask = 0;
+ memset(&osvi, 0, sizeof(osvi));
+ osvi.dwOSVersionInfoSize = sizeof(osvi);
+ osvi.dwMajorVersion = 6;
+ osvi.dwMinorVersion = 1;
+ VER_SET_CONDITION(mask, VER_MAJORVERSION, VER_GREATER_EQUAL);
+ VER_SET_CONDITION(mask, VER_MINORVERSION, VER_GREATER_EQUAL);
+ if (!VerifyVersionInfo(&osvi, VER_MAJORVERSION | VER_MINORVERSION,
mask)) {
+ return false;
+ }
#endif // V8_OS_MACOSX
return FLAG_enable_avx;
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
