Changeset 243989 in webkit

Timestamp:

Apr 8, 2019 3:16:22 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[CMake] Detect SSE2 at compile time
​https://bugs.webkit.org/show_bug.cgi?id=196488

Patch by Xan Lopez <Xan Lopez> on 2019-04-08
Reviewed by Carlos Garcia Campos.

.:

• CMakeLists.txt: Use FindSSE2.cmake to detect SSE2 support.
• Source/cmake/FindSSE2.cmake: Added.

Source/JavaScriptCore:

• assembler/MacroAssemblerX86Common.cpp: Remove unnecessary (and

incorrect) static_assert.

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp (modified) (3 diffs)
• Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h (modified) (2 diffs)
• Source/cmake/FindSSE2.cmake (added)

trunk/CMakeLists.txt

@@ -115 +115 @@
 endif ()
 
+#---------------------------
+# Make sure SSE2 is present.
+#---------------------------
+if (WTF_CPU_X86)
+    include(FindSSE2)
+    if (NOT SSE2_SUPPORT_FOUND)
+        message(FATAL_ERROR "SSE2 support is required to compile WebKit")
+    endif ()
+endif ()
+
 # -----------------------------------------------------------------------------
 # Determine the operating system

trunk/ChangeLog

@@ +1 @@
+2019-04-08  Xan Lopez  <xan@igalia.com>
+
+        [CMake] Detect SSE2 at compile time
+        https://bugs.webkit.org/show_bug.cgi?id=196488
+
+        Reviewed by Carlos Garcia Campos.
+
+        * CMakeLists.txt: Use FindSSE2.cmake to detect SSE2 support.
+        * Source/cmake/FindSSE2.cmake: Added.
+
 2019-04-05  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-04-08  Xan Lopez  <xan@igalia.com>
+
+        [CMake] Detect SSE2 at compile time
+        https://bugs.webkit.org/show_bug.cgi?id=196488
+
+        Reviewed by Carlos Garcia Campos.
+
+        * assembler/MacroAssemblerX86Common.cpp: Remove unnecessary (and
+        incorrect) static_assert.
+
 2019-04-07  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp

@@ -168 +168 @@
 static_assert(sizeof(Probe::State) == PROBE_SIZE, "Probe::State::size's matches ctiMasmProbeTrampoline");
 static_assert((PROBE_EXECUTOR_OFFSET + PTR_SIZE) <= (PROBE_SIZE + OUT_SIZE), "Must have room after ProbeContext to stash the probe handler");
-
-#if CPU(X86)
-// SSE2 is a hard requirement on x86.
-static_assert(isSSE2Present(), "SSE2 support is required in JavaScriptCore");
-#endif
 
 #undef PROBE_OFFSETOF
@@ -793 +788 @@
         {
             CPUID cpuid = getCPUID(0x1);
-            s_sse2CheckState = (cpuid[3] & (1 << 26)) ? CPUIDCheckState::Set : CPUIDCheckState::Clear;
             s_sse4_1CheckState = (cpuid[2] & (1 << 19)) ? CPUIDCheckState::Set : CPUIDCheckState::Clear;
             s_sse4_2CheckState = (cpuid[2] & (1 << 20)) ? CPUIDCheckState::Set : CPUIDCheckState::Clear;
@@ -810 +804 @@
 }
 
-MacroAssemblerX86Common::CPUIDCheckState MacroAssemblerX86Common::s_sse2CheckState = CPUIDCheckState::NotChecked;
 MacroAssemblerX86Common::CPUIDCheckState MacroAssemblerX86Common::s_sse4_1CheckState = CPUIDCheckState::NotChecked;
 MacroAssemblerX86Common::CPUIDCheckState MacroAssemblerX86Common::s_sse4_2CheckState = CPUIDCheckState::NotChecked;

trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h

@@ -4198 +4198 @@
 #endif
 
-#if CPU(X86)
-#if OS(MAC_OS_X)
-
-    // All X86 Macs are guaranteed to support at least SSE2,
-    static bool isSSE2Present()
-    {
-        return true;
-    }
-
-#else // OS(MAC_OS_X)
-    static bool isSSE2Present()
-    {
-        if (s_sse2CheckState == CPUIDCheckState::NotChecked)
-            collectCPUFeatures();
-        return s_sse2CheckState == CPUIDCheckState::Set;
-    }
-
-#endif // OS(MAC_OS_X)
-#elif !defined(NDEBUG) // CPU(X86)
-
-    // On x86-64 we should never be checking for SSE2 in a non-debug build,
-    // but non debug add this method to keep the asserts above happy.
-    static bool isSSE2Present()
-    {
-        return true;
-    }
-
-#endif
-
     using CPUID = std::array<unsigned, 4>;
     static CPUID getCPUID(unsigned level);
@@ -4232 +4203 @@
     JS_EXPORT_PRIVATE static void collectCPUFeatures();
 
-    JS_EXPORT_PRIVATE static CPUIDCheckState s_sse2CheckState;
     JS_EXPORT_PRIVATE static CPUIDCheckState s_sse4_1CheckState;
     JS_EXPORT_PRIVATE static CPUIDCheckState s_sse4_2CheckState;