Changeset 89957 in webkit

Timestamp:

Jun 28, 2011, 2:06:49 PM (15 years ago)

Author:

barraclough@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=63561
DFG JIT - don't always assume integer in relational compare

Reviewed by Oliver Hunt.

If neither operand is known integer, or either is in double representation,
then at least use a function call (don't bail off the speculative path).

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::compilePeepHoleCall):
(JSC::DFG::SpeculativeJIT::compile):

• dfg/DFGSpeculativeJIT.h:

(JSC::DFG::SpeculativeJIT::isDataFormatDouble):
(JSC::DFG::SpeculativeJIT::compareIsInteger):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGSpeculativeJIT.cpp (modified) (5 diffs)
• dfg/DFGSpeculativeJIT.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-06-28  Gavin Barraclough  <barraclough@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        https://bugs.webkit.org/show_bug.cgi?id=63561
+        DFG JIT - don't always assume integer in relational compare
+
+        If neither operand is known integer, or either is in double representation,
+        then at least use a function call (don't bail off the speculative path).
+
+        * dfg/DFGSpeculativeJIT.cpp:
+        (JSC::DFG::SpeculativeJIT::compilePeepHoleCall):
+        (JSC::DFG::SpeculativeJIT::compile):
+        * dfg/DFGSpeculativeJIT.h:
+        (JSC::DFG::SpeculativeJIT::isDataFormatDouble):
+        (JSC::DFG::SpeculativeJIT::compareIsInteger):
+
 2011-06-28  Oliver Hunt  <oliver@apple.com>
 

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

@@ -268 +268 @@
 }
 
-void SpeculativeJIT::compilePeepHoleEq(Node& node, NodeIndex branchNodeIndex)
+void SpeculativeJIT::compilePeepHoleCall(Node& node, NodeIndex branchNodeIndex, Z_DFGOperation_EJJ operation)
 {
     Node& branchNode = m_jit.graph()[branchNodeIndex];
@@ -291 +291 @@
 
     GPRResult result(this);
-    callOperation(operationCompareEq, result.gpr(), op1GPR, op2GPR);
+    callOperation(operation, result.gpr(), op1GPR, op2GPR);
     addBranch(m_jit.branchTest8(condition, result.gpr()), taken);
 
@@ -570 +570 @@
             ASSERT(node.adjustedRefCount() == 1);
 
-            compilePeepHoleIntegerBranch(node, branchNodeIndex, JITCompiler::LessThan);
+            if (compareIsInteger(node.child1, node.child2))
+                compilePeepHoleIntegerBranch(node, branchNodeIndex, JITCompiler::LessThan);
+            else
+                compilePeepHoleCall(node, branchNodeIndex, operationCompareLess);
 
             use(node.child1);
@@ -599 +602 @@
             ASSERT(node.adjustedRefCount() == 1);
 
-            compilePeepHoleIntegerBranch(node, branchNodeIndex, JITCompiler::LessThanOrEqual);
+            if (compareIsInteger(node.child1, node.child2))
+                compilePeepHoleIntegerBranch(node, branchNodeIndex, JITCompiler::LessThanOrEqual);
+            else
+                compilePeepHoleCall(node, branchNodeIndex, operationCompareLessEq);
 
             use(node.child1);
@@ -628 +634 @@
             ASSERT(node.adjustedRefCount() == 1);
 
-            if (isInteger(node.child1) || isInteger(node.child2))
+            if (compareIsInteger(node.child1, node.child2))
                 compilePeepHoleIntegerBranch(node, branchNodeIndex, JITCompiler::Equal);
             else
-                compilePeepHoleEq(node, branchNodeIndex);
+                compilePeepHoleCall(node, branchNodeIndex, operationCompareEq);
 
             use(node.child1);

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h

@@ -170 +170 @@
     }
 
+    bool isDataFormatDouble(NodeIndex nodeIndex)
+    {
+        Node& node = m_jit.graph()[nodeIndex];
+        VirtualRegister virtualRegister = node.virtualRegister();
+        GenerationInfo& info = m_generationInfo[virtualRegister];
+
+        return (info.registerFormat() | DataFormatJS) == DataFormatJSDouble;
+    }
+
+    bool compareIsInteger(NodeIndex op1, NodeIndex op2)
+    {
+        return !(isDataFormatDouble(op1) || isDataFormatDouble(op2)) && (isInteger(op1) || isInteger(op2));
+    }
+
     void compilePeepHoleIntegerBranch(Node&, NodeIndex branchNodeIndex, JITCompiler::RelationalCondition);
-    void compilePeepHoleEq(Node&, NodeIndex branchNodeIndex);
+    void compilePeepHoleCall(Node&, NodeIndex branchNodeIndex, Z_DFGOperation_EJJ);
 
     // Add a speculation check without additional recovery.