Update test expectations for mjsunit/tools/tickprocessor

R=yangguo@chromium.org

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

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

diff --git a/test/mjsunit/mjsunit.status b/test/mjsunit/mjsunit.status
index 8f01c2d..c322644 100644 (file)
--- a/test/mjsunit/mjsunit.status
+++ b/test/mjsunit/mjsunit.status
@@ -207,7 +207,7 @@
   # get the same random seed and would generate the same directory name. Besides
   # that, it doesn't make sense to run several variants of d8-os anyways.
   'd8-os': [PASS, NO_VARIANTS, ['isolates or arch == android_arm or arch == android_arm64 or arch == android_ia32', SKIP]],
-  'tools/tickprocessor': [PASS, ['arch == android_arm or arch == android_arm64 or arch == android_ia32', SKIP]],
+  'tools/tickprocessor': [PASS, NO_VARIANTS, ['arch == android_arm or arch == android_arm64 or arch == android_ia32', SKIP]],
 
   ##############################################################################
   # Long running test that reproduces memory leak and should be run manually.

diff --git a/test/mjsunit/tools/tickprocessor-test.default b/test/mjsunit/tools/tickprocessor-test.default
index 8ab17c3..3e01532 100644 (file)
--- a/test/mjsunit/tools/tickprocessor-test.default
+++ b/test/mjsunit/tools/tickprocessor-test.default
@@ -1,13 +1,9 @@
 Statistical profiling result from v8.log, (13 ticks, 2 unaccounted, 0 excluded).
 
- [Unknown]:
-   ticks  total  nonlib   name
-      2   15.4%
-
  [Shared libraries]:
    ticks  total  nonlib   name
-      3   23.1%    0.0%  /lib32/libm-2.7.so
-      1    7.7%    0.0%  ffffe000-fffff000
+      3   23.1%          /lib32/libm-2.7.so
+      1    7.7%          ffffe000-fffff000
 
  [JavaScript]:
    ticks  total  nonlib   name
@@ -20,9 +16,13 @@ Statistical profiling result from v8.log, (13 ticks, 2 unaccounted, 0 excluded).
       1    7.7%   11.1%  v8::internal::HashTable<v8::internal::StringDictionaryShape, v8::internal::String*>::FindEntry(v8::internal::String*)
       1    7.7%   11.1%  exp
 
- [GC]:
+ [Summary]:
    ticks  total  nonlib   name
-      0    0.0%
+      1    7.7%   11.1%  JavaScript
+      5   38.5%   55.6%  C++
+      0    0.0%    0.0%  GC
+      4   30.8%          Shared libraries
+      2   15.4%          Unaccounted
 
  [Bottom up (heavy) profile]:
   Note: percentage shows a share of a particular caller in the total

diff --git a/test/mjsunit/tools/tickprocessor-test.func-info b/test/mjsunit/tools/tickprocessor-test.func-info
index a66b90f..c93b6ec 100644 (file)
--- a/test/mjsunit/tools/tickprocessor-test.func-info
+++ b/test/mjsunit/tools/tickprocessor-test.func-info
@@ -11,9 +11,12 @@ Statistical profiling result from v8.log, (3 ticks, 0 unaccounted, 0 excluded).
  [C++]:
    ticks  total  nonlib   name
 
- [GC]:
+ [Summary]:
    ticks  total  nonlib   name
-      0    0.0%
+      3  100.0%  100.0%  JavaScript
+      0    0.0%    0.0%  C++
+      0    0.0%    0.0%  GC
+      0    0.0%          Shared libraries
 
  [Bottom up (heavy) profile]:
   Note: percentage shows a share of a particular caller in the total

diff --git a/test/mjsunit/tools/tickprocessor-test.gc-state b/test/mjsunit/tools/tickprocessor-test.gc-state
index 40f90db..6b1a6a3 100644 (file)
--- a/test/mjsunit/tools/tickprocessor-test.gc-state
+++ b/test/mjsunit/tools/tickprocessor-test.gc-state
@@ -9,9 +9,12 @@ Statistical profiling result from v8.log, (13 ticks, 0 unaccounted, 13 excluded)
  [C++]:
    ticks  total  nonlib   name
 
- [GC]:
+ [Summary]:
    ticks  total  nonlib   name
