<!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>[163852] 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/163852">163852</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-02-10 18:45:46 -0800 (Mon, 10 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make it possible to run tests with --llvmSimpleOpt=false
https://bugs.webkit.org/show_bug.cgi?id=128571
Reviewed by Mark Lam.
This also makes it so all run functions for the FTL are safe to call with FTL disabled,
because they do their own $enableFTL check.
* 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 (163851 => 163852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-02-11 02:41:46 UTC (rev 163851)
+++ trunk/Tools/ChangeLog 2014-02-11 02:45:46 UTC (rev 163852)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-02-10 Filip Pizlo <fpizlo@apple.com>
+
+ Make it possible to run tests with --llvmSimpleOpt=false
+ https://bugs.webkit.org/show_bug.cgi?id=128571
+
+ Reviewed by Mark Lam.
+
+ This also makes it so all run functions for the FTL are safe to call with FTL disabled,
+ because they do their own $enableFTL check.
+
+ * Scripts/run-jsc-stress-tests:
+
</ins><span class="cx"> 2014-02-10 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove WKPageSetVisibilityState
</span></span></pre></div>
<a id="trunkToolsScriptsrunjscstresstests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-jsc-stress-tests (163851 => 163852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-jsc-stress-tests 2014-02-11 02:41:46 UTC (rev 163851)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2014-02-11 02:45:46 UTC (rev 163852)
</span><span class="lines">@@ -534,19 +534,19 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runDefaultFTL
</span><del>- run("default-ftl", *FTL_OPTIONS)
</del><ins>+ run("default-ftl", *FTL_OPTIONS) if $enableFTL
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runFTLNoCJIT
</span><del>- run("ftl-no-cjit", "--enableConcurrentJIT=false", *FTL_OPTIONS)
</del><ins>+ run("ftl-no-cjit", "--enableConcurrentJIT=false", *FTL_OPTIONS) if $enableFTL
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runFTLNoCJITValidate
</span><del>- run("ftl-no-cjit-validate", "--enableConcurrentJIT=false", "--validateGraph=true", *FTL_OPTIONS)
</del><ins>+ run("ftl-no-cjit-validate", "--enableConcurrentJIT=false", "--validateGraph=true", *FTL_OPTIONS) if $enableFTL
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runFTLNoCJITOSRValidation
</span><del>- run("ftl-no-cjit-osr-validation", "--enableConcurrentJIT=false", "--validateFTLOSRExitLiveness=true", *FTL_OPTIONS)
</del><ins>+ run("ftl-no-cjit-osr-validation", "--enableConcurrentJIT=false", "--validateFTLOSRExitLiveness=true", *FTL_OPTIONS) if $enableFTL
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runDFGEager
</span><span class="lines">@@ -558,15 +558,15 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runFTLEager
</span><del>- run("ftl-eager", *(FTL_OPTIONS + EAGER_OPTIONS))
</del><ins>+ run("ftl-eager", *(FTL_OPTIONS + EAGER_OPTIONS)) if $enableFTL
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runFTLEagerNoCJITValidate
</span><del>- run("ftl-eager-no-cjit", "--enableConcurrentJIT=false", "--validateGraph=true", *(FTL_OPTIONS + EAGER_OPTIONS))
</del><ins>+ run("ftl-eager-no-cjit", "--enableConcurrentJIT=false", "--validateGraph=true", *(FTL_OPTIONS + EAGER_OPTIONS)) if $enableFTL
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runFTLEagerNoCJITOSRValidation
</span><del>- run("ftl-eager-no-cjit-osr-validation", "--enableConcurrentJIT=false", "--validateFTLOSRExitLiveness=true", *(FTL_OPTIONS + EAGER_OPTIONS))
</del><ins>+ run("ftl-eager-no-cjit-osr-validation", "--enableConcurrentJIT=false", "--validateFTLOSRExitLiveness=true", *(FTL_OPTIONS + EAGER_OPTIONS)) if $enableFTL
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runAlwaysTriggerCopyPhase
</span><span class="lines">@@ -577,6 +577,10 @@
</span><span class="cx"> run("no-cjit-no-aso", "--enableConcurrentJIT=false", "--enableArchitectureSpecificOptimizations=false")
</span><span class="cx"> end
</span><span class="cx">
</span><ins>+def runFTLNoSimpleOpt
+ run("ftl-no-simple-opt", "--enableConcurrentJIT=false", "--llvmSimpleOpt=false", *FTL_OPTIONS) if $enableFTL
+end
+
</ins><span class="cx"> def defaultRun
</span><span class="cx"> runDefault
</span><span class="cx"> runNoLLInt
</span><span class="lines">@@ -584,23 +588,19 @@
</span><span class="cx"> runNoCJITValidatePhases
</span><span class="cx"> runDFGEager
</span><span class="cx"> runDFGEagerNoCJITValidate
</span><del>- if $enableFTL
- runDefaultFTL
- runFTLNoCJITValidate
- runFTLNoCJITOSRValidation
- runFTLEager
- runFTLEagerNoCJITValidate
- runFTLEagerNoCJITOSRValidation
- end
</del><ins>+ runDefaultFTL
+ runFTLNoCJITValidate
+ runFTLNoCJITOSRValidation
+ runFTLEager
+ runFTLEagerNoCJITValidate
+ runFTLEagerNoCJITOSRValidation
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def defaultQuickRun
</span><span class="cx"> runDefault
</span><span class="cx"> runNoCJITValidate
</span><del>- if $enableFTL
- runDefaultFTL
- runFTLNoCJIT
- end
</del><ins>+ runDefaultFTL
+ runFTLNoCJIT
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> # This is expected to not do eager runs because eager runs can have a lot of recompilations
</span><span class="lines">@@ -656,15 +656,15 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runLayoutTestDefaultFTL
</span><del>- runLayoutTest("ftl", "--testTheFTL=true", *FTL_OPTIONS)
</del><ins>+ runLayoutTest("ftl", "--testTheFTL=true", *FTL_OPTIONS) if $enableFTL
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runLayoutTestFTLNoCJIT
</span><del>- runLayoutTest("ftl-no-cjit", "--testTheFTL=true", "--enableConcurrentJIT=false", *FTL_OPTIONS)
</del><ins>+ runLayoutTest("ftl-no-cjit", "--testTheFTL=true", "--enableConcurrentJIT=false", *FTL_OPTIONS) if $enableFTL
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runLayoutTestFTLEagerNoCJIT
</span><del>- runLayoutTest("ftl-eager-no-cjit", "--testTheFTL=true", "--enableConcurrentJIT=false", *(FTL_OPTIONS + EAGER_OPTIONS))
</del><ins>+ runLayoutTest("ftl-eager-no-cjit", "--testTheFTL=true", "--enableConcurrentJIT=false", *(FTL_OPTIONS + EAGER_OPTIONS)) if $enableFTL
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def noFTLRunLayoutTest
</span><span class="lines">@@ -676,11 +676,9 @@
</span><span class="cx">
</span><span class="cx"> def defaultRunLayoutTest
</span><span class="cx"> noFTLRunLayoutTest
</span><del>- if $enableFTL
- runLayoutTestDefaultFTL
- runLayoutTestFTLNoCJIT
- runLayoutTestFTLEagerNoCJIT
- end
</del><ins>+ runLayoutTestDefaultFTL
+ runLayoutTestFTLNoCJIT
+ runLayoutTestFTLEagerNoCJIT
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def prepareExtraRelativeFiles(extraFiles, destination)
</span><span class="lines">@@ -737,7 +735,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runMozillaTestDefaultFTL(mode, *extraFiles)
</span><del>- runMozillaTest("ftl", mode, extraFiles, *FTL_OPTIONS)
</del><ins>+ runMozillaTest("ftl", mode, extraFiles, *FTL_OPTIONS) if $enableFTL
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runMozillaTestLLInt(mode, *extraFiles)
</span><span class="lines">@@ -753,7 +751,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runMozillaTestFTLEagerNoCJITValidatePhases(mode, *extraFiles)
</span><del>- runMozillaTest("ftl-eager-no-cjit-validate-phases", mode, extraFiles, "--enableConcurrentJIT=false", "--validateBytecode=true", "--validateGraphAtEachPhase=true", *(FTL_OPTIONS + EAGER_OPTIONS))
</del><ins>+ runMozillaTest("ftl-eager-no-cjit-validate-phases", mode, extraFiles, "--enableConcurrentJIT=false", "--validateBytecode=true", "--validateGraphAtEachPhase=true", *(FTL_OPTIONS + EAGER_OPTIONS)) if $enableFTL
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def defaultRunMozillaTest(mode, *extraFiles)
</span><span class="lines">@@ -761,10 +759,8 @@
</span><span class="cx"> runMozillaTestLLInt(mode, *extraFiles)
</span><span class="cx"> runMozillaTestBaselineJIT(mode, *extraFiles)
</span><span class="cx"> runMozillaTestDFGEagerNoCJITValidatePhases(mode, *extraFiles)
</span><del>- if $enableFTL
- runMozillaTestDefaultFTL(mode, *extraFiles)
- runMozillaTestFTLEagerNoCJITValidatePhases(mode, *extraFiles)
- end
</del><ins>+ runMozillaTestDefaultFTL(mode, *extraFiles)
+ runMozillaTestFTLEagerNoCJITValidatePhases(mode, *extraFiles)
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def skip
</span></span></pre>
</div>
</div>
</body>
</html>