[webkit-changes] [163852] trunk/Tools

Mon, 10 Feb 2014 18:41:33 -0800

Title: [163852] trunk/Tools
Revision
163852
Author
fpi...@apple.com
Date
2014-02-10 18:45:46 -0800 (Mon, 10 Feb 2014)

Log Message

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:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (163851 => 163852)


--- trunk/Tools/ChangeLog	2014-02-11 02:41:46 UTC (rev 163851)
+++ trunk/Tools/ChangeLog	2014-02-11 02:45:46 UTC (rev 163852)
@@ -1,3 +1,15 @@
+2014-02-10  Filip Pizlo  <fpi...@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:
+
 2014-02-10  Gavin Barraclough  <barraclo...@apple.com>
 
         Remove WKPageSetVisibilityState

Modified: trunk/Tools/Scripts/run-jsc-stress-tests (163851 => 163852)


--- 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)
@@ -534,19 +534,19 @@
 end
 
 def runDefaultFTL
-    run("default-ftl", *FTL_OPTIONS)
+    run("default-ftl", *FTL_OPTIONS) if $enableFTL
 end
 
 def runFTLNoCJIT
-    run("ftl-no-cjit", "--enableConcurrentJIT=false", *FTL_OPTIONS)
+    run("ftl-no-cjit", "--enableConcurrentJIT=false", *FTL_OPTIONS) if $enableFTL
 end
 
 def runFTLNoCJITValidate
-    run("ftl-no-cjit-validate", "--enableConcurrentJIT=false", "--validateGraph=true", *FTL_OPTIONS)
+    run("ftl-no-cjit-validate", "--enableConcurrentJIT=false", "--validateGraph=true", *FTL_OPTIONS) if $enableFTL
 end
 
 def runFTLNoCJITOSRValidation
-    run("ftl-no-cjit-osr-validation", "--enableConcurrentJIT=false", "--validateFTLOSRExitLiveness=true", *FTL_OPTIONS)
+    run("ftl-no-cjit-osr-validation", "--enableConcurrentJIT=false", "--validateFTLOSRExitLiveness=true", *FTL_OPTIONS) if $enableFTL
 end
 
 def runDFGEager
@@ -558,15 +558,15 @@
 end
 
 def runFTLEager
-    run("ftl-eager", *(FTL_OPTIONS + EAGER_OPTIONS))
+    run("ftl-eager", *(FTL_OPTIONS + EAGER_OPTIONS)) if $enableFTL
 end
 
 def runFTLEagerNoCJITValidate
-    run("ftl-eager-no-cjit", "--enableConcurrentJIT=false", "--validateGraph=true", *(FTL_OPTIONS + EAGER_OPTIONS))
+    run("ftl-eager-no-cjit", "--enableConcurrentJIT=false", "--validateGraph=true", *(FTL_OPTIONS + EAGER_OPTIONS)) if $enableFTL
 end
 
 def runFTLEagerNoCJITOSRValidation
-    run("ftl-eager-no-cjit-osr-validation", "--enableConcurrentJIT=false", "--validateFTLOSRExitLiveness=true", *(FTL_OPTIONS + EAGER_OPTIONS))
+    run("ftl-eager-no-cjit-osr-validation", "--enableConcurrentJIT=false", "--validateFTLOSRExitLiveness=true", *(FTL_OPTIONS + EAGER_OPTIONS)) if $enableFTL
 end
 
 def runAlwaysTriggerCopyPhase
@@ -577,6 +577,10 @@
     run("no-cjit-no-aso", "--enableConcurrentJIT=false", "--enableArchitectureSpecificOptimizations=false")
 end
 
+def runFTLNoSimpleOpt
+    run("ftl-no-simple-opt", "--enableConcurrentJIT=false", "--llvmSimpleOpt=false", *FTL_OPTIONS) if $enableFTL
+end
+
 def defaultRun
     runDefault
     runNoLLInt
@@ -584,23 +588,19 @@
     runNoCJITValidatePhases
     runDFGEager
     runDFGEagerNoCJITValidate
