Enable TF for testing benchmarks.

BUG=
R=mstarzinger@chromium.org

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22976 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

test/benchmarks/benchmarks.status

@@ -25,9 +25,12 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Too slow in Debug mode.
+
 [
 [ALWAYS, {
-  'octane/mandreel': [PASS, ['mode == debug', SKIP]],
+  # Too slow in Debug mode. TODO(mstarzinger): Too slow for TF.
+  'octane/mandreel': [PASS, NO_VARIANTS, ['mode == debug', SKIP]],
+  # TODO(mstarzinger): Out of mem with TF.
+  'octane/zlib': [PASS, NO_VARIANTS],
 }],  # ALWAYS
 ]

test/benchmarks/testcfg.py

@@ -31,6 +31,7 @@ import shutil
 import subprocess
 import tarfile
 
+from testrunner.local import statusfile
 from testrunner.local import testsuite
 from testrunner.objects import testcase
 
@@ -183,8 +184,12 @@ class BenchmarksTestSuite(testsuite.TestSuite):
     os.chdir(old_cwd)
 
   def VariantFlags(self, testcase, default_flags):
-    # Both --nocrankshaft and --stressopt are very slow.
-    return [[]]
+    if testcase.outcomes and statusfile.OnlyStandardVariant(testcase.outcomes):
+      return [[]]
+    # 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-filter=*"]]
 
 
 def GetSuite(name, root):