<!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>[214836] trunk/Source</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/214836">214836</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2017-04-03 13:50:33 -0700 (Mon, 03 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>WTF::Liveness should have an API that focuses on actions at instruction boundaries
https://bugs.webkit.org/show_bug.cgi?id=170407
Reviewed by Keith Miller.
Source/JavaScriptCore:
Adopt changes to the WTF::Liveness<> API. Instead of having separate functions for the
early/late versions of uses and defs, we now have just a use/def API. Those
automatically take care of eary/late issues as needed.
This reduces the API surface between WTF::Liveness<> and its clients, which makes it
easier to implement some other optimizations I'm thinking about.
* b3/B3VariableLiveness.h:
(JSC::B3::VariableLivenessAdapter::forEachUse):
(JSC::B3::VariableLivenessAdapter::forEachDef):
(JSC::B3::VariableLivenessAdapter::forEachEarlyUse): Deleted.
(JSC::B3::VariableLivenessAdapter::forEachLateUse): Deleted.
(JSC::B3::VariableLivenessAdapter::forEachEarlyDef): Deleted.
(JSC::B3::VariableLivenessAdapter::forEachLateDef): Deleted.
* b3/air/AirLiveness.h:
(JSC::B3::Air::LivenessAdapter::blockSize):
(JSC::B3::Air::LivenessAdapter::forEachUse):
(JSC::B3::Air::LivenessAdapter::forEachDef):
(JSC::B3::Air::LivenessAdapter::forEachEarlyUse): Deleted.
(JSC::B3::Air::LivenessAdapter::forEachLateUse): Deleted.
(JSC::B3::Air::LivenessAdapter::forEachEarlyDef): Deleted.
(JSC::B3::Air::LivenessAdapter::forEachLateDef): Deleted.
Source/WTF:
Change the Liveness<> API to handle early and late things in one lump inside forEachUse
and forEachDef functions. This reduces the amount of different functions that Liveness<>
expects from its adaptor. This makes it easier to implement optimizations that cache the
use/def behavior of each instruction boundary.
* wtf/Liveness.h:
(WTF::Liveness::Liveness):
(WTF::Liveness::LocalCalc::execute):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3VariableLivenessh">trunk/Source/JavaScriptCore/b3/B3VariableLiveness.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirLivenessh">trunk/Source/JavaScriptCore/b3/air/AirLiveness.h</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfLivenessh">trunk/Source/WTF/wtf/Liveness.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (214835 => 214836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-04-03 20:44:54 UTC (rev 214835)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-04-03 20:50:33 UTC (rev 214836)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2017-04-03 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ WTF::Liveness should have an API that focuses on actions at instruction boundaries
+ https://bugs.webkit.org/show_bug.cgi?id=170407
+
+ Reviewed by Keith Miller.
+
+ Adopt changes to the WTF::Liveness<> API. Instead of having separate functions for the
+ early/late versions of uses and defs, we now have just a use/def API. Those
+ automatically take care of eary/late issues as needed.
+
+ This reduces the API surface between WTF::Liveness<> and its clients, which makes it
+ easier to implement some other optimizations I'm thinking about.
+
+ * b3/B3VariableLiveness.h:
+ (JSC::B3::VariableLivenessAdapter::forEachUse):
+ (JSC::B3::VariableLivenessAdapter::forEachDef):
+ (JSC::B3::VariableLivenessAdapter::forEachEarlyUse): Deleted.
+ (JSC::B3::VariableLivenessAdapter::forEachLateUse): Deleted.
+ (JSC::B3::VariableLivenessAdapter::forEachEarlyDef): Deleted.
+ (JSC::B3::VariableLivenessAdapter::forEachLateDef): Deleted.
+ * b3/air/AirLiveness.h:
+ (JSC::B3::Air::LivenessAdapter::blockSize):
+ (JSC::B3::Air::LivenessAdapter::forEachUse):
+ (JSC::B3::Air::LivenessAdapter::forEachDef):
+ (JSC::B3::Air::LivenessAdapter::forEachEarlyUse): Deleted.
+ (JSC::B3::Air::LivenessAdapter::forEachLateUse): Deleted.
+ (JSC::B3::Air::LivenessAdapter::forEachEarlyDef): Deleted.
+ (JSC::B3::Air::LivenessAdapter::forEachLateDef): Deleted.
+
+2017-04-03 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> Inst::forEachArg could compile to more compact code
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=170406
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3VariableLivenessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3VariableLiveness.h (214835 => 214836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3VariableLiveness.h 2017-04-03 20:44:54 UTC (rev 214835)
+++ trunk/Source/JavaScriptCore/b3/B3VariableLiveness.h 2017-04-03 20:50:33 UTC (rev 214836)
</span><span class="lines">@@ -61,9 +61,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename Func>
</span><del>- void forEachEarlyUse(BasicBlock* block, unsigned valueIndex, const Func& func)
</del><ins>+ void forEachUse(BasicBlock* block, unsigned valueBoundaryIndex, const Func& func)
</ins><span class="cx"> {
</span><del>- Value* value = block->get(valueIndex);
</del><ins>+ // We want all of the uses that happen between valueBoundaryIndex-1 and
+ // valueBoundaryIndex. Since the Get opcode is the only value that has a use and since
+ // this is an early use, we only care about block[valueBoundaryIndex].
+ Value* value = block->get(valueBoundaryIndex);
</ins><span class="cx"> if (!value)
</span><span class="cx"> return;
</span><span class="cx"> if (value->opcode() != Get)
</span><span class="lines">@@ -72,19 +75,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename Func>
</span><del>- void forEachLateUse(BasicBlock*, unsigned, const Func&)
</del><ins>+ void forEachDef(BasicBlock* block, unsigned valueBoundaryIndex, const Func& func)
</ins><span class="cx"> {
</span><del>- }
-
- template<typename Func>
- void forEachEarlyDef(BasicBlock*, unsigned, const Func&)
- {
- }
-
- template<typename Func>
- void forEachLateDef(BasicBlock* block, unsigned valueIndex, const Func& func)
- {
- Value* value = block->get(valueIndex);
</del><ins>+ // We want all of the defs that happen between valueBoundaryIndex-1 and
+ // valueBoundaryIndex. Since the Set opcode is the only value that has a def and since
+ // this is an late def, we only care about block[valueBoundaryIndex - 1].
+ Value* value = block->get(valueBoundaryIndex - 1);
</ins><span class="cx"> if (!value)
</span><span class="cx"> return;
</span><span class="cx"> if (value->opcode() != Set)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirLivenessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirLiveness.h (214835 => 214836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirLiveness.h 2017-04-03 20:44:54 UTC (rev 214835)
+++ trunk/Source/JavaScriptCore/b3/air/AirLiveness.h 2017-04-03 20:50:33 UTC (rev 214836)
</span><span class="lines">@@ -50,67 +50,55 @@
</span><span class="cx"> {
</span><span class="cx"> return block->size();
</span><span class="cx"> }
</span><del>-
- template<typename Func>
- void forEachEarlyUse(BasicBlock* block, unsigned instIndex, const Func& func)
- {
- Inst* inst = block->get(instIndex);
- if (!inst)
- return;
- inst->forEach<typename Adapter::Thing>(
- [&] (typename Adapter::Thing& thing, Arg::Role role, Bank bank, Width) {
- if (Arg::isEarlyUse(role)
- && Adapter::acceptsBank(bank)
- && Adapter::acceptsRole(role))
- func(Adapter::valueToIndex(thing));
- });
- }
</del><span class="cx">
</span><span class="cx"> template<typename Func>
</span><del>- void forEachLateUse(BasicBlock* block, unsigned instIndex, const Func& func)
</del><ins>+ void forEachUse(BasicBlock* block, size_t instBoundaryIndex, const Func& func)
</ins><span class="cx"> {
</span><del>- Inst* inst = block->get(instIndex);
- if (!inst)
- return;
- inst->forEach<typename Adapter::Thing>(
- [&] (typename Adapter::Thing& thing, Arg::Role role, Bank bank, Width) {
- if (Arg::isLateUse(role)
- && Adapter::acceptsBank(bank)
- && Adapter::acceptsRole(role))
- func(Adapter::valueToIndex(thing));
- });
</del><ins>+ if (Inst* prevInst = block->get(instBoundaryIndex - 1)) {
+ prevInst->forEach<typename Adapter::Thing>(
+ [&] (typename Adapter::Thing& thing, Arg::Role role, Bank bank, Width) {
+ if (Arg::isLateUse(role)
+ && Adapter::acceptsBank(bank)
+ && Adapter::acceptsRole(role))
+ func(Adapter::valueToIndex(thing));
+ });
+ }
+
+ if (Inst* nextInst = block->get(instBoundaryIndex)) {
+ nextInst->forEach<typename Adapter::Thing>(
+ [&] (typename Adapter::Thing& thing, Arg::Role role, Bank bank, Width) {
+ if (Arg::isEarlyUse(role)
+ && Adapter::acceptsBank(bank)
+ && Adapter::acceptsRole(role))
+ func(Adapter::valueToIndex(thing));
+ });
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename Func>
</span><del>- void forEachEarlyDef(BasicBlock* block, unsigned instIndex, const Func& func)
</del><ins>+ void forEachDef(BasicBlock* block, size_t instBoundaryIndex, const Func& func)
</ins><span class="cx"> {
</span><del>- Inst* inst = block->get(instIndex);
- if (!inst)
- return;
- inst->forEach<typename Adapter::Thing>(
- [&] (typename Adapter::Thing& thing, Arg::Role role, Bank bank, Width) {
- if (Arg::isEarlyDef(role)
- && Adapter::acceptsBank(bank)
- && Adapter::acceptsRole(role))
- func(Adapter::valueToIndex(thing));
- });
</del><ins>+ if (Inst* prevInst = block->get(instBoundaryIndex - 1)) {
+ prevInst->forEach<typename Adapter::Thing>(
+ [&] (typename Adapter::Thing& thing, Arg::Role role, Bank bank, Width) {
+ if (Arg::isLateDef(role)
+ && Adapter::acceptsBank(bank)
+ && Adapter::acceptsRole(role))
+ func(Adapter::valueToIndex(thing));
+ });
+ }
+
+ if (Inst* nextInst = block->get(instBoundaryIndex)) {
+ nextInst->forEach<typename Adapter::Thing>(
+ [&] (typename Adapter::Thing& thing, Arg::Role role, Bank bank, Width) {
+ if (Arg::isEarlyDef(role)
+ && Adapter::acceptsBank(bank)
+ && Adapter::acceptsRole(role))
+ func(Adapter::valueToIndex(thing));
+ });
+ }
</ins><span class="cx"> }
</span><del>-
- template<typename Func>
- void forEachLateDef(BasicBlock* block, unsigned instIndex, const Func& func)
- {
- Inst* inst = block->get(instIndex);
- if (!inst)
- return;
- inst->forEach<typename Adapter::Thing>(
- [&] (typename Adapter::Thing& thing, Arg::Role role, Bank bank, Width) {
- if (Arg::isLateDef(role)
- && Adapter::acceptsBank(bank)
- && Adapter::acceptsRole(role))
- func(Adapter::valueToIndex(thing));
- });
- }
-
</del><ins>+
</ins><span class="cx"> Code& code;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (214835 => 214836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2017-04-03 20:44:54 UTC (rev 214835)
+++ trunk/Source/WTF/ChangeLog 2017-04-03 20:50:33 UTC (rev 214836)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-04-03 Filip Pizlo <fpizlo@apple.com>
+
+ WTF::Liveness should have an API that focuses on actions at instruction boundaries
+ https://bugs.webkit.org/show_bug.cgi?id=170407
+
+ Reviewed by Keith Miller.
+
+ Change the Liveness<> API to handle early and late things in one lump inside forEachUse
+ and forEachDef functions. This reduces the amount of different functions that Liveness<>
+ expects from its adaptor. This makes it easier to implement optimizations that cache the
+ use/def behavior of each instruction boundary.
+
+ * wtf/Liveness.h:
+ (WTF::Liveness::Liveness):
+ (WTF::Liveness::LocalCalc::execute):
+
</ins><span class="cx"> 2017-04-01 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Mac cmake buildfix after 214586.
</span></span></pre></div>
<a id="trunkSourceWTFwtfLivenessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Liveness.h (214835 => 214836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Liveness.h 2017-04-03 20:44:54 UTC (rev 214835)
+++ trunk/Source/WTF/wtf/Liveness.h 2017-04-03 20:50:33 UTC (rev 214836)
</span><span class="lines">@@ -57,8 +57,8 @@
</span><span class="cx">
</span><span class="cx"> IndexVector& liveAtTail = m_liveAtTail[block];
</span><span class="cx">
</span><del>- Adapter::forEachLateUse(
- block, Adapter::blockSize(block) - 1,
</del><ins>+ Adapter::forEachUse(
+ block, Adapter::blockSize(block),
</ins><span class="cx"> [&] (unsigned index) {
</span><span class="cx"> liveAtTail.append(index);
</span><span class="cx"> });
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> localCalc.execute(instIndex);
</span><span class="cx">
</span><span class="cx"> // Handle the early def's of the first instruction.
</span><del>- Adapter::forEachEarlyDef(
</del><ins>+ Adapter::forEachDef(
</ins><span class="cx"> block, 0,
</span><span class="cx"> [&] (unsigned index) {
</span><span class="cx"> m_workset.remove(index);
</span><span class="lines">@@ -220,33 +220,23 @@
</span><span class="cx"> {
</span><span class="cx"> auto& workset = m_liveness.m_workset;
</span><span class="cx">
</span><del>- // First handle the early def's of the next instruction.
- m_liveness.forEachEarlyDef(
</del><ins>+ // Want an easy example to help you visualize how this works?
+ // Check out B3VariableLiveness.h.
+ //
+ // Want a hard example to help you understand the hard cases?
+ // Check out AirLiveness.h.
+
+ m_liveness.forEachDef(
</ins><span class="cx"> m_block, instIndex + 1,
</span><span class="cx"> [&] (unsigned index) {
</span><span class="cx"> workset.remove(index);
</span><span class="cx"> });
</span><span class="cx">
</span><del>- // Then handle def's.
- m_liveness.forEachLateDef(
</del><ins>+ m_liveness.forEachUse(
</ins><span class="cx"> m_block, instIndex,
</span><span class="cx"> [&] (unsigned index) {
</span><del>- workset.remove(index);
- });
-
- // Then handle use's.
- m_liveness.forEachEarlyUse(
- m_block, instIndex,
- [&] (unsigned index) {
</del><span class="cx"> workset.add(index);
</span><span class="cx"> });
</span><del>-
- // And finally, handle the late use's of the previous instruction.
- m_liveness.forEachLateUse(
- m_block, instIndex - 1,
- [&] (unsigned index) {
- workset.add(index);
- });
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre>
</div>
</div>
</body>
</html>