Fix predictable mode to make time pass faster.

R=hpayer@chromium.org

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

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

diff --git a/src/d8.cc b/src/d8.cc
index 356a64b..d0dfbbb 100644 (file)
--- a/src/d8.cc
+++ b/src/d8.cc
@@ -332,7 +332,6 @@ void Shell::PerformanceNow(const v8::FunctionCallbackInfo<v8::Value>& args) {
     Isolate* v8_isolate = args.GetIsolate();
     i::Heap* heap = reinterpret_cast<i::Isolate*>(v8_isolate)->heap();
     args.GetReturnValue().Set(heap->synthetic_time());
-
   } else {
     base::TimeDelta delta =
         base::TimeTicks::HighResolutionNow() - kInitialTicks;

diff --git a/src/heap/heap.h b/src/heap/heap.h
index c313333..b10a476 100644 (file)
--- a/src/heap/heap.h
+++ b/src/heap/heap.h
@@ -960,7 +960,7 @@ class Heap {
 
   // Returns deterministic "time" value in ms. Works only with
   // FLAG_verify_predictable.
-  double synthetic_time() { return allocations_count_ / 100.0; }
+  double synthetic_time() { return allocations_count_ / 2.0; }
 
   // Print short heap statistics.
   void PrintShortHeapStatistics();

diff --git a/test/benchmarks/benchmarks.status b/test/benchmarks/benchmarks.status
index 1afd5ec..3bdacc2 100644 (file)
--- a/test/benchmarks/benchmarks.status
+++ b/test/benchmarks/benchmarks.status
@@ -29,7 +29,5 @@
 [ALWAYS, {
   # Too slow in Debug mode.
   'octane/mandreel': [PASS, ['mode == debug', SKIP]],
-  # TODO(mstarzinger,ishell): Timeout with TF in predictable mode.
-  'octane/richards': [PASS, NO_VARIANTS],
 }],  # ALWAYS
 ]

diff --git a/test/benchmarks/testcfg.py b/test/benchmarks/testcfg.py
index 8c573ba..6607bef 100644 (file)
--- a/test/benchmarks/testcfg.py
+++ b/test/benchmarks/testcfg.py
@@ -31,7 +31,6 @@ import shutil
 import subprocess
 import tarfile
 
-from testrunner.local import statusfile
 from testrunner.local import testsuite
 from testrunner.objects import testcase
 
@@ -184,8 +183,6 @@ class BenchmarksTestSuite(testsuite.TestSuite):
     os.chdir(old_cwd)
 
   def VariantFlags(self, testcase, default_flags):
-    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.