<!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>[194320] 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/194320">194320</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-12-20 11:53:40 -0800 (Sun, 20 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement compareDouble in B3/Air
https://bugs.webkit.org/show_bug.cgi?id=150903
Reviewed by Benjamin Poulain.
A hole in our coverage is that we don't fuse a double comparison into a branch, then we will
crash in the instruction selector. Obviously, we *really* want to fuse double comparisons,
but we can't guarantee that this will always happen.
This also removes all uses of WTF::Dominators verification, since it's extremely slow even in
a release build. This speeds up testb3 with validateGraphAtEachPhase=true by an order of
magnitude.
* assembler/MacroAssembler.h:
(JSC::MacroAssembler::moveDoubleConditionallyFloat):
(JSC::MacroAssembler::compareDouble):
(JSC::MacroAssembler::compareFloat):
(JSC::MacroAssembler::lea):
* b3/B3Dominators.h:
(JSC::B3::Dominators::Dominators):
* b3/B3LowerToAir.cpp:
(JSC::B3::Air::LowerToAir::createCompare):
(JSC::B3::Air::LowerToAir::lower):
* b3/air/AirOpcode.opcodes:
* b3/testb3.cpp:
(JSC::B3::testCompare):
(JSC::B3::testEqualDouble):
(JSC::B3::simpleFunction):
(JSC::B3::run):
* dfg/DFGDominators.h:
(JSC::DFG::Dominators::Dominators):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerh">trunk/Source/JavaScriptCore/assembler/MacroAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3Dominatorsh">trunk/Source/JavaScriptCore/b3/B3Dominators.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3LowerToAircpp">trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirOpcodeopcodes">trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3testb3cpp">trunk/Source/JavaScriptCore/b3/testb3.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGDominatorsh">trunk/Source/JavaScriptCore/dfg/DFGDominators.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194319 => 194320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-20 10:27:02 UTC (rev 194319)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-20 19:53:40 UTC (rev 194320)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2015-12-18 Filip Pizlo <fpizlo@apple.com>
+
+ Implement compareDouble in B3/Air
+ https://bugs.webkit.org/show_bug.cgi?id=150903
+
+ Reviewed by Benjamin Poulain.
+
+ A hole in our coverage is that we don't fuse a double comparison into a branch, then we will
+ crash in the instruction selector. Obviously, we *really* want to fuse double comparisons,
+ but we can't guarantee that this will always happen.
+
+ This also removes all uses of WTF::Dominators verification, since it's extremely slow even in
+ a release build. This speeds up testb3 with validateGraphAtEachPhase=true by an order of
+ magnitude.
+
+ * assembler/MacroAssembler.h:
+ (JSC::MacroAssembler::moveDoubleConditionallyFloat):
+ (JSC::MacroAssembler::compareDouble):
+ (JSC::MacroAssembler::compareFloat):
+ (JSC::MacroAssembler::lea):
+ * b3/B3Dominators.h:
+ (JSC::B3::Dominators::Dominators):
+ * b3/B3LowerToAir.cpp:
+ (JSC::B3::Air::LowerToAir::createCompare):
+ (JSC::B3::Air::LowerToAir::lower):
+ * b3/air/AirOpcode.opcodes:
+ * b3/testb3.cpp:
+ (JSC::B3::testCompare):
+ (JSC::B3::testEqualDouble):
+ (JSC::B3::simpleFunction):
+ (JSC::B3::run):
+ * dfg/DFGDominators.h:
+ (JSC::DFG::Dominators::Dominators):
+
</ins><span class="cx"> 2015-12-19 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] WebKit contains dead source code for OS X Mavericks and earlier
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssembler.h (194319 => 194320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssembler.h 2015-12-20 10:27:02 UTC (rev 194319)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssembler.h 2015-12-20 19:53:40 UTC (rev 194320)
</span><span class="lines">@@ -1363,6 +1363,23 @@
</span><span class="cx"> moveDouble(src, dest);
</span><span class="cx"> falseCase.link(this);
</span><span class="cx"> }
</span><ins>+
+ // We should implement this the right way eventually, but for now, it's fine because it arises so
+ // infrequently.
+ void compareDouble(DoubleCondition cond, FPRegisterID left, FPRegisterID right, RegisterID dest)
+ {
+ move(TrustedImm32(0), dest);
+ Jump falseCase = branchDouble(invert(cond), left, right);
+ move(TrustedImm32(1), dest);
+ falseCase.link(this);
+ }
+ void compareFloat(DoubleCondition cond, FPRegisterID left, FPRegisterID right, RegisterID dest)
+ {
+ move(TrustedImm32(0), dest);
+ Jump falseCase = branchFloat(invert(cond), left, right);
+ move(TrustedImm32(1), dest);
+ falseCase.link(this);
+ }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void lea(Address address, RegisterID dest)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3Dominatorsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3Dominators.h (194319 => 194320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3Dominators.h 2015-12-20 10:27:02 UTC (rev 194319)
+++ trunk/Source/JavaScriptCore/b3/B3Dominators.h 2015-12-20 19:53:40 UTC (rev 194320)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #if ENABLE(B3_JIT)
</span><span class="cx">
</span><span class="cx"> #include "B3CFG.h"
</span><del>-#include "B3Common.h"
</del><span class="cx"> #include "B3Procedure.h"
</span><span class="cx"> #include <wtf/Dominators.h>
</span><span class="cx"> #include <wtf/FastMalloc.h>
</span><span class="lines">@@ -42,7 +41,7 @@
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> Dominators(Procedure& proc)
</span><del>- : WTF::Dominators<CFG>(proc.cfg(), shouldValidateIR())
</del><ins>+ : WTF::Dominators<CFG>(proc.cfg())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3LowerToAircpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp (194319 => 194320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2015-12-20 10:27:02 UTC (rev 194319)
+++ trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2015-12-20 19:53:40 UTC (rev 194320)
</span><span class="lines">@@ -1425,13 +1425,20 @@
</span><span class="cx"> return Inst();
</span><span class="cx"> }
</span><span class="cx"> },
</span><del>- [this] (const Arg&, const ArgPromise&, const ArgPromise&) -> Inst {
- // FIXME: Implement this.
- // https://bugs.webkit.org/show_bug.cgi?id=150903
</del><ins>+ [this] (const Arg& doubleCond, const ArgPromise& left, const ArgPromise& right) -> Inst {
+ if (isValidForm(CompareDouble, Arg::DoubleCond, left.kind(), right.kind(), Arg::Tmp)) {
+ return Inst(
+ CompareDouble, m_value, doubleCond,
+ left.consume(*this), right.consume(*this), tmp(m_value));
+ }
</ins><span class="cx"> return Inst();
</span><span class="cx"> },
</span><del>- [this] (const Arg&, const ArgPromise&, const ArgPromise&) -> Inst {
- // FIXME: Implement this.
</del><ins>+ [this] (const Arg& doubleCond, const ArgPromise& left, const ArgPromise& right) -> Inst {
+ if (isValidForm(CompareFloat, Arg::DoubleCond, left.kind(), right.kind(), Arg::Tmp)) {
+ return Inst(
+ CompareFloat, m_value, doubleCond,
+ left.consume(*this), right.consume(*this), tmp(m_value));
+ }
</ins><span class="cx"> return Inst();
</span><span class="cx"> },
</span><span class="cx"> inverted);
</span><span class="lines">@@ -1652,6 +1659,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case BitXor: {
</span><ins>+ // FIXME: If canBeInternal(child), we should generate this using the comparison path.
+ // https://bugs.webkit.org/show_bug.cgi?id=152367
+
</ins><span class="cx"> if (m_value->child(1)->isInt(-1)) {
</span><span class="cx"> appendUnOp<Not32, Not64>(m_value->child(0));
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirOpcodeopcodes"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes (194319 => 194320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2015-12-20 10:27:02 UTC (rev 194319)
+++ trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2015-12-20 19:53:40 UTC (rev 194320)
</span><span class="lines">@@ -435,6 +435,12 @@
</span><span class="cx"> ResCond, Tmp, Imm, Tmp
</span><span class="cx"> ResCond, Tmp, Tmp, Tmp
</span><span class="cx">
</span><ins>+CompareDouble U:G, U:F, U:F, D:G
+ DoubleCond, Tmp, Tmp, Tmp
+
+CompareFloat U:G, U:F, U:F, D:G
+ DoubleCond, Tmp, Tmp, Tmp
+
</ins><span class="cx"> # Note that branches have some logic in AirOptimizeBlockOrder.cpp. If you add new branches, please make sure
</span><span class="cx"> # you opt them into the block order optimizations.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3.cpp (194319 => 194320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-12-20 10:27:02 UTC (rev 194319)
+++ trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-12-20 19:53:40 UTC (rev 194320)
</span><span class="lines">@@ -7455,6 +7455,20 @@
</span><span class="cx"> variants(-left, -right);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void testEqualDouble(double left, double right, bool result)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ root->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ root->appendNew<Value>(
+ proc, Equal, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), FPRInfo::argumentFPR0),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), FPRInfo::argumentFPR1)));
+
+ CHECK(compileAndRun<bool>(proc, left, right) == result);
+}
+
</ins><span class="cx"> int simpleFunction(int a, int b)
</span><span class="cx"> {
</span><span class="cx"> return a + b;
</span><span class="lines">@@ -9498,6 +9512,13 @@
</span><span class="cx"> RUN(testCompare(BitAnd, 42, 42));
</span><span class="cx"> RUN(testCompare(BitAnd, 42, 0));
</span><span class="cx">
</span><ins>+ RUN(testEqualDouble(42, 42, true));
+ RUN(testEqualDouble(0, -0, true));
+ RUN(testEqualDouble(42, 43, false));
+ RUN(testEqualDouble(PNaN, 42, false));
+ RUN(testEqualDouble(42, PNaN, false));
+ RUN(testEqualDouble(PNaN, PNaN, false));
+
</ins><span class="cx"> RUN(testLoad<Int32>(60));
</span><span class="cx"> RUN(testLoad<Int32>(-60));
</span><span class="cx"> RUN(testLoad<Int32>(1000));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGDominatorsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGDominators.h (194319 => 194320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGDominators.h 2015-12-20 10:27:02 UTC (rev 194319)
+++ trunk/Source/JavaScriptCore/dfg/DFGDominators.h 2015-12-20 19:53:40 UTC (rev 194320)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> Dominators(Graph& graph)
</span><del>- : WTF::Dominators<CFG>(*graph.m_cfg, validationEnabled())
</del><ins>+ : WTF::Dominators<CFG>(*graph.m_cfg)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>