benchmark: changed millions and thousands to n

PR-URL: #18917 Fixes: #18778 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Weijia Wang <starkwang@126.com> Reviewed-By: Andreas Madsen <amwebdk@gmail.com> Reviewed-By: Anatoli Papirovski <apapirovski@mac.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
nodejs · Apr 12, 2018 · e6c3c50 · e6c3c50
1 parent 159c4d9
commit e6c3c50
Show file tree

Hide file tree

Showing 45 changed files with 269 additions and 301 deletions.
diff --git a/benchmark/buffers/buffer-compare-instance-method.js b/benchmark/buffers/buffer-compare-instance-method.js
@@ -4,11 +4,10 @@ const common = require('../common.js');
 const bench = common.createBenchmark(main, {
   size: [16, 512, 1024, 4096, 16386],
   args: [1, 2, 3, 4, 5],
-  millions: [1]
+  n: [1e6]
 });
 
-function main({ millions, size, args }) {
-  const iter = millions * 1e6;
+function main({ n, size, args }) {
   const b0 = Buffer.alloc(size, 'a');
   const b1 = Buffer.alloc(size, 'a');
   const b0Len = b0.length;
@@ -37,41 +36,41 @@ function main({ millions, size, args }) {
     case 2:
       b0.compare(b1, 0);
       bench.start();
-      for (i = 0; i < iter; i++) {
+      for (i = 0; i < n; i++) {
         b0.compare(b1, 0);
       }
-      bench.end(iter / 1e6);
+      bench.end(n);
       break;
     case 3:
       b0.compare(b1, 0, b1Len);
       bench.start();
-      for (i = 0; i < iter; i++) {
+      for (i = 0; i < n; i++) {
         b0.compare(b1, 0, b1Len);
       }
-      bench.end(iter / 1e6);
+      bench.end(n);
       break;
     case 4:
       b0.compare(b1, 0, b1Len, 0);
       bench.start();
-      for (i = 0; i < iter; i++) {
+      for (i = 0; i < n; i++) {
         b0.compare(b1, 0, b1Len, 0);
       }
-      bench.end(iter / 1e6);
+      bench.end(n);
       break;
     case 5:
       b0.compare(b1, 0, b1Len, 0, b0Len);
       bench.start();
-      for (i = 0; i < iter; i++) {
+      for (i = 0; i < n; i++) {
         b0.compare(b1, 0, b1Len, 0, b0Len);
       }
-      bench.end(iter / 1e6);
+      bench.end(n);
       break;
     default:
       b0.compare(b1);
       bench.start();
-      for (i = 0; i < iter; i++) {
+      for (i = 0; i < n; i++) {
         b0.compare(b1);
       }
-      bench.end(iter / 1e6);
+      bench.end(n);
   }
 }
diff --git a/benchmark/buffers/buffer-compare-offset.js b/benchmark/buffers/buffer-compare-offset.js
@@ -4,7 +4,7 @@ const common = require('../common.js');
 const bench = common.createBenchmark(main, {
   method: ['offset', 'slice'],
   size: [16, 512, 1024, 4096, 16386],
-  millions: [1]
+  n: [1e6]
 });
 
 function compareUsingSlice(b0, b1, len, iter) {
@@ -17,13 +17,12 @@ function compareUsingOffset(b0, b1, len, iter) {
     b0.compare(b1, 1, len, 1, len);
 }
 
-function main({ millions, size, method }) {
-  const iter = millions * 1e6;
+function main({ n, size, method }) {
   const fn = method === 'slice' ? compareUsingSlice : compareUsingOffset;
   bench.start();
   fn(Buffer.alloc(size, 'a'),
      Buffer.alloc(size, 'b'),
      size >> 1,
-     iter);
-  bench.end(millions);
+     n);
+  bench.end(n);
 }
diff --git a/benchmark/buffers/buffer-compare.js b/benchmark/buffers/buffer-compare.js
@@ -24,19 +24,18 @@ const common = require('../common.js');
 
 const bench = common.createBenchmark(main, {
   size: [16, 512, 1024, 4096, 16386],
-  millions: [1]
+  n: [1e6]
 });
 
-function main({ millions, size }) {
-  const iter = millions * 1e6;
+function main({ n, size }) {
   const b0 = Buffer.alloc(size, 'a');
   const b1 = Buffer.alloc(size, 'a');
 
   b1[size - 1] = 'b'.charCodeAt(0);
 
   bench.start();
-  for (var i = 0; i < iter; i++) {
+  for (var i = 0; i < n; i++) {
     Buffer.compare(b0, b1);
   }
-  bench.end(iter / 1e6);
+  bench.end(n);
 }
diff --git a/benchmark/buffers/buffer-read-float.js b/benchmark/buffers/buffer-read-float.js
@@ -6,10 +6,10 @@ const bench = common.createBenchmark(main, {
   type: ['Double', 'Float'],
   endian: ['BE', 'LE'],
   value: ['zero', 'big', 'small', 'inf', 'nan'],
-  millions: [1]
+  n: [1e6]
 });
 
-function main({ noAssert, millions, type, endian, value }) {
+function main({ noAssert, n, type, endian, value }) {
   noAssert = noAssert === 'true';
   type = type || 'Double';
   const buff = Buffer.alloc(8);
@@ -34,8 +34,8 @@ function main({ noAssert, millions, type, endian, value }) {
   buff[`write${type}${endian}`](values[type][value], 0, noAssert);
 
   bench.start();
-  for (var i = 0; i !== millions * 1e6; i++) {
+  for (var i = 0; i !== n; i++) {
     buff[fn](0, noAssert);
   }
-  bench.end(millions);
+  bench.end(n);
 }
diff --git a/benchmark/buffers/buffer-read.js b/benchmark/buffers/buffer-read.js
@@ -22,19 +22,20 @@ const bench = common.createBenchmark(main, {
   noAssert: ['false', 'true'],
   buffer: ['fast', 'slow'],
   type: types,
-  millions: [1]
+  n: [1e6]
 });
 
-function main({ noAssert, millions, buf, type }) {
+function main({ noAssert, n, buf, type }) {
   noAssert = noAssert === 'true';
   const clazz = buf === 'fast' ? Buffer : require('buffer').SlowBuffer;
   const buff = new clazz(8);
   const fn = `read${type || 'UInt8'}`;
 
   buff.writeDoubleLE(0, 0, noAssert);
   bench.start();
-  for (var i = 0; i !== millions * 1e6; i++) {
+
+  for (var i = 0; i !== n; i++) {
     buff[fn](0, noAssert);
   }
-  bench.end(millions);
+  bench.end(n);
 }
diff --git a/benchmark/buffers/buffer-write.js b/benchmark/buffers/buffer-write.js
@@ -22,7 +22,7 @@ const bench = common.createBenchmark(main, {
   noAssert: ['false', 'true'],
   buffer: ['fast', 'slow'],
   type: types,
-  millions: [1]
+  n: [1e6]
 });
 
 const INT8 = 0x7f;
@@ -45,30 +45,30 @@ const mod = {
   writeUInt32LE: UINT32
 };
 
-function main({ noAssert, millions, buf, type }) {
+function main({ noAssert, n, buf, type }) {
   const clazz = buf === 'fast' ? Buffer : require('buffer').SlowBuffer;
   const buff = new clazz(8);
   const fn = `write${type || 'UInt8'}`;
 
   if (/Int/.test(fn))
-    benchInt(buff, fn, millions, noAssert);
+    benchInt(buff, fn, n, noAssert);
   else
-    benchFloat(buff, fn, millions, noAssert);
+    benchFloat(buff, fn, n, noAssert);
 }
 
-function benchInt(buff, fn, millions, noAssert) {
+function benchInt(buff, fn, n, noAssert) {
   const m = mod[fn];
   bench.start();
-  for (var i = 0; i !== millions * 1e6; i++) {
+  for (var i = 0; i !== n; i++) {
     buff[fn](i & m, 0, noAssert);
   }
-  bench.end(millions);
+  bench.end(n);
 }
 
-function benchFloat(buff, fn, millions, noAssert) {
+function benchFloat(buff, fn, n, noAssert) {
   bench.start();
-  for (var i = 0; i !== millions * 1e6; i++) {
+  for (var i = 0; i !== n * 1e6; i++) {
     buff[fn](i, 0, noAssert);
   }
-  bench.end(millions);
+  bench.end(n);
 }
diff --git a/benchmark/buffers/dataview-set.js b/benchmark/buffers/dataview-set.js
@@ -20,7 +20,7 @@ const types = [
 
 const bench = common.createBenchmark(main, {
   type: types,
-  millions: [1]
+  n: [1e6]
 });
 
 const INT8 = 0x7f;
@@ -39,18 +39,17 @@ const mod = {
   setUint32: UINT32
 };
 
-function main({ millions, type }) {
+function main({ n, type }) {
   type = type || 'Uint8';
-  const len = millions * 1e6;
   const ab = new ArrayBuffer(8);
   const dv = new DataView(ab, 0, 8);
   const le = /LE$/.test(type);
   const fn = `set${type.replace(/[LB]E$/, '')}`;
 
   if (/int/i.test(fn))
-    benchInt(dv, fn, len, le);
+    benchInt(dv, fn, n, le);
   else
-    benchFloat(dv, fn, len, le);
+    benchFloat(dv, fn, n, le);
 }
 
 function benchInt(dv, fn, len, le) {
@@ -60,7 +59,7 @@ function benchInt(dv, fn, len, le) {
   for (var i = 0; i < len; i++) {
     method.call(dv, 0, i % m, le);
   }
-  bench.end(len / 1e6);
+  bench.end(len);
 }
 
 function benchFloat(dv, fn, len, le) {
@@ -69,5 +68,5 @@ function benchFloat(dv, fn, len, le) {
   for (var i = 0; i < len; i++) {
     method.call(dv, 0, i * 0.1, le);
   }
-  bench.end(len / 1e6);
+  bench.end(len);
 }
diff --git a/benchmark/es/defaultparams-bench.js b/benchmark/es/defaultparams-bench.js
@@ -5,7 +5,7 @@ const assert = require('assert');
 
 const bench = common.createBenchmark(main, {
   method: ['withoutdefaults', 'withdefaults'],
-  millions: [100]
+  n: [1e8]
 });
 
 function oldStyleDefaults(x, y) {
@@ -20,29 +20,29 @@ function defaultParams(x = 1, y = 2) {
   assert.strictEqual(y, 2);
 }
 
-function runOldStyleDefaults(millions) {
+function runOldStyleDefaults(n) {
   bench.start();
-  for (var i = 0; i < millions * 1e6; i++)
+  for (var i = 0; i < n; i++)
     oldStyleDefaults();
-  bench.end(millions);
+  bench.end(n);
 }
 
-function runDefaultParams(millions) {
+function runDefaultParams(n) {
   bench.start();
-  for (var i = 0; i < millions * 1e6; i++)
+  for (var i = 0; i < n; i++)
     defaultParams();
-  bench.end(millions);
+  bench.end(n);
 }
 
-function main({ millions, method }) {
+function main({ n, method }) {
   switch (method) {
     case '':
       // Empty string falls through to next line as default, mostly for tests.
     case 'withoutdefaults':
-      runOldStyleDefaults(millions);
+      runOldStyleDefaults(n);
       break;
     case 'withdefaults':
-      runDefaultParams(millions);
+      runDefaultParams(n);
       break;
     default:
       throw new Error(`Unexpected method "${method}"`);

diff --git a/benchmark/es/destructuring-bench.js b/benchmark/es/destructuring-bench.js
@@ -5,44 +5,44 @@ const assert = require('assert');
 
 const bench = common.createBenchmark(main, {
   method: ['swap', 'destructure'],
-  millions: [100]
+  n: [1e8]
 });
 
-function runSwapManual(millions) {
+function runSwapManual(n) {
   var x, y, r;
   bench.start();
-  for (var i = 0; i < millions * 1e6; i++) {
+  for (var i = 0; i < n; i++) {
     x = 1, y = 2;
     r = x;
     x = y;
     y = r;
     assert.strictEqual(x, 2);
     assert.strictEqual(y, 1);
   }
-  bench.end(millions);
+  bench.end(n);
 }
 
-function runSwapDestructured(millions) {
+function runSwapDestructured(n) {
   var x, y;
   bench.start();
-  for (var i = 0; i < millions * 1e6; i++) {
+  for (var i = 0; i < n; i++) {
     x = 1, y = 2;
     [x, y] = [y, x];
     assert.strictEqual(x, 2);
     assert.strictEqual(y, 1);
   }
-  bench.end(millions);
+  bench.end(n);
 }
 
-function main({ millions, method }) {
+function main({ n, method }) {
   switch (method) {
     case '':
       // Empty string falls through to next line as default, mostly for tests.
     case 'swap':
-      runSwapManual(millions);
+      runSwapManual(n);
       break;
     case 'destructure':
-      runSwapDestructured(millions);
+      runSwapDestructured(n);
       break;
     default:
       throw new Error(`Unexpected method "${method}"`);