[js-perf-test] Fix JSTests/PropertyQueries microbenchmark.

test/js-perf-test/PropertyQueries/property-queries.js

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 function ObjectWithKeys(count, keyOffset = 0, keyGen) {
-  var o = {};
+  var body = "";
   for (var i = 0; i < count; i++) {
     var key = keyGen(i + keyOffset);
-    o[key] = "value";
+    if (typeof key === "string") {
+      body += `this.${key} = 0\n`;
+    } else {
+      body += `this[${key}] = 0\n`;
+    }
   }
-  return o;
+  var f = new Function(body);
+  return new f();
 }
 
 function ObjectWithProperties(count, keyOffset) {
   return ObjectWithKeys(count, keyOffset, (key) => "key" + key );
 }
 
 function ObjectWithElements(count, keyOffset) {
   return ObjectWithKeys(count, keyOffset, (key) => key );
 }
 
@@ skipping 137 matching lines @@
 }
 
 
 var TestData = [];
 
 [true, false].forEach((cachable) => {
   [OBJ_MODE_FAST, OBJ_MODE_SLOW].forEach((obj_mode) => {
     var proto_mode = cachable ? "" : "-with-slow-proto";
     var name = `${obj_mode}-obj${proto_mode}`;
     var objects = [];
-    [10, 50, 100, 200, 500, 1000].forEach((prop_count) => {
+    [10, 50, 100, 200, 500].forEach((prop_count) => {
       // Create object with prop_count properties and prop_count elements.
       obj = ObjectWithProtoKeys(5, prop_count * 2, cachable,
                                 ObjectWithMixedKeys);
       if (obj_mode == OBJ_MODE_SLOW) {
         obj = MakeDictionaryMode(obj);
       }
       objects.push(obj);
     });
     TestData.push({name, objects});
   });
 });
 
 
 // ============================================================================
 
 function CreateTestFunction(template, object, keys) {
   // Force a new function for each test-object to avoid side-effects due to ICs.
   var text = "// random comment " + Math.random() + "\n" +
              template(object, keys);
   var func = new Function("object", "keys", text);
   return () => func(object, keys);
 }
 
+function CombineTestFunctions(tests) {
+  return () => {
+    for (var i = 0; i < tests.length; i++ ) {
+      tests[i]();
+    }
+  };
+}
+
 var TestFunctions = [
   {
     name: "in",
     // Query all keys.
     keys: (object) => Object.keys(object),
     template: (object, keys) => {
       var lines = [
         `var result = true;`,
         `for (var i = 0; i < keys.length; i++) {`,
         `  var key = keys[i];`,
@@ skipping 31 matching lines @@
 
 for (var test_function_desc of TestFunctions) {
   var test_function_name = test_function_desc.name;
 
   for (var query_kind of TestQueries) {
     var benchmarks = [];
     var suit_name = test_function_name + "--" + query_kind;
     for (var test_data of TestData) {
       var name = suit_name + "--" + test_data.name;
 
+      var tests = [];
       for (var object of test_data.objects) {
         var keys = test_function_desc.keys(object);
         keys = MakeKeyQueries(keys, query_kind);
 
-        var test_function = CreateTestFunction(test_function_desc.template,
-                                               object, keys);
-
-        var benchmark = new Benchmark(name, false, true, 400, test_function);
-        benchmarks.push(benchmark);
+        var test = CreateTestFunction(test_function_desc.template, object,
+                                      keys);
+        tests.push(test);
       }
+      var run_function = CombineTestFunctions(tests);
+      var benchmark = new Benchmark(name, false, false, 0, run_function);
+      benchmarks.push(benchmark);
     }
     Benchmarks.push(new BenchmarkSuite(suit_name, [100], benchmarks));
   }
 }
 
 // ============================================================================