<!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>[208855] trunk</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/208855">208855</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-11-17 11:21:42 -0800 (Thu, 17 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add rotate to Wasm
https://bugs.webkit.org/show_bug.cgi?id=164871
Reviewed by Filip Pizlo.
JSTests:
* wasm/wasm.json:
Source/JavaScriptCore:
Add rotate left and rotate right to Wasm. These directly map to B3 opcodes.
This also moves arm specific transformations of rotate left to lower macros
after optimization. It's a bad idea to have platform specific canonicalizations
in reduce strength since other optimizations may not be aware of it.
Add a bug to do pure CSE after lower macros after optimization since we want to
clean up RotL(value, Neg(Neg(shift))).
* b3/B3Generate.cpp:
(JSC::B3::generateToAir):
* b3/B3LowerMacrosAfterOptimizations.cpp:
* b3/B3ReduceStrength.cpp:
* wasm/wasm.json:
Websites/webkit.org:
Update docs for new rotate instructions.
* docs/b3/intermediate-representation.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkJSTestswasmwasmjson">trunk/JSTests/wasm/wasm.json</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3Generatecpp">trunk/Source/JavaScriptCore/b3/B3Generate.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3LowerMacrosAfterOptimizationscpp">trunk/Source/JavaScriptCore/b3/B3LowerMacrosAfterOptimizations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3ReduceStrengthcpp">trunk/Source/JavaScriptCore/b3/B3ReduceStrength.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmwasmjson">trunk/Source/JavaScriptCore/wasm/wasm.json</a></li>
<li><a href="#trunkWebsiteswebkitorgChangeLog">trunk/Websites/webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsiteswebkitorgdocsb3intermediaterepresentationhtml">trunk/Websites/webkit.org/docs/b3/intermediate-representation.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (208854 => 208855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-11-17 19:07:31 UTC (rev 208854)
+++ trunk/JSTests/ChangeLog 2016-11-17 19:21:42 UTC (rev 208855)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2016-11-17 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><ins>+ Add rotate to Wasm
+ https://bugs.webkit.org/show_bug.cgi?id=164871
+
+ Reviewed by Filip Pizlo.
+
+ * wasm/wasm.json:
+
+2016-11-17 Keith Miller <keith_miller@apple.com>
+
</ins><span class="cx"> Add sqrt to Wasm
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=164877
</span><span class="cx">
</span></span></pre></div>
<a id="trunkJSTestswasmwasmjson"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/wasm/wasm.json (208854 => 208855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/wasm.json 2016-11-17 19:07:31 UTC (rev 208854)
+++ trunk/JSTests/wasm/wasm.json 2016-11-17 19:21:42 UTC (rev 208855)
</span><span class="lines">@@ -105,8 +105,8 @@
</span><span class="cx"> "i32.shl": { "category": "arithmetic", "value": 74, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "Shl" },
</span><span class="cx"> "i32.shr_u": { "category": "arithmetic", "value": 75, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "SShr" },
</span><span class="cx"> "i32.shr_s": { "category": "arithmetic", "value": 76, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "ZShr" },
</span><del>- "i32.rotr": { "category": "arithmetic", "value": 182, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [] },
- "i32.rotl": { "category": "arithmetic", "value": 183, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [] },
</del><ins>+ "i32.rotr": { "category": "arithmetic", "value": 182, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "RotR" },
+ "i32.rotl": { "category": "arithmetic", "value": 183, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "RotL" },
</ins><span class="cx"> "i32.eq": { "category": "comparison", "value": 77, "return": ["bool"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "Equal" },
</span><span class="cx"> "i32.ne": { "category": "comparison", "value": 78, "return": ["bool"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "NotEqual" },
</span><span class="cx"> "i32.lt_s": { "category": "comparison", "value": 79, "return": ["bool"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "LessThan" },
</span><span class="lines">@@ -134,8 +134,8 @@
</span><span class="cx"> "i64.shl": { "category": "arithmetic", "value": 101, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "Shl" },
</span><span class="cx"> "i64.shr_u": { "category": "arithmetic", "value": 102, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "SShr" },
</span><span class="cx"> "i64.shr_s": { "category": "arithmetic", "value": 103, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "ZShr" },
</span><del>- "i64.rotr": { "category": "arithmetic", "value": 184, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [] },
- "i64.rotl": { "category": "arithmetic", "value": 185, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [] },
</del><ins>+ "i64.rotr": { "category": "arithmetic", "value": 184, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "RotR" },
+ "i64.rotl": { "category": "arithmetic", "value": 185, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "RotL" },
</ins><span class="cx"> "i64.eq": { "category": "comparison", "value": 104, "return": ["bool"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "Equal" },
</span><span class="cx"> "i64.ne": { "category": "comparison", "value": 105, "return": ["bool"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "NotEqual" },
</span><span class="cx"> "i64.lt_s": { "category": "comparison", "value": 106, "return": ["bool"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "LessThan" },
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (208854 => 208855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-11-17 19:07:31 UTC (rev 208854)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-11-17 19:21:42 UTC (rev 208855)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2016-11-17 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><ins>+ Add rotate to Wasm
+ https://bugs.webkit.org/show_bug.cgi?id=164871
+
+ Reviewed by Filip Pizlo.
+
+ Add rotate left and rotate right to Wasm. These directly map to B3 opcodes.
+ This also moves arm specific transformations of rotate left to lower macros
+ after optimization. It's a bad idea to have platform specific canonicalizations
+ in reduce strength since other optimizations may not be aware of it.
+
+ Add a bug to do pure CSE after lower macros after optimization since we want to
+ clean up RotL(value, Neg(Neg(shift))).
+
+ * b3/B3Generate.cpp:
+ (JSC::B3::generateToAir):
+ * b3/B3LowerMacrosAfterOptimizations.cpp:
+ * b3/B3ReduceStrength.cpp:
+ * wasm/wasm.json:
+
+2016-11-17 Keith Miller <keith_miller@apple.com>
+
</ins><span class="cx"> Add sqrt to Wasm
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=164877
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3Generatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3Generate.cpp (208854 => 208855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3Generate.cpp 2016-11-17 19:07:31 UTC (rev 208854)
+++ trunk/Source/JavaScriptCore/b3/B3Generate.cpp 2016-11-17 19:21:42 UTC (rev 208855)
</span><span class="lines">@@ -105,6 +105,9 @@
</span><span class="cx"> legalizeMemoryOffsets(procedure);
</span><span class="cx"> moveConstants(procedure);
</span><span class="cx">
</span><ins>+ // FIXME: We should run pureCSE here to clean up some platform specific changes from the previous phases.
+ // https://bugs.webkit.org/show_bug.cgi?id=164873
+
</ins><span class="cx"> if (shouldValidateIR())
</span><span class="cx"> validate(procedure);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3LowerMacrosAfterOptimizationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3LowerMacrosAfterOptimizations.cpp (208854 => 208855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3LowerMacrosAfterOptimizations.cpp 2016-11-17 19:07:31 UTC (rev 208854)
+++ trunk/Source/JavaScriptCore/b3/B3LowerMacrosAfterOptimizations.cpp 2016-11-17 19:21:42 UTC (rev 208855)
</span><span class="lines">@@ -152,6 +152,19 @@
</span><span class="cx"> m_value->replaceWithIdentity(result);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+
+ case RotL: {
+ // ARM64 doesn't have a rotate left.
+ if (isARM64()) {
+ if (isARM64()) {
+ Value* newShift = m_insertionSet.insert<Value>(m_index, Neg, m_value->origin(), m_value->child(1));
+ Value* rotate = m_insertionSet.insert<Value>(m_index, RotR, m_value->origin(), m_value->child(0), newShift);
+ m_value->replaceWithIdentity(rotate);
+ break;
+ }
+ }
+ break;
+ }
</ins><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3ReduceStrengthcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3ReduceStrength.cpp (208854 => 208855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3ReduceStrength.cpp 2016-11-17 19:07:31 UTC (rev 208854)
+++ trunk/Source/JavaScriptCore/b3/B3ReduceStrength.cpp 2016-11-17 19:21:42 UTC (rev 208855)
</span><span class="lines">@@ -1162,16 +1162,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // ARM64 only has rotate right.
- // Turn this: RotL(value, shift)
- // Into this: RotR(value, Neg(shift))
- if (isARM64()) {
- Value* newShift = m_insertionSet.insert<Value>(m_index, Neg, m_value->origin(), m_value->child(1));
- Value* rotate = m_insertionSet.insert<Value>(m_index, RotR, m_value->origin(), m_value->child(0), newShift);
- replaceWithIdentity(rotate);
- break;
- }
-
</del><span class="cx"> handleShiftAmount();
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmwasmjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/wasm.json (208854 => 208855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/wasm.json 2016-11-17 19:07:31 UTC (rev 208854)
+++ trunk/Source/JavaScriptCore/wasm/wasm.json 2016-11-17 19:21:42 UTC (rev 208855)
</span><span class="lines">@@ -105,8 +105,8 @@
</span><span class="cx"> "i32.shl": { "category": "arithmetic", "value": 74, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "Shl" },
</span><span class="cx"> "i32.shr_u": { "category": "arithmetic", "value": 75, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "SShr" },
</span><span class="cx"> "i32.shr_s": { "category": "arithmetic", "value": 76, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "ZShr" },
</span><del>- "i32.rotr": { "category": "arithmetic", "value": 182, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [] },
- "i32.rotl": { "category": "arithmetic", "value": 183, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [] },
</del><ins>+ "i32.rotr": { "category": "arithmetic", "value": 182, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "RotR" },
+ "i32.rotl": { "category": "arithmetic", "value": 183, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "RotL" },
</ins><span class="cx"> "i32.eq": { "category": "comparison", "value": 77, "return": ["bool"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "Equal" },
</span><span class="cx"> "i32.ne": { "category": "comparison", "value": 78, "return": ["bool"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "NotEqual" },
</span><span class="cx"> "i32.lt_s": { "category": "comparison", "value": 79, "return": ["bool"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "LessThan" },
</span><span class="lines">@@ -134,8 +134,8 @@
</span><span class="cx"> "i64.shl": { "category": "arithmetic", "value": 101, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "Shl" },
</span><span class="cx"> "i64.shr_u": { "category": "arithmetic", "value": 102, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "SShr" },
</span><span class="cx"> "i64.shr_s": { "category": "arithmetic", "value": 103, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "ZShr" },
</span><del>- "i64.rotr": { "category": "arithmetic", "value": 184, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [] },
- "i64.rotl": { "category": "arithmetic", "value": 185, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [] },
</del><ins>+ "i64.rotr": { "category": "arithmetic", "value": 184, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "RotR" },
+ "i64.rotl": { "category": "arithmetic", "value": 185, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "RotL" },
</ins><span class="cx"> "i64.eq": { "category": "comparison", "value": 104, "return": ["bool"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "Equal" },
</span><span class="cx"> "i64.ne": { "category": "comparison", "value": 105, "return": ["bool"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "NotEqual" },
</span><span class="cx"> "i64.lt_s": { "category": "comparison", "value": 106, "return": ["bool"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "LessThan" },
</span></span></pre></div>
<a id="trunkWebsiteswebkitorgChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Websites/webkit.org/ChangeLog (208854 => 208855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/webkit.org/ChangeLog 2016-11-17 19:07:31 UTC (rev 208854)
+++ trunk/Websites/webkit.org/ChangeLog 2016-11-17 19:21:42 UTC (rev 208855)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-11-17 Keith Miller <keith_miller@apple.com>
+
+ Add rotate to Wasm
+ https://bugs.webkit.org/show_bug.cgi?id=164871
+
+ Reviewed by Filip Pizlo.
+
+ Update docs for new rotate instructions.
+
+ * docs/b3/intermediate-representation.html:
+
</ins><span class="cx"> 2016-10-21 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Expand Trunc in B3 to support Double to Float
</span></span></pre></div>
<a id="trunkWebsiteswebkitorgdocsb3intermediaterepresentationhtml"></a>
<div class="modfile"><h4>Modified: trunk/Websites/webkit.org/docs/b3/intermediate-representation.html (208854 => 208855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/webkit.org/docs/b3/intermediate-representation.html 2016-11-17 19:07:31 UTC (rev 208854)
+++ trunk/Websites/webkit.org/docs/b3/intermediate-representation.html 2016-11-17 19:21:42 UTC (rev 208855)
</span><span class="lines">@@ -280,6 +280,16 @@
</span><span class="cx"> always Int32. Only the low 31 bits of the shift amount are used for Int32. Only the
</span><span class="cx"> low 63 bits of the shift amount are used for Int64.</dd>
</span><span class="cx">
</span><ins>+ <dt>T RotR(T, Int32)</dt>
+ <dd>Rotate right. Valid for Int32 and Int64. The shift amount is always Int32. Only the
+ low 31 bits of the shift amount are used for Int32. Only the low 63 bits of the shift
+ amount are used for Int64.</dd>
+
+ <dt>T RotL(T, Int32)</dt>
+ <dd>Rotate left. Valid for Int32 and Int64. The shift amount is always Int32. Only the
+ low 31 bits of the shift amount are used for Int32. Only the low 63 bits of the shift
+ amount are used for Int64.</dd>
+
</ins><span class="cx"> <dt>T Clz(T)</dt>
</span><span class="cx"> <dd>Count leading zeroes. Valid for Int32 and Int64.</dd>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>