<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[199639] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/199639">199639</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-16 21:55:02 -0700 (Sat, 16 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] DFG should support relational comparisons of Number and Other
https://bugs.webkit.org/show_bug.cgi?id=156669
Patch by Benjamin Poulain <bpoulain@webkit.org> on 2016-04-16
Reviewed by Darin Adler.
In Sunspider/3d-raytrace, DFG falls back to JSValue in some important
relational compare because profiling sees "undefined" from time to time.
This case is fairly common outside Sunspider too because of out-of-bounds array access.
Unfortunately for us, our fallback for compare is really inefficient.
Fortunately, relational comparison with null/undefined/true/false are trival.
We can just convert both side to Double. That's what this patch adds.
I also extended constant folding for those cases because I noticed
a bunch of "undefined" constant going through DoubleRep at runtime.
* dfg/DFGAbstractInterpreterInlines.h:
(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
* dfg/DFGFixupPhase.cpp:
(JSC::DFG::FixupPhase::fixupNode):
* tests/stress/compare-number-and-other.js: Added.
(opaqueSideEffect):
(let.operator.of.operators.eval.testPolymorphic):
(let.operator.of.operators.let.left.of.typeCases.let.right.of.typeCases.eval.testMonomorphic):
(let.operator.of.operators.let.left.of.typeCases.let.right.of.typeCases.testMonomorphicLeftConstant):
(let.operator.of.operators.let.left.of.typeCases.let.right.of.typeCases.testMonomorphicRightConstant):
(let.operator.of.operators.let.left.of.typeCases.let.right.of.typeCases.i.testPolymorphic):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh">trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGFixupPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstresscomparenumberandotherjs">trunk/Source/JavaScriptCore/tests/stress/compare-number-and-other.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (199638 => 199639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-04-17 03:44:52 UTC (rev 199638)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-04-17 04:55:02 UTC (rev 199639)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-04-16 Benjamin Poulain <bpoulain@webkit.org>
+
+ [JSC] DFG should support relational comparisons of Number and Other
+ https://bugs.webkit.org/show_bug.cgi?id=156669
+
+ Reviewed by Darin Adler.
+
+ In Sunspider/3d-raytrace, DFG falls back to JSValue in some important
+ relational compare because profiling sees "undefined" from time to time.
+
+ This case is fairly common outside Sunspider too because of out-of-bounds array access.
+ Unfortunately for us, our fallback for compare is really inefficient.
+
+ Fortunately, relational comparison with null/undefined/true/false are trival.
+ We can just convert both side to Double. That's what this patch adds.
+
+ I also extended constant folding for those cases because I noticed
+ a bunch of "undefined" constant going through DoubleRep at runtime.
+
+ * dfg/DFGAbstractInterpreterInlines.h:
+ (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+ * dfg/DFGFixupPhase.cpp:
+ (JSC::DFG::FixupPhase::fixupNode):
+ * tests/stress/compare-number-and-other.js: Added.
+ (opaqueSideEffect):
+ (let.operator.of.operators.eval.testPolymorphic):
+ (let.operator.of.operators.let.left.of.typeCases.let.right.of.typeCases.eval.testMonomorphic):
+ (let.operator.of.operators.let.left.of.typeCases.let.right.of.typeCases.testMonomorphicLeftConstant):
+ (let.operator.of.operators.let.left.of.typeCases.let.right.of.typeCases.testMonomorphicRightConstant):
+ (let.operator.of.operators.let.left.of.typeCases.let.right.of.typeCases.i.testPolymorphic):
+
</ins><span class="cx"> 2016-04-16 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] FRound/Negate can produce an impure NaN out of a pure NaN
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (199638 => 199639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2016-04-17 03:44:52 UTC (rev 199638)
+++ trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2016-04-17 04:55:02 UTC (rev 199639)
</span><span class="lines">@@ -392,9 +392,23 @@
</span><span class="cx">
</span><span class="cx"> case DoubleRep: {
</span><span class="cx"> JSValue child = forNode(node->child1()).value();
</span><del>- if (child && child.isNumber()) {
- setConstant(node, jsDoubleNumber(child.asNumber()));
- break;
</del><ins>+ if (child) {
+ if (child.isNumber()) {
+ setConstant(node, jsDoubleNumber(child.asNumber()));
+ break;
+ }
+ if (child.isUndefined()) {
+ setConstant(node, jsDoubleNumber(PNaN));
+ break;
+ }
+ if (child.isNull() || child.isFalse()) {
+ setConstant(node, jsDoubleNumber(0));
+ break;
+ }
+ if (child.isTrue()) {
+ setConstant(node, jsDoubleNumber(1));
+ break;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SpeculatedType type = forNode(node->child1()).m_type;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGFixupPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp (199638 => 199639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2016-04-17 03:44:52 UTC (rev 199638)
+++ trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2016-04-17 04:55:02 UTC (rev 199639)
</span><span class="lines">@@ -453,6 +453,18 @@
</span><span class="cx"> if (Node::shouldSpeculateNumberOrBoolean(node->child1().node(), node->child2().node())) {
</span><span class="cx"> fixDoubleOrBooleanEdge(node->child1());
</span><span class="cx"> fixDoubleOrBooleanEdge(node->child2());
</span><ins>+ }
+ if (node->op() != CompareEq
+ && node->child1()->shouldSpeculateNotCell()
+ && node->child2()->shouldSpeculateNotCell()) {
+ if (node->child1()->shouldSpeculateNumberOrBoolean())
+ fixDoubleOrBooleanEdge(node->child1());
+ else
+ fixEdge<DoubleRepUse>(node->child1());
+ if (node->child2()->shouldSpeculateNumberOrBoolean())
+ fixDoubleOrBooleanEdge(node->child2());
+ else
+ fixEdge<DoubleRepUse>(node->child2());
</ins><span class="cx"> node->clearFlags(NodeMustGenerate);
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresscomparenumberandotherjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/compare-number-and-other.js (0 => 199639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/compare-number-and-other.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/compare-number-and-other.js 2016-04-17 04:55:02 UTC (rev 199639)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+let typeCases = [
+ "1",
+ "Math.PI",
+ "NaN",
+ "undefined",
+ "null",
+ "true",
+ "false",
+];
+
+let operators = ["<", "<=", ">", ">=", "==", "!=", "===", "!=="];
+
+function opaqueSideEffect()
+{
+}
+noInline(opaqueSideEffect);
+
+let testCaseIndex = 0;
+for (let operator of operators) {
+ eval(`
+ function testPolymorphic(a, b) {
+ if (a ${operator} b) {
+ opaqueSideEffect()
+ return true;
+ }
+ return false;
+ }
+ noInline(testPolymorphic)`);
+
+ for (let left of typeCases) {
+ for (let right of typeCases) {
+ let llintResult = eval(left + operator + right);
+ eval(`
+ function testMonomorphic${testCaseIndex}(a, b) {
+ if (a ${operator} b) {
+ opaqueSideEffect()
+ return true;
+ }
+ return false;
+ }
+ noInline(testMonomorphic${testCaseIndex});
+
+ function testMonomorphicLeftConstant${testCaseIndex}(b) {
+ if (${left} ${operator} b) {
+ opaqueSideEffect()
+ return true;
+ }
+ return false;
+ }
+ noInline(testMonomorphicLeftConstant${testCaseIndex});
+
+ function testMonomorphicRightConstant${testCaseIndex}(a) {
+ if (a ${operator} ${right}) {
+ opaqueSideEffect()
+ return true;
+ }
+ return false;
+ }
+ noInline(testMonomorphicRightConstant${testCaseIndex});
+
+ for (let i = 0; i < 500; ++i) {
+ if (testMonomorphic${testCaseIndex}(${left}, ${right}) != ${llintResult})
+ throw "Failed testMonomorphic${testCaseIndex}(${left}, ${right})";
+ if (testMonomorphicLeftConstant${testCaseIndex}(${right}) != ${llintResult})
+ throw "Failed testMonomorphicLeftConstant${testCaseIndex}(${right})";
+ if (testMonomorphicRightConstant${testCaseIndex}(${left}) != ${llintResult})
+ throw "Failed testMonomorphicLeftConstant${testCaseIndex}(${left})";
+ if (testPolymorphic(${left}, ${right}) !== ${llintResult})
+ throw "Failed polymorphicVersion(${left})";
+ }
+ `);
+ ++testCaseIndex;
+ }
+ }
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>