Changeset 203067 in webkit

Timestamp:

Jul 11, 2016, 10:04:14 AM (9 years ago)

Author:

mark.lam@apple.com

Message:

Change run-webkit-tests.py and run-jsc-stress-tests to use a smaller JS stack size for testing.
​https://bugs.webkit.org/show_bug.cgi?id=159524

Reviewed by Michael Saboff.

Tools:

Forced tests to run with only a 1.5M JS stack size instead of the default 4M.
Also fixed up some tests to behave better to work with this new limit. This
should make stack overflow tests complete sooner.

• Scripts/run-jsc-stress-tests:
• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

(main):

LayoutTests:

• js/dom/deep-recursion-test.html:
• js/script-tests/stack-overflow-arrity-catch.js:

(funcWith20Args):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/dom/deep-recursion-test.html (modified) (1 diff)
• LayoutTests/js/script-tests/stack-overflow-arrity-catch.js (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/run-jsc-stress-tests (modified) (2 diffs)
• Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-07-11  Mark Lam  <mark.lam@apple.com>
+
+        Change run-webkit-tests.py and run-jsc-stress-tests to use a smaller JS stack size for testing.
+        https://bugs.webkit.org/show_bug.cgi?id=159524
+
+        Reviewed by Michael Saboff.
+
+        * js/dom/deep-recursion-test.html:
+        * js/script-tests/stack-overflow-arrity-catch.js:
+        (funcWith20Args):
+
 2016-07-11  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/LayoutTests/js/dom/deep-recursion-test.html

@@ -14 +14 @@
 
     try {
-        simpleRecursion(17472);
+        simpleRecursion(10000);
     } catch (ex) {
         debug("FAIL: " + ex);

trunk/LayoutTests/js/script-tests/stack-overflow-arrity-catch.js

@@ -1 +1 @@
 description('Test that if an arrity check causes a stack overflow, the exception goes to the right catch');
 
-function funcWith20Args(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8,
+function funcWith40Args(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8,
                         arg9, arg10, arg11, arg12, arg13, arg14, arg15,
-                        arg16, arg17, arg18, arg19, arg20)
+                        arg16, arg17, arg18, arg19, arg20,
+                        arg21, arg22, arg23, arg24, arg25, arg26, arg27, arg28,
+                        arg29, arg30, arg31, arg32, arg33, arg34, arg35,
+                        arg36, arg37, arg38, arg39, arg40)
 {
-    debug("ERROR: Shouldn't arrive in 20 arg function!");
+    debug("ERROR: Shouldn't arrive in 40 arg function!");
 }
 
@@ -24 +27 @@
         
         try {
-            funcWith20Args(1, 2, 3);
+            funcWith40Args(1, 2, 3);
         } catch (err2) {
             gotRightCatch = true;
@@ -45 +48 @@
         // now cause a stack overflow exception due to arrity processing
         try {
-            funcWith20Args(1, 2, 3, 4, 5, 6);
+            funcWith40Args(1, 2, 3, 4, 5, 6);
         } catch (err2) {
             gotRightCatch = true;

trunk/Tools/ChangeLog

@@ +1 @@
+2016-07-11  Mark Lam  <mark.lam@apple.com>
+
+        Change run-webkit-tests.py and run-jsc-stress-tests to use a smaller JS stack size for testing.
+        https://bugs.webkit.org/show_bug.cgi?id=159524
+
+        Reviewed by Michael Saboff.
+
+        Forced tests to run with only a 1.5M JS stack size instead of the default 4M.
+        Also fixed up some tests to behave better to work with this new limit.  This
+        should make stack overflow tests complete sooner.
+
+        * Scripts/run-jsc-stress-tests:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        (main):
+
 2016-07-11  Michael Catanzaro  <mcatanzaro@igalia.com>
 

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

@@ -1 +1 @@
 #!/usr/bin/env ruby
 
-# Copyright (C) 2013-2015 Apple Inc. All rights reserved.
+# Copyright (C) 2013-2016 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -427 +427 @@
 $numPasses = 0
 
-BASE_OPTIONS = ["--useFTLJIT=false", "--useFunctionDotArguments=true"]
+# We force all tests to use a smaller (1.5M) stack so that stack overflow tests can run faster.
+BASE_OPTIONS = ["--useFTLJIT=false", "--useFunctionDotArguments=true", "--maxPerThreadStackUsage=1572864"]
 EAGER_OPTIONS = ["--thresholdForJITAfterWarmUp=10", "--thresholdForJITSoon=10", "--thresholdForOptimizeAfterWarmUp=20", "--thresholdForOptimizeAfterLongWarmUp=20", "--thresholdForOptimizeSoon=20", "--thresholdForFTLOptimizeAfterWarmUp=20", "--thresholdForFTLOptimizeSoon=20", "--maximumEvalCacheableSourceLength=150000"]
 NO_CJIT_OPTIONS = ["--useConcurrentJIT=false", "--thresholdForJITAfterWarmUp=100"]

trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

@@ -1 +1 @@
 # Copyright (C) 2010 Google Inc. All rights reserved.
 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Szeged
-# Copyright (C) 2011 Apple Inc. All rights reserved.
+# Copyright (C) 2011, 2016 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -75 +75 @@
 
     try:
+        # Force all tests to use a smaller stack so that stack overflow tests can run faster.
+        stackSizeInBytes = 1.5 * 1024 * 1024
+        options.additional_env_var.append('JSC_maxPerThreadStackUsage=' + str(stackSizeInBytes))
+        options.additional_env_var.append('__XPC_JSC_maxPerThreadStackUsage=' + str(stackSizeInBytes))
         run_details = run(port, options, args, stderr)
         if run_details.exit_code != -1 and not run_details.initial_results.keyboard_interrupted: