From eb9e6c015705847190147201c587e1e668358a78 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Thu, 21 Feb 2019 03:26:27 -0800
Subject: [PATCH] test: improve performance of
 test-crypto-timing-safe-equal-benchmarks

Using `eval()` rather than `require()`'ing a fixture and deleting it
from the cache results in a roughtly 10x improvement in running time.

Fixes: https://github.com/nodejs/node/issues/25984
Refs: https://github.com/nodejs/node/issues/26229

PR-URL: https://github.com/nodejs/node/pull/26237
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Yang Guo <yangguo@chromium.org>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Teddy Katz <teddy.katz@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
---
 ...crypto-timing-safe-equal-benchmark-func.js | 17 ------------
 ...est-crypto-timing-safe-equal-benchmarks.js | 27 ++++++++++---------
 2 files changed, 15 insertions(+), 29 deletions(-)
 delete mode 100644 test/fixtures/crypto-timing-safe-equal-benchmark-func.js

diff --git a/test/fixtures/crypto-timing-safe-equal-benchmark-func.js b/test/fixtures/crypto-timing-safe-equal-benchmark-func.js
deleted file mode 100644
index 96470e3e4434a8..00000000000000
--- a/test/fixtures/crypto-timing-safe-equal-benchmark-func.js
+++ /dev/null
@@ -1,17 +0,0 @@
-'use strict';
-
-const assert = require('assert');
-module.exports = (compareFunc, firstBufFill, secondBufFill, bufSize) => {
-  const firstBuffer = Buffer.alloc(bufSize, firstBufFill);
-  const secondBuffer = Buffer.alloc(bufSize, secondBufFill);
-
-  const startTime = process.hrtime();
-  const result = compareFunc(firstBuffer, secondBuffer);
-  const endTime = process.hrtime(startTime);
-
-  // Ensure that the result of the function call gets used, so it doesn't
-  // get discarded due to engine optimizations.
-  assert.strictEqual(result, firstBufFill === secondBufFill);
-
-  return endTime[0] * 1e9 + endTime[1];
-};
diff --git a/test/pummel/test-crypto-timing-safe-equal-benchmarks.js b/test/pummel/test-crypto-timing-safe-equal-benchmarks.js
index 0592b9a0d63674..b649b071e1e49d 100644
--- a/test/pummel/test-crypto-timing-safe-equal-benchmarks.js
+++ b/test/pummel/test-crypto-timing-safe-equal-benchmarks.js
@@ -6,21 +6,24 @@ if (!common.hasCrypto)
 if (!common.enoughTestMem)
   common.skip('memory-intensive test');
 
-const fixtures = require('../common/fixtures');
 const assert = require('assert');
 const crypto = require('crypto');
 
-const BENCHMARK_FUNC_PATH =
-  `${fixtures.fixturesDir}/crypto-timing-safe-equal-benchmark-func`;
-function runOneBenchmark(...args) {
-  const benchmarkFunc = require(BENCHMARK_FUNC_PATH);
-  const result = benchmarkFunc(...args);
-
-  // Don't let the comparison function get cached. This avoid a timing
-  // inconsistency due to V8 optimization where the function would take
-  // less time when called with a specific set of parameters.
-  delete require.cache[require.resolve(BENCHMARK_FUNC_PATH)];
-  return result;
+function runOneBenchmark(compareFunc, firstBufFill, secondBufFill, bufSize) {
+  return eval(`
+      const firstBuffer = Buffer.alloc(bufSize, firstBufFill);
+      const secondBuffer = Buffer.alloc(bufSize, secondBufFill);
+
+      const startTime = process.hrtime();
+      const result = compareFunc(firstBuffer, secondBuffer);
+      const endTime = process.hrtime(startTime);
+
+      // Ensure that the result of the function call gets used, so it doesn't
+      // get discarded due to engine optimizations.
+      assert.strictEqual(result, firstBufFill === secondBufFill);
+
+      endTime[0] * 1e9 + endTime[1];
+    `);
 }
 
 function getTValue(compareFunc) {