-    if $enableFTL
-        runDefaultFTL
-        runFTLNoCJITValidate
-        runFTLNoCJITOSRValidation
-        runFTLEager
-        runFTLEagerNoCJITValidate
-        runFTLEagerNoCJITOSRValidation
-    end
+    runDefaultFTL
+    runFTLNoCJITValidate
+    runFTLNoCJITOSRValidation
+    runFTLEager
+    runFTLEagerNoCJITValidate
+    runFTLEagerNoCJITOSRValidation
 end
 
 def defaultQuickRun
     runDefault
     runNoCJITValidate
-    if $enableFTL
-        runDefaultFTL
-        runFTLNoCJIT
-    end
+    runDefaultFTL
+    runFTLNoCJIT
 end
 
 # This is expected to not do eager runs because eager runs can have a lot of recompilations
@@ -656,15 +656,15 @@
 end
 
 def runLayoutTestDefaultFTL
-    runLayoutTest("ftl", "--testTheFTL=true", *FTL_OPTIONS)
+    runLayoutTest("ftl", "--testTheFTL=true", *FTL_OPTIONS) if $enableFTL
 end
 
 def runLayoutTestFTLNoCJIT
-    runLayoutTest("ftl-no-cjit", "--testTheFTL=true", "--enableConcurrentJIT=false", *FTL_OPTIONS)
+    runLayoutTest("ftl-no-cjit", "--testTheFTL=true", "--enableConcurrentJIT=false", *FTL_OPTIONS) if $enableFTL
 end
 
 def runLayoutTestFTLEagerNoCJIT
-    runLayoutTest("ftl-eager-no-cjit", "--testTheFTL=true", "--enableConcurrentJIT=false", *(FTL_OPTIONS + EAGER_OPTIONS))
+    runLayoutTest("ftl-eager-no-cjit", "--testTheFTL=true", "--enableConcurrentJIT=false", *(FTL_OPTIONS + EAGER_OPTIONS)) if $enableFTL
 end
 
 def noFTLRunLayoutTest
@@ -676,11 +676,9 @@
 
 def defaultRunLayoutTest
     noFTLRunLayoutTest
-    if $enableFTL
-        runLayoutTestDefaultFTL
-        runLayoutTestFTLNoCJIT
-        runLayoutTestFTLEagerNoCJIT
-    end
+    runLayoutTestDefaultFTL
+    runLayoutTestFTLNoCJIT
+    runLayoutTestFTLEagerNoCJIT
 end
 
 def prepareExtraRelativeFiles(extraFiles, destination)
@@ -737,7 +735,7 @@
 end
 
 def runMozillaTestDefaultFTL(mode, *extraFiles)
-    runMozillaTest("ftl", mode, extraFiles, *FTL_OPTIONS)
+    runMozillaTest("ftl", mode, extraFiles, *FTL_OPTIONS) if $enableFTL
 end
 
 def runMozillaTestLLInt(mode, *extraFiles)
@@ -753,7 +751,7 @@
 end
 
 def runMozillaTestFTLEagerNoCJITValidatePhases(mode, *extraFiles)
-    runMozillaTest("ftl-eager-no-cjit-validate-phases", mode, extraFiles, "--enableConcurrentJIT=false", "--validateBytecode=true", "--validateGraphAtEachPhase=true", *(FTL_OPTIONS + EAGER_OPTIONS))
+    runMozillaTest("ftl-eager-no-cjit-validate-phases", mode, extraFiles, "--enableConcurrentJIT=false", "--validateBytecode=true", "--validateGraphAtEachPhase=true", *(FTL_OPTIONS + EAGER_OPTIONS)) if $enableFTL
 end
 
 def defaultRunMozillaTest(mode, *extraFiles)
@@ -761,10 +759,8 @@
     runMozillaTestLLInt(mode, *extraFiles)
     runMozillaTestBaselineJIT(mode, *extraFiles)
     runMozillaTestDFGEagerNoCJITValidatePhases(mode, *extraFiles)
-    if $enableFTL
-        runMozillaTestDefaultFTL(mode, *extraFiles)
-        runMozillaTestFTLEagerNoCJITValidatePhases(mode, *extraFiles)
-    end
+    runMozillaTestDefaultFTL(mode, *extraFiles)
+    runMozillaTestFTLEagerNoCJITValidatePhases(mode, *extraFiles)
 end
 
 def skip

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to