Permalink
Browse files

meta: merge node/master into node-chakracore/master

Merge 67ba8ff as of 2018-09-09
This commit was automatically generated. For any problems, please contact jackhorton

Reviewed-By: Kyle Farnung <kfarnung@microsoft.com>
  • Loading branch information...
chakrabot authored and kfarnung committed Sep 11, 2018
2 parents f8471b0 + 67ba8ff commit 71b13c476aaf4ef79c4690e291b2e261c72dfa3b
Showing 1,592 changed files with 88,590 additions and 73,697 deletions.
@@ -129,7 +129,7 @@ out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp \
config.gypi
$(PYTHON) tools/gyp_node.py -f make
config.gypi: configure
config.gypi: configure configure.py
@if [ -x config.status ]; then \
./config.status; \
else \
@@ -16,7 +16,7 @@ const inputs = {
};
const bench = common.createBenchmark(main, {
n: [4e6],
n: [1e5],
type: Object.keys(inputs)
});
@@ -4,8 +4,8 @@ const common = require('../common');
const util = require('util');
const bench = common.createBenchmark(main, {
n: [1e3],
len: [1e5],
n: [5e2],
len: [1e2, 1e5],
type: [
'denseArray',
'sparseArray',
@@ -3,7 +3,7 @@
const util = require('util');
const common = require('../common.js');
const bench = common.createBenchmark(main, { n: [1e6] });
const bench = common.createBenchmark(main, { n: [2e4] });
function main({ n }) {
const proxyA = new Proxy({}, { get: () => {} });
@@ -9,7 +9,7 @@ const opts = {
none: undefined
};
const bench = common.createBenchmark(main, {
n: [2e6],
n: [2e4],
method: [
'Object',
'Object_empty',
@@ -81,7 +81,7 @@ function main({ method, n, option }) {
benchmark(n, new Error('error'), options);
break;
case 'Array':
benchmark(n, Array(20).fill().map((_, i) => i), options);
benchmark(n, Array(50).fill().map((_, i) => i), options);
break;
case 'TypedArray':
obj = new Uint8Array(Array(50).fill().map((_, i) => i));
@@ -5,26 +5,23 @@ const assert = require('assert');
const groupedInputs = {
group_common: ['undefined', 'utf8', 'utf-8', 'base64',
'binary', 'latin1', 'ucs-2'],
group_upper: ['UTF-8', 'UTF8', 'UCS2', 'UTF-16LE',
'UTF16LE', 'BASE64', 'UCS-2'],
group_uncommon: ['foo', '1', 'false', 'undefined', '[]', '{}'],
'binary', 'latin1', 'ucs2'],
group_upper: ['UTF-8', 'UTF8', 'UCS2',
'UTF16LE', 'BASE64', 'UCS2'],
group_uncommon: ['foo'],
group_misc: ['', 'utf16le', 'hex', 'HEX', 'BINARY']
};
const inputs = [
'',
'utf8', 'utf-8', 'UTF-8',
'UTF8', 'Utf8', 'uTf-8', 'utF-8',
'ucs2', 'UCS2', 'UcS2',
'ucs-2', 'UCS-2', 'UcS-2',
'utf16le', 'utf-16le', 'UTF-16LE', 'UTF16LE',
'', 'utf8', 'utf-8', 'UTF-8', 'UTF8', 'Utf8',
'ucs2', 'UCS2', 'utf16le', 'UTF16LE',
'binary', 'BINARY', 'latin1', 'base64', 'BASE64',
'hex', 'HEX', 'foo', '1', 'false', 'undefined', '[]', '{}'];
'hex', 'HEX', 'foo', 'undefined'
];
const bench = common.createBenchmark(main, {
input: inputs.concat(Object.keys(groupedInputs)),
n: [1e7]
n: [1e5]
}, {
flags: '--expose-internals'
});
@@ -39,16 +36,8 @@ function getInput(input) {
return groupedInputs.group_uncommon;
case 'group_misc':
return groupedInputs.group_misc;
case '1':
return [1];
case 'false':
return [false];
case 'undefined':
return [undefined];
case '[]':
return [[]];
case '{}':
return [{}];
default:
return [input];
}
@@ -3,7 +3,7 @@
const common = require('../common');
const bench = common.createBenchmark(main, {
n: [1e6]
n: [1e5]
}, { flags: ['--expose-internals'] });
function main({ n, type }) {
@@ -3,7 +3,7 @@
const common = require('../common');
const bench = common.createBenchmark(main, {
n: [1e7],
n: [1e5],
pos: ['start', 'middle', 'end'],
size: [10, 100, 500],
}, { flags: ['--expose-internals'] });
@@ -29,7 +29,7 @@ const bench = common.createBenchmark(main, {
type: Object.keys(args),
version: ['native', 'js'],
argument: ['true', 'false-primitive', 'false-object'],
n: [5e6]
n: [1e5]
}, {
flags: ['--expose-internals']
});
@@ -31,7 +31,7 @@
# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.26',
'v8_embedder_string': '-node.9',
# Enable disassembler for `--print-code` v8 options
'v8_enable_disassembler': 1,
Oops, something went wrong.

0 comments on commit 71b13c4

Please sign in to comment.