buffer: improve compare() performance
PR-URL: https://github.com/nodejs/node/pull/10927 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
parent
39f65e6656
commit
9e0f6a5eb4
@ -4,26 +4,80 @@ const v8 = require('v8');
|
|||||||
|
|
||||||
const bench = common.createBenchmark(main, {
|
const bench = common.createBenchmark(main, {
|
||||||
size: [16, 512, 1024, 4096, 16386],
|
size: [16, 512, 1024, 4096, 16386],
|
||||||
|
args: [1, 2, 3, 4, 5],
|
||||||
millions: [1]
|
millions: [1]
|
||||||
});
|
});
|
||||||
|
|
||||||
function main(conf) {
|
function main(conf) {
|
||||||
const iter = (conf.millions >>> 0) * 1e6;
|
const iter = (conf.millions >>> 0) * 1e6;
|
||||||
const size = (conf.size >>> 0);
|
const size = (conf.size >>> 0);
|
||||||
const b0 = new Buffer(size).fill('a');
|
const args = (conf.args >>> 0);
|
||||||
const b1 = new Buffer(size).fill('a');
|
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);
|
b1[size - 1] = 'b'.charCodeAt(0);
|
||||||
|
|
||||||
// Force optimization before starting the benchmark
|
// Force optimization before starting the benchmark
|
||||||
|
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);
|
b0.compare(b1);
|
||||||
|
}
|
||||||
v8.setFlagsFromString('--allow_natives_syntax');
|
v8.setFlagsFromString('--allow_natives_syntax');
|
||||||
eval('%OptimizeFunctionOnNextCall(b0.compare)');
|
eval('%OptimizeFunctionOnNextCall(b0.compare)');
|
||||||
b0.compare(b1);
|
switch (args) {
|
||||||
|
case 2:
|
||||||
|
b0.compare(b1, 0);
|
||||||
bench.start();
|
bench.start();
|
||||||
for (var i = 0; i < iter; i++) {
|
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);
|
b0.compare(b1);
|
||||||
}
|
}
|
||||||
bench.end(iter / 1e6);
|
bench.end(iter / 1e6);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
const binding = process.binding('buffer');
|
const binding = process.binding('buffer');
|
||||||
|
const { compare: compare_, compareOffset } = binding;
|
||||||
const { isArrayBuffer, isSharedArrayBuffer, isUint8Array } =
|
const { isArrayBuffer, isSharedArrayBuffer, isUint8Array } =
|
||||||
process.binding('util');
|
process.binding('util');
|
||||||
const bindingObj = {};
|
const bindingObj = {};
|
||||||
@ -544,39 +545,45 @@ Buffer.prototype.compare = function compare(target,
|
|||||||
end,
|
end,
|
||||||
thisStart,
|
thisStart,
|
||||||
thisEnd) {
|
thisEnd) {
|
||||||
|
|
||||||
if (!isUint8Array(target))
|
if (!isUint8Array(target))
|
||||||
throw new TypeError('Argument must be a Buffer or Uint8Array');
|
throw new TypeError('Argument must be a Buffer or Uint8Array');
|
||||||
|
if (arguments.length === 1)
|
||||||
|
return compare_(this, target);
|
||||||
|
|
||||||
if (start === undefined)
|
if (start === undefined)
|
||||||
start = 0;
|
start = 0;
|
||||||
|
else if (start < 0)
|
||||||
|
throw new RangeError('out of range index');
|
||||||
|
else
|
||||||
|
start >>>= 0;
|
||||||
|
|
||||||
if (end === undefined)
|
if (end === undefined)
|
||||||
end = target.length;
|
end = target.length;
|
||||||
|
else if (end > target.length)
|
||||||
|
throw new RangeError('out of range index');
|
||||||
|
else
|
||||||
|
end >>>= 0;
|
||||||
|
|
||||||
if (thisStart === undefined)
|
if (thisStart === undefined)
|
||||||
thisStart = 0;
|
thisStart = 0;
|
||||||
|
else if (thisStart < 0)
|
||||||
|
throw new RangeError('out of range index');
|
||||||
|
else
|
||||||
|
thisStart >>>= 0;
|
||||||
|
|
||||||
if (thisEnd === undefined)
|
if (thisEnd === undefined)
|
||||||
thisEnd = this.length;
|
thisEnd = this.length;
|
||||||
|
else if (thisEnd > this.length)
|
||||||
if (start < 0 ||
|
|
||||||
end > target.length ||
|
|
||||||
thisStart < 0 ||
|
|
||||||
thisEnd > this.length) {
|
|
||||||
throw new RangeError('out of range index');
|
throw new RangeError('out of range index');
|
||||||
}
|
else
|
||||||
|
|
||||||
if (thisStart >= thisEnd && start >= end)
|
|
||||||
return 0;
|
|
||||||
if (thisStart >= thisEnd)
|
|
||||||
return -1;
|
|
||||||
if (start >= end)
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
start >>>= 0;
|
|
||||||
end >>>= 0;
|
|
||||||
thisStart >>>= 0;
|
|
||||||
thisEnd >>>= 0;
|
thisEnd >>>= 0;
|
||||||
|
|
||||||
return binding.compareOffset(this, target, start, thisStart, end, thisEnd);
|
if (thisStart >= thisEnd)
|
||||||
|
return (start >= end ? 0 : -1);
|
||||||
|
else if (start >= end)
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
return compareOffset(this, target, start, thisStart, end, thisEnd);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user