Changeset 281684 in webkit for trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

Timestamp:

Aug 26, 2021, 9:26:35 PM (4 years ago)

Author:

[email protected]

Message:

[JSC] op_put_private_name should use modern IC and remove ByValInfo
​https://bugs.webkit.org/show_bug.cgi?id=229544

Reviewed by Saam Barati.

JSTests:

Move class-fields-private benchmarks into microbenchmarks.
Added several microbenchmarks and stress tests.

• microbenchmarks/class-private-field-polymorphic.js: Added.

(shouldBe):
(test.A.prototype.put):

• microbenchmarks/get-private-name.js: Renamed from JSTests/microbenchmarks/class-fields-private/get-private-name.js.
• microbenchmarks/monomorphic-get-private-field.js: Renamed from JSTests/microbenchmarks/class-fields-private/monomorphic-get-private-field.js.
• microbenchmarks/polymorphic-get-private-field.js: Renamed from JSTests/microbenchmarks/class-fields-private/polymorphic-get-private-field.js.
• microbenchmarks/polymorphic-put-private-field.js: Renamed from JSTests/microbenchmarks/class-fields-private/polymorphic-put-private-field.js.
• microbenchmarks/put-by-val-polymorphic-properties.js: Added.

(shouldBe):
(test):

• microbenchmarks/put-private-field.js: Renamed from JSTests/microbenchmarks/class-fields-private/put-private-field.js.
• stress/class-private-field-megamorphic.js: Added.

(shouldBe):

• stress/class-private-field-polymorphic.js: Added.

(shouldBe):
(test.A.prototype.put):

• stress/put-by-val-polymorphic-properties.js: Added.

(shouldBe):
(test):

Source/JavaScriptCore:

This patch makes op_put_private_name use new PutByVal IC. This allows op_put_private_name to support
polymorphic properties, and we can finally remove Baseline's adhoc IC and ByValInfo completely.

Added microbenchmark showed 3x improvement due to polymorphic PutPrivateName IC.

ToT Patched

class-private-field-polymorphic 9.3666+-0.0332 ^{3.1199+-0.0182} definitely 3.0022x faster

• JavaScriptCore.xcodeproj/project.pbxproj:
• Sources.txt:
• bytecode/ByValInfo.cpp: Removed.
• bytecode/ByValInfo.h: Removed.
• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::getICStatusMap):
(JSC::CodeBlock::stronglyVisitStrongReferences):
(JSC::CodeBlock::findByValInfo): Deleted.
(JSC::CodeBlock::addByValInfo): Deleted.

• bytecode/CodeBlock.h:
• bytecode/ICStatusMap.h:
• dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::parseBlock):

• dfg/DFGFixupPhase.cpp:

(JSC::DFG::FixupPhase::fixupNode):

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::compileGetPrivateName):
(JSC::DFG::SpeculativeJIT::compilePutPrivateName):

• dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• dfg/DFGSpeculativeJIT64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• dfg/DFGStoreBarrierInsertionPhase.cpp:
• ftl/FTLLowerDFGToB3.cpp:

(JSC::FTL::DFG::LowerDFGToB3::compilePutPrivateName):

• jit/JIT.cpp:

(JSC::JIT::privateCompileSlowCases):
(JSC::JIT::link):
(JSC::JIT::privateCompileExceptionHandlers):

• jit/JIT.h:

(JSC::ByValCompilationInfo::ByValCompilationInfo): Deleted.

• jit/JITInlines.h:

(JSC::JIT::emitArrayProfileStoreToHoleSpecialCase): Deleted.
(JSC::JIT::emitArrayProfileOutOfBoundsSpecialCase): Deleted.

• jit/JITOperations.cpp:

(JSC::putPrivateNameOptimize):
(JSC::putPrivateName):
(JSC::JSC_DEFINE_JIT_OPERATION):

• jit/JITOperations.h:
• jit/JITPropertyAccess.cpp:

(JSC::JIT::emit_op_put_private_name):
(JSC::JIT::emitSlow_op_put_private_name):
(JSC::JIT::slow_op_put_private_name_prepareCallGenerator):
(JSC::JIT::emitPutByValWithCachedId): Deleted.
(JSC::JIT::emitPutPrivateNameWithCachedId): Deleted.
(JSC::JIT::emitByValIdentifierCheck): Deleted.
(JSC::JIT::privateCompilePutPrivateNameWithCachedId): Deleted.

• jit/JITPropertyAccess32_64.cpp:

(JSC::JIT::emit_op_put_private_name):
(JSC::JIT::emitSlow_op_put_private_name):

• jit/Repatch.cpp:

(JSC::appropriateGenericPutByFunction):
(JSC::appropriateOptimizingPutByFunction):
(JSC::resetPutBy):

Tools:

• Scripts/run-jsc-benchmarks:

File:

• trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -33 +33 @@
 #include "ArithProfile.h"
 #include "BasicBlockLocation.h"
-#include "ByValInfo.h"
 #include "BytecodeDumper.h"
 #include "BytecodeLivenessAnalysisInlines.h"
@@ -1627 +1626 @@
             for (CallLinkInfo* callLinkInfo : jitData->m_callLinkInfos)
                 result.add(callLinkInfo->codeOrigin(), ICStatus()).iterator->value.callLinkInfo = callLinkInfo;
-            for (ByValInfo* byValInfo : jitData->m_byValInfos)
-                result.add(CodeOrigin(byValInfo->bytecodeIndex), ICStatus()).iterator->value.byValInfo = byValInfo;
         }
 #if ENABLE(DFG_JIT)
@@ -1700 +1697 @@
 }
 
-ByValInfo* CodeBlock::findByValInfo(CodeOrigin codeOrigin)
-{
-    ConcurrentJSLocker locker(m_lock);
-    if (auto* jitData = m_jitData.get()) {
-        for (ByValInfo* byValInfo : jitData->m_byValInfos) {
-            if (byValInfo->bytecodeIndex == codeOrigin.bytecodeIndex())
-                return byValInfo;
-        }
-    }
-    return nullptr;
-}
-
-ByValInfo* CodeBlock::addByValInfo(BytecodeIndex bytecodeIndex)
-{
-    ConcurrentJSLocker locker(m_lock);
-    return ensureJITData(locker).m_byValInfos.add(bytecodeIndex);
-}
-
 CallLinkInfo* CodeBlock::addCallLinkInfo(CodeOrigin codeOrigin)
 {
@@ -1829 +1808 @@
 #if ENABLE(JIT)
     if (auto* jitData = m_jitData.get()) {
-        for (ByValInfo* byValInfo : jitData->m_byValInfos)
-            byValInfo->visitAggregate(visitor);
         for (StructureStubInfo* stubInfo : jitData->m_stubInfos)
             stubInfo->visitAggregate(visitor);