<!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>[194824] 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/194824">194824</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-01-09 20:15:59 -0800 (Sat, 09 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Air should support Branch64 with immediates
https://bugs.webkit.org/show_bug.cgi?id=152951
Reviewed by Oliver Hunt.
This doesn't significantly improve performance on any benchmarks, but it's great to get this
obvious omission out of the way.
* assembler/MacroAssemblerX86_64.h:
(JSC::MacroAssemblerX86_64::branch64):
* b3/air/AirOpcode.opcodes:
* b3/testb3.cpp:
(JSC::B3::testPowDoubleByIntegerLoop):
(JSC::B3::testBranch64Equal):
(JSC::B3::testBranch64EqualImm):
(JSC::B3::testBranch64EqualMem):
(JSC::B3::testBranch64EqualMemImm):
(JSC::B3::zero):
(JSC::B3::run):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86_64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h</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 (194823 => 194824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-01-10 00:38:56 UTC (rev 194823)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-01-10 04:15:59 UTC (rev 194824)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-01-09 Filip Pizlo <fpizlo@apple.com>
+
+ Air should support Branch64 with immediates
+ https://bugs.webkit.org/show_bug.cgi?id=152951
+
+ Reviewed by Oliver Hunt.
+
+ This doesn't significantly improve performance on any benchmarks, but it's great to get this
+ obvious omission out of the way.
+
+ * assembler/MacroAssemblerX86_64.h:
+ (JSC::MacroAssemblerX86_64::branch64):
+ * b3/air/AirOpcode.opcodes:
+ * b3/testb3.cpp:
+ (JSC::B3::testPowDoubleByIntegerLoop):
+ (JSC::B3::testBranch64Equal):
+ (JSC::B3::testBranch64EqualImm):
+ (JSC::B3::testBranch64EqualMem):
+ (JSC::B3::testBranch64EqualMemImm):
+ (JSC::B3::zero):
+ (JSC::B3::run):
+
</ins><span class="cx"> 2016-01-09 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Allow overriding the frameworks directory independently of using a staging install path
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86_64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h (194823 => 194824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h 2016-01-10 00:38:56 UTC (rev 194823)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h 2016-01-10 04:15:59 UTC (rev 194824)
</span><span class="lines">@@ -722,6 +722,16 @@
</span><span class="cx"> return Jump(m_assembler.jCC(x86Condition(cond)));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ Jump branch64(RelationalCondition cond, RegisterID left, TrustedImm32 right)
+ {
+ if (((cond == Equal) || (cond == NotEqual)) && !right.m_value) {
+ m_assembler.testq_rr(left, left);
+ return Jump(m_assembler.jCC(x86Condition(cond)));
+ }
+ m_assembler.cmpq_ir(right.m_value, left);
+ return Jump(m_assembler.jCC(x86Condition(cond)));
+ }
+
</ins><span class="cx"> Jump branch64(RelationalCondition cond, RegisterID left, TrustedImm64 right)
</span><span class="cx"> {
</span><span class="cx"> if (((cond == Equal) || (cond == NotEqual)) && !right.m_value) {
</span><span class="lines">@@ -750,6 +760,12 @@
</span><span class="cx"> return Jump(m_assembler.jCC(x86Condition(cond)));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ Jump branch64(RelationalCondition cond, Address left, TrustedImm32 right)
+ {
+ m_assembler.cmpq_im(right.m_value, left.offset, left.base);
+ return Jump(m_assembler.jCC(x86Condition(cond)));
+ }
+
</ins><span class="cx"> Jump branch64(RelationalCondition cond, Address left, TrustedImm64 right)
</span><span class="cx"> {
</span><span class="cx"> move(right, scratchRegister());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirOpcodeopcodes"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes (194823 => 194824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2016-01-10 00:38:56 UTC (rev 194823)
+++ trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2016-01-10 04:15:59 UTC (rev 194824)
</span><span class="lines">@@ -540,8 +540,10 @@
</span><span class="cx">
</span><span class="cx"> 64: Branch64 U:G:32, U:G:64, U:G:64 /branch
</span><span class="cx"> RelCond, Tmp, Tmp
</span><ins>+ RelCond, Tmp, Imm
</ins><span class="cx"> x86: RelCond, Tmp, Addr
</span><span class="cx"> x86: RelCond, Addr, Tmp
</span><ins>+ x86: RelCond, Addr, Imm
</ins><span class="cx"> x86: RelCond, Index, Tmp
</span><span class="cx">
</span><span class="cx"> BranchTest8 U:G:32, U:G:8, U:G:8 /branch
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3.cpp (194823 => 194824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3.cpp 2016-01-10 00:38:56 UTC (rev 194823)
+++ trunk/Source/JavaScriptCore/b3/testb3.cpp 2016-01-10 04:15:59 UTC (rev 194824)
</span><span class="lines">@@ -8868,6 +8868,134 @@
</span><span class="cx"> CHECK(isIdentical(compileAndRun<double>(proc, xOperand, yOperand), pow(xOperand, yOperand)));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void testBranch64Equal(int64_t left, int64_t right)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ Value* arg1 = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0);
+ Value* arg2 = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR1);
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<Value>(proc, Equal, Origin(), arg1, arg2),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ bool trueResult = true;
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<MemoryValue>(
+ proc, Load8Z, Origin(),
+ thenCase->appendNew<ConstPtrValue>(proc, Origin(), &trueResult)));
+
+ bool elseResult = false;
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<MemoryValue>(
+ proc, Load8Z, Origin(),
+ elseCase->appendNew<ConstPtrValue>(proc, Origin(), &elseResult)));
+
+ CHECK(compileAndRun<bool>(proc, left, right) == (left == right));
+}
+
+void testBranch64EqualImm(int64_t left, int64_t right)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ Value* arg1 = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0);
+ Value* arg2 = root->appendNew<ConstPtrValue>(proc, Origin(), right);
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<Value>(proc, Equal, Origin(), arg1, arg2),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ bool trueResult = true;
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<MemoryValue>(
+ proc, Load8Z, Origin(),
+ thenCase->appendNew<ConstPtrValue>(proc, Origin(), &trueResult)));
+
+ bool elseResult = false;
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<MemoryValue>(
+ proc, Load8Z, Origin(),
+ elseCase->appendNew<ConstPtrValue>(proc, Origin(), &elseResult)));
+
+ CHECK(compileAndRun<bool>(proc, left) == (left == right));
+}
+
+void testBranch64EqualMem(int64_t left, int64_t right)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ Value* arg1 = root->appendNew<MemoryValue>(
+ proc, Load, pointerType(), Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0));
+ Value* arg2 = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR1);
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<Value>(proc, Equal, Origin(), arg1, arg2),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ bool trueResult = true;
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<MemoryValue>(
+ proc, Load8Z, Origin(),
+ thenCase->appendNew<ConstPtrValue>(proc, Origin(), &trueResult)));
+
+ bool elseResult = false;
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<MemoryValue>(
+ proc, Load8Z, Origin(),
+ elseCase->appendNew<ConstPtrValue>(proc, Origin(), &elseResult)));
+
+ CHECK(compileAndRun<bool>(proc, &left, right) == (left == right));
+}
+
+void testBranch64EqualMemImm(int64_t left, int64_t right)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ Value* arg1 = root->appendNew<MemoryValue>(
+ proc, Load, pointerType(), Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0));
+ Value* arg2 = root->appendNew<ConstPtrValue>(proc, Origin(), right);
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<Value>(proc, Equal, Origin(), arg1, arg2),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ bool trueResult = true;
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<MemoryValue>(
+ proc, Load8Z, Origin(),
+ thenCase->appendNew<ConstPtrValue>(proc, Origin(), &trueResult)));
+
+ bool elseResult = false;
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<MemoryValue>(
+ proc, Load8Z, Origin(),
+ elseCase->appendNew<ConstPtrValue>(proc, Origin(), &elseResult)));
+
+ CHECK(compileAndRun<bool>(proc, &left) == (left == right));
+}
+
</ins><span class="cx"> // Make sure the compiler does not try to optimize anything out.
</span><span class="cx"> NEVER_INLINE double zero()
</span><span class="cx"> {
</span><span class="lines">@@ -10101,6 +10229,27 @@
</span><span class="cx"> RUN(testSelectInvert());
</span><span class="cx"> RUN_BINARY(testPowDoubleByIntegerLoop, floatingPointOperands<double>(), int64Operands());
</span><span class="cx">
</span><ins>+ RUN(testBranch64Equal(0, 0));
+ RUN(testBranch64Equal(1, 1));
+ RUN(testBranch64Equal(-1, -1));
+ RUN(testBranch64Equal(1, -1));
+ RUN(testBranch64Equal(-1, 1));
+ RUN(testBranch64EqualImm(0, 0));
+ RUN(testBranch64EqualImm(1, 1));
+ RUN(testBranch64EqualImm(-1, -1));
+ RUN(testBranch64EqualImm(1, -1));
+ RUN(testBranch64EqualImm(-1, 1));
+ RUN(testBranch64EqualMem(0, 0));
+ RUN(testBranch64EqualMem(1, 1));
+ RUN(testBranch64EqualMem(-1, -1));
+ RUN(testBranch64EqualMem(1, -1));
+ RUN(testBranch64EqualMem(-1, 1));
+ RUN(testBranch64EqualMemImm(0, 0));
+ RUN(testBranch64EqualMemImm(1, 1));
+ RUN(testBranch64EqualMemImm(-1, -1));
+ RUN(testBranch64EqualMemImm(1, -1));
+ RUN(testBranch64EqualMemImm(-1, 1));
+
</ins><span class="cx"> if (tasks.isEmpty())
</span><span class="cx"> usage();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>