Changeset 204393 in webkit for trunk/Source/JavaScriptCore/dfg/DFGGraph.h

Timestamp:

Aug 11, 2016, 5:22:20 PM (9 years ago)

Author:

[email protected]

Message:

[JSC] Revert most of r203808
​https://bugs.webkit.org/show_bug.cgi?id=160784

Patch by Benjamin Poulain <​[email protected]> on 2016-08-11
Reviewed by Geoffrey Garen.

Switching to fastMalloc() caused regressions on Jetstream and Octane
on MacBook Air. I was able to get back some of it in the following
patches but the tests that never go to FTL are still regressed.

This patch revert r203808 except of the node index.
Nodes are allocated with the custom allocator like before but they are
now also kept in a table, addressed by the node index.

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

(JSC::B3::SparseCollection::packIndices): Deleted.

• dfg/DFGAllocator.h: Added.

(JSC::DFG::Allocator::Region::size):
(JSC::DFG::Allocator::Region::headerSize):
(JSC::DFG::Allocator::Region::numberOfThingsPerRegion):
(JSC::DFG::Allocator::Region::data):
(JSC::DFG::Allocator::Region::isInThisRegion):
(JSC::DFG::Allocator::Region::regionFor):
(JSC::DFG::Allocator<T>::Allocator):
(JSC::DFG::Allocator<T>::~Allocator):
(JSC::DFG::Allocator<T>::allocate):
(JSC::DFG::Allocator<T>::free):
(JSC::DFG::Allocator<T>::freeAll):
(JSC::DFG::Allocator<T>::reset):
(JSC::DFG::Allocator<T>::indexOf):
(JSC::DFG::Allocator<T>::allocatorOf):
(JSC::DFG::Allocator<T>::bumpAllocate):
(JSC::DFG::Allocator<T>::freeListAllocate):
(JSC::DFG::Allocator<T>::allocateSlow):
(JSC::DFG::Allocator<T>::freeRegionsStartingAt):
(JSC::DFG::Allocator<T>::startBumpingIn):

• dfg/DFGDriver.cpp:

(JSC::DFG::compileImpl):

• dfg/DFGGraph.cpp:

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

• dfg/DFGGraph.h:

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

• dfg/DFGLongLivedState.cpp: Added.

(JSC::DFG::LongLivedState::LongLivedState):
(JSC::DFG::LongLivedState::~LongLivedState):
(JSC::DFG::LongLivedState::shrinkToFit):

• dfg/DFGLongLivedState.h: Added.
• dfg/DFGNode.h:
• dfg/DFGNodeAllocator.h: Added.

(operator new ):

• dfg/DFGPlan.cpp:

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

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

(JSC::DFG::Worklist::runThread):

• runtime/VM.cpp:

(JSC::VM::VM):

• runtime/VM.h:

File:

• trunk/Source/JavaScriptCore/dfg/DFGGraph.h (modified) (8 diffs)

trunk/Source/JavaScriptCore/dfg/DFGGraph.h

@@ -30 +30 @@
 
 #include "AssemblyHelpers.h"
-#include "B3SparseCollection.h"
 #include "BytecodeLivenessAnalysisInlines.h"
 #include "CodeBlock.h"
@@ -36 +35 @@
 #include "DFGBasicBlock.h"
 #include "DFGFrozenValue.h"
+#include "DFGLongLivedState.h"
 #include "DFGNode.h"
+#include "DFGNodeAllocator.h"
 #include "DFGPlan.h"
 #include "DFGPropertyTypeKey.h"
@@ -124 +125 @@
 class Graph : public virtual Scannable {
 public:
-    Graph(VM&, Plan&);
+    Graph(VM&, Plan&, LongLivedState&);
     ~Graph();
     
@@ -184 +185 @@
     Node* addNode(Params... params)
     {
-        Node* node = new Node(params...);
-        m_nodes.add(std::unique_ptr<Node>(node));
+        Node* node = new (m_allocator) Node(params...);
+        addNodeToMapByIndex(node);
         return node;
     }
@@ -191 +192 @@
     Node* addNode(SpeculatedType type, Params... params)
     {
-        Node* node = addNode(params...);
+        Node* node = new (m_allocator) Node(params...);
         node->predict(type);
+        addNodeToMapByIndex(node);
         return node;
     }
+
     void deleteNode(Node*);
-    unsigned maxNodeCount() const { return m_nodes.size(); }
-    Node* nodeAt(unsigned index) const { return m_nodes[index]; }
+    unsigned maxNodeCount() const { return m_nodesByIndex.size(); }
+    Node* nodeAt(unsigned index) const { return m_nodesByIndex[index]; }
     void packNodeIndices();
 
@@ -835 +838 @@
     CodeBlock* m_codeBlock;
     CodeBlock* m_profiledBlock;
+    
+    NodeAllocator& m_allocator;
 
     Vector< RefPtr<BasicBlock> , 8> m_blocks;
@@ -923 +928 @@
     bool m_hasExceptionHandlers { false };
 private:
-    void adoptNodeOutOfLine(Node&);
+    void addNodeToMapByIndex(Node*);
 
     bool isStringPrototypeMethodSane(JSGlobalObject*, UniquedStringImpl*);
@@ -957 +962 @@
     }
 
-    B3::SparseCollection<Node> m_nodes;
+    Vector<Node*, 0, UnsafeVectorOverflow> m_nodesByIndex;
+    Vector<unsigned, 0, UnsafeVectorOverflow> m_nodeIndexFreeList;
     Vector<AbstractValue, 0, UnsafeVectorOverflow> m_abstractValuesCache;
 };