Changeset 160328 in webkit for trunk/Source/JavaScriptCore/dfg/DFGCSEPhase.cpp

Timestamp:

Dec 9, 2013, 2:02:46 PM (11 years ago)

Author:

[email protected]

Message:

CSE should work in SSA
​https://bugs.webkit.org/show_bug.cgi?id=125430

Reviewed by Oliver Hunt and Mark Hahnenberg.

• dfg/DFGCSEPhase.cpp:

(JSC::DFG::CSEPhase::run):
(JSC::DFG::CSEPhase::performNodeCSE):

• dfg/DFGPlan.cpp:

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

File:

• trunk/Source/JavaScriptCore/dfg/DFGCSEPhase.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/dfg/DFGCSEPhase.cpp

@@ -49 +49 @@
     bool run()
     {
-        ASSERT((cseMode == NormalCSE) == (m_graph.m_fixpointState == FixpointNotConverged));
         ASSERT(m_graph.m_fixpointState != BeforeFixpoint);
         
@@ -56 +55 @@
         m_graph.clearReplacements();
         
-        for (unsigned blockIndex = 0; blockIndex < m_graph.numBlocks(); ++blockIndex)
-            performBlockCSE(m_graph.block(blockIndex));
+        if (m_graph.m_form == SSA) {
+            Vector<BasicBlock*> depthFirst;
+            m_graph.getBlocksInDepthFirstOrder(depthFirst);
+            for (unsigned i = 0; i < depthFirst.size(); ++i)
+                performBlockCSE(depthFirst[i]);
+        } else {
+            for (unsigned blockIndex = 0; blockIndex < m_graph.numBlocks(); ++blockIndex)
+                performBlockCSE(m_graph.block(blockIndex));
+        }
         
         return m_changed;
@@ -1016 +1022 @@
             m_graph.performSubstitution(node);
         
-        if (node->op() == SetLocal)
+        if (node->containsMovHint()) {
+            ASSERT(node->op() != ZombieHint);
             node->child1()->mergeFlags(NodeRelevantToOSR);
+        }
         
         switch (node->op()) {
@@ -1121 +1129 @@
             
         case Flush: {
+            if (m_graph.m_form == SSA) {
+                // FIXME: Enable Flush store elimination in SSA form.
+                // https://bugs.webkit.org/show_bug.cgi?id=125429
+                break;
+            }
             VariableAccessData* variableAccessData = node->variableAccessData();
             VirtualRegister local = variableAccessData->local();