Changeset 161914 in webkit

Timestamp:

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

Author:

mhahnenberg@apple.com

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):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/Heap.cpp (modified) (5 diffs)
• heap/MarkedBlock.cpp (modified) (2 diffs)
• heap/MarkedSpace.cpp (modified) (1 diff)
• heap/MarkedSpace.h (modified) (1 diff)
• heap/SlotVisitorInlines.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-01-13  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        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):
+
 2014-01-13  Brian Burg  <bburg@apple.com>
 

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
 }
 

trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp

@@ -200 +200 @@
 void MarkedBlock::clearMarks()
 {
+#if ENABLE(GGC)
     if (heap()->operationInProgress() == JSC::EdenCollection)
         this->clearMarksWithCollectionType<EdenCollection>();
     else
         this->clearMarksWithCollectionType<FullCollection>();
+#else
+    this->clearMarksWithCollectionType<FullCollection>();
+#endif
 }
 
@@ -220 +224 @@
     if (collectionType == FullCollection) {
         m_marks.clearAll();
+#if ENABLE(GGC)
         m_rememberedSet.clearAll();
+#endif
     }
 

trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp

@@ -146 +146 @@
     m_immortalStructureDestructorSpace.largeAllocator.reset();
 
+#if ENABLE(GGC)
     m_blocksWithNewObjects.clear();
+#endif
 }
 

trunk/Source/JavaScriptCore/heap/MarkedSpace.h

@@ -278 +278 @@
 inline void MarkedSpace::didAllocateInBlock(MarkedBlock* block)
 {
+#if ENABLE(GGC)
     m_blocksWithNewObjects.append(block);
+#else
+    UNUSED_PARAM(block);
+#endif
 }
 

trunk/Source/JavaScriptCore/heap/SlotVisitorInlines.h

@@ -102 +102 @@
 
     m_bytesVisited += MarkedBlock::blockFor(cell)->cellSize();
-    m_visitCount++;
         
     MARK_LOG_CHILD(*this, cell);
@@ -243 +242 @@
 inline void SlotVisitor::reportExtraMemoryUsage(JSCell* owner, size_t size)
 {
+#if ENABLE(GGC)
     // We don't want to double-count the extra memory that was reported in previous collections.
     if (heap()->operationInProgress() == EdenCollection && MarkedBlock::blockFor(owner)->isRemembered(owner))
         return;
+#else
+    UNUSED_PARAM(owner);
+#endif
 
     size_t* counter = &m_shared.m_vm->heap.m_extraMemoryUsage;