Changeset 161914 in webkit for trunk/Source/JavaScriptCore/heap/Heap.cpp

Timestamp:

Jan 13, 2014, 3:50:58 PM (11 years ago)

Author:

[email protected]

Message:

Performance regression on dromaeo due to generational marking
​https://bugs.webkit.org/show_bug.cgi?id=126901

Reviewed by Oliver Hunt.

We were seeing some performance regression with ENABLE_GGC == 0, so this patch
ifdefs out more things to get rid of the additional overhead.

• heap/Heap.cpp:

(JSC::Heap::markRoots):
(JSC::Heap::writeBarrier):

• heap/MarkedBlock.cpp:

(JSC::MarkedBlock::clearMarks):
(JSC::MarkedBlock::clearMarksWithCollectionType):

• heap/MarkedSpace.cpp:

(JSC::MarkedSpace::resetAllocators):

• heap/MarkedSpace.h:

(JSC::MarkedSpace::didAllocateInBlock):

• heap/SlotVisitorInlines.h:

(JSC::SlotVisitor::internalAppend):
(JSC::SlotVisitor::reportExtraMemoryUsage):

File:

• trunk/Source/JavaScriptCore/heap/Heap.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/heap/Heap.cpp

@@ -490 +490 @@
     HeapRootVisitor heapRootVisitor(visitor);
 
+#if ENABLE(GGC)
     Vector<const JSCell*> rememberedSet(m_slotVisitor.markStack().size());
     m_slotVisitor.markStack().fillVector(rememberedSet);
+#endif
 
     {
@@ -596 +598 @@
     }
 
+#if ENABLE(GGC)
     {
         GCPHASE(ClearRememberedSet);
@@ -603 +606 @@
         }
     }
+#endif
 
     GCCOUNTER(VisitedValueCount, visitor.visitCount());
@@ -1077 +1081 @@
 void Heap::writeBarrier(const JSCell* from)
 {
+#if ENABLE(GGC)
     ASSERT_GC_OBJECT_LOOKS_VALID(const_cast<JSCell*>(from));
     if (!from || !isMarked(from))
@@ -1082 +1087 @@
     Heap* heap = Heap::heap(from);
     heap->addToRememberedSet(from);
+#else
+    UNUSED_PARAM(from);
+#endif
 }