Changeset 95786 in webkit

Timestamp:

Sep 22, 2011 11:59:38 PM (13 years ago)

Author:

fpizlo@apple.com

Message:

GetScopedVar should have value profiling
​https://bugs.webkit.org/show_bug.cgi?id=68676

Reviewed by Oliver Hunt.

Added GetScopedVar value profiling and predictin propagation.
Added GetScopeChain to CSE.

• dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::parseBlock):

• dfg/DFGGraph.h:

(JSC::DFG::Graph::predict):

• dfg/DFGNode.h:

(JSC::DFG::Node::hasPrediction):

• dfg/DFGPropagator.cpp:

(JSC::DFG::Propagator::propagateNodePredictions):
(JSC::DFG::Propagator::getScopeChainLoadElimination):
(JSC::DFG::Propagator::performNodeCSE):

• jit/JITPropertyAccess.cpp:

(JSC::JIT::emit_op_get_scoped_var):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGByteCodeParser.cpp (modified) (1 diff)
• dfg/DFGGraph.h (modified) (1 diff)
• dfg/DFGNode.h (modified) (1 diff)
• dfg/DFGPropagator.cpp (modified) (8 diffs)
• jit/JITPropertyAccess.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-09-22  Filip Pizlo  <fpizlo@apple.com>
+
+        GetScopedVar should have value profiling
+        https://bugs.webkit.org/show_bug.cgi?id=68676
+
+        Reviewed by Oliver Hunt.
+        
+        Added GetScopedVar value profiling and predictin propagation.
+        Added GetScopeChain to CSE.
+
+        * dfg/DFGByteCodeParser.cpp:
+        (JSC::DFG::ByteCodeParser::parseBlock):
+        * dfg/DFGGraph.h:
+        (JSC::DFG::Graph::predict):
+        * dfg/DFGNode.h:
+        (JSC::DFG::Node::hasPrediction):
+        * dfg/DFGPropagator.cpp:
+        (JSC::DFG::Propagator::propagateNodePredictions):
+        (JSC::DFG::Propagator::getScopeChainLoadElimination):
+        (JSC::DFG::Propagator::performNodeCSE):
+        * jit/JITPropertyAccess.cpp:
+        (JSC::JIT::emit_op_get_scoped_var):
+
 2011-09-22  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp

@@ -1120 +1120 @@
             int depth = currentInstruction[3].u.operand;
             NodeIndex getScopeChain = addToGraph(GetScopeChain, OpInfo(depth));
-            NodeIndex getScopedVar = addToGraph(GetScopedVar, OpInfo(slot), getScopeChain);
+            NodeIndex getScopedVar = addToGraph(GetScopedVar, OpInfo(slot), OpInfo(PredictNone), getScopeChain);
             set(dst, getScopedVar);
+            stronglyPredict(getScopedVar);
             NEXT_OPCODE(op_get_scoped_var);
         }

trunk/Source/JavaScriptCore/dfg/DFGGraph.h

@@ -197 +197 @@
         case Construct:
         case GetByOffset:
+        case GetScopedVar:
             return node.predict(prediction, source);
         default:

trunk/Source/JavaScriptCore/dfg/DFGNode.h

@@ -625 +625 @@
         case Construct:
         case GetByOffset:
+        case GetScopedVar:
             return true;
         default:

trunk/Source/JavaScriptCore/dfg/DFGPropagator.cpp

@@ -472 +472 @@
             changed |= node.predict(m_uses[m_compileIndex] & ~PredictionTagMask, StrongPrediction);
             if (isStrongPrediction(node.getPrediction()))
-                changed |= setPrediction(node.getPrediction());
+                changed |= mergePrediction(node.getPrediction());
             break;
         }
@@ -490 +490 @@
             changed |= node.predict(m_uses[m_compileIndex] & ~PredictionTagMask, StrongPrediction);
             if (isStrongPrediction(node.getPrediction()))
-                changed |= setPrediction(node.getPrediction());
+                changed |= mergePrediction(node.getPrediction());
             break;
         }
@@ -505 +505 @@
             changed |= node.predict(m_uses[m_compileIndex] & ~PredictionTagMask, StrongPrediction);
             if (isStrongPrediction(node.getPrediction()))
-                changed |= setPrediction(node.getPrediction());
+                changed |= mergePrediction(node.getPrediction());
             break;
         }
@@ -528 +528 @@
         }
             
+        case GetScopedVar: {
+            changed |= node.predict(m_uses[m_compileIndex] & ~PredictionTagMask, StrongPrediction);
+            PredictedType prediction = node.getPrediction();
+            if (isStrongPrediction(prediction))
+                changed |= mergePrediction(prediction);
+            break;
+        }
+            
+        case GetScopeChain: {
+            changed |= setPrediction(makePrediction(PredictCellOther, StrongPrediction));
+            break;
+        }
+            
         case PutByVal:
         case PutByValAlias:
@@ -536 +549 @@
         }
 
-        case GetScopeChain:
         case GetCallee: {
             changed |= setPrediction(makePrediction(PredictObjectOther, StrongPrediction));
@@ -588 +600 @@
         case ResolveBase:
         case ResolveBaseStrictPut:
-        case GetScopedVar:
             break;
             
@@ -977 +988 @@
     }
     
+    NodeIndex getScopeChainLoadElimination(unsigned depth)
+    {
+        NodeIndex start = startIndexForChildren();
+        for (NodeIndex index = endIndexForPureCSE(); index-- > start;) {
+            Node& node = m_graph[index];
+            if (node.op == GetScopeChain
+                && node.scopeChainDepth() == depth)
+                return index;
+        }
+        return NoNode;
+    }
+    
     void performSubstitution(NodeIndex& child)
     {
@@ -1068 +1091 @@
             break;
             
+        case GetScopeChain:
+            setReplacement(getScopeChainLoadElimination(node.scopeChainDepth()));
+            break;
+
         // Handle nodes that are conditionally pure: these are pure, and can
         // be CSE'd, so long as the prediction is the one we want.

trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp

@@ -966 +966 @@
     loadPtr(Address(regT0, JSVariableObject::offsetOfRegisters()), regT0);
     loadPtr(Address(regT0, currentInstruction[2].u.operand * sizeof(Register)), regT0);
+    emitValueProfilingSite(FirstProfilingSite);
     emitPutVirtualRegister(currentInstruction[1].u.operand);
 }