<!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>[209929] 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/209929">209929</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-12-16 11:28:58 -0800 (Fri, 16 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add predecessor info to dumps from JSC_dumpBytecodeLivenessResults=true.
https://bugs.webkit.org/show_bug.cgi?id=165958
Reviewed by Saam Barati.
Also:
1. refactored the code to use a common lambda function to dump FastBitVectors.
2. list successors by their block index instead of pointers.
* bytecode/BytecodeLivenessAnalysis.cpp:
(JSC::BytecodeLivenessAnalysis::dumpResults):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeBytecodeLivenessAnalysiscpp">trunk/Source/JavaScriptCore/bytecode/BytecodeLivenessAnalysis.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (209928 => 209929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-12-16 19:24:06 UTC (rev 209928)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-12-16 19:28:58 UTC (rev 209929)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-12-16 Mark Lam <mark.lam@apple.com>
+
+ Add predecessor info to dumps from JSC_dumpBytecodeLivenessResults=true.
+ https://bugs.webkit.org/show_bug.cgi?id=165958
+
+ Reviewed by Saam Barati.
+
+ Also:
+ 1. refactored the code to use a common lambda function to dump FastBitVectors.
+ 2. list successors by their block index instead of pointers.
+
+ * bytecode/BytecodeLivenessAnalysis.cpp:
+ (JSC::BytecodeLivenessAnalysis::dumpResults):
+
</ins><span class="cx"> 2016-12-16 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> WebAssembly: WasmB3IRGenerator should throw exceptions instead of crash
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeBytecodeLivenessAnalysiscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/BytecodeLivenessAnalysis.cpp (209928 => 209929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/BytecodeLivenessAnalysis.cpp 2016-12-16 19:24:06 UTC (rev 209928)
+++ trunk/Source/JavaScriptCore/bytecode/BytecodeLivenessAnalysis.cpp 2016-12-16 19:28:58 UTC (rev 209929)
</span><span class="lines">@@ -142,14 +142,43 @@
</span><span class="cx"> Interpreter* interpreter = codeBlock->vm()->interpreter;
</span><span class="cx"> Instruction* instructionsBegin = codeBlock->instructions().begin();
</span><span class="cx"> unsigned i = 0;
</span><ins>+
+ unsigned numberOfBlocks = m_graph.size();
+ Vector<FastBitVector> predecessors(numberOfBlocks);
+ for (BytecodeBasicBlock* block : m_graph)
+ predecessors[block->index()].resize(numberOfBlocks);
</ins><span class="cx"> for (BytecodeBasicBlock* block : m_graph) {
</span><ins>+ for (unsigned j = 0; j < block->successors().size(); j++) {
+ unsigned blockIndex = block->index();
+ unsigned successorIndex = block->successors()[j]->index();
+ predecessors[successorIndex][blockIndex] = true;
+ }
+ }
+
+ auto dumpBitVector = [] (FastBitVector& bits) {
+ for (unsigned j = 0; j < bits.numBits(); j++) {
+ if (bits[j])
+ dataLogF(" %u", j);
+ }
+ };
+
+ for (BytecodeBasicBlock* block : m_graph) {
</ins><span class="cx"> dataLogF("\nBytecode basic block %u: %p (offset: %u, length: %u)\n", i++, block, block->leaderOffset(), block->totalLength());
</span><del>- dataLogF("Successors: ");
</del><ins>+
+ dataLogF("Predecessors:");
+ dumpBitVector(predecessors[block->index()]);
+ dataLogF("\n");
+
+ dataLogF("Successors:");
+ FastBitVector successors;
+ successors.resize(numberOfBlocks);
</ins><span class="cx"> for (unsigned j = 0; j < block->successors().size(); j++) {
</span><span class="cx"> BytecodeBasicBlock* successor = block->successors()[j];
</span><del>- dataLogF("%p ", successor);
</del><ins>+ successors[successor->index()] = true;
</ins><span class="cx"> }
</span><ins>+ dumpBitVector(successors); // Dump in sorted order.
</ins><span class="cx"> dataLogF("\n");
</span><ins>+
</ins><span class="cx"> if (block->isEntryBlock()) {
</span><span class="cx"> dataLogF("Entry block %p\n", block);
</span><span class="cx"> continue;
</span><span class="lines">@@ -161,12 +190,9 @@
</span><span class="cx"> for (unsigned bytecodeOffset = block->leaderOffset(); bytecodeOffset < block->leaderOffset() + block->totalLength();) {
</span><span class="cx"> const Instruction* currentInstruction = &instructionsBegin[bytecodeOffset];
</span><span class="cx">
</span><del>- dataLogF("Live variables: ");
</del><ins>+ dataLogF("Live variables:");
</ins><span class="cx"> FastBitVector liveBefore = getLivenessInfoAtBytecodeOffset(bytecodeOffset);
</span><del>- for (unsigned j = 0; j < liveBefore.numBits(); j++) {
- if (liveBefore[j])
- dataLogF("%u ", j);
- }
</del><ins>+ dumpBitVector(liveBefore);
</ins><span class="cx"> dataLogF("\n");
</span><span class="cx"> codeBlock->dumpBytecode(WTF::dataFile(), codeBlock->globalObject()->globalExec(), instructionsBegin, currentInstruction);
</span><span class="cx">
</span><span class="lines">@@ -175,12 +201,9 @@
</span><span class="cx"> bytecodeOffset += opcodeLength;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- dataLogF("Live variables: ");
</del><ins>+ dataLogF("Live variables:");
</ins><span class="cx"> FastBitVector liveAfter = block->out();
</span><del>- for (unsigned j = 0; j < liveAfter.numBits(); j++) {
- if (liveAfter[j])
- dataLogF("%u ", j);
- }
</del><ins>+ dumpBitVector(liveAfter);
</ins><span class="cx"> dataLogF("\n");
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>