<!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>[165855] 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/165855">165855</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-03-18 16:53:49 -0700 (Tue, 18 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update RegExp Tracing code
https://bugs.webkit.org/show_bug.cgi?id=130381
Reviewed by Andreas Kling.
Updated the regular expression tracing code for 8/16 bit JIT as
well as match only entry points. Also added average string length
metric.
* runtime/RegExp.cpp:
(JSC::RegExp::RegExp):
(JSC::RegExp::match):
(JSC::RegExp::printTraceData):
* runtime/RegExp.h:
* runtime/VM.cpp:
(JSC::VM::addRegExpToTrace):
(JSC::VM::dumpRegExpTrace):
* runtime/VM.h:
* yarr/YarrJIT.h:
(JSC::Yarr::YarrCodeBlock::get8BitMatchOnlyAddr):
(JSC::Yarr::YarrCodeBlock::get16BitMatchOnlyAddr):
(JSC::Yarr::YarrCodeBlock::get8BitMatchAddr):
(JSC::Yarr::YarrCodeBlock::get16BitMatchAddr):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpcpp">trunk/Source/JavaScriptCore/runtime/RegExp.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExph">trunk/Source/JavaScriptCore/runtime/RegExp.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMcpp">trunk/Source/JavaScriptCore/runtime/VM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMh">trunk/Source/JavaScriptCore/runtime/VM.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreyarrYarrJITh">trunk/Source/JavaScriptCore/yarr/YarrJIT.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (165854 => 165855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-18 23:09:44 UTC (rev 165854)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-18 23:53:49 UTC (rev 165855)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-03-18 Michael Saboff <msaboff@apple.com>
+
+ Update RegExp Tracing code
+ https://bugs.webkit.org/show_bug.cgi?id=130381
+
+ Reviewed by Andreas Kling.
+
+ Updated the regular expression tracing code for 8/16 bit JIT as
+ well as match only entry points. Also added average string length
+ metric.
+
+ * runtime/RegExp.cpp:
+ (JSC::RegExp::RegExp):
+ (JSC::RegExp::match):
+ (JSC::RegExp::printTraceData):
+ * runtime/RegExp.h:
+ * runtime/VM.cpp:
+ (JSC::VM::addRegExpToTrace):
+ (JSC::VM::dumpRegExpTrace):
+ * runtime/VM.h:
+ * yarr/YarrJIT.h:
+ (JSC::Yarr::YarrCodeBlock::get8BitMatchOnlyAddr):
+ (JSC::Yarr::YarrCodeBlock::get16BitMatchOnlyAddr):
+ (JSC::Yarr::YarrCodeBlock::get8BitMatchAddr):
+ (JSC::Yarr::YarrCodeBlock::get16BitMatchAddr):
+
</ins><span class="cx"> 2014-03-17 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Add CompareStrictEq(StringIdent:, NotStringVar:) and CompareStrictEq(String:, Untyped:)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExp.cpp (165854 => 165855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExp.cpp 2014-03-18 23:09:44 UTC (rev 165854)
+++ trunk/Source/JavaScriptCore/runtime/RegExp.cpp 2014-03-18 23:53:49 UTC (rev 165855)
</span><span class="lines">@@ -227,6 +227,10 @@
</span><span class="cx"> , m_constructionError(0)
</span><span class="cx"> , m_numSubpatterns(0)
</span><span class="cx"> #if ENABLE(REGEXP_TRACING)
</span><ins>+ , m_rtMatchOnlyTotalSubjectStringLen(0.0)
+ , m_rtMatchTotalSubjectStringLen(0.0)
+ , m_rtMatchOnlyCallCount(0)
+ , m_rtMatchOnlyFoundCount(0)
</ins><span class="cx"> , m_rtMatchCallCount(0)
</span><span class="cx"> , m_rtMatchFoundCount(0)
</span><span class="cx"> #endif
</span><span class="lines">@@ -324,6 +328,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(REGEXP_TRACING)
</span><span class="cx"> m_rtMatchCallCount++;
</span><ins>+ m_rtMatchTotalSubjectStringLen += (double)(s.length() - startOffset);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ASSERT(m_state != ParseError);
</span><span class="lines">@@ -445,7 +450,8 @@
</span><span class="cx"> MatchResult RegExp::match(VM& vm, const String& s, unsigned startOffset)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(REGEXP_TRACING)
</span><del>- m_rtMatchCallCount++;
</del><ins>+ m_rtMatchOnlyCallCount++;
+ m_rtMatchOnlyTotalSubjectStringLen += (double)(s.length() - startOffset);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ASSERT(m_state != ParseError);
</span><span class="lines">@@ -458,7 +464,7 @@
</span><span class="cx"> m_regExpJITCode.execute(s.characters16(), startOffset, s.length());
</span><span class="cx"> #if ENABLE(REGEXP_TRACING)
</span><span class="cx"> if (!result)
</span><del>- m_rtMatchFoundCount++;
</del><ins>+ m_rtMatchOnlyFoundCount++;
</ins><span class="cx"> #endif
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -476,7 +482,7 @@
</span><span class="cx">
</span><span class="cx"> if (r >= 0) {
</span><span class="cx"> #if ENABLE(REGEXP_TRACING)
</span><del>- m_rtMatchFoundCount++;
</del><ins>+ m_rtMatchOnlyFoundCount++;
</ins><span class="cx"> #endif
</span><span class="cx"> return MatchResult(r, reinterpret_cast<unsigned*>(offsetVector)[1]);
</span><span class="cx"> }
</span><span class="lines">@@ -563,16 +569,32 @@
</span><span class="cx"> Yarr::YarrCodeBlock& codeBlock = m_regExpJITCode;
</span><span class="cx">
</span><span class="cx"> const size_t jitAddrSize = 20;
</span><del>- char jitAddr[jitAddrSize];
- if (m_state == JITCode)
- snprintf(jitAddr, jitAddrSize, "fallback");
- else
- snprintf(jitAddr, jitAddrSize, "0x%014lx", reinterpret_cast<unsigned long int>(codeBlock.getAddr()));
</del><ins>+ char jit8BitMatchOnlyAddr[jitAddrSize];
+ char jit16BitMatchOnlyAddr[jitAddrSize];
+ char jit8BitMatchAddr[jitAddrSize];
+ char jit16BitMatchAddr[jitAddrSize];
+ if (m_state == ByteCode) {
+ snprintf(jit8BitMatchOnlyAddr, jitAddrSize, "fallback ");
+ snprintf(jit16BitMatchOnlyAddr, jitAddrSize, "---- ");
+ snprintf(jit8BitMatchAddr, jitAddrSize, "fallback ");
+ snprintf(jit16BitMatchAddr, jitAddrSize, "---- ");
+ } else {
+ snprintf(jit8BitMatchOnlyAddr, jitAddrSize, "0x%014lx", reinterpret_cast<unsigned long int>(codeBlock.get8BitMatchOnlyAddr()));
+ snprintf(jit16BitMatchOnlyAddr, jitAddrSize, "0x%014lx", reinterpret_cast<unsigned long int>(codeBlock.get16BitMatchOnlyAddr()));
+ snprintf(jit8BitMatchAddr, jitAddrSize, "0x%014lx", reinterpret_cast<unsigned long int>(codeBlock.get8BitMatchAddr()));
+ snprintf(jit16BitMatchAddr, jitAddrSize, "0x%014lx", reinterpret_cast<unsigned long int>(codeBlock.get16BitMatchAddr()));
+ }
</ins><span class="cx"> #else
</span><del>- const char* jitAddr = "JIT Off";
</del><ins>+ const char* jit8BitMatchOnlyAddr = "JIT Off";
+ const char* jit16BitMatchOnlyAddr = "";
+ const char* jit8BitMatchAddr = "JIT Off";
+ const char* jit16BitMatchAddr = "";
</ins><span class="cx"> #endif
</span><ins>+ unsigned averageMatchOnlyStringLen = (unsigned)(m_rtMatchOnlyTotalSubjectStringLen / m_rtMatchOnlyCallCount);
+ unsigned averageMatchStringLen = (unsigned)(m_rtMatchTotalSubjectStringLen / m_rtMatchCallCount);
</ins><span class="cx">
</span><del>- printf("%-40.40s %16.16s %10d %10d\n", formattedPattern, jitAddr, m_rtMatchCallCount, m_rtMatchFoundCount);
</del><ins>+ printf("%-40.40s %16.16s %16.16s %10d %10d %10u\n", formattedPattern, jit8BitMatchOnlyAddr, jit16BitMatchOnlyAddr, m_rtMatchOnlyCallCount, m_rtMatchOnlyFoundCount, averageMatchOnlyStringLen);
+ printf(" %16.16s %16.16s %10d %10d %10u\n", jit8BitMatchAddr, jit16BitMatchAddr, m_rtMatchCallCount, m_rtMatchFoundCount, averageMatchStringLen);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExp.h (165854 => 165855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExp.h 2014-03-18 23:09:44 UTC (rev 165854)
+++ trunk/Source/JavaScriptCore/runtime/RegExp.h 2014-03-18 23:53:49 UTC (rev 165855)
</span><span class="lines">@@ -117,6 +117,10 @@
</span><span class="cx"> const char* m_constructionError;
</span><span class="cx"> unsigned m_numSubpatterns;
</span><span class="cx"> #if ENABLE(REGEXP_TRACING)
</span><ins>+ double m_rtMatchOnlyTotalSubjectStringLen;
+ double m_rtMatchTotalSubjectStringLen;
+ unsigned m_rtMatchOnlyCallCount;
+ unsigned m_rtMatchOnlyFoundCount;
</ins><span class="cx"> unsigned m_rtMatchCallCount;
</span><span class="cx"> unsigned m_rtMatchFoundCount;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.cpp (165854 => 165855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.cpp 2014-03-18 23:09:44 UTC (rev 165854)
+++ trunk/Source/JavaScriptCore/runtime/VM.cpp 2014-03-18 23:53:49 UTC (rev 165855)
</span><span class="lines">@@ -849,6 +849,7 @@
</span><span class="cx"> #if ENABLE(REGEXP_TRACING)
</span><span class="cx"> void VM::addRegExpToTrace(RegExp* regExp)
</span><span class="cx"> {
</span><ins>+ gcProtect(regExp);
</ins><span class="cx"> m_rtTraceList->add(regExp);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -859,14 +860,16 @@
</span><span class="cx">
</span><span class="cx"> if (iter != m_rtTraceList->end()) {
</span><span class="cx"> dataLogF("\nRegExp Tracing\n");
</span><del>- dataLogF(" match() matches\n");
- dataLogF("Regular Expression JIT Address calls found\n");
- dataLogF("----------------------------------------+----------------+----------+----------\n");
</del><ins>+ dataLogF("Regular Expression 8 Bit 16 Bit match() Matches Average\n");
+ dataLogF(" <Match only / Match> JIT Addr JIT Address calls found String len\n");
+ dataLogF("----------------------------------------+----------------+----------------+----------+----------+-----------\n");
</ins><span class="cx">
</span><span class="cx"> unsigned reCount = 0;
</span><span class="cx">
</span><del>- for (; iter != m_rtTraceList->end(); ++iter, ++reCount)
</del><ins>+ for (; iter != m_rtTraceList->end(); ++iter, ++reCount) {
</ins><span class="cx"> (*iter)->printTraceData();
</span><ins>+ gcUnprotect(*iter);
+ }
</ins><span class="cx">
</span><span class="cx"> dataLogF("%d Regular Expressions\n", reCount);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.h (165854 => 165855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h 2014-03-18 23:09:44 UTC (rev 165854)
+++ trunk/Source/JavaScriptCore/runtime/VM.h 2014-03-18 23:53:49 UTC (rev 165855)
</span><span class="lines">@@ -458,7 +458,7 @@
</span><span class="cx"> BumpPointerAllocator m_regExpAllocator;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(REGEXP_TRACING)
</span><del>- typedef ListHashSet<RefPtr<RegExp>> RTTraceList;
</del><ins>+ typedef ListHashSet<RegExp*> RTTraceList;
</ins><span class="cx"> RTTraceList* m_rtTraceList;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -473,7 +473,7 @@
</span><span class="cx"> JS_EXPORT_PRIVATE void dumpSampleData(ExecState* exec);
</span><span class="cx"> RegExpCache* regExpCache() { return m_regExpCache; }
</span><span class="cx"> #if ENABLE(REGEXP_TRACING)
</span><del>- void addRegExpToTrace(PassRefPtr<RegExp> regExp);
</del><ins>+ void addRegExpToTrace(RegExp*);
</ins><span class="cx"> #endif
</span><span class="cx"> JS_EXPORT_PRIVATE void dumpRegExpTrace();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreyarrYarrJITh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/yarr/YarrJIT.h (165854 => 165855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/yarr/YarrJIT.h 2014-03-18 23:09:44 UTC (rev 165854)
+++ trunk/Source/JavaScriptCore/yarr/YarrJIT.h 2014-03-18 23:53:49 UTC (rev 165855)
</span><span class="lines">@@ -108,7 +108,37 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(REGEXP_TRACING)
</span><del>- void *getAddr() { return m_ref.code().executableAddress(); }
</del><ins>+ void *get8BitMatchOnlyAddr()
+ {
+ if (!has8BitCodeMatchOnly())
+ return 0;
+
+ return m_matchOnly8.code().executableAddress();
+ }
+
+ void *get16BitMatchOnlyAddr()
+ {
+ if (!has16BitCodeMatchOnly())
+ return 0;
+
+ return m_matchOnly16.code().executableAddress();
+ }
+
+ void *get8BitMatchAddr()
+ {
+ if (!has8BitCode())
+ return 0;
+
+ return m_ref8.code().executableAddress();
+ }
+
+ void *get16BitMatchAddr()
+ {
+ if (!has16BitCode())
+ return 0;
+
+ return m_ref16.code().executableAddress();
+ }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void clear()
</span></span></pre>
</div>
</div>
</body>
</html>