Changeset 93698 in webkit for trunk/Source/JavaScriptCore/heap/Heap.h

Timestamp:

Aug 24, 2011, 2:50:40 AM (14 years ago)

Author:

[email protected]

Message:

There is no facility for profiling how the write barrier is used
​https://bugs.webkit.org/show_bug.cgi?id=66747

Reviewed by Geoffrey Garen.

Added facilities for the JIT to specify the kind of write barrier
being executed. Added code for profiling the number of each kind
of barrier encountered.

• GNUmakefile.list.am:
• JavaScriptCore.exp:
• JavaScriptCore.pro:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• dfg/DFGJITCodeGenerator.cpp:

(JSC::DFG::JITCodeGenerator::writeBarrier):
(JSC::DFG::JITCodeGenerator::cachedPutById):

• dfg/DFGJITCodeGenerator.h:
• dfg/DFGJITCompiler.cpp:

(JSC::DFG::JITCompiler::emitCount):

• dfg/DFGJITCompiler.h:

(JSC::DFG::JITCompiler::emitCount):

• dfg/DFGNonSpeculativeJIT.cpp:

(JSC::DFG::NonSpeculativeJIT::compile):

• dfg/DFGRepatch.cpp:

(JSC::DFG::tryCachePutByID):

• dfg/DFGSpeculativeJIT.cpp:

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

• heap/Heap.h:

(JSC::Heap::writeBarrier):

• heap/WriteBarrierSupport.cpp: Added.

(JSC::WriteBarrierCounters::initialize):

• heap/WriteBarrierSupport.h: Added.

(JSC::WriteBarrierCounters::WriteBarrierCounters):
(JSC::WriteBarrierCounters::jitCounterFor):
(JSC::WriteBarrierCounters::countWriteBarrier):

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

(JSC::JIT::emit_op_put_by_id):
(JSC::JIT::privateCompilePutByIdTransition):
(JSC::JIT::emit_op_put_scoped_var):
(JSC::JIT::emit_op_put_global_var):
(JSC::JIT::emitWriteBarrier):

• jit/JITPropertyAccess32_64.cpp:

(JSC::JIT::emit_op_put_by_val):
(JSC::JIT::emit_op_put_by_id):
(JSC::JIT::privateCompilePutByIdTransition):
(JSC::JIT::emit_op_put_scoped_var):
(JSC::JIT::emit_op_put_global_var):
(JSC::JIT::emitWriteBarrier):

• runtime/InitializeThreading.cpp:

(JSC::initializeThreadingOnce):

• runtime/WriteBarrier.h:

(JSC::WriteBarrierBase::setWithoutWriteBarrier):

File:

• trunk/Source/JavaScriptCore/heap/Heap.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/heap/Heap.h

@@ -29 +29 @@
 #include "NewSpace.h"
 #include "SlotVisitor.h"
+#include "WriteBarrierSupport.h"
 #include <wtf/Forward.h>
 #include <wtf/HashCountedSet.h>
@@ -130 +131 @@
         
         enum AllocationEffort { AllocationMustSucceed, AllocationCanFail };
+        
+#if ENABLE(GGC)
+        static void writeBarrierFastCase(const JSCell* owner, JSCell*);
+#endif
 
         bool isValidAllocation(size_t);
@@ -237 +242 @@
 
 #if ENABLE(GGC)
-    inline void Heap::writeBarrier(const JSCell* owner, JSCell* cell)
+    inline void Heap::writeBarrierFastCase(const JSCell* owner, JSCell* cell)
     {
         if (MarkedBlock::blockFor(owner)->inNewSpace())
@@ -244 +249 @@
     }
 
+    inline void Heap::writeBarrier(const JSCell* owner, JSCell* cell)
+    {
+        WriteBarrierCounters::countWriteBarrier();
+        writeBarrierFastCase(owner, cell);
+    }
+
     inline void Heap::writeBarrier(const JSCell* owner, JSValue value)
     {
+        WriteBarrierCounters::countWriteBarrier();
         if (!value)
             return;
         if (!value.isCell())
             return;
-        writeBarrier(owner, value.asCell());
-    }
-
+        writeBarrierFastCase(owner, value.asCell());
+    }
 #else
 
     inline void Heap::writeBarrier(const JSCell*, JSCell*)
     {
+        WriteBarrierCounters::countWriteBarrier();
     }
 
     inline void Heap::writeBarrier(const JSCell*, JSValue)
     {
+        WriteBarrierCounters::countWriteBarrier();
     }
 #endif