Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

buffer: improve compare() performance #10927

Merged
merged 1 commit into from
Jan 25, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 63 additions & 9 deletions benchmark/buffers/buffer-compare-instance-method.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,80 @@ const v8 = require('v8');

const bench = common.createBenchmark(main, {
size: [16, 512, 1024, 4096, 16386],
args: [1, 2, 3, 4, 5],
millions: [1]
});

function main(conf) {
const iter = (conf.millions >>> 0) * 1e6;
const size = (conf.size >>> 0);
const b0 = new Buffer(size).fill('a');
const b1 = new Buffer(size).fill('a');
const args = (conf.args >>> 0);
const b0 = Buffer.alloc(size, 'a');
const b1 = Buffer.alloc(size, 'a');
const b0Len = b0.length;
const b1Len = b1.length;
var i;

b1[size - 1] = 'b'.charCodeAt(0);

// Force optimization before starting the benchmark
b0.compare(b1);
switch (args) {
case 2:
b0.compare(b1, 0);
break;
case 3:
b0.compare(b1, 0, b1Len);
break;
case 4:
b0.compare(b1, 0, b1Len, 0);
break;
case 5:
b0.compare(b1, 0, b1Len, 0, b0Len);
break;
default:
b0.compare(b1);
}
v8.setFlagsFromString('--allow_natives_syntax');
eval('%OptimizeFunctionOnNextCall(b0.compare)');
b0.compare(b1);

bench.start();
for (var i = 0; i < iter; i++) {
b0.compare(b1);
switch (args) {
case 2:
b0.compare(b1, 0);
bench.start();
for (i = 0; i < iter; i++) {
b0.compare(b1, 0);
}
bench.end(iter / 1e6);
break;
case 3:
b0.compare(b1, 0, b1Len);
bench.start();
for (i = 0; i < iter; i++) {
b0.compare(b1, 0, b1Len);
}
bench.end(iter / 1e6);
break;
case 4:
b0.compare(b1, 0, b1Len, 0);
bench.start();
for (i = 0; i < iter; i++) {
b0.compare(b1, 0, b1Len, 0);
}
bench.end(iter / 1e6);
break;
case 5:
b0.compare(b1, 0, b1Len, 0, b0Len);
bench.start();
for (i = 0; i < iter; i++) {
b0.compare(b1, 0, b1Len, 0, b0Len);
}
bench.end(iter / 1e6);
break;
default:
b0.compare(b1);
bench.start();
for (i = 0; i < iter; i++) {
b0.compare(b1);
}
bench.end(iter / 1e6);
}
bench.end(iter / 1e6);
}
41 changes: 24 additions & 17 deletions lib/buffer.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
'use strict';

const binding = process.binding('buffer');
const { compare: compare_, compareOffset } = binding;
const { isArrayBuffer, isSharedArrayBuffer, isUint8Array } =
process.binding('util');
const bindingObj = {};
Expand Down Expand Up @@ -544,39 +545,45 @@ Buffer.prototype.compare = function compare(target,
end,
thisStart,
thisEnd) {

if (!isUint8Array(target))
throw new TypeError('Argument must be a Buffer or Uint8Array');
if (arguments.length === 1)
return compare_(this, target);

if (start === undefined)
start = 0;
else if (start < 0)
throw new RangeError('out of range index');
else
start >>>= 0;

if (end === undefined)
end = target.length;
else if (end > target.length)
throw new RangeError('out of range index');
else
end >>>= 0;

if (thisStart === undefined)
thisStart = 0;
else if (thisStart < 0)
throw new RangeError('out of range index');
else
thisStart >>>= 0;

if (thisEnd === undefined)
thisEnd = this.length;

if (start < 0 ||
end > target.length ||
thisStart < 0 ||
thisEnd > this.length) {
else if (thisEnd > this.length)
throw new RangeError('out of range index');
}
else
thisEnd >>>= 0;

if (thisStart >= thisEnd && start >= end)
return 0;
if (thisStart >= thisEnd)
return -1;
if (start >= end)
return (start >= end ? 0 : -1);
else if (start >= end)
return 1;

start >>>= 0;
end >>>= 0;
thisStart >>>= 0;
thisEnd >>>= 0;

return binding.compareOffset(this, target, start, thisStart, end, thisEnd);
return compareOffset(this, target, start, thisStart, end, thisEnd);
};


Expand Down