Merge branch 'fix-large-text-benchmark'

Author: aminya

benchmark/marker-index.benchmark.js

@@ -1,6 +1,10 @@
 'use strict';
 
+console.log(' running marker-index tests... \n')
+
 const Random = require('random-seed')
+const {performance} = require("perf_hooks")
+
 const {MarkerIndex} = require('..')
 const {traverse, traversalDistance, compare} = require('../test/js/helpers/point-helpers')
 
@@ -41,12 +45,13 @@ function runBenchmark () {
 }
 
 function profileOperations (name, operations) {
-  console.time(name)
+  const ti1 = performance.now()
   for (let i = 0, n = operations.length; i < n; i++) {
     const operation = operations[i]
     markerIndex[operation[0]].apply(markerIndex, operation[1])
   }
-  console.timeEnd(name)
+  const tf1 = performance.now()
+  console.log(`${name} ${' '.repeat(80-name.length)} ${(tf1-ti1).toFixed(3)} ms`)
 }
 
 function enqueueSequentialInsert () {
@@ -118,3 +123,5 @@ function getSplice () {
 }
 
 runBenchmark()
+
+console.log(' \n marker-index finished \n')

benchmark/text-buffer.benchmark.js

@@ -1,4 +1,8 @@
+console.log(' running text-buffer tests... \n')
+
 const assert = require('assert')
+const {performance} = require("perf_hooks")
+
 const {TextBuffer} = require('..')
 
 const text = 'abc def ghi jkl\n'.repeat(1024 * 1024)
@@ -8,14 +12,15 @@ const trialCount = 10
 
 function benchmarkSearch(description, pattern, expectedPosition) {
   let name = `Search for ${description} - TextBuffer`
-  console.time(name)
+  const ti1 = performance.now()
   for (let i = 0; i < trialCount; i++) {
-    assert.deepEqual(buffer.searchSync(pattern), expectedPosition)
+    assert.deepEqual(buffer.findSync(pattern), expectedPosition)
   }
-  console.timeEnd(name)
+  const tf1 = performance.now()
+  console.log(`${name} ${' '.repeat(80-name.length)} ${(tf1-ti1).toFixed(3)} ms`)
 
   name = `Search for ${description} - lines array`
-  console.time(name)
+  const ti2 = performance.now()
   const regex = new RegExp(pattern)
   for (let i = 0; i < trialCount; i++) {
     for (let row = 0, rowCount = lines.length; row < rowCount; row++) {
@@ -32,11 +37,14 @@ function benchmarkSearch(description, pattern, expectedPosition) {
       }
     }
   }
-  console.timeEnd(name)
-  console.log()
+  const tf2 = performance.now()
+  console.log(`${name} ${' '.repeat(80-name.length)} ${(tf2-ti2).toFixed(3)} ms`)
 }
 
 benchmarkSearch('simple non-existent pattern', '\t', null)
 benchmarkSearch('complex non-existent pattern', '123|456|789', null)
 benchmarkSearch('simple existing pattern', 'jkl', {start: {row: 0, column: 12}, end: {row: 0, column: 15}})
-benchmarkSearch('complex existing pattern', 'j\\w+', {start: {row: 0, column: 12}, end: {row: 0, column: 15}})
+benchmarkSearch('complex existing pattern', 'j\\w+', {start: {row: 0, column: 12}, end: {row: 0, column: 15}})
+
+
+console.log('\n text-buffer finished \n')

package.json

@@ -12,7 +12,7 @@
     "test:node": "mocha test/js/*.js",
     "test:browser": "SUPERSTRING_USE_BROWSER_VERSION=1 mocha test/js/*.js",
     "test": "npm run test:node && npm run test:browser",
-    "benchmark": "node benchmark/marker-index.benchmark.js && node benchmark/large-text-buffer.benchmark.js",
+    "benchmark": "node benchmark/text-buffer.benchmark.js && node benchmark/marker-index.benchmark.js && node benchmark/large-text-buffer.benchmark.js",
     "prepublishOnly": "git submodule update --init --recursive && npm run build:browser",
     "standard": "standard --recursive src test",
     "format": "clang-format -i src/core/*.cc src/core/*.h src/bindings/*.cc src/bindings/*.h src/bindings/em/*.cc src/bindings/em/*.h",