Changeset 153295 in webkit for trunk/Source/JavaScriptCore/dfg/DFGAtTailAbstractState.h

Timestamp:

Jul 24, 2013, 9:05:31 PM (12 years ago)

Author:

[email protected]

Message:

fourthTier: DFG should do a high-level LICM before going to FTL
​https://bugs.webkit.org/show_bug.cgi?id=118749

Reviewed by Oliver Hunt.

Implements LICM hoisting for nodes that never write anything and never read
things that are clobbered by the loop. There are some other preconditions for
hoisting, see DFGLICMPhase.cpp.

Also did a few fixes:

• ClobberSet::add was failing to switch Super entries to Direct entries in some cases.

• DFGClobberize.cpp needed to #include "Operations.h".

• DCEPhase needs to process the graph in reverse DFS order, when we're in SSA.

• AbstractInterpreter can now execute a Node without knowing its indexInBlock. Knowing the indexInBlock is an optional optimization that all other clients of AI still opt into, but LICM doesn't.

This makes the FTL a 2.19x speed-up on imaging-gaussian-blur.

• JavaScriptCore.xcodeproj/project.pbxproj:
• dfg/DFGAbstractInterpreter.h:

(AbstractInterpreter):

• dfg/DFGAbstractInterpreterInlines.h:

(JSC::DFG::::executeEffects):
(JSC::DFG::::execute):
(DFG):
(JSC::DFG::::clobberWorld):
(JSC::DFG::::clobberStructures):

• dfg/DFGAtTailAbstractState.cpp: Added.

(DFG):
(JSC::DFG::AtTailAbstractState::AtTailAbstractState):
(JSC::DFG::AtTailAbstractState::~AtTailAbstractState):
(JSC::DFG::AtTailAbstractState::createValueForNode):
(JSC::DFG::AtTailAbstractState::forNode):

• dfg/DFGAtTailAbstractState.h: Added.

(DFG):
(AtTailAbstractState):
(JSC::DFG::AtTailAbstractState::initializeTo):
(JSC::DFG::AtTailAbstractState::forNode):
(JSC::DFG::AtTailAbstractState::variables):
(JSC::DFG::AtTailAbstractState::block):
(JSC::DFG::AtTailAbstractState::isValid):
(JSC::DFG::AtTailAbstractState::setDidClobber):
(JSC::DFG::AtTailAbstractState::setIsValid):
(JSC::DFG::AtTailAbstractState::setBranchDirection):
(JSC::DFG::AtTailAbstractState::setFoundConstants):
(JSC::DFG::AtTailAbstractState::haveStructures):
(JSC::DFG::AtTailAbstractState::setHaveStructures):

• dfg/DFGBasicBlock.h:

(JSC::DFG::BasicBlock::insertBeforeLast):

• dfg/DFGBasicBlockInlines.h:

(DFG):

• dfg/DFGClobberSet.cpp:

(JSC::DFG::ClobberSet::add):
(JSC::DFG::ClobberSet::addAll):

• dfg/DFGClobberize.cpp:

(JSC::DFG::doesWrites):

• dfg/DFGClobberize.h:

(DFG):

• dfg/DFGDCEPhase.cpp:

(JSC::DFG::DCEPhase::DCEPhase):
(JSC::DFG::DCEPhase::run):
(JSC::DFG::DCEPhase::fixupBlock):
(DCEPhase):

• dfg/DFGEdgeDominates.h: Added.

(DFG):
(EdgeDominates):
(JSC::DFG::EdgeDominates::EdgeDominates):
(JSC::DFG::EdgeDominates::operator()):
(JSC::DFG::EdgeDominates::result):
(JSC::DFG::edgesDominate):

• dfg/DFGFixupPhase.cpp:

(JSC::DFG::FixupPhase::fixupNode):
(JSC::DFG::FixupPhase::checkArray):

• dfg/DFGLICMPhase.cpp: Added.

(LICMPhase):
(JSC::DFG::LICMPhase::LICMPhase):
(JSC::DFG::LICMPhase::run):
(JSC::DFG::LICMPhase::attemptHoist):
(DFG):
(JSC::DFG::performLICM):

• dfg/DFGLICMPhase.h: Added.

(DFG):

• dfg/DFGPlan.cpp:

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

File:

• trunk/Source/JavaScriptCore/dfg/DFGAtTailAbstractState.h (copied) (copied from trunk/Source/JavaScriptCore/dfg/DFGBasicBlockInlines.h ) (2 diffs)

trunk/Source/JavaScriptCore/dfg/DFGAtTailAbstractState.h

@@ -24 +24 @@
  */
 
-#ifndef DFGBasicBlockInlines_h
-#define DFGBasicBlockInlines_h
+#ifndef DFGAtTailAbstractState_h
+#define DFGAtTailAbstractState_h
 
+#include <wtf/Platform.h>
+
+#if ENABLE(DFG_JIT)
+
+#include "DFGAbstractValue.h"
 #include "DFGBasicBlock.h"
 #include "DFGGraph.h"
 
-#if ENABLE(DFG_JIT)
+namespace JSC { namespace DFG { 
 
-namespace JSC { namespace DFG {
+class AtTailAbstractState {
+public:
+    AtTailAbstractState();
+    
+    ~AtTailAbstractState();
+    
+    void initializeTo(BasicBlock* block)
+    {
+        m_block = block;
+    }
+    
+    void createValueForNode(Node*);
+    AbstractValue& forNode(Node*);
+    AbstractValue& forNode(Edge edge) { return forNode(edge.node()); }
+    Operands<AbstractValue>& variables() { return m_block->valuesAtTail; }
+    
+    BasicBlock* block() const { return m_block; }
+    
+    bool isValid() { return m_block->cfaDidFinish; }
+    
+    void setDidClobber(bool) { }
+    void setIsValid(bool isValid) { m_block->cfaDidFinish = isValid; }
+    void setBranchDirection(BranchDirection) { }
+    void setFoundConstants(bool) { }
+    bool haveStructures() const { return true; } // It's always safe to return true.
+    void setHaveStructures(bool) { }
 
-#define DFG_DEFINE_APPEND_NODE(templatePre, templatePost, typeParams, valueParamsComma, valueParams, valueArgs) \
-    templatePre typeParams templatePost inline Node* BasicBlock::appendNode(Graph& graph, SpeculatedType type valueParamsComma valueParams) \
-    { \
-        Node* result = graph.addNode(type valueParamsComma valueArgs); \
-        append(result); \
-        return result; \
-    }
-    DFG_VARIADIC_TEMPLATE_FUNCTION(DFG_DEFINE_APPEND_NODE)
-#undef DFG_DEFINE_APPEND_NODE
-
-#define DFG_DEFINE_APPEND_NODE(templatePre, templatePost, typeParams, valueParamsComma, valueParams, valueArgs) \
-    templatePre typeParams templatePost inline Node* BasicBlock::appendNonTerminal(Graph& graph, SpeculatedType type valueParamsComma valueParams) \
-    { \
-        Node* result = graph.addNode(type valueParamsComma valueArgs); \
-        append(last()); \
-        at(size() - 2) = result; \
-        return result; \
-    }
-    DFG_VARIADIC_TEMPLATE_FUNCTION(DFG_DEFINE_APPEND_NODE)
-#undef DFG_DEFINE_APPEND_NODE
+private:
+    BasicBlock* m_block;
+};
 
 } } // namespace JSC::DFG
@@ -59 +72 @@
 #endif // ENABLE(DFG_JIT)
 
-#endif // DFGBasicBlockInlines_h
+#endif // DFGAtTailAbstractState_h