-      0    0.0%
+      0    0.0%    0.0%  JavaScript
+      0    0.0%    0.0%  C++
+      0    0.0%    0.0%  GC
+      0    0.0%          Shared libraries
 
  [Bottom up (heavy) profile]:
   Note: percentage shows a share of a particular caller in the total

diff --git a/test/mjsunit/tools/tickprocessor-test.ignore-unknown b/test/mjsunit/tools/tickprocessor-test.ignore-unknown
index 677da9c..de70527 100644 (file)
--- a/test/mjsunit/tools/tickprocessor-test.ignore-unknown
+++ b/test/mjsunit/tools/tickprocessor-test.ignore-unknown
@@ -2,8 +2,8 @@ Statistical profiling result from v8.log, (13 ticks, 2 unaccounted, 0 excluded).
 
  [Shared libraries]:
    ticks  total  nonlib   name
-      3   27.3%    0.0%  /lib32/libm-2.7.so
-      1    9.1%    0.0%  ffffe000-fffff000
+      3   27.3%          /lib32/libm-2.7.so
+      1    9.1%          ffffe000-fffff000
 
  [JavaScript]:
    ticks  total  nonlib   name
@@ -16,9 +16,12 @@ Statistical profiling result from v8.log, (13 ticks, 2 unaccounted, 0 excluded).
       1    9.1%   14.3%  v8::internal::HashTable<v8::internal::StringDictionaryShape, v8::internal::String*>::FindEntry(v8::internal::String*)
       1    9.1%   14.3%  exp
 
- [GC]:
+ [Summary]:
    ticks  total  nonlib   name
-      0    0.0%
+      1    9.1%   14.3%  JavaScript
+      5   45.5%   71.4%  C++
+      0    0.0%    0.0%  GC
+      4   36.4%          Shared libraries
 
  [Bottom up (heavy) profile]:
   Note: percentage shows a share of a particular caller in the total

diff --git a/test/mjsunit/tools/tickprocessor-test.separate-ic b/test/mjsunit/tools/tickprocessor-test.separate-ic
index 2d49f73..119ccbe 100644 (file)
--- a/test/mjsunit/tools/tickprocessor-test.separate-ic
+++ b/test/mjsunit/tools/tickprocessor-test.separate-ic
@@ -1,13 +1,9 @@
 Statistical profiling result from v8.log, (13 ticks, 2 unaccounted, 0 excluded).
 
- [Unknown]:
-   ticks  total  nonlib   name
-      2   15.4%
-
  [Shared libraries]:
    ticks  total  nonlib   name
-      3   23.1%    0.0%  /lib32/libm-2.7.so
-      1    7.7%    0.0%  ffffe000-fffff000
+      3   23.1%          /lib32/libm-2.7.so
+      1    7.7%          ffffe000-fffff000
 
  [JavaScript]:
    ticks  total  nonlib   name
@@ -22,9 +18,13 @@ Statistical profiling result from v8.log, (13 ticks, 2 unaccounted, 0 excluded).
       1    7.7%   11.1%  v8::internal::HashTable<v8::internal::StringDictionaryShape, v8::internal::String*>::FindEntry(v8::internal::String*)
       1    7.7%   11.1%  exp
 
- [GC]:
+ [Summary]:
    ticks  total  nonlib   name
-      0    0.0%
+      3   23.1%   33.3%  JavaScript
+      5   38.5%   55.6%  C++
+      0    0.0%    0.0%  GC
+      4   30.8%          Shared libraries
+      2   15.4%          Unaccounted
 
  [Bottom up (heavy) profile]:
   Note: percentage shows a share of a particular caller in the total

diff --git a/test/mjsunit/tools/tickprocessor.js b/test/mjsunit/tools/tickprocessor.js
index 78a7c43..f460d34 100644 (file)
--- a/test/mjsunit/tools/tickprocessor.js
+++ b/test/mjsunit/tools/tickprocessor.js
@@ -25,10 +25,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// This test case is not compatible with optimization stress because the
-// generated profile will look vastly different when more is optimized.
-// Flags: --nostress-opt --noalways-opt
-
 // Load implementations from <project root>/tools.
 // Files: tools/splaytree.js tools/codemap.js tools/csvparser.js
 // Files: tools/consarray.js tools/profile.js tools/profile_view.js