Changeset 256500 in webkit

Timestamp:

Feb 12, 2020 8:11:51 PM (4 years ago)

Author:

mark.lam@apple.com

Message:

Add options for debugging WASM code.
​https://bugs.webkit.org/show_bug.cgi?id=207677
<rdar://problem/59411390>

Reviewed by Yusuke Suzuki.

Specifically ...

JSC_useBBQJIT - allows the BBQ JIT to be used if true
JSC_useOMGJIT - allows the OMG JIT to be used if true
JSC_useWasmLLIntPrologueOSR - allows prologue OSR from Wasm LLInt if true
JSC_useWasmLLIntLoopOSR - allows loop OSR from Wasm LLInt if true
JSC_useWasmLLIntEpilogueOSR - allows epilogue OSR from Wasm LLInt if true
JSC_wasmFunctionIndexRangeToCompile=N:M - wasm function index range to allow compilation on, e.g. 1:100

• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/Options.cpp:

(JSC::Options::ensureOptionsAreCoherent):

• runtime/OptionsList.h:
• wasm/WasmBBQPlan.cpp:

(JSC::Wasm::BBQPlan::BBQPlan):

• wasm/WasmOMGForOSREntryPlan.cpp:

(JSC::Wasm::OMGForOSREntryPlan::OMGForOSREntryPlan):

• wasm/WasmOMGPlan.cpp:

(JSC::Wasm::OMGPlan::OMGPlan):

• wasm/WasmOperations.cpp:

(JSC::Wasm::shouldJIT):
(JSC::Wasm::operationWasmTriggerOSREntryNow):
(JSC::Wasm::operationWasmTriggerTierUpNow):

• wasm/WasmSlowPaths.cpp:

(JSC::LLInt::shouldJIT):
(JSC::LLInt::WASM_SLOW_PATH_DECL):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (2 diffs)
• runtime/Options.cpp (modified) (1 diff)
• runtime/OptionsList.h (modified) (2 diffs)
• wasm/WasmBBQPlan.cpp (modified) (2 diffs)
• wasm/WasmOMGForOSREntryPlan.cpp (modified) (2 diffs)
• wasm/WasmOMGPlan.cpp (modified) (2 diffs)
• wasm/WasmOperations.cpp (modified) (4 diffs)
• wasm/WasmSlowPaths.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-02-12  Mark Lam  <mark.lam@apple.com>
+
+        Add options for debugging WASM code.
+        https://bugs.webkit.org/show_bug.cgi?id=207677
+        <rdar://problem/59411390>
+
+        Reviewed by Yusuke Suzuki.
+
+        Specifically ...
+
+            JSC_useBBQJIT                            - allows the BBQ JIT to be used if true
+            JSC_useOMGJIT                            - allows the OMG JIT to be used if true
+            JSC_useWasmLLIntPrologueOSR              - allows prologue OSR from Wasm LLInt if true
+            JSC_useWasmLLIntLoopOSR                  - allows loop OSR from Wasm LLInt if true
+            JSC_useWasmLLIntEpilogueOSR              - allows epilogue OSR from Wasm LLInt if true
+            JSC_wasmFunctionIndexRangeToCompile=N:M  - wasm function index range to allow compilation on, e.g. 1:100
+
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * runtime/Options.cpp:
+        (JSC::Options::ensureOptionsAreCoherent):
+        * runtime/OptionsList.h:
+        * wasm/WasmBBQPlan.cpp:
+        (JSC::Wasm::BBQPlan::BBQPlan):
+        * wasm/WasmOMGForOSREntryPlan.cpp:
+        (JSC::Wasm::OMGForOSREntryPlan::OMGForOSREntryPlan):
+        * wasm/WasmOMGPlan.cpp:
+        (JSC::Wasm::OMGPlan::OMGPlan):
+        * wasm/WasmOperations.cpp:
+        (JSC::Wasm::shouldJIT):
+        (JSC::Wasm::operationWasmTriggerOSREntryNow):
+        (JSC::Wasm::operationWasmTriggerTierUpNow):
+        * wasm/WasmSlowPaths.cpp:
+        (JSC::LLInt::shouldJIT):
+        (JSC::LLInt::WASM_SLOW_PATH_DECL):
+
 2020-02-12  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -5074 +5074 @@
                 F692A8870255597D01FF60F7 /* JSCJSValue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCJSValue.cpp; sourceTree = "<group>"; tabWidth = 8; };
                 F73926918DC64330AFCDF0D7 /* JSSourceCode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSourceCode.cpp; sourceTree = "<group>"; };
+                FE00262223F3AF33003A358F /* WebAssembly.asm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm.asm; name = WebAssembly.asm; path = llint/WebAssembly.asm; sourceTree = "<group>"; };
                 FE086BC92123DEFA003F2929 /* EntryFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EntryFrame.h; sourceTree = "<group>"; };
                 FE0D4A041AB8DD0A002F54BF /* ExecutionTimeLimitTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ExecutionTimeLimitTest.cpp; path = API/tests/ExecutionTimeLimitTest.cpp; sourceTree = "<group>"; };
@@ -5477 +5478 @@
                                 86A054471556451B00445157 /* LowLevelInterpreter32_64.asm */,
                                 86A054481556451B00445157 /* LowLevelInterpreter64.asm */,
