<!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>[191996] 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/191996">191996</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-11-03 16:41:14 -0800 (Tue, 03 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>B3::LowerToAir should recognize Neg (i.e. Sub($0, value))
https://bugs.webkit.org/show_bug.cgi?id=150759
Reviewed by Benjamin Poulain.
Adds various forms of Sub(0, value) and compiles them as Neg. Also fixes a bug in
StoreSubLoad. This bug was correctness-benign, so I couldn't add a test for it.
* b3/B3LowerToAir.cpp:
(JSC::B3::Air::LowerToAir::immOrTmp):
(JSC::B3::Air::LowerToAir::appendUnOp):
(JSC::B3::Air::LowerToAir::appendBinOp):
(JSC::B3::Air::LowerToAir::tryAppendStoreUnOp):
(JSC::B3::Air::LowerToAir::tryAppendStoreBinOp):
(JSC::B3::Air::LowerToAir::trySub):
(JSC::B3::Air::LowerToAir::tryStoreSubLoad):
* b3/B3LoweringMatcher.patterns:
* b3/air/AirOpcode.opcodes:
* b3/testb3.cpp:
(JSC::B3::testAdd1Ptr):
(JSC::B3::testNeg32):
(JSC::B3::testNegPtr):
(JSC::B3::testStoreAddLoad):
(JSC::B3::testStoreAddAndLoad):
(JSC::B3::testStoreNegLoad32):
(JSC::B3::testStoreNegLoadPtr):
(JSC::B3::testAdd1Uncommuted):
(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="#trunkSourceJavaScriptCoreb3B3LoweringMatcherpatterns">trunk/Source/JavaScriptCore/b3/B3LoweringMatcher.patterns</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 (191995 => 191996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-11-04 00:39:29 UTC (rev 191995)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-11-04 00:41:14 UTC (rev 191996)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2015-11-03 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ B3::LowerToAir should recognize Neg (i.e. Sub($0, value))
+ https://bugs.webkit.org/show_bug.cgi?id=150759
+
+ Reviewed by Benjamin Poulain.
+
+ Adds various forms of Sub(0, value) and compiles them as Neg. Also fixes a bug in
+ StoreSubLoad. This bug was correctness-benign, so I couldn't add a test for it.
+
+ * b3/B3LowerToAir.cpp:
+ (JSC::B3::Air::LowerToAir::immOrTmp):
+ (JSC::B3::Air::LowerToAir::appendUnOp):
+ (JSC::B3::Air::LowerToAir::appendBinOp):
+ (JSC::B3::Air::LowerToAir::tryAppendStoreUnOp):
+ (JSC::B3::Air::LowerToAir::tryAppendStoreBinOp):
+ (JSC::B3::Air::LowerToAir::trySub):
+ (JSC::B3::Air::LowerToAir::tryStoreSubLoad):
+ * b3/B3LoweringMatcher.patterns:
+ * b3/air/AirOpcode.opcodes:
+ * b3/testb3.cpp:
+ (JSC::B3::testAdd1Ptr):
+ (JSC::B3::testNeg32):
+ (JSC::B3::testNegPtr):
+ (JSC::B3::testStoreAddLoad):
+ (JSC::B3::testStoreAddAndLoad):
+ (JSC::B3::testStoreNegLoad32):
+ (JSC::B3::testStoreNegLoadPtr):
+ (JSC::B3::testAdd1Uncommuted):
+ (JSC::B3::run):
+
+2015-11-03 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> B3::Values that have effects should allow specification of custom HeapRanges
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150535
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3LowerToAircpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp (191995 => 191996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2015-11-04 00:39:29 UTC (rev 191995)
+++ trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2015-11-04 00:41:14 UTC (rev 191996)
</span><span class="lines">@@ -277,6 +277,25 @@
</span><span class="cx"> return tmp(value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ template<Air::Opcode opcode>
+ void appendUnOp(Value* value)
+ {
+ Tmp result = tmp(currentValue);
+
+ // Two operand forms like:
+ // Op a, b
+ // mean something like:
+ // b = Op a
+
+ if (isValidForm(opcode, Arg::Tmp, Arg::Tmp)) {
+ append(opcode, tmp(value), result);
+ return;
+ }
+
+ append(relaxedMoveForType(currentValue->type()), tmp(value), result);
+ append(opcode, result);
+ }
+
</ins><span class="cx"> template<Air::Opcode opcode, Commutativity commutativity = NotCommutative>
</span><span class="cx"> void appendBinOp(Value* left, Value* right)
</span><span class="cx"> {
</span><span class="lines">@@ -352,6 +371,20 @@
</span><span class="cx"> append(opcode, tmp(right), result);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ template<Air::Opcode opcode>
+ bool tryAppendStoreUnOp(Value* value)
+ {
+ Arg storeAddr = addr(currentValue);
+ ASSERT(storeAddr);
+
+ if (loadAddr(value) != storeAddr)
+ return false;
+
+ commitInternal(value);
+ append(opcode, storeAddr);
+ return true;
+ }
+
</ins><span class="cx"> template<Air::Opcode opcode, Commutativity commutativity = NotCommutative>
</span><span class="cx"> bool tryAppendStoreBinOp(Value* left, Value* right)
</span><span class="cx"> {
</span><span class="lines">@@ -628,10 +661,16 @@
</span><span class="cx"> {
</span><span class="cx"> switch (left->type()) {
</span><span class="cx"> case Int32:
</span><del>- appendBinOp<Sub32>(left, right);
</del><ins>+ if (left->isInt32(0))
+ appendUnOp<Neg32>(right);
+ else
+ appendBinOp<Sub32>(left, right);
</ins><span class="cx"> return true;
</span><span class="cx"> case Int64:
</span><del>- appendBinOp<Sub64>(left, right);
</del><ins>+ if (left->isInt64(0))
+ appendUnOp<Neg64>(right);
+ else
+ appendBinOp<Sub64>(left, right);
</ins><span class="cx"> return true;
</span><span class="cx"> default:
</span><span class="cx"> // FIXME: Implement more types!
</span><span class="lines">@@ -700,6 +739,8 @@
</span><span class="cx"> {
</span><span class="cx"> switch (left->type()) {
</span><span class="cx"> case Int32:
</span><ins>+ if (left->isInt32(0))
+ return tryAppendStoreUnOp<Neg32>(right);
</ins><span class="cx"> return tryAppendStoreBinOp<Sub32, NotCommutative>(left, right);
</span><span class="cx"> default:
</span><span class="cx"> // FIXME: Implement more types!
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3LoweringMatcherpatterns"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3LoweringMatcher.patterns (191995 => 191996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3LoweringMatcher.patterns 2015-11-04 00:39:29 UTC (rev 191995)
+++ trunk/Source/JavaScriptCore/b3/B3LoweringMatcher.patterns 2015-11-04 00:41:14 UTC (rev 191996)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> Shl = Shl(value, amount)
</span><span class="cx">
</span><span class="cx"> StoreAddLoad = Store(Add(left, right), address)
</span><del>-StoreSubLoad = Store(Add(left, right), address)
</del><ins>+StoreSubLoad = Store(Sub(left, right), address)
</ins><span class="cx"> StoreAndLoad = Store(BitAnd(left, right), address)
</span><span class="cx"> Store = Store(value, address)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirOpcodeopcodes"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes (191995 => 191996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2015-11-04 00:39:29 UTC (rev 191995)
+++ trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2015-11-04 00:41:14 UTC (rev 191996)
</span><span class="lines">@@ -89,6 +89,13 @@
</span><span class="cx"> Tmp, Tmp
</span><span class="cx"> Imm, Tmp
</span><span class="cx">
</span><ins>+Neg32 UD:G
+ Tmp
+ Addr
+
+Neg64 UD:G
+ Tmp
+
</ins><span class="cx"> Lea UA:G, D:G
</span><span class="cx"> Addr, Tmp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3.cpp (191995 => 191996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-11-04 00:39:29 UTC (rev 191995)
+++ trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-11-04 00:41:14 UTC (rev 191996)
</span><span class="lines">@@ -835,6 +835,36 @@
</span><span class="cx"> CHECK(compileAndRun<intptr_t>(proc, value) == value + 1);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void testNeg32(int32_t value)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ root->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ root->appendNew<Value>(
+ proc, Sub, Origin(),
+ root->appendNew<Const32Value>(proc, Origin(), 0),
+ root->appendNew<Value>(
+ proc, Trunc, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0))));
+
+ CHECK(compileAndRun<int32_t>(proc, value) == -value);
+}
+
+void testNegPtr(intptr_t value)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ root->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ root->appendNew<Value>(
+ proc, Sub, Origin(),
+ root->appendNew<ConstPtrValue>(proc, Origin(), 0),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0)));
+
+ CHECK(compileAndRun<intptr_t>(proc, value) == -value);
+}
+
</ins><span class="cx"> void testStoreAddLoad(int amount)
</span><span class="cx"> {
</span><span class="cx"> Procedure proc;
</span><span class="lines">@@ -931,6 +961,54 @@
</span><span class="cx"> CHECK(slot == ((37 + amount) & mask));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void testStoreNegLoad32(int32_t value)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+
+ int32_t slot = value;
+
+ ConstPtrValue* slotPtr = root->appendNew<ConstPtrValue>(proc, Origin(), &slot);
+
+ root->appendNew<MemoryValue>(
+ proc, Store, Origin(),
+ root->appendNew<Value>(
+ proc, Sub, Origin(),
+ root->appendNew<Const32Value>(proc, Origin(), 0),
+ root->appendNew<MemoryValue>(proc, Load, Int32, Origin(), slotPtr)),
+ slotPtr);
+
+ root->appendNew<ControlValue>(
+ proc, Return, Origin(), root->appendNew<Const32Value>(proc, Origin(), 0));
+
+ CHECK(!compileAndRun<int32_t>(proc));
+ CHECK(slot == -value);
+}
+
+void testStoreNegLoadPtr(intptr_t value)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+
+ intptr_t slot = value;
+
+ ConstPtrValue* slotPtr = root->appendNew<ConstPtrValue>(proc, Origin(), &slot);
+
+ root->appendNew<MemoryValue>(
+ proc, Store, Origin(),
+ root->appendNew<Value>(
+ proc, Sub, Origin(),
+ root->appendNew<ConstPtrValue>(proc, Origin(), 0),
+ root->appendNew<MemoryValue>(proc, Load, pointerType(), Origin(), slotPtr)),
+ slotPtr);
+
+ root->appendNew<ControlValue>(
+ proc, Return, Origin(), root->appendNew<Const32Value>(proc, Origin(), 0));
+
+ CHECK(!compileAndRun<int32_t>(proc));
+ CHECK(slot == -value);
+}
+
</ins><span class="cx"> void testAdd1Uncommuted(int value)
</span><span class="cx"> {
</span><span class="cx"> Procedure proc;
</span><span class="lines">@@ -1866,11 +1944,15 @@
</span><span class="cx"> RUN(testAdd1(45));
</span><span class="cx"> RUN(testAdd1Ptr(51));
</span><span class="cx"> RUN(testAdd1Ptr(bitwise_cast<intptr_t>(vm)));
</span><ins>+ RUN(testNeg32(52));
+ RUN(testNegPtr(53));
</ins><span class="cx"> RUN(testStoreAddLoad(46));
</span><span class="cx"> RUN(testStoreSubLoad(46));
</span><span class="cx"> RUN(testStoreAddLoadInterference(52));
</span><span class="cx"> RUN(testStoreAddAndLoad(47, 0xffff));
</span><span class="cx"> RUN(testStoreAddAndLoad(470000, 0xffff));
</span><ins>+ RUN(testStoreNegLoad32(54));
+ RUN(testStoreNegLoadPtr(55));
</ins><span class="cx"> RUN(testAdd1Uncommuted(48));
</span><span class="cx"> RUN(testLoadOffset());
</span><span class="cx"> RUN(testLoadOffsetNotConstant());
</span></span></pre>
</div>
</div>
</body>
</html>