Changeset 278030 in webkit for trunk/Source/JavaScriptCore/dfg/DFGJITFinalizer.cpp

Timestamp:

May 25, 2021, 11:16:47 AM (4 years ago)

Author:

[email protected]

Message:

Finalize DFG/FTL code refs on the compiler threads
​https://bugs.webkit.org/show_bug.cgi?id=226096

Reviewed by Mark Lam.

Previously, link tasks that ran via the addLinkTask API were guaranteed to be
called on the main thread. This is no longer the case. Most link tasks are
happy running on a background thread, since all they're really doing is
linking branches/calls or grabbing labels. However, a few users of addLinkTask were
relying on it running on the main thread. For those users, there is a new
addMainThreadFinalizationTask API, which is now used instead.

• assembler/LinkBuffer.cpp:

(JSC::LinkBuffer::~LinkBuffer):
(JSC::LinkBuffer::runMainThreadFinalizationTasks):

• assembler/LinkBuffer.h:

(JSC::LinkBuffer::cancel):
(JSC::LinkBuffer::addMainThreadFinalizationTask):
(JSC::LinkBuffer::~LinkBuffer): Deleted.

• dfg/DFGFailedFinalizer.cpp:

(JSC::DFG::FailedFinalizer::finalizeFunction): Deleted.

• dfg/DFGFailedFinalizer.h:
• dfg/DFGFinalizer.h:

(JSC::DFG::Finalizer::cancel):

• dfg/DFGJITCompiler.cpp:

(JSC::DFG::JITCompiler::compile):
(JSC::DFG::JITCompiler::compileFunction):

• dfg/DFGJITFinalizer.cpp:

(JSC::DFG::JITFinalizer::cancel):
(JSC::DFG::JITFinalizer::finalize):
(JSC::DFG::JITFinalizer::finalizeFunction): Deleted.
(JSC::DFG::JITFinalizer::finalizeCommon): Deleted.

• dfg/DFGJITFinalizer.h:
• dfg/DFGLazyJSValue.cpp:

(JSC::DFG::LazyJSValue::emit const):

• dfg/DFGPlan.cpp:

(JSC::DFG::Plan::finalizeWithoutNotifyingCallback):
(JSC::DFG::Plan::cancel):

• ftl/FTLJITFinalizer.cpp:

(JSC::FTL::JITFinalizer::finalize):
(JSC::FTL::JITFinalizer::cancel):
(JSC::FTL::JITFinalizer::finalizeFunction): Deleted.
(JSC::FTL::JITFinalizer::finalizeCommon): Deleted.

• ftl/FTLJITFinalizer.h:
• ftl/FTLLink.cpp:

(JSC::FTL::link):

• ftl/FTLPatchpointExceptionHandle.cpp:

(JSC::FTL::PatchpointExceptionHandle::scheduleExitCreationForUnwind):

• ftl/FTLThunks.h:

(JSC::FTL::Thunks::getSlowPathCallThunk):
Add a lock to FTLThunks since we now may be calling into it from more than
one thread at a time.

• jit/AssemblyHelpers.cpp:

(JSC::AssemblyHelpers::emitVirtualCall):
(JSC::AssemblyHelpers::emitUnlinkedVirtualCall): Deleted.

• jit/AssemblyHelpers.h:
• jit/JIT.cpp:

(JSC::JIT::finalizeOnMainThread):

• jit/JIT.h:
• jit/JITCall.cpp:

(JSC::JIT::compileCallEvalSlowCase):

• jit/JITCall32_64.cpp:

(JSC::JIT::compileCallEvalSlowCase):

File:

• trunk/Source/JavaScriptCore/dfg/DFGJITFinalizer.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/dfg/DFGJITFinalizer.cpp

@@ -56 +56 @@
 bool JITFinalizer::finalize()
 {
-    MacroAssemblerCodeRef<JSEntryPtrTag> codeRef = FINALIZE_DFG_CODE(*m_linkBuffer, JSEntryPtrTag, "DFG JIT code for %s", toCString(CodeBlockWithJITType(m_plan.codeBlock(), JITType::DFGJIT)).data());
-    m_jitCode->initializeCodeRefForDFG(codeRef, codeRef.code());
+    VM& vm = *m_plan.vm();
 
-    m_plan.codeBlock()->setJITCode(m_jitCode.copyRef());
+    WTF::crossModifyingCodeFence();
 
-    finalizeCommon();
-    
-    return true;
-}
+    m_linkBuffer->runMainThreadFinalizationTasks();
 
-bool JITFinalizer::finalizeFunction()
-{
-    RELEASE_ASSERT(!m_withArityCheck.isEmptyValue());
-    m_jitCode->initializeCodeRefForDFG(
-        FINALIZE_DFG_CODE(*m_linkBuffer, JSEntryPtrTag, "DFG JIT code for %s", toCString(CodeBlockWithJITType(m_plan.codeBlock(), JITType::DFGJIT)).data()),
-        m_withArityCheck);
-    m_plan.codeBlock()->setJITCode(m_jitCode.copyRef());
+    CodeBlock* codeBlock = m_plan.codeBlock();
 
-    finalizeCommon();
-    
-    return true;
-}
-
-void JITFinalizer::finalizeCommon()
-{
-    CodeBlock* codeBlock = m_plan.codeBlock();
+    codeBlock->setJITCode(m_jitCode.copyRef());
 
 #if ENABLE(FTL_JIT)
@@ -88 +71 @@
 
     if (UNLIKELY(m_plan.compilation()))
-        m_plan.vm()->m_perBytecodeProfiler->addCompilation(codeBlock, *m_plan.compilation());
+        vm.m_perBytecodeProfiler->addCompilation(codeBlock, *m_plan.compilation());
 
     if (!m_plan.willTryToTierUp())
@@ -95 +78 @@
     // The codeBlock is now responsible for keeping many things alive (e.g. frozen values)
     // that were previously kept alive by the plan.
-    m_plan.vm()->heap.writeBarrier(codeBlock);
+    vm.heap.writeBarrier(codeBlock);
+
+    return true;
 }