+                                FE00262223F3AF33003A358F /* WebAssembly.asm */,
                         );
                         name = llint;

trunk/Source/JavaScriptCore/runtime/Options.cpp

@@ -950 +950 @@
         dataLog("INCOHERENT OPTIONS: at least one of useLLInt or useJIT must be true\n");
     }
+    if (useWebAssembly() && !(useWasmLLInt() || useBBQJIT())) {
+        coherent = false;
+        dataLog("INCOHERENT OPTIONS: at least one of useWasmLLInt or useBBQJIT must be true\n");
+    }
     if (!coherent)
         CRASH();

trunk/Source/JavaScriptCore/runtime/OptionsList.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -468 +468 @@
     v(Bool, wasmBBQUsesAir, true, Normal, nullptr) \
     v(Bool, useWasmLLInt, true, Normal, nullptr) \
+    v(Bool, useBBQJIT, true, Normal, "allows the BBQ JIT to be used if true") \
+    v(Bool, useOMGJIT, true, Normal, "allows the OMG JIT to be used if true") \
+    v(Bool, useWasmLLIntPrologueOSR, true, Normal, "allows prologue OSR from Wasm LLInt if true") \
+    v(Bool, useWasmLLIntLoopOSR, true, Normal, "allows loop OSR from Wasm LLInt if true") \
+    v(Bool, useWasmLLIntEpilogueOSR, true, Normal, "allows epilogue OSR from Wasm LLInt if true") \
+    v(OptionRange, wasmFunctionIndexRangeToCompile, 0, Normal, "wasm function index range to allow compilation on, e.g. 1:100") \
     v(Bool, wasmLLIntTiersUpToBBQ, true, Normal, nullptr) \
     v(Size, webAssemblyBBQAirModeThreshold, isIOS() ? (10 * MB) : 0, Normal, "If 0, we always use BBQ Air. If Wasm module code size hits this threshold, we compile Wasm module with B3 BBQ mode.") \

trunk/Source/JavaScriptCore/wasm/WasmBBQPlan.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2016-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -59 +59 @@
     , m_functionIndex(functionIndex)
 {
+    ASSERT(Options::useBBQJIT());
     setMode(m_codeBlock->mode());
+    dataLogLnIf(WasmBBQPlanInternal::verbose, "Starting BBQ plan for ", functionIndex);
 }
 

