REGRESSION(203616): no FTL testing was inadvertently removed
authormsaboff@apple.com <msaboff@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Jul 2016 23:17:13 +0000 (23:17 +0000)
committermsaboff@apple.com <msaboff@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Jul 2016 23:17:13 +0000 (23:17 +0000)
https://bugs.webkit.org/show_bug.cgi?id=160100

Rubber-stamped by Filip Pizlo.

Added runNoFTL back into the set of tests we run on FTL enabled platforms.
Renamed runLayoutTestNoFTL to runLayoutTestDefault.  Restructured the test
logic for the runLayout and runNoisy variants to match the run test logic,
that is we always invoke runXXXDefault and invoke runXXXNoFTL for FTL
enabled platforms.

* Scripts/run-jsc-stress-tests:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@203625 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/run-jsc-stress-tests

index be17176..f171d3d 100644 (file)
@@ -1,3 +1,18 @@
+2016-07-22  Michael Saboff  <msaboff@apple.com>
+
+        REGRESSION(203616): no FTL testing was inadvertently removed
+        https://bugs.webkit.org/show_bug.cgi?id=160100
+
+        Rubber-stamped by Filip Pizlo.
+
+        Added runNoFTL back into the set of tests we run on FTL enabled platforms.
+        Renamed runLayoutTestNoFTL to runLayoutTestDefault.  Restructured the test
+        logic for the runLayout and runNoisy variants to match the run test logic,
+        that is we always invoke runXXXDefault and invoke runXXXNoFTL for FTL
+        enabled platforms.
+
+        * Scripts/run-jsc-stress-tests:
+
 2016-07-22  Brady Eidson  <beidson@apple.com>
 
         Removing IndexedDatabases that have stored blobs doesn't remove the blob files.
index f5454ed..8ef4194 100755 (executable)
@@ -898,6 +898,7 @@ def defaultRun
 
             return if !$isFTLPlatform
 
+            runNoFTL
             runFTLNoCJITValidate
             runFTLNoCJITNoPutStackValidate
             runFTLNoCJITNoInlineValidate
@@ -922,6 +923,7 @@ def defaultNoNoLLIntRun
 
             return if !$isFTLPlatform
 
+            runNoFTL
             runFTLNoCJITValidate
             runFTLNoCJITNoPutStackValidate
             runFTLNoCJITNoInlineValidate
@@ -936,7 +938,11 @@ def defaultQuickRun
     runDefault
     if $jitTests
         runNoCJITValidate
-        runFTLNoCJITValidate if $isFTLPlatform
+
+        return if $isFTLPlatform
+
+        runNoFTL
+        runFTLNoCJITValidate
     end
 end
 
@@ -967,6 +973,7 @@ def defaultNoEagerRun
 
         return if !$isFTLPlatform
 
+        runNoFTL
         runFTLNoCJITValidate
         runFTLNoCJITNoInlineValidate
     end
@@ -984,6 +991,7 @@ def defaultNoSamplingProfilerRun
 
         return if !$isFTLPlatform
 
+        runNoFTL
         runFTLNoCJITNoPutStackValidate
         runFTLNoCJITNoInlineValidate
         runFTLEager
@@ -1167,7 +1175,7 @@ def runLayoutTestDFGEagerNoCJIT
     runLayoutTest("dfg-eager-no-cjit", *(NO_CJIT_OPTIONS + EAGER_OPTIONS))
 end
 
-def runLayoutTestFTL
+def runLayoutTestDefault
     runLayoutTest(nil, "--testTheFTL=true", *FTL_OPTIONS)
 end
 
@@ -1190,10 +1198,15 @@ def noFTLRunLayoutTest
 end
 
 def defaultQuickRunLayoutTest
-    runLayoutTestNoFTL
+    runLayoutTestDefault
     if $jitTests
-        runLayoutTestFTLNoCJIT
-        runLayoutTestFTLEagerNoCJIT
+        if $isFTLPlatform
+            runLayoutTestNoFTL
+            runLayoutTestFTLNoCJIT
+            runLayoutTestFTLEagerNoCJIT
+        else
+            noFTLRunLayoutTest
+        end
     end
 end
 
@@ -1201,13 +1214,13 @@ def defaultRunLayoutTest
     if $quickMode
         defaultQuickRunLayoutTest
     else
-        runLayoutTestNoFTL
+        runLayoutTestDefault
         if $jitTests
             noFTLRunLayoutTest
 
             return if !$isFTLPlatform
 
-            runLayoutTestFTL
+            runLayoutTestNoFTL
             runLayoutTestFTLNoCJIT
             runLayoutTestFTLEagerNoCJIT
         end
@@ -1215,26 +1228,26 @@ def defaultRunLayoutTest
 end
 
 def noEagerNoNoLLIntTestsRunLayoutTest
-    runLayoutTestNoFTL
+    runLayoutTestDefault
     if $jitTests
         runLayoutTestNoCJIT
 
         return if !$isFTLPlatform
 
-        runLayoutTestFTL
+        runLayoutTestNoFTL
         runLayoutTestFTLNoCJIT
     end
 end
 
 def noNoLLIntRunLayoutTest
-    runLayoutTestNoFTL
+    runLayoutTestDefault
     if $jitTests
         runLayoutTestNoCJIT
         runLayoutTestDFGEagerNoCJIT
 
         return if !$isFTLPlatform
 
-        runLayoutTestFTL
+        runLayoutTestNoFTL
         runLayoutTestFTLNoCJIT
         runLayoutTestFTLEagerNoCJIT
     end
@@ -1350,6 +1363,10 @@ def runNoisyTestDefault
     runNoisyTest("default", *FTL_OPTIONS)
 end
 
+def runNoisyTestNoFTL
+    runNoisyTest("no-ftl")
+end
+
 def runNoisyTestNoCJIT
     runNoisyTest("ftl-no-cjit", "--validateBytecode=true", "--validateGraphAtEachPhase=true", *(FTL_OPTIONS + NO_CJIT_OPTIONS))
 end
@@ -1361,6 +1378,7 @@ end
 def defaultRunNoisyTest
     runNoisyTestDefault
     if $jitTests and $isFTLPlatform
+        runNoisyTestNoFTL
         runNoisyTestNoCJIT
         runNoisyTestEagerNoCJIT
     end