Commit 2fb88d61 authored by ishell's avatar ishell Committed by Commit bot

[js-perf-test] Shorten output of JSTests/PropertyQueries microbenchmark.

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

Cr-Commit-Position: refs/heads/master@{#35810}
parent 0e1e3c83
...@@ -171,62 +171,20 @@ ...@@ -171,62 +171,20 @@
"resources": ["property-queries.js"], "resources": ["property-queries.js"],
"results_regexp": "^%s\\-PropertyQueries\\(Score\\): (.+)$", "results_regexp": "^%s\\-PropertyQueries\\(Score\\): (.+)$",
"tests": [ "tests": [
{"name": "in--query-internalized-prop--fast-obj"}, {"name": "in--INTERN-prop"},
{"name": "in--query-internalized-prop--slow-obj"}, {"name": "in--DEINTERN-prop"},
{"name": "in--query-internalized-prop--fast-obj-with-slow-proto"}, {"name": "in--NE-INTERN-prop"},
{"name": "in--query-internalized-prop--slow-obj-with-slow-proto"}, {"name": "in--NE-DEINTERN-prop"},
{"name": "in--query-deinternalized-prop--fast-obj"}, {"name": "in--el"},
{"name": "in--query-deinternalized-prop--slow-obj"}, {"name": "in--el-str"},
{"name": "in--query-deinternalized-prop--fast-obj-with-slow-proto"}, {"name": "in--NE-el"},
{"name": "in--query-deinternalized-prop--slow-obj-with-slow-proto"}, {"name": "Object.hasOwnProperty--INTERN-prop"},
{"name": "in--query-non-existing-internalized-prop--fast-obj"}, {"name": "Object.hasOwnProperty--DEINTERN-prop"},
{"name": "in--query-non-existing-internalized-prop--slow-obj"}, {"name": "Object.hasOwnProperty--NE-INTERN-prop"},
{"name": "in--query-non-existing-internalized-prop--fast-obj-with-slow-proto"}, {"name": "Object.hasOwnProperty--NE-DEINTERN-prop"},
{"name": "in--query-non-existing-internalized-prop--slow-obj-with-slow-proto"}, {"name": "Object.hasOwnProperty--el"},
{"name": "in--query-non-existing-deinternalized-prop--fast-obj"}, {"name": "Object.hasOwnProperty--el-str"},
{"name": "in--query-non-existing-deinternalized-prop--slow-obj"}, {"name": "Object.hasOwnProperty--NE-el"}
{"name": "in--query-non-existing-deinternalized-prop--fast-obj-with-slow-proto"},
{"name": "in--query-non-existing-deinternalized-prop--slow-obj-with-slow-proto"},
{"name": "in--query-element--fast-obj"},
{"name": "in--query-element--slow-obj"},
{"name": "in--query-element--fast-obj-with-slow-proto"},
{"name": "in--query-element--slow-obj-with-slow-proto"},
{"name": "in--query-element-as-string--fast-obj"},
{"name": "in--query-element-as-string--slow-obj"},
{"name": "in--query-element-as-string--fast-obj-with-slow-proto"},
{"name": "in--query-element-as-string--slow-obj-with-slow-proto"},
{"name": "in--query-non-existing-element--fast-obj"},
{"name": "in--query-non-existing-element--slow-obj"},
{"name": "in--query-non-existing-element--fast-obj-with-slow-proto"},
{"name": "in--query-non-existing-element--slow-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-internalized-prop--fast-obj"},
{"name": "Object.hasOwnProperty--query-internalized-prop--slow-obj"},
{"name": "Object.hasOwnProperty--query-internalized-prop--fast-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-internalized-prop--slow-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-deinternalized-prop--fast-obj"},
{"name": "Object.hasOwnProperty--query-deinternalized-prop--slow-obj"},
{"name": "Object.hasOwnProperty--query-deinternalized-prop--fast-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-deinternalized-prop--slow-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-non-existing-internalized-prop--fast-obj"},
{"name": "Object.hasOwnProperty--query-non-existing-internalized-prop--slow-obj"},
{"name": "Object.hasOwnProperty--query-non-existing-internalized-prop--fast-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-non-existing-internalized-prop--slow-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-non-existing-deinternalized-prop--fast-obj"},
{"name": "Object.hasOwnProperty--query-non-existing-deinternalized-prop--slow-obj"},
{"name": "Object.hasOwnProperty--query-non-existing-deinternalized-prop--fast-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-non-existing-deinternalized-prop--slow-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-element--fast-obj"},
{"name": "Object.hasOwnProperty--query-element--slow-obj"},
{"name": "Object.hasOwnProperty--query-element--fast-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-element--slow-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-element-as-string--fast-obj"},
{"name": "Object.hasOwnProperty--query-element-as-string--slow-obj"},
{"name": "Object.hasOwnProperty--query-element-as-string--fast-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-element-as-string--slow-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-non-existing-element--fast-obj"},
{"name": "Object.hasOwnProperty--query-non-existing-element--slow-obj"},
{"name": "Object.hasOwnProperty--query-non-existing-element--fast-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-non-existing-element--slow-obj-with-slow-proto"}
] ]
} }
] ]
......
...@@ -18,62 +18,20 @@ ...@@ -18,62 +18,20 @@
], ],
"results_regexp": "^%s\\-PropertyQueries\\(Score\\): (.+)$", "results_regexp": "^%s\\-PropertyQueries\\(Score\\): (.+)$",
"tests": [ "tests": [
{"name": "in--query-internalized-prop--fast-obj"}, {"name": "in--INTERN-prop"},
{"name": "in--query-internalized-prop--slow-obj"}, {"name": "in--DEINTERN-prop"},
{"name": "in--query-internalized-prop--fast-obj-with-slow-proto"}, {"name": "in--NE-INTERN-prop"},
{"name": "in--query-internalized-prop--slow-obj-with-slow-proto"}, {"name": "in--NE-DEINTERN-prop"},
{"name": "in--query-deinternalized-prop--fast-obj"}, {"name": "in--el"},
{"name": "in--query-deinternalized-prop--slow-obj"}, {"name": "in--el-str"},
{"name": "in--query-deinternalized-prop--fast-obj-with-slow-proto"}, {"name": "in--NE-el"},
{"name": "in--query-deinternalized-prop--slow-obj-with-slow-proto"}, {"name": "Object.hasOwnProperty--INTERN-prop"},
{"name": "in--query-non-existing-internalized-prop--fast-obj"}, {"name": "Object.hasOwnProperty--DEINTERN-prop"},
{"name": "in--query-non-existing-internalized-prop--slow-obj"}, {"name": "Object.hasOwnProperty--NE-INTERN-prop"},
{"name": "in--query-non-existing-internalized-prop--fast-obj-with-slow-proto"}, {"name": "Object.hasOwnProperty--NE-DEINTERN-prop"},
{"name": "in--query-non-existing-internalized-prop--slow-obj-with-slow-proto"}, {"name": "Object.hasOwnProperty--el"},
{"name": "in--query-non-existing-deinternalized-prop--fast-obj"}, {"name": "Object.hasOwnProperty--el-str"},
{"name": "in--query-non-existing-deinternalized-prop--slow-obj"}, {"name": "Object.hasOwnProperty--NE-el"}
{"name": "in--query-non-existing-deinternalized-prop--fast-obj-with-slow-proto"},
{"name": "in--query-non-existing-deinternalized-prop--slow-obj-with-slow-proto"},
{"name": "in--query-element--fast-obj"},
{"name": "in--query-element--slow-obj"},
{"name": "in--query-element--fast-obj-with-slow-proto"},
{"name": "in--query-element--slow-obj-with-slow-proto"},
{"name": "in--query-element-as-string--fast-obj"},
{"name": "in--query-element-as-string--slow-obj"},
{"name": "in--query-element-as-string--fast-obj-with-slow-proto"},
{"name": "in--query-element-as-string--slow-obj-with-slow-proto"},
{"name": "in--query-non-existing-element--fast-obj"},
{"name": "in--query-non-existing-element--slow-obj"},
{"name": "in--query-non-existing-element--fast-obj-with-slow-proto"},
{"name": "in--query-non-existing-element--slow-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-internalized-prop--fast-obj"},
{"name": "Object.hasOwnProperty--query-internalized-prop--slow-obj"},
{"name": "Object.hasOwnProperty--query-internalized-prop--fast-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-internalized-prop--slow-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-deinternalized-prop--fast-obj"},
{"name": "Object.hasOwnProperty--query-deinternalized-prop--slow-obj"},
{"name": "Object.hasOwnProperty--query-deinternalized-prop--fast-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-deinternalized-prop--slow-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-non-existing-internalized-prop--fast-obj"},
{"name": "Object.hasOwnProperty--query-non-existing-internalized-prop--slow-obj"},
{"name": "Object.hasOwnProperty--query-non-existing-internalized-prop--fast-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-non-existing-internalized-prop--slow-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-non-existing-deinternalized-prop--fast-obj"},
{"name": "Object.hasOwnProperty--query-non-existing-deinternalized-prop--slow-obj"},
{"name": "Object.hasOwnProperty--query-non-existing-deinternalized-prop--fast-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-non-existing-deinternalized-prop--slow-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-element--fast-obj"},
{"name": "Object.hasOwnProperty--query-element--slow-obj"},
{"name": "Object.hasOwnProperty--query-element--fast-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-element--slow-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-element-as-string--fast-obj"},
{"name": "Object.hasOwnProperty--query-element-as-string--slow-obj"},
{"name": "Object.hasOwnProperty--query-element-as-string--fast-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-element-as-string--slow-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-non-existing-element--fast-obj"},
{"name": "Object.hasOwnProperty--query-non-existing-element--slow-obj"},
{"name": "Object.hasOwnProperty--query-non-existing-element--fast-obj-with-slow-proto"},
{"name": "Object.hasOwnProperty--query-non-existing-element--slow-obj-with-slow-proto"}
] ]
} }
] ]
......
...@@ -81,15 +81,13 @@ function Deinternalize(s) { ...@@ -81,15 +81,13 @@ function Deinternalize(s) {
// ============================================================================ // ============================================================================
const QUERY_INTERNALIZED_PROP = "query-internalized-prop"; const QUERY_INTERNALIZED_PROP = "INTERN-prop";
const QUERY_DEINTERNALIZED_PROP = "query-deinternalized-prop"; const QUERY_DEINTERNALIZED_PROP = "DEINTERN-prop";
const QUERY_NON_EXISTING_INTERNALIZED_PROP = const QUERY_NON_EXISTING_INTERNALIZED_PROP = "NE-INTERN-prop";
"query-non-existing-internalized-prop"; const QUERY_NON_EXISTING_DEINTERNALIZED_PROP = "NE-DEINTERN-prop";
const QUERY_NON_EXISTING_DEINTERNALIZED_PROP = const QUERY_ELEMENT = "el";
"query-non-existing-deinternalized-prop"; const QUERY_ELEMENT_AS_STRING = "el-str";
const QUERY_ELEMENT = "query-element"; const QUERY_NON_EXISTING_ELEMENT = "NE-el";
const QUERY_ELEMENT_AS_STRING = "query-element-as-string";
const QUERY_NON_EXISTING_ELEMENT = "query-non-existing-element";
const OBJ_MODE_FAST = "fast"; const OBJ_MODE_FAST = "fast";
const OBJ_MODE_SLOW = "slow"; const OBJ_MODE_SLOW = "slow";
...@@ -238,9 +236,10 @@ for (var test_function_desc of TestFunctions) { ...@@ -238,9 +236,10 @@ for (var test_function_desc of TestFunctions) {
var test_function_name = test_function_desc.name; var test_function_name = test_function_desc.name;
for (var query_kind of TestQueries) { for (var query_kind of TestQueries) {
var benchmarks = [];
var suit_name = test_function_name + "--" + query_kind;
for (var test_data of TestData) { for (var test_data of TestData) {
var benchmarks = []; var name = suit_name + "--" + test_data.name;
var name = test_function_name + "--" + query_kind + "--" + test_data.name;
for (var object of test_data.objects) { for (var object of test_data.objects) {
var keys = test_function_desc.keys(object); var keys = test_function_desc.keys(object);
...@@ -252,8 +251,8 @@ for (var test_function_desc of TestFunctions) { ...@@ -252,8 +251,8 @@ for (var test_function_desc of TestFunctions) {
var benchmark = new Benchmark(name, false, true, 400, test_function); var benchmark = new Benchmark(name, false, true, 400, test_function);
benchmarks.push(benchmark); benchmarks.push(benchmark);
} }
Benchmarks.push(new BenchmarkSuite(name, [100], benchmarks));
} }
Benchmarks.push(new BenchmarkSuite(suit_name, [100], benchmarks));
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment