benchmark: clean up config resolution in multiple benchmarks

lundibundi · codebytere · commit 1caf98f813aa · 2020-03-16T19:42:20.000-07:00
This removes 'to Number' casting in multiple benchmarks (which is handled by the benchmark runner) and cleans up some var usage in changed benchmarks. PR-URL: #31581 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/benchmark/fs/readfile-partitioned.js b/benchmark/fs/readfile-partitioned.js
@@ -22,8 +22,7 @@ const bench = common.createBenchmark(main, {
   concurrent: [1, 10]
 });
 
-function main(conf) {
-  const len = +conf.len;
+function main({ len, dur, concurrent }) {
   try { fs.unlinkSync(filename); } catch {}
   let data = Buffer.alloc(len, 'x');
   fs.writeFileSync(filename, data);
@@ -40,7 +39,7 @@ function main(conf) {
     benchEnded = true;
     bench.end(totalOps);
     try { fs.unlinkSync(filename); } catch {}
-  }, +conf.dur * 1000);
+  }, dur * 1000);
 
   function read() {
     fs.readFile(filename, afterRead);
@@ -78,8 +77,7 @@ function main(conf) {
   }
 
   // Start reads
-  let cur = +conf.concurrent;
-  while (cur--) read();
+  while (concurrent-- > 0) read();
 
   // Start a competing zip
   zip();
diff --git a/benchmark/http/set_header.js b/benchmark/http/set_header.js
@@ -16,10 +16,7 @@ const bench = common.createBenchmark(main, {
   n: [1e6],
 });
 
-function main(conf) {
-  const n = +conf.n;
-  const value = conf.value;
-
+function main({ n, value }) {
   const og = new OutgoingMessage();
 
   bench.start();
diff --git a/benchmark/url/legacy-vs-whatwg-url-get-prop.js b/benchmark/url/legacy-vs-whatwg-url-get-prop.js
@@ -71,9 +71,8 @@ function useWHATWG(data) {
 }
 
 function main({ type, method, e }) {
-  e = +e;
-  var data;
-  var noDead;  // Avoid dead code elimination.
+  let data;
+  let noDead;  // Avoid dead code elimination.
   switch (method) {
     case 'legacy':
       data = common.bakeUrlData(type, e, false, false);
diff --git a/benchmark/url/legacy-vs-whatwg-url-parse.js b/benchmark/url/legacy-vs-whatwg-url-parse.js
@@ -46,7 +46,6 @@ function useWHATWGWithoutBase(data) {
 }
 
 function main({ e, method, type, withBase }) {
-  e = +e;
   withBase = withBase === 'true';
   var noDead;  // Avoid dead code elimination.
   var data;
diff --git a/benchmark/url/legacy-vs-whatwg-url-serialize.js b/benchmark/url/legacy-vs-whatwg-url-serialize.js
@@ -35,7 +35,6 @@ function useWHATWG(data) {
 }
 
 function main({ type, e, method }) {
-  e = +e;
   const data = common.bakeUrlData(type, e, false, false);
 
   var noDead;  // Avoid dead code elimination.
diff --git a/benchmark/url/whatwg-url-properties.js b/benchmark/url/whatwg-url-properties.js
@@ -34,7 +34,6 @@ function get(data, prop) {
 }
 
 function main({ e, type, prop, withBase }) {
-  e = +e;
   withBase = withBase === 'true';
   const data = common.bakeUrlData(type, e, withBase, true);
   switch (prop) {
diff --git a/benchmark/worker/echo.js b/benchmark/worker/echo.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const common = require('../common.js');
+const { Worker } = require('worker_threads');
 const path = require('path');
 const bench = common.createBenchmark(main, {
   workers: [1],
@@ -11,19 +12,14 @@ const bench = common.createBenchmark(main, {
 
 const workerPath = path.resolve(__dirname, '..', 'fixtures', 'echo.worker.js');
 
-function main(conf) {
-  const { Worker } = require('worker_threads');
-
-  const n = +conf.n;
-  const workers = +conf.workers;
-  const sends = +conf.sendsPerBroadcast;
+function main({ n, workers, sendsPerBroadcast: sends, payload: payloadType }) {
   const expectedPerBroadcast = sends * workers;
-  var payload;
-  var readies = 0;
-  var broadcasts = 0;
-  var msgCount = 0;
+  let payload;
+  let readies = 0;
+  let broadcasts = 0;
+  let msgCount = 0;
 
-  switch (conf.payload) {
+  switch (payloadType) {
     case 'string':
       payload = 'hello world!';
       break;

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ function useWHATWGWithoutBase(data) {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`function main({ e, method, type, withBase }) {`
`49`		`- e = +e;`
`50`	`49`	`withBase = withBase === 'true';`
`51`	`50`	`var noDead; // Avoid dead code elimination.`
`52`	`51`	`var data;`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ function useWHATWG(data) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`function main({ type, e, method }) {`
`38`		`- e = +e;`
`39`	`38`	`const data = common.bakeUrlData(type, e, false, false);`
`40`	`39`
`41`	`40`	`var noDead; // Avoid dead code elimination.`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ function get(data, prop) {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`function main({ e, type, prop, withBase }) {`
`37`		`- e = +e;`
`38`	`37`	`withBase = withBase === 'true';`
`39`	`38`	`const data = common.bakeUrlData(type, e, withBase, true);`
`40`	`39`	`switch (prop) {`