benchmark: remove benchmarks forced optimizations

Removes all instances of %OptimizeFunctionOnNextCall from benchmarks Refs: nodejs#9615 Refs: nodejs#11720
JaneaSystems · Mar 8, 2017 · f1f899a · f1f899a
1 parent fdb4a6c
commit f1f899a
Show file tree

Hide file tree

Showing 43 changed files with 38 additions and 318 deletions.
diff --git a/benchmark/README.md b/benchmark/README.md
@@ -235,12 +235,3 @@ it returns to accomplish what they need. This function reports timing
 data to the parent process (usually created by running `compare.js`, `run.js` or
 `scatter.js`).
 
-### v8ForceOptimization(method[, ...args])
-
-Force V8 to mark the `method` for optimization with the native function
-`%OptimizeFunctionOnNextCall()` and return the optimization status
-after that.
-
-It can be used to prevent the benchmark from getting disrupted by the optimizer
-kicking in halfway through. However, this could result in a less effective
-optimization. In general, only use it if you know what it actually does.
diff --git a/benchmark/buffers/buffer-compare-instance-method.js b/benchmark/buffers/buffer-compare-instance-method.js
@@ -1,6 +1,5 @@
 'use strict';
 const common = require('../common.js');
-const v8 = require('v8');
 
 const bench = common.createBenchmark(main, {
   size: [16, 512, 1024, 4096, 16386],
@@ -20,7 +19,6 @@ function main(conf) {
 
   b1[size - 1] = 'b'.charCodeAt(0);
 
-  // Force optimization before starting the benchmark
   switch (args) {
     case 2:
       b0.compare(b1, 0);
@@ -37,8 +35,6 @@ function main(conf) {
     default:
       b0.compare(b1);
   }
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(b0.compare)');
   switch (args) {
     case 2:
       b0.compare(b1, 0);

diff --git a/benchmark/buffers/buffer-compare-offset.js b/benchmark/buffers/buffer-compare-offset.js
@@ -1,6 +1,5 @@
 'use strict';
 const common = require('../common.js');
-const v8 = require('v8');
 
 const bench = common.createBenchmark(main, {
   method: ['offset', 'slice'],
@@ -9,18 +8,6 @@ const bench = common.createBenchmark(main, {
 });
 
 function compareUsingSlice(b0, b1, len, iter) {
-
-  // Force optimization before starting the benchmark
-  Buffer.compare(b0.slice(1, len), b1.slice(1, len));
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(Buffer.compare)');
-  eval('%OptimizeFunctionOnNextCall(b0.slice)');
-  eval('%OptimizeFunctionOnNextCall(b1.slice)');
-  Buffer.compare(b0.slice(1, len), b1.slice(1, len));
-  doCompareUsingSlice(b0, b1, len, iter);
-}
-
-function doCompareUsingSlice(b0, b1, len, iter) {
   var i;
   bench.start();
   for (i = 0; i < iter; i++)
@@ -29,16 +16,6 @@ function doCompareUsingSlice(b0, b1, len, iter) {
 }
 
 function compareUsingOffset(b0, b1, len, iter) {
-  len = len + 1;
-  // Force optimization before starting the benchmark
-  b0.compare(b1, 1, len, 1, len);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(b0.compare)');
-  b0.compare(b1, 1, len, 1, len);
-  doCompareUsingOffset(b0, b1, len, iter);
-}
-
-function doCompareUsingOffset(b0, b1, len, iter) {
   var i;
   bench.start();
   for (i = 0; i < iter; i++)

diff --git a/benchmark/buffers/buffer-swap.js b/benchmark/buffers/buffer-swap.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const common = require('../common.js');
-const v8 = require('v8');
 
 const bench = common.createBenchmark(main, {
   aligned: ['true', 'false'],
@@ -81,9 +80,7 @@ function main(conf) {
   const buf = createBuffer(len, aligned === 'true');
   const bufferSwap = genMethod(method);
 
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(bufferSwap)');
-
+  bufferSwap(n, buf);
   bench.start();
   bufferSwap(n, buf);
   bench.end(n);

diff --git a/benchmark/common.js b/benchmark/common.js
@@ -229,17 +229,3 @@ Benchmark.prototype.report = function(rate, elapsed) {
     type: 'report'
   });
 };
-
-exports.v8ForceOptimization = function(method) {
-  if (typeof method !== 'function')
-    return;
-
-  const v8 = require('v8');
-  v8.setFlagsFromString('--allow_natives_syntax');
-
-  const args = Array.prototype.slice.call(arguments, 1);
-  method.apply(null, args);
-  eval('%OptimizeFunctionOnNextCall(method)');
-  method.apply(null, args);
-  return eval('%GetOptimizationStatus(method)');
-};
diff --git a/benchmark/crypto/get-ciphers.js b/benchmark/crypto/get-ciphers.js
@@ -12,9 +12,12 @@ function main(conf) {
   const v = conf.v;
   const method = require(v).getCiphers;
   var i = 0;
-
-  common.v8ForceOptimization(method);
+  // first call to getChipers will dominate the results
+  if (n > 1) {
+    for (; i < n; i++)
+      method();
+  }
   bench.start();
-  for (; i < n; i++) method();
+  for (i = 0; i < n; i++) method();
   bench.end(n);
 }
diff --git a/benchmark/es/defaultparams-bench.js b/benchmark/es/defaultparams-bench.js
@@ -22,8 +22,6 @@ function defaultParams(x = 1, y = 2) {
 
 function runOldStyleDefaults(n) {
 
-  common.v8ForceOptimization(oldStyleDefaults);
-
   var i = 0;
   bench.start();
   for (; i < n; i++)
@@ -33,8 +31,6 @@ function runOldStyleDefaults(n) {
 
 function runDefaultParams(n) {
 
-  common.v8ForceOptimization(defaultParams);
-
   var i = 0;
   bench.start();
   for (; i < n; i++)

diff --git a/benchmark/es/restparams-bench.js b/benchmark/es/restparams-bench.js
@@ -35,8 +35,6 @@ function useArguments() {
 
 function runCopyArguments(n) {
 
-  common.v8ForceOptimization(copyArguments, 1, 2, 'a', 'b');
-
   var i = 0;
   bench.start();
   for (; i < n; i++)
@@ -46,8 +44,6 @@ function runCopyArguments(n) {
 
 function runRestArguments(n) {
 
-  common.v8ForceOptimization(restArguments, 1, 2, 'a', 'b');
-
   var i = 0;
   bench.start();
   for (; i < n; i++)
@@ -57,8 +53,6 @@ function runRestArguments(n) {
 
 function runUseArguments(n) {
 
-  common.v8ForceOptimization(useArguments, 1, 2, 'a', 'b');
-
   var i = 0;
   bench.start();
   for (; i < n; i++)

diff --git a/benchmark/misc/console.js b/benchmark/misc/console.js
@@ -4,9 +4,6 @@ const common = require('../common.js');
 const assert = require('assert');
 const Writable = require('stream').Writable;
 const util = require('util');
-const v8 = require('v8');
-
-v8.setFlagsFromString('--allow_natives_syntax');
 
 const methods = [
   'restAndSpread',
@@ -51,14 +48,7 @@ function usingArgumentsAndApplyC() {
   nullStream.write(util.format.apply(null, arguments) + '\n');
 }
 
-function optimize(method, ...args) {
-  method(...args);
-  eval(`%OptimizeFunctionOnNextCall(${method.name})`);
-  method(...args);
-}
-
 function runUsingRestAndConcat(n) {
-  optimize(usingRestAndConcat, 'a', 1);
 
   var i = 0;
   bench.start();
@@ -70,7 +60,6 @@ function runUsingRestAndConcat(n) {
 function runUsingRestAndSpread(n, concat) {
 
   const method = concat ? usingRestAndSpreadC : usingRestAndSpreadTS;
-  optimize(method, 'this is %s of %d', 'a', 1);
 
   var i = 0;
   bench.start();
@@ -82,7 +71,6 @@ function runUsingRestAndSpread(n, concat) {
 function runUsingRestAndApply(n, concat) {
 
   const method = concat ? usingRestAndApplyC : usingRestAndApplyTS;
-  optimize(method, 'this is %s of %d', 'a', 1);
 
   var i = 0;
   bench.start();
@@ -94,7 +82,6 @@ function runUsingRestAndApply(n, concat) {
 function runUsingArgumentsAndApply(n, concat) {
 
   const method = concat ? usingArgumentsAndApplyC : usingArgumentsAndApplyTS;
-  optimize(method, 'this is %s of %d', 'a', 1);
 
   var i = 0;
   bench.start();

diff --git a/benchmark/misc/punycode.js b/benchmark/misc/punycode.js
@@ -42,16 +42,16 @@ function usingICU(val) {
 }
 
 function runPunycode(n, val) {
-  common.v8ForceOptimization(usingPunycode, val);
   var i = 0;
-  bench.start();
   for (; i < n; i++)
     usingPunycode(val);
+  bench.start();
+  for (i = 0; i < n; i++)
+    usingPunycode(val);
   bench.end(n);
 }
 
 function runICU(n, val) {
-  common.v8ForceOptimization(usingICU, val);
   var i = 0;
   bench.start();
   for (; i < n; i++)

diff --git a/benchmark/misc/util-extend-vs-object-assign.js b/benchmark/misc/util-extend-vs-object-assign.js
@@ -2,7 +2,6 @@
 
 const common = require('../common.js');
 const util = require('util');
-const v8 = require('v8');
 
 const bench = common.createBenchmark(main, {
   type: ['extend', 'assign'],
@@ -12,25 +11,18 @@ const bench = common.createBenchmark(main, {
 function main(conf) {
   let fn;
   const n = conf.n | 0;
-  let v8command;
 
   if (conf.type === 'extend') {
     fn = util._extend;
-    v8command = '%OptimizeFunctionOnNextCall(util._extend)';
   } else if (conf.type === 'assign') {
     fn = Object.assign;
-    // Object.assign is built-in, cannot be optimized
-    v8command = '';
   }
 
   // Force-optimize the method to test so that the benchmark doesn't
   // get disrupted by the optimizer kicking in halfway through.
   for (var i = 0; i < conf.type.length * 10; i += 1)
     fn({}, process.env);
 
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval(v8command);
-
   var obj = new Proxy({}, { set: function(a, b, c) { return true; } });
 
   bench.start();

diff --git a/benchmark/path/basename-posix.js b/benchmark/path/basename-posix.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   pathext: [
@@ -30,12 +29,6 @@ function main(conf) {
     input = input.slice(0, extIdx);
   }
 
-  // Force optimization before starting the benchmark
-  p.basename(input, ext);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.basename)');
-  p.basename(input, ext);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p.basename(input, ext);

diff --git a/benchmark/path/basename-win32.js b/benchmark/path/basename-win32.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   pathext: [
@@ -30,12 +29,6 @@ function main(conf) {
     input = input.slice(0, extIdx);
   }
 
-  // Force optimization before starting the benchmark
-  p.basename(input, ext);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.basename)');
-  p.basename(input, ext);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p.basename(input, ext);

diff --git a/benchmark/path/dirname-posix.js b/benchmark/path/dirname-posix.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   path: [
@@ -21,12 +20,6 @@ function main(conf) {
   var p = path.posix;
   var input = '' + conf.path;
 
-  // Force optimization before starting the benchmark
-  p.dirname(input);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.dirname)');
-  p.dirname(input);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p.dirname(input);

diff --git a/benchmark/path/dirname-win32.js b/benchmark/path/dirname-win32.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   path: [
@@ -21,12 +20,6 @@ function main(conf) {
   var p = path.win32;
   var input = '' + conf.path;
 
-  // Force optimization before starting the benchmark
-  p.dirname(input);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.dirname)');
-  p.dirname(input);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p.dirname(input);

diff --git a/benchmark/path/extname-posix.js b/benchmark/path/extname-posix.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   path: [
@@ -24,12 +23,6 @@ function main(conf) {
   var p = path.posix;
   var input = '' + conf.path;
 
-  // Force optimization before starting the benchmark
-  p.extname(input);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.extname)');
-  p.extname(input);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p.extname(input);