Revert "Enable turbofan deoptimization by default."

This reverts commit 866032692ff59ac4282e6d1a483cbb52870cc784 for breaking
tests.

TBR=mstarzinger@chromium.org
BUG=

Review URL: https://codereview.chromium.org/681713004

Cr-Commit-Position: refs/heads/master@{#24908}
git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@24908 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/test/benchmarks/testcfg.py b/test/benchmarks/testcfg.py
index 7c4dc40..29e0c37 100644 (file)
--- a/test/benchmarks/testcfg.py
+++ b/test/benchmarks/testcfg.py
@@ -186,7 +186,7 @@ class BenchmarksTestSuite(testsuite.TestSuite):
     # Both --nocrankshaft and --stressopt are very slow. Add TF but without
     # always opt to match the way the benchmarks are run for performance
     # testing.
-    return [[], ["--turbo-asm", "--turbo-filter=*", "--turbo-deoptimization"]]
+    return [[], ["--turbo-asm", "--turbo-filter=*"]]
 
 
 def GetSuite(name, root):

diff --git a/test/mjsunit/mjsunit.status b/test/mjsunit/mjsunit.status
index e172207..bf297fe 100644 (file)
--- a/test/mjsunit/mjsunit.status
+++ b/test/mjsunit/mjsunit.status
@@ -72,9 +72,6 @@
   'compare-known-objects-slow': [PASS, NO_VARIANTS],
   'elements-kind': [PASS, NO_VARIANTS],
 
-  # TODO(jarin) Traversal of large frame states is too slow.
-  'regress/regress-2612': [PASS, ['mode == debug', SKIP]],
-
   # Some tests are just too slow to run for now.
   'bit-not': [PASS, NO_VARIANTS],
   'json2': [PASS, NO_VARIANTS],

diff --git a/tools/run-tests.py b/tools/run-tests.py
index d9d35f5..dc73a40 100755 (executable)
--- a/tools/run-tests.py
+++ b/tools/run-tests.py
@@ -87,7 +87,7 @@ TIMEOUT_SCALEFACTOR = {"debug"   : 4,
 VARIANT_FLAGS = {
     "default": [],
     "stress": ["--stress-opt", "--always-opt"],
-    "turbofan": ["--turbo-asm", "--turbo-filter=*", "--always-opt", "--turbo-deoptimization"],
+    "turbofan": ["--turbo-asm", "--turbo-filter=*", "--always-opt"],
     "nocrankshaft": ["--nocrankshaft"]}
 
 VARIANTS = ["default", "stress", "turbofan", "nocrankshaft"]