Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / v8 / test / benchmarks / testcfg.py

diff --git a/src/v8/test/benchmarks/testcfg.py b/src/v8/test/benchmarks/testcfg.py
index b15553a..29e0c37 100644 (file)
--- a/src/v8/test/benchmarks/testcfg.py
+++ b/src/v8/test/benchmarks/testcfg.py
@@ -64,7 +64,7 @@ class BenchmarksTestSuite(testsuite.TestSuite):
         "octane/crypto",
         "octane/deltablue",
         "octane/earley-boyer",
-        "octane/gbemu",
+        "octane/gbemu-part1",
         "octane/mandreel",
         "octane/navier-stokes",
         "octane/pdfjs",
@@ -72,6 +72,8 @@ class BenchmarksTestSuite(testsuite.TestSuite):
         "octane/regexp",
         "octane/richards",
         "octane/splay",
+        "octane/typescript",
+        "octane/zlib",
 
         "sunspider/3d-cube",
         "sunspider/3d-morph",
@@ -111,6 +113,14 @@ class BenchmarksTestSuite(testsuite.TestSuite):
     elif testcase.path.startswith("octane"):
       result.append(os.path.join(self.testroot, "octane/base.js"))
       result.append(os.path.join(self.testroot, "%s.js" % testcase.path))
+      if testcase.path.startswith("octane/gbemu"):
+        result.append(os.path.join(self.testroot, "octane/gbemu-part2.js"))
+      elif testcase.path.startswith("octane/typescript"):
+        result.append(os.path.join(self.testroot,
+                                   "octane/typescript-compiler.js"))
+        result.append(os.path.join(self.testroot, "octane/typescript-input.js"))
+      elif testcase.path.startswith("octane/zlib"):
+        result.append(os.path.join(self.testroot, "octane/zlib-data.js"))
       result += ["-e", "BenchmarkSuite.RunSuites({});"]
     elif testcase.path.startswith("sunspider"):
       result.append(os.path.join(self.testroot, "%s.js" % testcase.path))
@@ -158,8 +168,8 @@ class BenchmarksTestSuite(testsuite.TestSuite):
 
     self._DownloadIfNecessary(
         ("http://svn.webkit.org/repository/webkit/trunk/PerformanceTests/"
-         "SunSpider/tests/sunspider-1.0/"),
-        "153700", "sunspider")
+         "SunSpider/tests/sunspider-1.0.2/"),
+        "159499", "sunspider")
 
     self._DownloadIfNecessary(
         ("http://kraken-mirror.googlecode.com/svn/trunk/kraken/tests/"
@@ -168,13 +178,15 @@ class BenchmarksTestSuite(testsuite.TestSuite):
 
     self._DownloadIfNecessary(
         "http://octane-benchmark.googlecode.com/svn/trunk/",
-        "22", "octane")
+        "26", "octane")
 
     os.chdir(old_cwd)
 
   def VariantFlags(self, testcase, default_flags):
-    # Both --nocrankshaft and --stressopt are very slow.
-    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-asm", "--turbo-filter=*"]]
 
 
 def GetSuite(name, root):