<!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>[193436] 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/193436">193436</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-04 12:31:14 -0800 (Fri, 04 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Extend the strength reduction of B3's BitAnd with booleans
https://bugs.webkit.org/show_bug.cgi?id=151852
Patch by Benjamin Poulain <bpoulain@apple.com> on 2015-12-04
Reviewed by Saam Barati.
1) Masking a boolean with any pattern that has the lsb set
remains a boolean.
2) ReduceStrength on that particular pattern of BitAnd.
* b3/B3ReduceStrength.cpp:
* b3/B3Value.cpp:
(JSC::B3::Value::returnsBool):
* b3/testb3.cpp:
(JSC::B3::testBitAndWithMaskReturnsBooleans):
(JSC::B3::run):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3ReduceStrengthcpp">trunk/Source/JavaScriptCore/b3/B3ReduceStrength.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3Valuecpp">trunk/Source/JavaScriptCore/b3/B3Value.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 (193435 => 193436)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-04 20:29:49 UTC (rev 193435)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-04 20:31:14 UTC (rev 193436)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-12-04 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><ins>+ [JSC] Extend the strength reduction of B3's BitAnd with booleans
+ https://bugs.webkit.org/show_bug.cgi?id=151852
+
+ Reviewed by Saam Barati.
+
+ 1) Masking a boolean with any pattern that has the lsb set
+ remains a boolean.
+ 2) ReduceStrength on that particular pattern of BitAnd.
+
+ * b3/B3ReduceStrength.cpp:
+ * b3/B3Value.cpp:
+ (JSC::B3::Value::returnsBool):
+ * b3/testb3.cpp:
+ (JSC::B3::testBitAndWithMaskReturnsBooleans):
+ (JSC::B3::run):
+
+2015-12-04 Benjamin Poulain <bpoulain@apple.com>
+
</ins><span class="cx"> [JSC] Add doubleRem() to FTLB3Output
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151851
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3ReduceStrengthcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3ReduceStrength.cpp (193435 => 193436)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3ReduceStrength.cpp 2015-12-04 20:29:49 UTC (rev 193435)
+++ trunk/Source/JavaScriptCore/b3/B3ReduceStrength.cpp 2015-12-04 20:31:14 UTC (rev 193436)
</span><span class="lines">@@ -571,6 +571,17 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Turn this: Select(BitAnd(bool, xyz1), a, b)
+ // Into this: Select(bool, a, b)
+ if (m_value->child(0)->opcode() == BitAnd
+ && m_value->child(0)->child(1)->hasInt()
+ && m_value->child(0)->child(1)->asInt() & 1
+ && m_value->child(0)->child(0)->returnsBool()) {
+ m_value->child(0) = m_value->child(0)->child(0);
+ m_changed = true;
+ break;
+ }
+
</ins><span class="cx"> // Turn this: Select(stuff, x, x)
</span><span class="cx"> // Into this: x
</span><span class="cx"> if (m_value->child(1) == m_value->child(2)) {
</span><span class="lines">@@ -845,7 +856,17 @@
</span><span class="cx"> std::swap(branch->taken(), branch->notTaken());
</span><span class="cx"> m_changed = true;
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ // Turn this: Branch(BitAnd(bool, xyb1), then, else)
+ // Into this: Branch(bool, then, else)
+ if (branch->child(0)->opcode() == BitAnd
+ && branch->child(0)->child(1)->hasInt()
+ && branch->child(0)->child(1)->asInt() & 1
+ && branch->child(0)->child(0)->returnsBool()) {
+ branch->child(0) = branch->child(0)->child(0);
+ m_changed = true;
+ }
+
</ins><span class="cx"> TriState triState = branch->child(0)->asTriState();
</span><span class="cx">
</span><span class="cx"> // Turn this: Branch(0, then, else)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3Valuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3Value.cpp (193435 => 193436)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3Value.cpp 2015-12-04 20:29:49 UTC (rev 193435)
+++ trunk/Source/JavaScriptCore/b3/B3Value.cpp 2015-12-04 20:31:14 UTC (rev 193436)
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx"> case Const32:
</span><span class="cx"> return asInt32() == 0 || asInt32() == 1;
</span><span class="cx"> case BitAnd:
</span><del>- return child(1)->isInt32(1);
</del><ins>+ return child(1)->hasInt() && child(1)->asInt() & 1;
</ins><span class="cx"> case Equal:
</span><span class="cx"> case NotEqual:
</span><span class="cx"> case LessThan:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3.cpp (193435 => 193436)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-12-04 20:29:49 UTC (rev 193435)
+++ trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-12-04 20:31:14 UTC (rev 193436)
</span><span class="lines">@@ -998,6 +998,29 @@
</span><span class="cx"> CHECK(compileAndRun<int>(proc, b) == (a & (b & c)));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void testBitAndWithMaskReturnsBooleans(int64_t a, int64_t b)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ Value* arg0 = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0);
+ Value* arg1 = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR1);
+ Value* equal = root->appendNew<Value>(proc, Equal, Origin(), arg0, arg1);
+ Value* maskedEqual = root->appendNew<Value>(proc, BitAnd, Origin(),
+ root->appendNew<Const32Value>(proc, Origin(), 0x5),
+ equal);
+ Value* inverted = root->appendNew<Value>(proc, BitXor, Origin(),
+ root->appendNew<Const32Value>(proc, Origin(), 0x1),
+ maskedEqual);
+ Value* select = root->appendNew<Value>(proc, Select, Origin(), inverted,
+ root->appendNew<Const64Value>(proc, Origin(), 42),
+ root->appendNew<Const64Value>(proc, Origin(), -5));
+
+ root->appendNew<ControlValue>(proc, Return, Origin(), select);
+
+ int64_t expected = (a == b) ? -5 : 42;
+ CHECK(compileAndRun<int64_t>(proc, a, b) == expected);
+}
+
</ins><span class="cx"> void testBitOrArgs(int64_t a, int64_t b)
</span><span class="cx"> {
</span><span class="cx"> Procedure proc;
</span><span class="lines">@@ -5781,6 +5804,7 @@
</span><span class="cx"> RUN(testBitAndImmBitAndArgImm32(7, 2, 3));
</span><span class="cx"> RUN(testBitAndImmBitAndArgImm32(6, 1, 6));
</span><span class="cx"> RUN(testBitAndImmBitAndArgImm32(24, 0xffff, 7));
</span><ins>+ RUN_BINARY(testBitAndWithMaskReturnsBooleans, int64Operands(), int64Operands());
</ins><span class="cx">
</span><span class="cx"> RUN(testBitOrArgs(43, 43));
</span><span class="cx"> RUN(testBitOrArgs(43, 0));
</span></span></pre>
</div>
</div>
</body>
</html>