<!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>[192334] 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/192334">192334</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-11-11 16:41:12 -0800 (Wed, 11 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add ability to insert probes in LLVM IR that we generate.
https://bugs.webkit.org/show_bug.cgi?id=151159
Reviewed by Geoffrey Garen.
This is done by inserting a stackmap intrinsic and emitting the probe there.
We can now insert probes that take a lambda like so:
probe([] (CCallHelpers::ProbeContext*) {
dataLog("Hello FTL\n");
});
* ftl/FTLCompile.cpp:
* ftl/FTLInlineCacheDescriptor.h:
(JSC::FTL::ProbeDescriptor::ProbeDescriptor):
(JSC::FTL::ProbeDescriptor::probeFunction):
* ftl/FTLInlineCacheSize.cpp:
(JSC::FTL::sizeOfProbe):
* ftl/FTLInlineCacheSize.h:
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::probe):
* ftl/FTLState.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLCompilecpp">trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLInlineCacheDescriptorh">trunk/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptor.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLInlineCacheSizecpp">trunk/Source/JavaScriptCore/ftl/FTLInlineCacheSize.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLInlineCacheSizeh">trunk/Source/JavaScriptCore/ftl/FTLInlineCacheSize.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLStateh">trunk/Source/JavaScriptCore/ftl/FTLState.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (192333 => 192334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2015-11-12 00:29:53 UTC (rev 192333)
+++ trunk/Source/JavaScriptCore/ChangeLog        2015-11-12 00:41:12 UTC (rev 192334)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2015-11-11 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><ins>+ Add ability to insert probes in LLVM IR that we generate.
+ https://bugs.webkit.org/show_bug.cgi?id=151159
+
+ Reviewed by Geoffrey Garen.
+
+ This is done by inserting a stackmap intrinsic and emitting the probe there.
+
+ We can now insert probes that take a lambda like so:
+
+ probe([] (CCallHelpers::ProbeContext*) {
+ dataLog("Hello FTL\n");
+ });
+
+ * ftl/FTLCompile.cpp:
+ * ftl/FTLInlineCacheDescriptor.h:
+ (JSC::FTL::ProbeDescriptor::ProbeDescriptor):
+ (JSC::FTL::ProbeDescriptor::probeFunction):
+ * ftl/FTLInlineCacheSize.cpp:
+ (JSC::FTL::sizeOfProbe):
+ * ftl/FTLInlineCacheSize.h:
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::probe):
+ * ftl/FTLState.h:
+
+2015-11-11 Mark Lam <mark.lam@apple.com>
+
</ins><span class="cx"> Change probe CPUState gpr() and fpr() to return references.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151154
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCompilecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp (192333 => 192334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp        2015-11-12 00:29:53 UTC (rev 192333)
+++ trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp        2015-11-12 00:41:12 UTC (rev 192334)
</span><span class="lines">@@ -459,6 +459,36 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(MASM_PROBE)
+
+static void generateProbe(
+ State& state, CodeBlock* codeBlock, GeneratedFunction generatedFunction,
+ StackMaps::RecordMap& recordMap, ProbeDescriptor& ic)
+{
+ VM& vm = state.graph.m_vm;
+ size_t sizeOfIC = sizeOfProbe();
+
+ StackMaps::RecordMap::iterator iter = recordMap.find(ic.stackmapID());
+ if (iter == recordMap.end())
+ return; // It was optimized out.
+
+ CCallHelpers fastPathJIT(&vm, codeBlock);
+ Vector<StackMaps::RecordAndIndex>& records = iter->value;
+ for (unsigned i = records.size(); i--;) {
+ StackMaps::Record& record = records[i].record;
+
+ fastPathJIT.probe(ic.probeFunction());
+ CCallHelpers::Jump done = fastPathJIT.jump();
+
+ char* startOfIC = bitwise_cast<char*>(generatedFunction) + record.instructionOffset;
+ generateInlineIfPossibleOutOfLineIfNot(state, vm, codeBlock, fastPathJIT, startOfIC, sizeOfIC, "Probe", [&] (LinkBuffer& linkBuffer, CCallHelpers&, bool) {
+ linkBuffer.link(done, CodeLocationLabel(startOfIC + sizeOfIC));
+ });
+ }
+}
+
+#endif // ENABLE(MASM_PROBE)
+
</ins><span class="cx"> static RegisterSet usedRegistersFor(const StackMaps::Record& record)
</span><span class="cx"> {
</span><span class="cx"> if (Options::assumeAllRegsInFTLICAreLive())
</span><span class="lines">@@ -911,6 +941,12 @@
</span><span class="cx"> state.finalizer->sideCodeLinkBuffer->locationOf(std::get<1>(tuple)));
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+#if ENABLE(MASM_PROBE)
+ for (unsigned i = state.probes.size(); i--;) {
+ ProbeDescriptor& probe = state.probes[i];
+ generateProbe(state, codeBlock, generatedFunction, recordMap, probe);
+ }
+#endif
</ins><span class="cx"> for (auto& pair : exceptionJumpsToLink)
</span><span class="cx"> state.finalizer->sideCodeLinkBuffer->link(pair.first, pair.second);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLInlineCacheDescriptorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptor.h (192333 => 192334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptor.h        2015-11-12 00:29:53 UTC (rev 192333)
+++ trunk/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptor.h        2015-11-12 00:41:12 UTC (rev 192334)
</span><span class="lines">@@ -175,6 +175,22 @@
</span><span class="cx"> RefPtr<LazySlowPathLinkerTask> m_linker;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+#if ENABLE(MASM_PROBE)
+class ProbeDescriptor : public InlineCacheDescriptor {
+public:
+ ProbeDescriptor(unsigned stackmapID, std::function<void (CCallHelpers::ProbeContext*)> probeFunction)
+ : InlineCacheDescriptor(stackmapID, codeOrigin(), nullptr)
+ , m_probeFunction(probeFunction)
+ {
+ }
+
+ std::function<void (CCallHelpers::ProbeContext*)>& probeFunction() { return m_probeFunction; }
+
+private:
+ std::function<void (CCallHelpers::ProbeContext*)> m_probeFunction;
+};
+#endif // ENABLE(MASM_PROBE)
+
</ins><span class="cx"> } } // namespace JSC::FTL
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(FTL_JIT)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLInlineCacheSizecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLInlineCacheSize.cpp (192333 => 192334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLInlineCacheSize.cpp        2015-11-12 00:29:53 UTC (rev 192333)
+++ trunk/Source/JavaScriptCore/ftl/FTLInlineCacheSize.cpp        2015-11-12 00:41:12 UTC (rev 192334)
</span><span class="lines">@@ -145,6 +145,13 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(MASM_PROBE)
+size_t sizeOfProbe()
+{
+ return 132; // Based on ARM64.
+}
+#endif
+
</ins><span class="cx"> size_t sizeOfICFor(Node* node)
</span><span class="cx"> {
</span><span class="cx"> switch (node->op()) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLInlineCacheSizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLInlineCacheSize.h (192333 => 192334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLInlineCacheSize.h        2015-11-12 00:29:53 UTC (rev 192333)
+++ trunk/Source/JavaScriptCore/ftl/FTLInlineCacheSize.h        2015-11-12 00:41:12 UTC (rev 192334)
</span><span class="lines">@@ -47,6 +47,9 @@
</span><span class="cx"> size_t sizeOfConstructForwardVarargs();
</span><span class="cx"> size_t sizeOfIn();
</span><span class="cx"> size_t sizeOfArithSub();
</span><ins>+#if ENABLE(MASM_PROBE)
+size_t sizeOfProbe();
+#endif
</ins><span class="cx">
</span><span class="cx"> size_t sizeOfICFor(DFG::Node*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (192333 => 192334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp        2015-11-12 00:29:53 UTC (rev 192333)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp        2015-11-12 00:41:12 UTC (rev 192334)
</span><span class="lines">@@ -9397,6 +9397,15 @@
</span><span class="cx"> return abstractStructure(edge.node());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(MASM_PROBE)
+ void probe(std::function<void (CCallHelpers::ProbeContext*)> probeFunc)
+ {
+ uint32_t stackmapID = m_stackmapIDs++;
+ m_ftlState.probes.append(ProbeDescriptor(stackmapID, probeFunc));
+ m_out.call(m_out.stackmapIntrinsic(), m_out.constInt64(stackmapID), m_out.constInt32(sizeOfProbe()));
+ }
+#endif
+
</ins><span class="cx"> void crash()
</span><span class="cx"> {
</span><span class="cx"> crash(m_highBlock->index, m_node->index());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLState.h (192333 => 192334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLState.h        2015-11-12 00:29:53 UTC (rev 192333)
+++ trunk/Source/JavaScriptCore/ftl/FTLState.h        2015-11-12 00:41:12 UTC (rev 192334)
</span><span class="lines">@@ -81,6 +81,9 @@
</span><span class="cx"> SegmentedVector<CheckInDescriptor> checkIns;
</span><span class="cx"> SegmentedVector<ArithSubDescriptor> arithSubs;
</span><span class="cx"> SegmentedVector<LazySlowPathDescriptor> lazySlowPaths;
</span><ins>+#if ENABLE(MASM_PROBE)
+ SegmentedVector<ProbeDescriptor> probes;
+#endif
</ins><span class="cx"> Vector<JSCall> jsCalls;
</span><span class="cx"> Vector<JSCallVarargs> jsCallVarargses;
</span><span class="cx"> Vector<JSTailCall> jsTailCalls;
</span></span></pre>
</div>
</div>
</body>
</html>