trunk/Source/JavaScriptCore/wasm/WasmOMGForOSREntryPlan.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -62 +62 @@
     , m_loopIndex(loopIndex)
 {
+    ASSERT(Options::useOMGJIT());
     setMode(mode);
     ASSERT(m_codeBlock->runnable());

trunk/Source/JavaScriptCore/wasm/WasmOMGPlan.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2017-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -60 +60 @@
     , m_functionIndex(functionIndex)
 {
+    ASSERT(Options::useOMGJIT());
     setMode(mode);
     ASSERT(m_codeBlock->runnable());

trunk/Source/JavaScriptCore/wasm/WasmOperations.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -234 +234 @@
 }
 
+inline bool shouldJIT(unsigned functionIndex)
+{
+    if (!VM::canUseJIT())
+        return false;
+    if (!Options::useOMGJIT())
+        return false;
+    if (!Options::wasmFunctionIndexRangeToCompile().isInRange(functionIndex))
+        return false;
+    return true;
+}
+
 void JIT_OPERATION operationWasmTriggerOSREntryNow(Probe::Context& context)
 {
@@ -254 +265 @@
     BBQCallee& callee = static_cast<BBQCallee&>(codeBlock.wasmBBQCalleeFromFunctionIndexSpace(functionIndexInSpace));
     TierUpCount& tierUp = *callee.tierUpCount();
+
+    if (!shouldJIT(functionIndex)) {
+        tierUp.deferIndefinitely();
+        return returnWithoutOSREntry();
+    }
+
     dataLogLnIf(Options::verboseOSR(), "Consider OMGForOSREntryPlan for [", functionIndex, "] loopIndex#", loopIndex, " with executeCounter = ", tierUp, " ", RawPointer(callee.replacement()));
 
@@ -427 +444 @@
     BBQCallee& callee = static_cast<BBQCallee&>(codeBlock.wasmBBQCalleeFromFunctionIndexSpace(functionIndexInSpace));
     TierUpCount& tierUp = *callee.tierUpCount();
+
+    if (!shouldJIT(functionIndex)) {
+        tierUp.deferIndefinitely();
+        return;
+    }
+
     dataLogLnIf(Options::verboseOSR(), "Consider OMGPlan for [", functionIndex, "] with executeCounter = ", tierUp, " ", RawPointer(callee.replacement()));
 

trunk/Source/JavaScriptCore/wasm/WasmSlowPaths.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -81 +81 @@
         : callFrame->r(virtualRegister))
 
+enum class RequiredWasmJIT { Any, OMG };
+
+inline bool shouldJIT(Wasm::FunctionCodeBlock* codeBlock, RequiredWasmJIT requiredJIT = RequiredWasmJIT::Any)
+{
+    if (!VM::canUseJIT())
+        return false;
+    if (requiredJIT == RequiredWasmJIT::OMG) {
+        if (!Options::useOMGJIT())
+            return false;
+    } else {
+        if (Options::wasmLLIntTiersUpToBBQ() && !Options::useBBQJIT())
+            return false;
+        if (!Options::wasmLLIntTiersUpToBBQ() && !Options::useOMGJIT())
+            return false;
+    }
+    if (!Options::wasmFunctionIndexRangeToCompile().isInRange(codeBlock->functionIndex()))
+        return false;
+    return true;
+}
+
 inline bool jitCompileAndSetHeuristics(Wasm::LLIntCallee* callee, Wasm::FunctionCodeBlock* codeBlock, Wasm::Instance* instance)
 {
@@ -136 +156 @@
     Wasm::FunctionCodeBlock* codeBlock = CODE_BLOCK();
 
-    dataLogLnIf(Options::verboseOSR(), *callee, ": Entered epilogue_osr with tierUpCounter = ", codeBlock->tierUpCounter());
+    if (!shouldJIT(codeBlock)) {
+        codeBlock->tierUpCounter().deferIndefinitely();
+        WASM_RETURN_TWO(nullptr, nullptr);
+    }
+
+    if (!Options::useWasmLLIntPrologueOSR())
+        WASM_RETURN_TWO(nullptr, nullptr);
+
+    dataLogLnIf(Options::verboseOSR(), *callee, ": Entered prologue_osr with tierUpCounter = ", codeBlock->tierUpCounter());
 
     if (!jitCompileAndSetHeuristics(callee, codeBlock, instance))
-        WASM_RETURN_TWO(0, 0);
+        WASM_RETURN_TWO(nullptr, nullptr);
 
     WASM_RETURN_TWO(callee->replacement()->entrypoint().executableAddress(), 0);
@@ -146 +174 @@
 WASM_SLOW_PATH_DECL(loop_osr)
 {
-    if (!Options::useWebAssemblyOSR()) {
-        slow_path_wasm_prologue_osr(callFrame, pc, instance);
-        WASM_RETURN_TWO(0, 0);
-    }
-
     Wasm::LLIntCallee* callee = static_cast<Wasm::LLIntCallee*>(callFrame->callee().asWasmCallee());
     Wasm::FunctionCodeBlock* codeBlock = CODE_BLOCK();
     Wasm::LLIntTierUpCounter& tierUpCounter = codeBlock->tierUpCounter();
+
+    if (!Options::useWebAssemblyOSR() || !Options::useWasmLLIntLoopOSR() || !shouldJIT(codeBlock, RequiredWasmJIT::OMG)) {
+        slow_path_wasm_prologue_osr(callFrame, pc, instance);
+        WASM_RETURN_TWO(0, 0);
+    }
 
     dataLogLnIf(Options::verboseOSR(), *callee, ": Entered loop_osr with tierUpCounter = ", codeBlock->tierUpCounter());
@@ -221 +249 @@
     Wasm::LLIntCallee* callee = static_cast<Wasm::LLIntCallee*>(callFrame->callee().asWasmCallee());
     Wasm::FunctionCodeBlock* codeBlock = CODE_BLOCK();
+
+    if (!shouldJIT(codeBlock)) {
+        codeBlock->tierUpCounter().deferIndefinitely();
+        WASM_END_IMPL();
+    }
+    if (!Options::useWasmLLIntEpilogueOSR())
+        WASM_END_IMPL();
 
     dataLogLnIf(Options::verboseOSR(), *callee, ": Entered epilogue_osr with tierUpCounter = ", codeBlock->tierUpCounter());