<!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>[203616] 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/203616">203616</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2016-07-22 13:53:41 -0700 (Fri, 22 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't run FTL related JSC stress tests on non-FTL platforms
https://bugs.webkit.org/show_bug.cgi?id=160033
Reviewed by Mark Lam.
Added check for running tests on platforms that don't enable FTL to not run FTL tests.
Refactored several of the runXXX test methods to always runXXXDefault and made those
runXXXDefault to pass FTL_OPTIONS. For platforms that don't enable the FTL, FTL_OPTIONS
doesn't cause a problem.
* 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 (203615 => 203616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-07-22 20:38:28 UTC (rev 203615)
+++ trunk/Tools/ChangeLog 2016-07-22 20:53:41 UTC (rev 203616)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-07-22 Michael Saboff <msaboff@apple.com>
+
+ Don't run FTL related JSC stress tests on non-FTL platforms
+ https://bugs.webkit.org/show_bug.cgi?id=160033
+
+ Reviewed by Mark Lam.
+
+ Added check for running tests on platforms that don't enable FTL to not run FTL tests.
+ Refactored several of the runXXX test methods to always runXXXDefault and made those
+ runXXXDefault to pass FTL_OPTIONS. For platforms that don't enable the FTL, FTL_OPTIONS
+ doesn't cause a problem.
+
+ * Scripts/run-jsc-stress-tests:
+
</ins><span class="cx"> 2016-07-22 Per Arne Vollan <pvollan@apple.com>
</span><span class="cx">
</span><span class="cx"> IWebView::mainFrame crashes if called after IWebView::close
</span></span></pre></div>
<a id="trunkToolsScriptsrunjscstresstests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-jsc-stress-tests (203615 => 203616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-jsc-stress-tests 2016-07-22 20:38:28 UTC (rev 203615)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2016-07-22 20:53:41 UTC (rev 203616)
</span><span class="lines">@@ -404,6 +404,7 @@
</span><span class="cx">
</span><span class="cx"> $hostOS = determineOS unless $hostOS
</span><span class="cx"> $architecture = determineArchitecture unless $architecture
</span><ins>+$isFTLPlatform = !($architecture == "x86" || $architecture == "arm" || $hostOS == "windows" || $hostOS == "linux" && $architecture == "arm64")
</ins><span class="cx">
</span><span class="cx"> if !$testRunnerType
</span><span class="cx"> if $remote and $hostOS == "darwin"
</span><span class="lines">@@ -886,7 +887,7 @@
</span><span class="cx"> if $quickMode
</span><span class="cx"> defaultQuickRun
</span><span class="cx"> else
</span><del>- runNoFTL
</del><ins>+ runDefault
</ins><span class="cx"> runAlwaysTriggerCopyPhase
</span><span class="cx"> if $jitTests
</span><span class="cx"> runNoLLInt
</span><span class="lines">@@ -893,7 +894,10 @@
</span><span class="cx"> runNoCJITValidatePhases
</span><span class="cx"> runDFGEager
</span><span class="cx"> runDFGEagerNoCJITValidate
</span><del>- runDefault
</del><ins>+ runDFGMaximalFlushPhase
+
+ return if !$isFTLPlatform
+
</ins><span class="cx"> runFTLNoCJITValidate
</span><span class="cx"> runFTLNoCJITNoPutStackValidate
</span><span class="cx"> runFTLNoCJITNoInlineValidate
</span><span class="lines">@@ -900,7 +904,6 @@
</span><span class="cx"> runFTLEager
</span><span class="cx"> runFTLEagerNoCJITValidate
</span><span class="cx"> runFTLNoCJITSmallPool
</span><del>- runDFGMaximalFlushPhase
</del><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="lines">@@ -909,13 +912,16 @@
</span><span class="cx"> if $quickMode
</span><span class="cx"> defaultQuickRun
</span><span class="cx"> else
</span><del>- runNoFTL
</del><ins>+ runDefault
</ins><span class="cx"> runAlwaysTriggerCopyPhase
</span><span class="cx"> if $jitTests
</span><span class="cx"> runNoCJITValidatePhases
</span><span class="cx"> runDFGEager
</span><span class="cx"> runDFGEagerNoCJITValidate
</span><del>- runDefault
</del><ins>+ runDFGMaximalFlushPhase
+
+ return if !$isFTLPlatform
+
</ins><span class="cx"> runFTLNoCJITValidate
</span><span class="cx"> runFTLNoCJITNoPutStackValidate
</span><span class="cx"> runFTLNoCJITNoInlineValidate
</span><span class="lines">@@ -922,27 +928,25 @@
</span><span class="cx"> runFTLEager
</span><span class="cx"> runFTLEagerNoCJITValidate
</span><span class="cx"> runFTLNoCJITSmallPool
</span><del>- runDFGMaximalFlushPhase
</del><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def defaultQuickRun
</span><ins>+ runDefault
</ins><span class="cx"> if $jitTests
</span><del>- runDefault
- runFTLNoCJITValidate
- else
- runNoFTL
- if $jitTests
- runNoCJITValidate
- end
</del><ins>+ runNoCJITValidate
+ runFTLNoCJITValidate if $isFTLPlatform
</ins><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def defaultSpotCheckNoMaximalFlush
</span><span class="cx"> defaultQuickRun
</span><ins>+ runNoCJITNoAccessInlining
+
+ return if !$isFTLPlatform
+
</ins><span class="cx"> runFTLNoCJITOSRValidation
</span><del>- runNoCJITNoAccessInlining
</del><span class="cx"> runFTLNoCJITNoAccessInlining
</span><span class="cx"> end
</span><span class="cx">
</span><span class="lines">@@ -955,12 +959,14 @@
</span><span class="cx"> # for reasons that don't arise in the real world. It's used for tests that assert convergence
</span><span class="cx"> # by counting recompilations.
</span><span class="cx"> def defaultNoEagerRun
</span><del>- runNoFTL
</del><ins>+ runDefault
</ins><span class="cx"> runAlwaysTriggerCopyPhase
</span><span class="cx"> if $jitTests
</span><span class="cx"> runNoLLInt
</span><span class="cx"> runNoCJITValidatePhases
</span><del>- runDefault
</del><ins>+
+ return if !$isFTLPlatform
+
</ins><span class="cx"> runFTLNoCJITValidate
</span><span class="cx"> runFTLNoCJITNoInlineValidate
</span><span class="cx"> end
</span><span class="lines">@@ -967,7 +973,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def defaultNoSamplingProfilerRun
</span><del>- runNoFTL
</del><ins>+ runDefault
</ins><span class="cx"> runAlwaysTriggerCopyPhase
</span><span class="cx"> if $jitTests
</span><span class="cx"> runNoLLInt
</span><span class="lines">@@ -974,13 +980,15 @@
</span><span class="cx"> runNoCJITValidatePhases
</span><span class="cx"> runDFGEager
</span><span class="cx"> runDFGEagerNoCJITValidate
</span><del>- runDefault
</del><ins>+ runDFGMaximalFlushPhase
+
+ return if !$isFTLPlatform
+
</ins><span class="cx"> runFTLNoCJITNoPutStackValidate
</span><span class="cx"> runFTLNoCJITNoInlineValidate
</span><span class="cx"> runFTLEager
</span><span class="cx"> runFTLEagerNoCJITValidate
</span><span class="cx"> runFTLNoCJITSmallPool
</span><del>- runDFGMaximalFlushPhase
</del><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><span class="lines">@@ -1014,6 +1022,8 @@
</span><span class="cx"> return
</span><span class="cx"> end
</span><span class="cx">
</span><ins>+ return if !$isFTLPlatform
+
</ins><span class="cx"> run("ftl-no-cjit-type-profiler", "--useTypeProfiler=true", *(FTL_OPTIONS + NO_CJIT_OPTIONS))
</span><span class="cx"> run("ftl-type-profiler", "--useTypeProfiler=true", *(FTL_OPTIONS))
</span><span class="cx"> end
</span><span class="lines">@@ -1023,6 +1033,8 @@
</span><span class="cx"> return
</span><span class="cx"> end
</span><span class="cx">
</span><ins>+ return if !$isFTLPlatform
+
</ins><span class="cx"> run("ftl-no-cjit-type-profiler", "--useControlFlowProfiler=true", *(FTL_OPTIONS + NO_CJIT_OPTIONS))
</span><span class="cx"> end
</span><span class="cx">
</span><span class="lines">@@ -1109,6 +1121,9 @@
</span><span class="cx"> run("no-cjit-validate-phases-modules", "-m", "--validateBytecode=true", "--validateGraphAtEachPhase=true", *NO_CJIT_OPTIONS)
</span><span class="cx"> run("dfg-eager-modules", "-m", *EAGER_OPTIONS)
</span><span class="cx"> run("dfg-eager-no-cjit-validate-modules", "-m", "--validateGraph=true", *(NO_CJIT_OPTIONS + EAGER_OPTIONS))
</span><ins>+
+ return if !$isFTLPlatform
+
</ins><span class="cx"> run("default-ftl-modules", "-m", *FTL_OPTIONS)
</span><span class="cx"> run("ftl-no-cjit-validate-modules", "-m", "--validateGraph=true", *(FTL_OPTIONS + NO_CJIT_OPTIONS))
</span><span class="cx"> run("ftl-no-cjit-no-inline-validate-modules", "-m", "--validateGraph=true", "--maximumInliningDepth=1", *(FTL_OPTIONS + NO_CJIT_OPTIONS))
</span><span class="lines">@@ -1152,7 +1167,7 @@
</span><span class="cx"> runLayoutTest("dfg-eager-no-cjit", *(NO_CJIT_OPTIONS + EAGER_OPTIONS))
</span><span class="cx"> end
</span><span class="cx">
</span><del>-def runLayoutTestDefault
</del><ins>+def runLayoutTestFTL
</ins><span class="cx"> runLayoutTest(nil, "--testTheFTL=true", *FTL_OPTIONS)
</span><span class="cx"> end
</span><span class="cx">
</span><span class="lines">@@ -1189,7 +1204,10 @@
</span><span class="cx"> runLayoutTestNoFTL
</span><span class="cx"> if $jitTests
</span><span class="cx"> noFTLRunLayoutTest
</span><del>- runLayoutTestDefault
</del><ins>+
+ return if !$isFTLPlatform
+
+ runLayoutTestFTL
</ins><span class="cx"> runLayoutTestFTLNoCJIT
</span><span class="cx"> runLayoutTestFTLEagerNoCJIT
</span><span class="cx"> end
</span><span class="lines">@@ -1200,7 +1218,10 @@
</span><span class="cx"> runLayoutTestNoFTL
</span><span class="cx"> if $jitTests
</span><span class="cx"> runLayoutTestNoCJIT
</span><del>- runLayoutTestDefault
</del><ins>+
+ return if !$isFTLPlatform
+
+ runLayoutTestFTL
</ins><span class="cx"> runLayoutTestFTLNoCJIT
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="lines">@@ -1210,7 +1231,10 @@
</span><span class="cx"> if $jitTests
</span><span class="cx"> runLayoutTestNoCJIT
</span><span class="cx"> runLayoutTestDFGEagerNoCJIT
</span><del>- runLayoutTestDefault
</del><ins>+
+ return if !$isFTLPlatform
+
+ runLayoutTestFTL
</ins><span class="cx"> runLayoutTestFTLNoCJIT
</span><span class="cx"> runLayoutTestFTLEagerNoCJIT
</span><span class="cx"> end
</span><span class="lines">@@ -1313,7 +1337,7 @@
</span><span class="cx"> runMozillaTestBaselineJIT(mode, *extraFiles)
</span><span class="cx"> runMozillaTestDFGEagerNoCJITValidatePhases(mode, *extraFiles)
</span><span class="cx"> runMozillaTestDefault(mode, *extraFiles)
</span><del>- runMozillaTestFTLEagerNoCJITValidatePhases(mode, *extraFiles)
</del><ins>+ runMozillaTestFTLEagerNoCJITValidatePhases(mode, *extraFiles) if $isFTLPlatform
</ins><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="lines">@@ -1326,10 +1350,6 @@
</span><span class="cx"> runNoisyTest("default", *FTL_OPTIONS)
</span><span class="cx"> end
</span><span class="cx">
</span><del>-def runNoisyTestNoFTL
- runNoisyTest("no-ftl")
-end
-
</del><span class="cx"> def runNoisyTestNoCJIT
</span><span class="cx"> runNoisyTest("ftl-no-cjit", "--validateBytecode=true", "--validateGraphAtEachPhase=true", *(FTL_OPTIONS + NO_CJIT_OPTIONS))
</span><span class="cx"> end
</span><span class="lines">@@ -1339,9 +1359,8 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def defaultRunNoisyTest
</span><del>- runNoisyTestNoFTL
- if $jitTests
- runNoisyTestDefault
</del><ins>+ runNoisyTestDefault
+ if $jitTests and $isFTLPlatform
</ins><span class="cx"> runNoisyTestNoCJIT
</span><span class="cx"> runNoisyTestEagerNoCJIT
</span><span class="cx"> end
</span></span></pre>
</div>
</div>
</body>
</html>