<!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>[192493] 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/192493">192493</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-16 15:49:22 -0800 (Mon, 16 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Add trivial lowering for B3's Div with doubles
https://bugs.webkit.org/show_bug.cgi?id=151292
Patch by Benjamin Poulain <bpoulain@apple.com> on 2015-11-16
Reviewed by Geoffrey Garen.
Filip had already made the constant propagation for it.
The Air Opcode was all we had left.
* b3/B3LowerToAir.cpp:
(JSC::B3::Air::LowerToAir::lower):
* b3/air/AirOpcode.opcodes:
* b3/testb3.cpp:
(JSC::B3::testDivArgDouble):
(JSC::B3::testDivArgsDouble):
(JSC::B3::testDivArgImmDouble):
(JSC::B3::testDivImmArgDouble):
(JSC::B3::testDivImmsDouble):
(JSC::B3::run):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (192492 => 192493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-11-16 23:47:10 UTC (rev 192492)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-11-16 23:49:22 UTC (rev 192493)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-11-16 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><ins>+ [JSC] Add trivial lowering for B3's Div with doubles
+ https://bugs.webkit.org/show_bug.cgi?id=151292
+
+ Reviewed by Geoffrey Garen.
+
+ Filip had already made the constant propagation for it.
+ The Air Opcode was all we had left.
+
+ * b3/B3LowerToAir.cpp:
+ (JSC::B3::Air::LowerToAir::lower):
+ * b3/air/AirOpcode.opcodes:
+ * b3/testb3.cpp:
+ (JSC::B3::testDivArgDouble):
+ (JSC::B3::testDivArgsDouble):
+ (JSC::B3::testDivArgImmDouble):
+ (JSC::B3::testDivImmArgDouble):
+ (JSC::B3::testDivImmsDouble):
+ (JSC::B3::run):
+
+2015-11-16 Benjamin Poulain <bpoulain@apple.com>
+
</ins><span class="cx"> [JSC] Speed up the coalescing-related operation of the iterated register allocator
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151290
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3LowerToAircpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp (192492 => 192493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2015-11-16 23:47:10 UTC (rev 192492)
+++ trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2015-11-16 23:49:22 UTC (rev 192493)
</span><span class="lines">@@ -1292,10 +1292,9 @@
</span><span class="cx"> append(Move, eax, tmp(m_value));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+ ASSERT(isFloat(m_value->type()));
</ins><span class="cx">
</span><del>- // FIXME: Support doubles.
- // https://bugs.webkit.org/show_bug.cgi?id=150991
- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ appendBinOp<Air::Oops, Air::Oops, DivDouble>(m_value->child(0), m_value->child(1));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirOpcodeopcodes"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes (192492 => 192493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2015-11-16 23:47:10 UTC (rev 192492)
+++ trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2015-11-16 23:49:22 UTC (rev 192493)
</span><span class="lines">@@ -78,6 +78,10 @@
</span><span class="cx"> Add64 U:G, U:G, D:G
</span><span class="cx"> Imm, Tmp, Tmp
</span><span class="cx">
</span><ins>+AddDouble U:F, UD:F
+ Tmp, Tmp
+ Addr, Tmp
+
</ins><span class="cx"> Sub32 U:G, UD:G
</span><span class="cx"> Tmp, Tmp
</span><span class="cx"> Imm, Addr
</span><span class="lines">@@ -106,6 +110,10 @@
</span><span class="cx"> Mul64 U:G, UD:G
</span><span class="cx"> Tmp, Tmp
</span><span class="cx">
</span><ins>+DivDouble U:F, UD:F
+ Tmp, Tmp
+ Addr, Tmp
+
</ins><span class="cx"> X86ConvertToDoubleWord32 U:G, D:G
</span><span class="cx"> Tmp*, Tmp*
</span><span class="cx">
</span><span class="lines">@@ -132,10 +140,6 @@
</span><span class="cx"> Tmp, Tmp
</span><span class="cx"> Imm, Tmp
</span><span class="cx">
</span><del>-AddDouble U:F, UD:F
- Tmp, Tmp
- Addr, Tmp
-
</del><span class="cx"> Lshift32 U:G, UD:G
</span><span class="cx"> Tmp*, Tmp
</span><span class="cx"> Imm, Tmp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3.cpp (192492 => 192493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-11-16 23:47:10 UTC (rev 192492)
+++ trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-11-16 23:49:22 UTC (rev 192493)
</span><span class="lines">@@ -384,6 +384,70 @@
</span><span class="cx"> test(1);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void testDivArgDouble(double a)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ Value* value = root->appendNew<ArgumentRegValue>(proc, Origin(), FPRInfo::argumentFPR0);
+ root->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ root->appendNew<Value>(proc, Div, Origin(), value, value));
+
+ CHECK(isIdentical(compileAndRun<double>(proc, a), a / a));
+}
+
+void testDivArgsDouble(double a, double b)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ Value* valueA = root->appendNew<ArgumentRegValue>(proc, Origin(), FPRInfo::argumentFPR0);
+ Value* valueB = root->appendNew<ArgumentRegValue>(proc, Origin(), FPRInfo::argumentFPR1);
+ root->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ root->appendNew<Value>(proc, Div, Origin(), valueA, valueB));
+
+ CHECK(isIdentical(compileAndRun<double>(proc, a, b), a / b));
+}
+
+void testDivArgImmDouble(double a, double b)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ Value* valueA = root->appendNew<ArgumentRegValue>(proc, Origin(), FPRInfo::argumentFPR0);
+ Value* valueB = root->appendNew<ConstDoubleValue>(proc, Origin(), b);
+ root->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ root->appendNew<Value>(proc, Div, Origin(), valueA, valueB));
+
+ CHECK(isIdentical(compileAndRun<double>(proc, a), a / b));
+}
+
+void testDivImmArgDouble(double a, double b)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ Value* valueA = root->appendNew<ConstDoubleValue>(proc, Origin(), a);
+ Value* valueB = root->appendNew<ArgumentRegValue>(proc, Origin(), FPRInfo::argumentFPR0);
+ root->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ root->appendNew<Value>(proc, Div, Origin(), valueA, valueB));
+
+ CHECK(isIdentical(compileAndRun<double>(proc, b), a / b));
+}
+
+void testDivImmsDouble(double a, double b)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ Value* valueA = root->appendNew<ConstDoubleValue>(proc, Origin(), a);
+ Value* valueB = root->appendNew<ConstDoubleValue>(proc, Origin(), b);
+ root->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ root->appendNew<Value>(proc, Div, Origin(), valueA, valueB));
+
+ CHECK(isIdentical(compileAndRun<double>(proc), a / b));
+}
+
</ins><span class="cx"> void testSubArg(int a)
</span><span class="cx"> {
</span><span class="cx"> Procedure proc;
</span><span class="lines">@@ -4057,6 +4121,30 @@
</span><span class="cx"> RUN(testMulArgs32(1, 2));
</span><span class="cx"> RUN(testMulLoadTwice());
</span><span class="cx">
</span><ins>+ RUN(testDivArgDouble(M_PI));
+ RUN(testDivArgsDouble(M_PI, 1));
+ RUN(testDivArgsDouble(M_PI, -M_PI));
+ RUN(testDivArgImmDouble(M_PI, 1));
+ RUN(testDivArgImmDouble(M_PI, 0));
+ RUN(testDivArgImmDouble(M_PI, negativeZero()));
+ RUN(testDivArgImmDouble(0, 0));
+ RUN(testDivArgImmDouble(0, negativeZero()));
+ RUN(testDivArgImmDouble(negativeZero(), 0));
+ RUN(testDivArgImmDouble(negativeZero(), negativeZero()));
+ RUN(testDivImmArgDouble(M_PI, 1));
+ RUN(testDivImmArgDouble(M_PI, 0));
+ RUN(testDivImmArgDouble(M_PI, negativeZero()));
+ RUN(testDivImmArgDouble(0, 0));
+ RUN(testDivImmArgDouble(0, negativeZero()));
+ RUN(testDivImmArgDouble(negativeZero(), 0));
+ RUN(testDivImmArgDouble(negativeZero(), negativeZero()));
+ RUN(testDivImmsDouble(M_PI, 1));
+ RUN(testDivImmsDouble(M_PI, 0));
+ RUN(testDivImmsDouble(M_PI, negativeZero()));
+ RUN(testDivImmsDouble(0, 0));
+ RUN(testDivImmsDouble(0, negativeZero()));
+ RUN(testDivImmsDouble(negativeZero(), negativeZero()));
+
</ins><span class="cx"> RUN(testSubArg(24));
</span><span class="cx"> RUN(testSubArgs(1, 1));
</span><span class="cx"> RUN(testSubArgs(1, 2));
</span></span></pre>
</div>
</div>
</body>
</html>