<!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>[192478] 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/192478">192478</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-11-16 11:29:34 -0800 (Mon, 16 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure that the address matcher correctly handles Shl(x, 1)
https://bugs.webkit.org/show_bug.cgi?id=151316
Reviewed by Geoffrey Garen.
This optimization isn't really that awesome, but the nicest part of the change is just the
testing. If we ever do more cleverness with shifts, these tests will come in handy.
* b3/B3LowerToAir.cpp:
(JSC::B3::Air::LowerToAir::effectiveAddr):
* b3/testb3.cpp:
(JSC::B3::testLoadOffsetUsingAddNotConstant):
(JSC::B3::testLoadAddrShift):
(JSC::B3::testFramePointer):
(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 (192477 => 192478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-11-16 19:04:02 UTC (rev 192477)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-11-16 19:29:34 UTC (rev 192478)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-11-16 Filip Pizlo <fpizlo@apple.com>
+
+ Make sure that the address matcher correctly handles Shl(x, 1)
+ https://bugs.webkit.org/show_bug.cgi?id=151316
+
+ Reviewed by Geoffrey Garen.
+
+ This optimization isn't really that awesome, but the nicest part of the change is just the
+ testing. If we ever do more cleverness with shifts, these tests will come in handy.
+
+ * b3/B3LowerToAir.cpp:
+ (JSC::B3::Air::LowerToAir::effectiveAddr):
+ * b3/testb3.cpp:
+ (JSC::B3::testLoadOffsetUsingAddNotConstant):
+ (JSC::B3::testLoadAddrShift):
+ (JSC::B3::testFramePointer):
+ (JSC::B3::run):
+
</ins><span class="cx"> 2015-11-16 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Use FTL by default when LLVM 3.7 is available
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3LowerToAircpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp (192477 => 192478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2015-11-16 19:04:02 UTC (rev 192477)
+++ trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2015-11-16 19:29:34 UTC (rev 192478)
</span><span class="lines">@@ -395,6 +395,18 @@
</span><span class="cx"> return Arg::index(tmp(left), tmp(right));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ case Shl: {
+ Value* left = address->child(0);
+
+ // We'll never see child(1)->isInt32(0), since that would have been reduced. If the shift
+ // amount is greater than 1, then there isn't really anything smart that we could do here.
+ // We avoid using baseless indexes because their encoding isn't particularly efficient.
+ if (m_locked.contains(left) || !address->child(1)->isInt32(1))
+ return Arg::addr(tmp(address));
+
+ return Arg::index(tmp(left), tmp(left));
+ }
+
</ins><span class="cx"> case FramePointer:
</span><span class="cx"> return Arg::addr(Tmp(GPRInfo::callFrameRegister));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3.cpp (192477 => 192478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-11-16 19:04:02 UTC (rev 192477)
+++ trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-11-16 19:29:34 UTC (rev 192478)
</span><span class="lines">@@ -1889,6 +1889,36 @@
</span><span class="cx"> CHECK(compileAndRun<int>(proc, &array[0]) == array[0] + array[1]);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void testLoadAddrShift(unsigned shift)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ int slots[2];
+
+ // Figure out which slot to use while having proper alignment for the shift.
+ int* slot;
+ uintptr_t arg;
+ for (unsigned i = sizeof(slots)/sizeof(slots[0]); i--;) {
+ slot = slots + i;
+ arg = bitwise_cast<uintptr_t>(slot) >> shift;
+ if (bitwise_cast<int*>(arg << shift) == slot)
+ break;
+ }
+
+ *slot = 8675309;
+
+ root->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ root->appendNew<MemoryValue>(
+ proc, Load, Int32, Origin(),
+ root->appendNew<Value>(
+ proc, Shl, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0),
+ root->appendNew<Const32Value>(proc, Origin(), shift))));
+
+ CHECK(compileAndRun<int>(proc, arg) == 8675309);
+}
+
</ins><span class="cx"> void testFramePointer()
</span><span class="cx"> {
</span><span class="cx"> Procedure proc;
</span><span class="lines">@@ -4362,6 +4392,10 @@
</span><span class="cx"> RUN(testLoadOffsetUsingAdd());
</span><span class="cx"> RUN(testLoadOffsetUsingAddInterference());
</span><span class="cx"> RUN(testLoadOffsetUsingAddNotConstant());
</span><ins>+ RUN(testLoadAddrShift(0));
+ RUN(testLoadAddrShift(1));
+ RUN(testLoadAddrShift(2));
+ RUN(testLoadAddrShift(3));
</ins><span class="cx"> RUN(testFramePointer());
</span><span class="cx"> RUN(testStackSlot());
</span><span class="cx"> RUN(testLoadFromFramePointer());
</span></span></pre>
</div>
</div>
</body>
</html>