Annotate large string tests with largeHeap
authorutatane.tea@gmail.com <utatane.tea@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 15 Jan 2017 07:22:19 +0000 (07:22 +0000)
committerutatane.tea@gmail.com <utatane.tea@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 15 Jan 2017 07:22:19 +0000 (07:22 +0000)
https://bugs.webkit.org/show_bug.cgi?id=167054

Reviewed by Filip Pizlo.

JSTests:

* microbenchmarks/dense-set.js:
* microbenchmarks/lots-of-fields.js:
* stress/joined-strings-should-not-exceed-max-string-length.js:
* stress/make-large-string-jit-strcat.js:
* stress/make-large-string-jit.js:
* stress/make-large-string-strcat.js:
* stress/make-large-string.js:
* stress/string-joining-long-strings-should-not-crash.js:
* stress/string-prototype-replace-should-throw-out-of-memory-error-when-using-too-much-memory.js:

Tools:

* Scripts/run-javascriptcore-tests:
* Scripts/run-jsc-stress-tests:

LayoutTests:

* js/script-tests/stringimpl-to-jsstring-on-large-strings-1.js:
* js/script-tests/stringimpl-to-jsstring-on-large-strings-2.js:
* js/script-tests/stringimpl-to-jsstring-on-large-strings-3.js:

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

17 files changed:
JSTests/ChangeLog
JSTests/microbenchmarks/dense-set.js
JSTests/microbenchmarks/lots-of-fields.js
JSTests/stress/joined-strings-should-not-exceed-max-string-length.js
JSTests/stress/make-large-string-jit-strcat.js
JSTests/stress/make-large-string-jit.js
JSTests/stress/make-large-string-strcat.js
JSTests/stress/make-large-string.js
JSTests/stress/string-joining-long-strings-should-not-crash.js
JSTests/stress/string-prototype-replace-should-throw-out-of-memory-error-when-using-too-much-memory.js
LayoutTests/ChangeLog
LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-1.js
LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-2.js
LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-3.js
Tools/ChangeLog
Tools/Scripts/run-javascriptcore-tests
Tools/Scripts/run-jsc-stress-tests

index c0e6c46..c2a1612 100644 (file)
@@ -1,5 +1,22 @@
 2017-01-14  Yusuke Suzuki  <utatane.tea@gmail.com>
 
+        Annotate large string tests with largeHeap
+        https://bugs.webkit.org/show_bug.cgi?id=167054
+
+        Reviewed by Filip Pizlo.
+
+        * microbenchmarks/dense-set.js:
+        * microbenchmarks/lots-of-fields.js:
+        * stress/joined-strings-should-not-exceed-max-string-length.js:
+        * stress/make-large-string-jit-strcat.js:
+        * stress/make-large-string-jit.js:
+        * stress/make-large-string-strcat.js:
+        * stress/make-large-string.js:
+        * stress/string-joining-long-strings-should-not-crash.js:
+        * stress/string-prototype-replace-should-throw-out-of-memory-error-when-using-too-much-memory.js:
+
+2017-01-14  Yusuke Suzuki  <utatane.tea@gmail.com>
+
         Reserve capacity for StringBuilder in unescape
         https://bugs.webkit.org/show_bug.cgi?id=167008
 
index 15ca881..dffcefa 100644 (file)
@@ -1,4 +1,4 @@
-//@ largeHeap
+//@ skip if $memoryLimited
 (function() {
     
     function bench(name, f, arg) {
index 38bf3f1..246f93c 100644 (file)
@@ -1,5 +1,5 @@
 // This test uses all available memory on some small memory devices.
-//@largeHeap
+//@ skip if $memoryLimited
 
 function foo() {
     var result = 0;
index 67f2453..4044b1b 100644 (file)
@@ -1,4 +1,4 @@
-//@ largeHeap
+//@ skip if $memoryLimited
 //@ runFTLNoCJIT if !$memoryLimited
 // This test should not crash or fail any assertions.
 
index a6aeb1d..979d044 100644 (file)
@@ -1,3 +1,4 @@
+//@ skip if $memoryLimited
 // Like make-large-string-jit.js, but tests MakeRope with three arguments and op_strcat
 // in the DFG and FTL JITs.
 
index 8ee8847..dc8ed87 100644 (file)
@@ -1,3 +1,4 @@
+//@ skip if $memoryLimited
 // Like make-large-string.js, but tests MakeRope with two arguments in the DFG and FTL JITs.
 
 var s = "s";
index c3ad773..3ac31dc 100644 (file)
@@ -1,3 +1,5 @@
+//@ skip if $memoryLimited
+
 var s = "s";
 
 try {
index ed776bf..b300f4b 100644 (file)
@@ -1,4 +1,4 @@
-//@ largeHeap
+//@ skip if $memoryLimited
 //@ runDefault if !$memoryLimited
 // This test should not crash.
 
index 5e52fbe..539af84 100644 (file)
@@ -1,3 +1,14 @@
+2017-01-14  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        Annotate large string tests with largeHeap
+        https://bugs.webkit.org/show_bug.cgi?id=167054
+
+        Reviewed by Filip Pizlo.
+
+        * js/script-tests/stringimpl-to-jsstring-on-large-strings-1.js:
+        * js/script-tests/stringimpl-to-jsstring-on-large-strings-2.js:
+        * js/script-tests/stringimpl-to-jsstring-on-large-strings-3.js:
+
 2017-01-14  Chris Dumez  <cdumez@apple.com>
 
         Align the innerText setter with the HTML spec and Gecko
index 3825d0b..f354d7c 100644 (file)
@@ -1,3 +1,13 @@
+2017-01-14  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        Annotate large string tests with largeHeap
+        https://bugs.webkit.org/show_bug.cgi?id=167054
+
+        Reviewed by Filip Pizlo.
+
+        * Scripts/run-javascriptcore-tests:
+        * Scripts/run-jsc-stress-tests:
+
 2017-01-14  Joseph Pecoraro  <pecoraro@apple.com>
 
         Remove stale references to ENABLE_ES6_GENERATORS and ENABLE_PROMISES
index 71921c9..48c2b8e 100755 (executable)
@@ -136,7 +136,7 @@ Usage: $programName [options] [options to pass to build system]
   --make-runner                 Uses the faster make-based runner.
 
   --memory-limited              Indicate that we are targeting the test for a memory limited device.
-                                Skip tests tagged with //\@largeHeap
+                                Skip tests tagged with //\@skip if \$memoryLimited
 
   --filter                      Only run tests whose name matches the given regular expression.
   --env-vars                    Pass a list of environment variables to set before running tests.
index 342779e..c35041d 100755 (executable)
@@ -127,7 +127,7 @@ def usage
     puts "--no-copy                   Do not copy the JavaScriptCore build product before testing."
     puts "                            --jsc specifies an already present JavaScriptCore to test."
     puts "--memory-limited            Indicate that we are targeting the test for a memory limited device."
-    puts "                            Skip tests tagged with //@largeHeap"
+    puts "                            Skip tests tagged with //@skip if $memoryLimited"
     puts "--no-jit                    Do not run JIT specific tests."
     puts "--force-collectContinuously Enable the collectContinuously mode even if disabled on this"
     puts "                            platform."
@@ -1489,13 +1489,6 @@ def skip
     puts "Skipping #{$collectionName}/#{$benchmark}"
 end
 
-def largeHeap
-    if $memoryLimited
-        $didAddRunCommand = true
-        puts "Skipping #{$collectionName}/#{$benchmark}"
-    end
-end
-
 def allJSFiles(path)
     if path.file?
         [path]