Changeset 216815 in webkit for trunk/Source/JavaScriptCore/b3/B3SparseCollection.h

Timestamp:

May 12, 2017, 9:59:35 PM (8 years ago)

Author:

[email protected]

Message:

[JSC] DFG::Node should not have its own allocator
​https://bugs.webkit.org/show_bug.cgi?id=160098

Reviewed by Saam Barati.

I just rebased the patch from <​http://trac.webkit.org/changeset/203808>.

I ran Octane and JetStream locally on a MacBook Air and I wasn't able to
reproduce a regression. Let's land this again and see what the bots say.

• JavaScriptCore.xcodeproj/project.pbxproj:
• b3/B3SparseCollection.h:

(JSC::B3::SparseCollection::packIndices):

• dfg/DFGAllocator.h: Removed.
• dfg/DFGDriver.cpp:

(JSC::DFG::compileImpl):

• dfg/DFGGraph.cpp:

(JSC::DFG::Graph::Graph):
(JSC::DFG::Graph::~Graph):
(JSC::DFG::Graph::deleteNode):
(JSC::DFG::Graph::packNodeIndices):
(JSC::DFG::Graph::addNodeToMapByIndex): Deleted.

• dfg/DFGGraph.h:

(JSC::DFG::Graph::addNode):
(JSC::DFG::Graph::maxNodeCount):
(JSC::DFG::Graph::nodeAt):

• dfg/DFGLongLivedState.cpp: Removed.
• dfg/DFGLongLivedState.h: Removed.
• dfg/DFGNode.h:
• dfg/DFGNodeAllocator.h:
• dfg/DFGPlan.cpp:

(JSC::DFG::Plan::compileInThread):
(JSC::DFG::Plan::compileInThreadImpl):

• dfg/DFGPlan.h:
• dfg/DFGWorklist.cpp:
• runtime/VM.cpp:

(JSC::VM::VM):

• runtime/VM.h:

File:

• trunk/Source/JavaScriptCore/b3/B3SparseCollection.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/b3/B3SparseCollection.h

@@ -26 +26 @@
 #pragma once
 
-#if ENABLE(B3_JIT)
+#if ENABLE(DFG_JIT)
 
 #include <wtf/StdLibExtras.h>
@@ -74 +74 @@
         m_indexFreeList.append(value->m_index);
         m_vector[value->m_index] = nullptr;
+    }
+
+    void packIndices()
+    {
+        if (m_indexFreeList.isEmpty())
+            return;
+
+        unsigned holeIndex = 0;
+        unsigned endIndex = m_vector.size();
+
+        while (true) {
+            while (holeIndex < endIndex && m_vector[holeIndex])
+                ++holeIndex;
+
+            if (holeIndex == endIndex)
+                break;
+            ASSERT(holeIndex < m_vector.size());
+            ASSERT(!m_vector[holeIndex]);
+
+            do {
+                --endIndex;
+            } while (!m_vector[endIndex] && endIndex > holeIndex);
+
+            if (holeIndex == endIndex)
+                break;
+            ASSERT(endIndex > holeIndex);
+            ASSERT(m_vector[endIndex]);
+
+            auto& value = m_vector[endIndex];
+            value->m_index = holeIndex;
+            m_vector[holeIndex] = WTFMove(value);
+            ++holeIndex;
+        }
+
+        m_indexFreeList.resize(0);
+        m_vector.resize(endIndex);
     }
 
@@ -140 +176 @@
 } } // namespace JSC::B3
 
-#endif // ENABLE(B3_JIT)
+#endif // ENABLE(DFG_JIT)