Changeset 244505 in webkit

Timestamp:

Apr 22, 2019 11:30:16 AM (5 years ago)

Author:

ysuzuki@apple.com

Message:

[JSC] useJIT should subsume useRegExpJIT
​https://bugs.webkit.org/show_bug.cgi?id=197153

Reviewed by Alex Christensen.

useJIT should subsume useRegExpJIT. We should immediately disable JIT feature if useJIT = false,
even if useRegExpJIT is true.

• dfg/DFGCapabilities.cpp:

(JSC::DFG::isSupported):

• runtime/Options.cpp:

(JSC::recomputeDependentOptions):

• runtime/RegExp.cpp:

(JSC::RegExp::compile):
(JSC::RegExp::compileMatchOnly):

• runtime/VM.cpp:

(JSC::enableAssembler):
(JSC::VM::canUseRegExpJIT): Deleted.

• runtime/VM.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGCapabilities.cpp (modified) (1 diff)
• runtime/Options.cpp (modified) (2 diffs)
• runtime/RegExp.cpp (modified) (2 diffs)
• runtime/VM.cpp (modified) (2 diffs)
• runtime/VM.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-04-22  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] useJIT should subsume useRegExpJIT
+        https://bugs.webkit.org/show_bug.cgi?id=197153
+
+        Reviewed by Alex Christensen.
+
+        useJIT should subsume useRegExpJIT. We should immediately disable JIT feature if useJIT = false,
+        even if useRegExpJIT is true.
+
+        * dfg/DFGCapabilities.cpp:
+        (JSC::DFG::isSupported):
+        * runtime/Options.cpp:
+        (JSC::recomputeDependentOptions):
+        * runtime/RegExp.cpp:
+        (JSC::RegExp::compile):
+        (JSC::RegExp::compileMatchOnly):
+        * runtime/VM.cpp:
+        (JSC::enableAssembler):
+        (JSC::VM::canUseRegExpJIT): Deleted.
+        * runtime/VM.h:
+
 2019-04-22  Basuke Suzuki  <basuke.suzuki@sony.com>
 

trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp

@@ -39 +39 @@
 bool isSupported()
 {
-    return Options::useDFGJIT()
-        && MacroAssembler::supportsFloatingPoint();
+    return VM::canUseJIT() && Options::useDFGJIT() && MacroAssembler::supportsFloatingPoint();
 }
 

trunk/Source/JavaScriptCore/runtime/Options.cpp

@@ -393 +393 @@
     Options::useLLInt() = true;
     Options::useJIT() = false;
+    Options::useBaselineJIT() = false;
     Options::useDFGJIT() = false;
     Options::useFTLJIT() = false;
     Options::useDOMJIT() = false;
+    Options::useRegExpJIT() = false;
+#endif
+#if !ENABLE(CONCURRENT_JS)
+    Options::useConcurrentJIT() = false;
 #endif
 #if !ENABLE(YARR_JIT)
     Options::useRegExpJIT() = false;
-#endif
-#if !ENABLE(CONCURRENT_JS)
-    Options::useConcurrentJIT() = false;
 #endif
 #if !ENABLE(DFG_JIT)
@@ -413 +415 @@
 #if !CPU(X86_64) && !CPU(ARM64)
     Options::useConcurrentGC() = false;
-#endif
-    
-#if ENABLE(JIT) && CPU(X86)
-    // Disable JIT on IA-32 if SSE2 is not present
-    if (!MacroAssemblerX86::supportsFloatingPoint())
-        Options::useJIT() = false;
 #endif
 

trunk/Source/JavaScriptCore/runtime/RegExp.cpp

@@ -259 +259 @@
 
 #if ENABLE(YARR_JIT)
-    if (!pattern.containsUnsignedLengthPattern() && VM::canUseRegExpJIT()
+    if (!pattern.containsUnsignedLengthPattern() && VM::canUseJIT() && Options::useRegExpJIT()
 #if !ENABLE(YARR_JIT_BACKREFERENCES)
         && !pattern.m_containsBackreferences
@@ -317 +317 @@
 
 #if ENABLE(YARR_JIT)
-    if (!pattern.containsUnsignedLengthPattern() && VM::canUseRegExpJIT()
+    if (!pattern.containsUnsignedLengthPattern() && VM::canUseJIT() && Options::useRegExpJIT()
 #if !ENABLE(YARR_JIT_BACKREFERENCES)
         && !pattern.m_containsBackreferences

trunk/Source/JavaScriptCore/runtime/VM.cpp

@@ -191 +191 @@
 static bool enableAssembler()
 {
-    if (!Options::useJIT() && !Options::useRegExpJIT())
+    if (!Options::useJIT())
         return false;
 
@@ -231 +231 @@
 #endif
     s_canUseJIT = VM::canUseAssembler() && Options::useJIT();
-#endif
-}
-
-bool VM::canUseRegExpJIT()
-{
-#if ENABLE(YARR_JIT)
-    static std::once_flag onceKey;
-    static bool enabled = false;
-    std::call_once(onceKey, [] {
-        enabled = VM::canUseAssembler() && Options::useRegExpJIT();
-    });
-    return enabled;
-#else
-    return false; // interpreter only
 #endif
 }

trunk/Source/JavaScriptCore/runtime/VM.h

@@ -634 +634 @@
 
     static JS_EXPORT_PRIVATE bool canUseAssembler();
-    static JS_EXPORT_PRIVATE bool canUseRegExpJIT();
     static JS_EXPORT_PRIVATE bool isInMiniMode();