<!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>[192255] 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/192255">192255</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-11-10 10:36:10 -0800 (Tue, 10 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[B3] Add a test for CCall with double arguments and results
https://bugs.webkit.org/show_bug.cgi?id=151064
Reviewed by Saam Barati.
The test already passed on trunk. But when looking at the disassembly, I realized that I had
made a rookie mistake in the call argument marshalling: the stores to the stack went after the
moves to argument registers! This means that arguments that go to stack would be made to
interfere with all argument registers. That's some severe register pressure right there. So,
this change fixes that as well, and adds a FIXME to do it in a more principled manner in Air.
* b3/B3LowerToAir.cpp:
(JSC::B3::Air::LowerToAir::tryAppendStoreBinOp):
(JSC::B3::Air::LowerToAir::createStore):
(JSC::B3::Air::LowerToAir::appendStore):
(JSC::B3::Air::LowerToAir::moveForType):
(JSC::B3::Air::LowerToAir::marshallCCallArgument):
* b3/testb3.cpp:
(JSC::B3::testReturnDouble):
(JSC::B3::simpleFunctionDouble):
(JSC::B3::testCallSimpleDouble):
(JSC::B3::functionWithHellaDoubleArguments):
(JSC::B3::testCallFunctionWithHellaDoubleArguments):
(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="#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 (192254 => 192255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-11-10 18:32:45 UTC (rev 192254)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-11-10 18:36:10 UTC (rev 192255)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-11-09 Filip Pizlo <fpizlo@apple.com>
+
+ [B3] Add a test for CCall with double arguments and results
+ https://bugs.webkit.org/show_bug.cgi?id=151064
+
+ Reviewed by Saam Barati.
+
+ The test already passed on trunk. But when looking at the disassembly, I realized that I had
+ made a rookie mistake in the call argument marshalling: the stores to the stack went after the
+ moves to argument registers! This means that arguments that go to stack would be made to
+ interfere with all argument registers. That's some severe register pressure right there. So,
+ this change fixes that as well, and adds a FIXME to do it in a more principled manner in Air.
+
+ * b3/B3LowerToAir.cpp:
+ (JSC::B3::Air::LowerToAir::tryAppendStoreBinOp):
+ (JSC::B3::Air::LowerToAir::createStore):
+ (JSC::B3::Air::LowerToAir::appendStore):
+ (JSC::B3::Air::LowerToAir::moveForType):
+ (JSC::B3::Air::LowerToAir::marshallCCallArgument):
+ * b3/testb3.cpp:
+ (JSC::B3::testReturnDouble):
+ (JSC::B3::simpleFunctionDouble):
+ (JSC::B3::testCallSimpleDouble):
+ (JSC::B3::functionWithHellaDoubleArguments):
+ (JSC::B3::testCallFunctionWithHellaDoubleArguments):
+ (JSC::B3::run):
+
</ins><span class="cx"> 2015-11-10 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Remove create_hash_table options and simplify build system
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3LowerToAircpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp (192254 => 192255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2015-11-10 18:32:45 UTC (rev 192254)
+++ trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2015-11-10 18:36:10 UTC (rev 192255)
</span><span class="lines">@@ -661,18 +661,21 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void appendStore(Value* value, const Arg& dest)
</del><ins>+ Inst createStore(Value* value, const Arg& dest)
</ins><span class="cx"> {
</span><span class="cx"> Air::Opcode move = moveForType(value->type());
</span><span class="cx">
</span><del>- if (imm(value) && isValidForm(move, Arg::Imm, dest.kind())) {
- append(move, imm(value), dest);
- return;
- }
</del><ins>+ if (imm(value) && isValidForm(move, Arg::Imm, dest.kind()))
+ return Inst(move, m_value, imm(value), dest);
</ins><span class="cx">
</span><del>- append(move, tmp(value), dest);
</del><ins>+ return Inst(move, m_value, tmp(value), dest);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ void appendStore(Value* value, const Arg& dest)
+ {
+ m_insts.last().append(createStore(value, dest));
+ }
+
</ins><span class="cx"> Air::Opcode moveForType(Type type)
</span><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><span class="lines">@@ -1167,7 +1170,14 @@
</span><span class="cx"> unsigned stackIndex = stackCount++;
</span><span class="cx">
</span><span class="cx"> Arg result = Arg::callArg(stackIndex * sizeof(void*));
</span><del>- appendStore(child, result);
</del><ins>+
+ // Put the code for storing the argument before anything else. This significantly eases the
+ // burden on the register allocator. If we could, we'd hoist these stores as far as
+ // possible.
+ // FIXME: Add a phase to hoist stores as high as possible to relieve register pressure.
+ // https://bugs.webkit.org/show_bug.cgi?id=151063
+ m_insts.last().insert(0, createStore(child, result));
+
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3.cpp (192254 => 192255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-11-10 18:32:45 UTC (rev 192254)
+++ trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-11-10 18:36:10 UTC (rev 192255)
</span><span class="lines">@@ -2703,6 +2703,50 @@
</span><span class="cx"> CHECK(isIdentical(compileAndRun<double>(proc), value));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+double simpleFunctionDouble(double a, double b)
+{
+ return a + b;
+}
+
+void testCallSimpleDouble(double a, double b)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ root->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ root->appendNew<CCallValue>(
+ proc, Double, Origin(),
+ root->appendNew<ConstPtrValue>(proc, Origin(), bitwise_cast<void*>(simpleFunctionDouble)),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), FPRInfo::argumentFPR0),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), FPRInfo::argumentFPR1)));
+
+ CHECK(compileAndRun<double>(proc, a, b) == a + b);
+}
+
+double functionWithHellaDoubleArguments(double a, double b, double c, double d, double e, double f, double g, double h, double i, double j, double k, double l, double m, double n, double o, double p, double q, double r, double s, double t, double u, double v, double w, double x, double y, double z)
+{
+ return a * pow(2, 0) + b * pow(2, 1) + c * pow(2, 2) + d * pow(2, 3) + e * pow(2, 4) + f * pow(2, 5) + g * pow(2, 6) + h * pow(2, 7) + i * pow(2, 8) + j * pow(2, 9) + k * pow(2, 10) + l * pow(2, 11) + m * pow(2, 12) + n * pow(2, 13) + o * pow(2, 14) + p * pow(2, 15) + q * pow(2, 16) + r * pow(2, 17) + s * pow(2, 18) + t * pow(2, 19) + u * pow(2, 20) + v * pow(2, 21) + w * pow(2, 22) + x * pow(2, 23) + y * pow(2, 24) + z * pow(2, 25);
+}
+
+void testCallFunctionWithHellaDoubleArguments()
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+
+ Vector<Value*> args;
+ for (unsigned i = 0; i < 26; ++i)
+ args.append(root->appendNew<ConstDoubleValue>(proc, Origin(), i + 1));
+
+ CCallValue* call = root->appendNew<CCallValue>(
+ proc, Double, Origin(),
+ root->appendNew<ConstPtrValue>(proc, Origin(), bitwise_cast<void*>(functionWithHellaDoubleArguments)));
+ call->children().appendVector(args);
+
+ root->appendNew<ControlValue>(proc, Return, Origin(), call);
+
+ CHECK(compileAndRun<double>(proc) == functionWithHellaDoubleArguments(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26));
+}
+
</ins><span class="cx"> #define RUN(test) do { \
</span><span class="cx"> if (!shouldRun(#test)) \
</span><span class="cx"> break; \
</span><span class="lines">@@ -3174,6 +3218,9 @@
</span><span class="cx"> RUN(testReturnDouble(-0.0));
</span><span class="cx"> RUN(testReturnDouble(42.5));
</span><span class="cx">
</span><ins>+ RUN(testCallSimpleDouble(1, 2));
+ RUN(testCallFunctionWithHellaDoubleArguments());
+
</ins><span class="cx"> if (tasks.isEmpty())
</span><span class="cx"> usage();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>