<!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>[184683] trunk/Tools</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/184683">184683</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2015-05-20 18:14:16 -0700 (Wed, 20 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add option to run_jsc_stress_tests to disable JIT testing
https://bugs.webkit.org/show_bug.cgi?id=145233
Reviewed by Mark Lam.
Added --no-jit option.
* Scripts/run-jsc-stress-tests:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsrunjscstresstests">trunk/Tools/Scripts/run-jsc-stress-tests</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (184682 => 184683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-05-21 00:58:25 UTC (rev 184682)
+++ trunk/Tools/ChangeLog 2015-05-21 01:14:16 UTC (rev 184683)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-05-20 Michael Saboff <msaboff@apple.com>
+
+ Add option to run_jsc_stress_tests to disable JIT testing
+ https://bugs.webkit.org/show_bug.cgi?id=145233
+
+ Reviewed by Mark Lam.
+
+ Added --no-jit option.
+
+ * Scripts/run-jsc-stress-tests:
+
</ins><span class="cx"> 2015-05-20 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Use correct String for StringView in WTF API tests
</span></span></pre></div>
<a id="trunkToolsScriptsrunjscstresstests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-jsc-stress-tests (184682 => 184683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-jsc-stress-tests 2015-05-21 00:58:25 UTC (rev 184682)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2015-05-21 01:14:16 UTC (rev 184683)
</span><span class="lines">@@ -91,6 +91,7 @@
</span><span class="cx"> $jscPath = nil
</span><span class="cx"> $doNotMessWithVMPath = false
</span><span class="cx"> $enableFTL = false
</span><ins>+$jitTests = true
</ins><span class="cx"> $memoryLimited = false
</span><span class="cx"> $outputDir = Pathname.new("results")
</span><span class="cx"> $verbosity = 0
</span><span class="lines">@@ -117,6 +118,7 @@
</span><span class="cx"> puts "--ftl-jit Indicate that we have the FTL JIT."
</span><span class="cx"> puts "--memory-limited Indicate that we are targeting the test for a memory limited device."
</span><span class="cx"> puts " Skip tests tagged with //@large-heap"
</span><ins>+ puts "--no-jit Do not run JIT specific tests."
</ins><span class="cx"> puts "--output-dir (-o) Path where to put results. Default is #{$outputDir}."
</span><span class="cx"> puts "--verbose (-v) Print more things while running."
</span><span class="cx"> puts "--run-bundle Runs a bundle previously created by run-jsc-stress-tests."
</span><span class="lines">@@ -143,6 +145,7 @@
</span><span class="cx"> ['--no-copy', GetoptLong::NO_ARGUMENT],
</span><span class="cx"> ['--ftl-jit', GetoptLong::NO_ARGUMENT],
</span><span class="cx"> ['--memory-limited', GetoptLong::NO_ARGUMENT],
</span><ins>+ ['--no-jit', GetoptLong::NO_ARGUMENT],
</ins><span class="cx"> ['--output-dir', '-o', GetoptLong::REQUIRED_ARGUMENT],
</span><span class="cx"> ['--run-bundle', GetoptLong::REQUIRED_ARGUMENT],
</span><span class="cx"> ['--tarball', GetoptLong::OPTIONAL_ARGUMENT],
</span><span class="lines">@@ -170,6 +173,8 @@
</span><span class="cx"> $enableFTL = true
</span><span class="cx"> when '--memory-limited'
</span><span class="cx"> $memoryLimited = true
</span><ins>+ when '--no-jit'
+ $jitTests = false
</ins><span class="cx"> when '--verbose'
</span><span class="cx"> $verbosity += 1
</span><span class="cx"> when '--run-bundle'
</span><span class="lines">@@ -225,6 +230,11 @@
</span><span class="cx"> exit 1
</span><span class="cx"> end
</span><span class="cx">
</span><ins>+if $enableFTL and !$jitTests
+ $stderr.puts "Error: can only specify one of --no-jit and --ftl-jit"
+ exit 1
+end
+
</ins><span class="cx"> if $doNotMessWithVMPath
</span><span class="cx"> $jscPath = Pathname.new(jscArg)
</span><span class="cx"> else
</span><span class="lines">@@ -658,7 +668,9 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runNoLLInt
</span><del>- run("no-llint", "--useLLInt=false")
</del><ins>+ if $jitTests
+ run("no-llint", "--useLLInt=false")
+ end
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runNoCJITValidate
</span><span class="lines">@@ -731,16 +743,18 @@
</span><span class="cx">
</span><span class="cx"> def defaultRun
</span><span class="cx"> runDefault
</span><del>- runNoLLInt
</del><span class="cx"> runAlwaysTriggerCopyPhase
</span><del>- runNoCJITValidatePhases
- runDFGEager
- runDFGEagerNoCJITValidate
- runDefaultFTL
- runFTLNoCJITValidate
- runFTLNoCJITNoInlineValidate
- runFTLEager
- runFTLEagerNoCJITValidate
</del><ins>+ if $jitTests
+ runNoLLInt
+ runNoCJITValidatePhases
+ runDFGEager
+ runDFGEagerNoCJITValidate
+ runDefaultFTL
+ runFTLNoCJITValidate
+ runFTLNoCJITNoInlineValidate
+ runFTLEager
+ runFTLEagerNoCJITValidate
+ end
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def defaultQuickRun
</span><span class="lines">@@ -749,7 +763,9 @@
</span><span class="cx"> runFTLNoCJITValidate
</span><span class="cx"> else
</span><span class="cx"> runDefault
</span><del>- runNoCJITValidate
</del><ins>+ if $jitTests
+ runNoCJITValidate
+ end
</ins><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><span class="lines">@@ -766,12 +782,14 @@
</span><span class="cx"> # by counting recompilations.
</span><span class="cx"> def defaultNoEagerRun
</span><span class="cx"> runDefault
</span><del>- runNoLLInt
</del><span class="cx"> runAlwaysTriggerCopyPhase
</span><del>- runNoCJITValidatePhases
- runDefaultFTL
- runFTLNoCJITValidate
- runFTLNoCJITNoInlineValidate
</del><ins>+ if $jitTests
+ runNoLLInt
+ runNoCJITValidatePhases
+ runDefaultFTL
+ runFTLNoCJITValidate
+ runFTLNoCJITNoInlineValidate
+ end
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runProfiler
</span><span class="lines">@@ -800,6 +818,10 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runTypeProfiler
</span><ins>+ if !$jitTests
+ return
+ end
+
</ins><span class="cx"> if $enableFTL
</span><span class="cx"> run("ftl-no-cjit-type-profiler", "--enableTypeProfiler=true", *(FTL_OPTIONS + NO_CJIT_OPTIONS))
</span><span class="cx"> else
</span><span class="lines">@@ -808,6 +830,10 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runControlFlowProfiler
</span><ins>+ if !$jitTests
+ return
+ end
+
</ins><span class="cx"> if $enableFTL
</span><span class="cx"> run("ftl-no-cjit-type-profiler", "--enableControlFlowProfiler=true", *(FTL_OPTIONS + NO_CJIT_OPTIONS))
</span><span class="cx"> else
</span><span class="lines">@@ -863,17 +889,23 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def noFTLRunLayoutTest
</span><del>- runLayoutTestDefault
</del><ins>+ if !$jitTests
+ return
+ end
+
</ins><span class="cx"> runLayoutTestNoLLInt
</span><span class="cx"> runLayoutTestNoCJIT
</span><span class="cx"> runLayoutTestDFGEagerNoCJIT
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def defaultRunLayoutTest
</span><del>- noFTLRunLayoutTest
- runLayoutTestDefaultFTL
- runLayoutTestFTLNoCJIT
- runLayoutTestFTLEagerNoCJIT
</del><ins>+ runLayoutTestDefault
+ if $jitTests
+ noFTLRunLayoutTest
+ runLayoutTestDefaultFTL
+ runLayoutTestFTLNoCJIT
+ runLayoutTestFTLEagerNoCJIT
+ end
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def prepareExtraRelativeFiles(extraFiles, destination)
</span><span class="lines">@@ -951,11 +983,13 @@
</span><span class="cx">
</span><span class="cx"> def defaultRunMozillaTest(mode, *extraFiles)
</span><span class="cx"> runMozillaTestDefault(mode, *extraFiles)
</span><del>- runMozillaTestLLInt(mode, *extraFiles)
- runMozillaTestBaselineJIT(mode, *extraFiles)
- runMozillaTestDFGEagerNoCJITValidatePhases(mode, *extraFiles)
- runMozillaTestDefaultFTL(mode, *extraFiles)
- runMozillaTestFTLEagerNoCJITValidatePhases(mode, *extraFiles)
</del><ins>+ if $jitTests
+ runMozillaTestLLInt(mode, *extraFiles)
+ runMozillaTestBaselineJIT(mode, *extraFiles)
+ runMozillaTestDFGEagerNoCJITValidatePhases(mode, *extraFiles)
+ runMozillaTestDefaultFTL(mode, *extraFiles)
+ runMozillaTestFTLEagerNoCJITValidatePhases(mode, *extraFiles)
+ end
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def skip
</span></span></pre>
</div>
</div>
</body>
</html>