From e4de256cddbf252e7a166ecac0e22acd9560be68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Wed, 28 Jul 2021 07:10:29 -0400 Subject: [PATCH] chore: reorganize benchmarks (#13606) --- .../many-empty-statements/bench.mjs | 4 +-- .../many-identifiers/1-length.mjs | 4 +-- .../many-identifiers/25-length.mjs | 4 +-- .../babel-generator}/real-case/jquery-3.6.txt | 0 .../babel-generator}/real-case/jquery.mjs | 4 +-- .../identifier.bench.mjs | 0 .../isIdentifierChar.bench.mjs | 6 ++-- .../isIdentifierName.bench.mjs | 6 ++-- .../isIdentifierStart.bench.mjs | 6 ++-- .../isKeyword.bench.mjs | 6 ++-- .../isStrictBindReservedWord.bench.mjs | 6 ++-- .../babel-parser}/large-regexp/bench.mjs | 4 +-- .../many-arrow-function-flow-types/bench.mjs | 4 +-- .../babel-parser}/many-async-arrows/bench.mjs | 4 +-- .../1-length.bench.mjs | 4 +-- .../attachComment-false.bench.mjs | 4 +-- .../many-identifiers/1-length.bench.mjs | 4 +-- .../many-identifiers/11-length.bench.mjs | 4 +-- .../many-identifiers/2-length.bench.mjs | 4 +-- .../babel-parser}/many-identifiers/await.mjs | 4 +-- .../many-inner-comments-nested/bench.mjs | 4 +-- .../many-inner-comments/bench.mjs | 4 +-- .../many-leading-comments-nested/bench.mjs | 4 +-- .../many-leading-comments/bench.mjs | 4 +-- .../many-leading-trailing-comments/bench.mjs | 4 +-- .../10-length-binding.mjs | 4 +-- .../1-length-binding.mjs | 4 +-- .../many-named-export/1-length.bench.mjs | 4 +-- .../many-small-all-flags-regexp/bench.mjs | 4 +-- .../many-trailing-comments-nested/bench.mjs | 4 +-- .../many-trailing-comments/bench.mjs | 4 +-- benchmark/package.json | 14 ++++++++ .../benchmark => benchmark}/util.mjs | 0 package.json | 3 +- packages/babel-generator/package.json | 2 -- .../.npmignore | 1 - .../benchmark/util.mjs | 17 --------- .../package.json | 2 -- packages/babel-parser/benchmark/util.mjs | 17 --------- packages/babel-parser/package.json | 2 -- yarn.lock | 36 +++++++++++-------- 41 files changed, 101 insertions(+), 119 deletions(-) rename {packages/babel-generator/benchmark => benchmark/babel-generator}/many-empty-statements/bench.mjs (88%) rename {packages/babel-generator/benchmark => benchmark/babel-generator}/many-identifiers/1-length.mjs (88%) rename {packages/babel-generator/benchmark => benchmark/babel-generator}/many-identifiers/25-length.mjs (88%) rename {packages/babel-generator/benchmark => benchmark/babel-generator}/real-case/jquery-3.6.txt (100%) rename {packages/babel-generator/benchmark => benchmark/babel-generator}/real-case/jquery.mjs (89%) rename {packages/babel-helper-validator-identifier/benchmark => benchmark/babel-helper-validator-identifier}/identifier.bench.mjs (100%) rename {packages/babel-helper-validator-identifier/benchmark => benchmark/babel-helper-validator-identifier}/isIdentifierChar.bench.mjs (83%) rename {packages/babel-helper-validator-identifier/benchmark => benchmark/babel-helper-validator-identifier}/isIdentifierName.bench.mjs (83%) rename {packages/babel-helper-validator-identifier/benchmark => benchmark/babel-helper-validator-identifier}/isIdentifierStart.bench.mjs (83%) rename {packages/babel-helper-validator-identifier/benchmark => benchmark/babel-helper-validator-identifier}/isKeyword.bench.mjs (80%) rename {packages/babel-helper-validator-identifier/benchmark => benchmark/babel-helper-validator-identifier}/isStrictBindReservedWord.bench.mjs (83%) rename {packages/babel-parser/benchmark => benchmark/babel-parser}/large-regexp/bench.mjs (87%) rename {packages/babel-parser/benchmark => benchmark/babel-parser}/many-arrow-function-flow-types/bench.mjs (88%) rename {packages/babel-parser/benchmark => benchmark/babel-parser}/many-async-arrows/bench.mjs (87%) rename {packages/babel-parser/benchmark => benchmark/babel-parser}/many-class-private-properties/1-length.bench.mjs (92%) rename {packages/babel-parser/benchmark => benchmark/babel-parser}/many-empty-statements/attachComment-false.bench.mjs (86%) rename {packages/babel-parser/benchmark => benchmark/babel-parser}/many-identifiers/1-length.bench.mjs (87%) rename {packages/babel-parser/benchmark => benchmark/babel-parser}/many-identifiers/11-length.bench.mjs (87%) rename {packages/babel-parser/benchmark => benchmark/babel-parser}/many-identifiers/2-length.bench.mjs (87%) rename {packages/babel-parser/benchmark => benchmark/babel-parser}/many-identifiers/await.mjs (87%) rename {packages/babel-parser/benchmark => benchmark/babel-parser}/many-inner-comments-nested/bench.mjs (87%) rename {packages/babel-parser/benchmark => benchmark/babel-parser}/many-inner-comments/bench.mjs (88%) rename {packages/babel-parser/benchmark => benchmark/babel-parser}/many-leading-comments-nested/bench.mjs (88%) rename {packages/babel-parser/benchmark => benchmark/babel-parser}/many-leading-comments/bench.mjs (88%) rename {packages/babel-parser/benchmark => benchmark/babel-parser}/many-leading-trailing-comments/bench.mjs (89%) rename {packages/babel-parser/benchmark => benchmark/babel-parser}/many-let-declarations-within-block/10-length-binding.mjs (87%) rename {packages/babel-parser/benchmark => benchmark/babel-parser}/many-let-declarations/1-length-binding.mjs (92%) rename {packages/babel-parser/benchmark => benchmark/babel-parser}/many-named-export/1-length.bench.mjs (92%) rename {packages/babel-parser/benchmark => benchmark/babel-parser}/many-small-all-flags-regexp/bench.mjs (87%) rename {packages/babel-parser/benchmark => benchmark/babel-parser}/many-trailing-comments-nested/bench.mjs (87%) rename {packages/babel-parser/benchmark => benchmark/babel-parser}/many-trailing-comments/bench.mjs (88%) create mode 100644 benchmark/package.json rename {packages/babel-generator/benchmark => benchmark}/util.mjs (100%) delete mode 100644 packages/babel-helper-validator-identifier/benchmark/util.mjs delete mode 100644 packages/babel-parser/benchmark/util.mjs diff --git a/packages/babel-generator/benchmark/many-empty-statements/bench.mjs b/benchmark/babel-generator/many-empty-statements/bench.mjs similarity index 88% rename from packages/babel-generator/benchmark/many-empty-statements/bench.mjs rename to benchmark/babel-generator/many-empty-statements/bench.mjs index 44c599e1e52c..8fa5d14f39a9 100644 --- a/packages/babel-generator/benchmark/many-empty-statements/bench.mjs +++ b/benchmark/babel-generator/many-empty-statements/bench.mjs @@ -1,8 +1,8 @@ import Benchmark from "benchmark"; import baseline from "@babel-baseline/generator"; -import current from "../../lib/index.js"; +import current from "@babel/generator"; import parser from "@babel/parser"; -import { report } from "../util.mjs"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); diff --git a/packages/babel-generator/benchmark/many-identifiers/1-length.mjs b/benchmark/babel-generator/many-identifiers/1-length.mjs similarity index 88% rename from packages/babel-generator/benchmark/many-identifiers/1-length.mjs rename to benchmark/babel-generator/many-identifiers/1-length.mjs index e296ae7d7c03..8e9c28a0a271 100644 --- a/packages/babel-generator/benchmark/many-identifiers/1-length.mjs +++ b/benchmark/babel-generator/many-identifiers/1-length.mjs @@ -1,8 +1,8 @@ import Benchmark from "benchmark"; import baseline from "@babel-baseline/generator"; -import current from "../../lib/index.js"; +import current from "@babel/generator"; import parser from "@babel/parser"; -import { report } from "../util.mjs"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); diff --git a/packages/babel-generator/benchmark/many-identifiers/25-length.mjs b/benchmark/babel-generator/many-identifiers/25-length.mjs similarity index 88% rename from packages/babel-generator/benchmark/many-identifiers/25-length.mjs rename to benchmark/babel-generator/many-identifiers/25-length.mjs index f9d8ae07e16f..9bc9f0be39eb 100644 --- a/packages/babel-generator/benchmark/many-identifiers/25-length.mjs +++ b/benchmark/babel-generator/many-identifiers/25-length.mjs @@ -1,8 +1,8 @@ import Benchmark from "benchmark"; import baseline from "@babel-baseline/generator"; -import current from "../../lib/index.js"; +import current from "@babel/generator"; import parser from "@babel/parser"; -import { report } from "../util.mjs"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); diff --git a/packages/babel-generator/benchmark/real-case/jquery-3.6.txt b/benchmark/babel-generator/real-case/jquery-3.6.txt similarity index 100% rename from packages/babel-generator/benchmark/real-case/jquery-3.6.txt rename to benchmark/babel-generator/real-case/jquery-3.6.txt diff --git a/packages/babel-generator/benchmark/real-case/jquery.mjs b/benchmark/babel-generator/real-case/jquery.mjs similarity index 89% rename from packages/babel-generator/benchmark/real-case/jquery.mjs rename to benchmark/babel-generator/real-case/jquery.mjs index 0b53d3933021..90d40d12d565 100644 --- a/packages/babel-generator/benchmark/real-case/jquery.mjs +++ b/benchmark/babel-generator/real-case/jquery.mjs @@ -1,8 +1,8 @@ import Benchmark from "benchmark"; import baseline from "@babel-baseline/generator"; -import current from "../../lib/index.js"; +import current from "@babel/generator"; import parser from "@babel/parser"; -import { report } from "../util.mjs"; +import { report } from "../../util.mjs"; import { readFileSync } from "fs"; const suite = new Benchmark.Suite(); diff --git a/packages/babel-helper-validator-identifier/benchmark/identifier.bench.mjs b/benchmark/babel-helper-validator-identifier/identifier.bench.mjs similarity index 100% rename from packages/babel-helper-validator-identifier/benchmark/identifier.bench.mjs rename to benchmark/babel-helper-validator-identifier/identifier.bench.mjs diff --git a/packages/babel-helper-validator-identifier/benchmark/isIdentifierChar.bench.mjs b/benchmark/babel-helper-validator-identifier/isIdentifierChar.bench.mjs similarity index 83% rename from packages/babel-helper-validator-identifier/benchmark/isIdentifierChar.bench.mjs rename to benchmark/babel-helper-validator-identifier/isIdentifierChar.bench.mjs index 27f7ac51efe4..b23936fa041f 100644 --- a/packages/babel-helper-validator-identifier/benchmark/isIdentifierChar.bench.mjs +++ b/benchmark/babel-helper-validator-identifier/isIdentifierChar.bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; -import baseline from "@babel/helper-validator-identifier-baseline"; -import current from "../lib/index.js"; -import { report } from "./util.mjs"; +import baseline from "@babel-baseline/helper-validator-identifier"; +import current from "@babel/helper-validator-identifier"; +import { report } from "../util.mjs"; const suite = new Benchmark.Suite(); diff --git a/packages/babel-helper-validator-identifier/benchmark/isIdentifierName.bench.mjs b/benchmark/babel-helper-validator-identifier/isIdentifierName.bench.mjs similarity index 83% rename from packages/babel-helper-validator-identifier/benchmark/isIdentifierName.bench.mjs rename to benchmark/babel-helper-validator-identifier/isIdentifierName.bench.mjs index 31ecfb3d7185..03d47e451dc1 100644 --- a/packages/babel-helper-validator-identifier/benchmark/isIdentifierName.bench.mjs +++ b/benchmark/babel-helper-validator-identifier/isIdentifierName.bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; -import baseline from "@babel/helper-validator-identifier-baseline"; -import current from "../lib/index.js"; -import { report } from "./util.mjs"; +import baseline from "@babel-baseline/helper-validator-identifier"; +import current from "@babel/helper-validator-identifier"; +import { report } from "../util.mjs"; const suite = new Benchmark.Suite(); diff --git a/packages/babel-helper-validator-identifier/benchmark/isIdentifierStart.bench.mjs b/benchmark/babel-helper-validator-identifier/isIdentifierStart.bench.mjs similarity index 83% rename from packages/babel-helper-validator-identifier/benchmark/isIdentifierStart.bench.mjs rename to benchmark/babel-helper-validator-identifier/isIdentifierStart.bench.mjs index f106514cf5d0..3e6bf76e0ce1 100644 --- a/packages/babel-helper-validator-identifier/benchmark/isIdentifierStart.bench.mjs +++ b/benchmark/babel-helper-validator-identifier/isIdentifierStart.bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; -import baseline from "@babel/helper-validator-identifier-baseline"; -import current from "../lib/index.js"; -import { report } from "./util.mjs"; +import baseline from "@babel-baseline/helper-validator-identifier"; +import current from "@babel/helper-validator-identifier"; +import { report } from "../util.mjs"; const suite = new Benchmark.Suite(); diff --git a/packages/babel-helper-validator-identifier/benchmark/isKeyword.bench.mjs b/benchmark/babel-helper-validator-identifier/isKeyword.bench.mjs similarity index 80% rename from packages/babel-helper-validator-identifier/benchmark/isKeyword.bench.mjs rename to benchmark/babel-helper-validator-identifier/isKeyword.bench.mjs index 2366ce6917eb..d9016a7223f4 100644 --- a/packages/babel-helper-validator-identifier/benchmark/isKeyword.bench.mjs +++ b/benchmark/babel-helper-validator-identifier/isKeyword.bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; -import baseline from "@babel/helper-validator-identifier-baseline"; -import current from "../lib/index.js"; -import { report } from "./util.mjs"; +import baseline from "@babel-baseline/helper-validator-identifier"; +import current from "@babel/helper-validator-identifier"; +import { report } from "../util.mjs"; const suite = new Benchmark.Suite(); diff --git a/packages/babel-helper-validator-identifier/benchmark/isStrictBindReservedWord.bench.mjs b/benchmark/babel-helper-validator-identifier/isStrictBindReservedWord.bench.mjs similarity index 83% rename from packages/babel-helper-validator-identifier/benchmark/isStrictBindReservedWord.bench.mjs rename to benchmark/babel-helper-validator-identifier/isStrictBindReservedWord.bench.mjs index 713e926d1efd..e8d40cf6961f 100644 --- a/packages/babel-helper-validator-identifier/benchmark/isStrictBindReservedWord.bench.mjs +++ b/benchmark/babel-helper-validator-identifier/isStrictBindReservedWord.bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; -import baseline from "@babel/helper-validator-identifier-baseline"; -import current from "../lib/index.js"; -import { report } from "./util.mjs"; +import baseline from "@babel-baseline/helper-validator-identifier"; +import current from "@babel/helper-validator-identifier"; +import { report } from "../util.mjs"; const suite = new Benchmark.Suite(); diff --git a/packages/babel-parser/benchmark/large-regexp/bench.mjs b/benchmark/babel-parser/large-regexp/bench.mjs similarity index 87% rename from packages/babel-parser/benchmark/large-regexp/bench.mjs rename to benchmark/babel-parser/large-regexp/bench.mjs index 67a6bdfb08e7..69e3766e038d 100644 --- a/packages/babel-parser/benchmark/large-regexp/bench.mjs +++ b/benchmark/babel-parser/large-regexp/bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; import baseline from "@babel-baseline/parser"; -import current from "../../lib/index.js"; -import { report } from "../util.mjs"; +import current from "@babel/parser"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); function createInput(length) { diff --git a/packages/babel-parser/benchmark/many-arrow-function-flow-types/bench.mjs b/benchmark/babel-parser/many-arrow-function-flow-types/bench.mjs similarity index 88% rename from packages/babel-parser/benchmark/many-arrow-function-flow-types/bench.mjs rename to benchmark/babel-parser/many-arrow-function-flow-types/bench.mjs index b57eee28f278..ce4f76b8c4a9 100644 --- a/packages/babel-parser/benchmark/many-arrow-function-flow-types/bench.mjs +++ b/benchmark/babel-parser/many-arrow-function-flow-types/bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; import baseline from "@babel-baseline/parser"; -import current from "../../lib/index.js"; -import { report } from "../util.mjs"; +import current from "@babel/parser"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); function createInput(length) { diff --git a/packages/babel-parser/benchmark/many-async-arrows/bench.mjs b/benchmark/babel-parser/many-async-arrows/bench.mjs similarity index 87% rename from packages/babel-parser/benchmark/many-async-arrows/bench.mjs rename to benchmark/babel-parser/many-async-arrows/bench.mjs index 030e52353501..6d088a3212e3 100644 --- a/packages/babel-parser/benchmark/many-async-arrows/bench.mjs +++ b/benchmark/babel-parser/many-async-arrows/bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; import baseline from "@babel-baseline/parser"; -import current from "../../lib/index.js"; -import { report } from "../util.mjs"; +import current from "@babel/parser"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); function createInput(length) { diff --git a/packages/babel-parser/benchmark/many-class-private-properties/1-length.bench.mjs b/benchmark/babel-parser/many-class-private-properties/1-length.bench.mjs similarity index 92% rename from packages/babel-parser/benchmark/many-class-private-properties/1-length.bench.mjs rename to benchmark/babel-parser/many-class-private-properties/1-length.bench.mjs index b8d7e31d7832..670d2eb2b603 100644 --- a/packages/babel-parser/benchmark/many-class-private-properties/1-length.bench.mjs +++ b/benchmark/babel-parser/many-class-private-properties/1-length.bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; import baseline from "@babel-baseline/parser"; -import current from "../../lib/index.js"; -import { report } from "../util.mjs"; +import current from "@babel/parser"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); // All codepoints in [0x4e00, 0x9ffc] are valid identifier name per Unicode 13 diff --git a/packages/babel-parser/benchmark/many-empty-statements/attachComment-false.bench.mjs b/benchmark/babel-parser/many-empty-statements/attachComment-false.bench.mjs similarity index 86% rename from packages/babel-parser/benchmark/many-empty-statements/attachComment-false.bench.mjs rename to benchmark/babel-parser/many-empty-statements/attachComment-false.bench.mjs index a75b586b49e1..6dd79a42e6ab 100644 --- a/packages/babel-parser/benchmark/many-empty-statements/attachComment-false.bench.mjs +++ b/benchmark/babel-parser/many-empty-statements/attachComment-false.bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; import baseline from "@babel-baseline/parser"; -import current from "../../lib/index.js"; -import { report } from "../util.mjs"; +import current from "@babel/parser"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); diff --git a/packages/babel-parser/benchmark/many-identifiers/1-length.bench.mjs b/benchmark/babel-parser/many-identifiers/1-length.bench.mjs similarity index 87% rename from packages/babel-parser/benchmark/many-identifiers/1-length.bench.mjs rename to benchmark/babel-parser/many-identifiers/1-length.bench.mjs index df6605795ad2..b07a22b16376 100644 --- a/packages/babel-parser/benchmark/many-identifiers/1-length.bench.mjs +++ b/benchmark/babel-parser/many-identifiers/1-length.bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; import baseline from "@babel-baseline/parser"; -import current from "../../lib/index.js"; -import { report } from "../util.mjs"; +import current from "@babel/parser"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); function createInput(length) { diff --git a/packages/babel-parser/benchmark/many-identifiers/11-length.bench.mjs b/benchmark/babel-parser/many-identifiers/11-length.bench.mjs similarity index 87% rename from packages/babel-parser/benchmark/many-identifiers/11-length.bench.mjs rename to benchmark/babel-parser/many-identifiers/11-length.bench.mjs index 67d3c259280a..6b3acca8ba0a 100644 --- a/packages/babel-parser/benchmark/many-identifiers/11-length.bench.mjs +++ b/benchmark/babel-parser/many-identifiers/11-length.bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; import baseline from "../../lib/index-main.js"; -import current from "../../lib/index.js"; -import { report } from "../util.mjs"; +import current from "@babel/parser"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); function createInput(length) { diff --git a/packages/babel-parser/benchmark/many-identifiers/2-length.bench.mjs b/benchmark/babel-parser/many-identifiers/2-length.bench.mjs similarity index 87% rename from packages/babel-parser/benchmark/many-identifiers/2-length.bench.mjs rename to benchmark/babel-parser/many-identifiers/2-length.bench.mjs index 4d6453c6f439..a06ec563aa4d 100644 --- a/packages/babel-parser/benchmark/many-identifiers/2-length.bench.mjs +++ b/benchmark/babel-parser/many-identifiers/2-length.bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; import baseline from "@babel-baseline/parser"; -import current from "../../lib/index.js"; -import { report } from "../util.mjs"; +import current from "@babel/parser"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); function createInput(length) { diff --git a/packages/babel-parser/benchmark/many-identifiers/await.mjs b/benchmark/babel-parser/many-identifiers/await.mjs similarity index 87% rename from packages/babel-parser/benchmark/many-identifiers/await.mjs rename to benchmark/babel-parser/many-identifiers/await.mjs index 9bf634ecebd7..966dbc1340d8 100644 --- a/packages/babel-parser/benchmark/many-identifiers/await.mjs +++ b/benchmark/babel-parser/many-identifiers/await.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; import baseline from "../../lib/index-main.js"; -import current from "../../lib/index.js"; -import { report } from "../util.mjs"; +import current from "@babel/parser"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); function createInput(length) { diff --git a/packages/babel-parser/benchmark/many-inner-comments-nested/bench.mjs b/benchmark/babel-parser/many-inner-comments-nested/bench.mjs similarity index 87% rename from packages/babel-parser/benchmark/many-inner-comments-nested/bench.mjs rename to benchmark/babel-parser/many-inner-comments-nested/bench.mjs index 38d80f1a8d40..7602ab2b3cda 100644 --- a/packages/babel-parser/benchmark/many-inner-comments-nested/bench.mjs +++ b/benchmark/babel-parser/many-inner-comments-nested/bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; import baseline from "@babel-baseline/parser"; -import current from "../../lib/index.js"; -import { report } from "../util.mjs"; +import current from "@babel/parser"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); function createInput(length) { diff --git a/packages/babel-parser/benchmark/many-inner-comments/bench.mjs b/benchmark/babel-parser/many-inner-comments/bench.mjs similarity index 88% rename from packages/babel-parser/benchmark/many-inner-comments/bench.mjs rename to benchmark/babel-parser/many-inner-comments/bench.mjs index c0001e73ecd0..942f57830761 100644 --- a/packages/babel-parser/benchmark/many-inner-comments/bench.mjs +++ b/benchmark/babel-parser/many-inner-comments/bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; import baseline from "@babel-baseline/parser"; -import current from "../../lib/index.js"; -import { report } from "../util.mjs"; +import current from "@babel/parser"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); function createInput(length) { diff --git a/packages/babel-parser/benchmark/many-leading-comments-nested/bench.mjs b/benchmark/babel-parser/many-leading-comments-nested/bench.mjs similarity index 88% rename from packages/babel-parser/benchmark/many-leading-comments-nested/bench.mjs rename to benchmark/babel-parser/many-leading-comments-nested/bench.mjs index 55c7d2503304..a14c50c47e39 100644 --- a/packages/babel-parser/benchmark/many-leading-comments-nested/bench.mjs +++ b/benchmark/babel-parser/many-leading-comments-nested/bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; import baseline from "@babel-baseline/parser"; -import current from "../../lib/index.js"; -import { report } from "../util.mjs"; +import current from "@babel/parser"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); function createInput(length) { diff --git a/packages/babel-parser/benchmark/many-leading-comments/bench.mjs b/benchmark/babel-parser/many-leading-comments/bench.mjs similarity index 88% rename from packages/babel-parser/benchmark/many-leading-comments/bench.mjs rename to benchmark/babel-parser/many-leading-comments/bench.mjs index 0adc4f427430..7a31c2194045 100644 --- a/packages/babel-parser/benchmark/many-leading-comments/bench.mjs +++ b/benchmark/babel-parser/many-leading-comments/bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; import baseline from "@babel-baseline/parser"; -import current from "../../lib/index.js"; -import { report } from "../util.mjs"; +import current from "@babel/parser"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); function createInput(length) { diff --git a/packages/babel-parser/benchmark/many-leading-trailing-comments/bench.mjs b/benchmark/babel-parser/many-leading-trailing-comments/bench.mjs similarity index 89% rename from packages/babel-parser/benchmark/many-leading-trailing-comments/bench.mjs rename to benchmark/babel-parser/many-leading-trailing-comments/bench.mjs index fe613d4e5e6d..fe6d23352e5b 100644 --- a/packages/babel-parser/benchmark/many-leading-trailing-comments/bench.mjs +++ b/benchmark/babel-parser/many-leading-trailing-comments/bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; import baseline from "@babel-baseline/parser"; -import current from "../../lib/index.js"; -import { report } from "../util.mjs"; +import current from "@babel/parser"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); function createInput(length) { diff --git a/packages/babel-parser/benchmark/many-let-declarations-within-block/10-length-binding.mjs b/benchmark/babel-parser/many-let-declarations-within-block/10-length-binding.mjs similarity index 87% rename from packages/babel-parser/benchmark/many-let-declarations-within-block/10-length-binding.mjs rename to benchmark/babel-parser/many-let-declarations-within-block/10-length-binding.mjs index f6c54553592b..5ebeade42779 100644 --- a/packages/babel-parser/benchmark/many-let-declarations-within-block/10-length-binding.mjs +++ b/benchmark/babel-parser/many-let-declarations-within-block/10-length-binding.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; import baseline from "@babel-baseline/parser"; -import current from "../../lib/index.js"; -import { report } from "../util.mjs"; +import current from "@babel/parser"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); function createInput(length) { diff --git a/packages/babel-parser/benchmark/many-let-declarations/1-length-binding.mjs b/benchmark/babel-parser/many-let-declarations/1-length-binding.mjs similarity index 92% rename from packages/babel-parser/benchmark/many-let-declarations/1-length-binding.mjs rename to benchmark/babel-parser/many-let-declarations/1-length-binding.mjs index 3fd82c1c10c2..fbd2a811265e 100644 --- a/packages/babel-parser/benchmark/many-let-declarations/1-length-binding.mjs +++ b/benchmark/babel-parser/many-let-declarations/1-length-binding.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; import baseline from "@babel-baseline/parser"; -import current from "../../lib/index.js"; -import { report } from "../util.mjs"; +import current from "@babel/parser"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); // All codepoints in [0x4e00, 0x9ffc] are valid identifier name per Unicode 13 diff --git a/packages/babel-parser/benchmark/many-named-export/1-length.bench.mjs b/benchmark/babel-parser/many-named-export/1-length.bench.mjs similarity index 92% rename from packages/babel-parser/benchmark/many-named-export/1-length.bench.mjs rename to benchmark/babel-parser/many-named-export/1-length.bench.mjs index b7c46eec4388..bb3c19ebb3f3 100644 --- a/packages/babel-parser/benchmark/many-named-export/1-length.bench.mjs +++ b/benchmark/babel-parser/many-named-export/1-length.bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; import baseline from "@babel-baseline/parser"; -import current from "../../lib/index.js"; -import { report } from "../util.mjs"; +import current from "@babel/parser"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); // All codepoints in [0x4e00, 0x9ffc] are valid identifier name per Unicode 13 diff --git a/packages/babel-parser/benchmark/many-small-all-flags-regexp/bench.mjs b/benchmark/babel-parser/many-small-all-flags-regexp/bench.mjs similarity index 87% rename from packages/babel-parser/benchmark/many-small-all-flags-regexp/bench.mjs rename to benchmark/babel-parser/many-small-all-flags-regexp/bench.mjs index 8575ace39c0e..3c6b9fdd255c 100644 --- a/packages/babel-parser/benchmark/many-small-all-flags-regexp/bench.mjs +++ b/benchmark/babel-parser/many-small-all-flags-regexp/bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; import baseline from "../../lib/index-v2.js"; -import current from "../../lib/index.js"; -import { report } from "../util.mjs"; +import current from "@babel/parser"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); function createInput(length) { diff --git a/packages/babel-parser/benchmark/many-trailing-comments-nested/bench.mjs b/benchmark/babel-parser/many-trailing-comments-nested/bench.mjs similarity index 87% rename from packages/babel-parser/benchmark/many-trailing-comments-nested/bench.mjs rename to benchmark/babel-parser/many-trailing-comments-nested/bench.mjs index ae9fc2b0a7ad..81837be37f73 100644 --- a/packages/babel-parser/benchmark/many-trailing-comments-nested/bench.mjs +++ b/benchmark/babel-parser/many-trailing-comments-nested/bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; import baseline from "@babel-baseline/parser"; -import current from "../../lib/index.js"; -import { report } from "../util.mjs"; +import current from "@babel/parser"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); function createInput(length) { diff --git a/packages/babel-parser/benchmark/many-trailing-comments/bench.mjs b/benchmark/babel-parser/many-trailing-comments/bench.mjs similarity index 88% rename from packages/babel-parser/benchmark/many-trailing-comments/bench.mjs rename to benchmark/babel-parser/many-trailing-comments/bench.mjs index 1982485ee0ef..eaa92f98c780 100644 --- a/packages/babel-parser/benchmark/many-trailing-comments/bench.mjs +++ b/benchmark/babel-parser/many-trailing-comments/bench.mjs @@ -1,7 +1,7 @@ import Benchmark from "benchmark"; import baseline from "@babel-baseline/parser"; -import current from "../../lib/index.js"; -import { report } from "../util.mjs"; +import current from "@babel/parser"; +import { report } from "../../util.mjs"; const suite = new Benchmark.Suite(); function createInput(length) { diff --git a/benchmark/package.json b/benchmark/package.json new file mode 100644 index 000000000000..d746d27fc59f --- /dev/null +++ b/benchmark/package.json @@ -0,0 +1,14 @@ +{ + "name": "@babel/benchmark", + "private": true, + "type": "module", + "devDependencies": { + "@babel-baseline/generator": "npm:@babel/generator@7.14.5", + "@babel-baseline/helper-validator-identifier": "npm:@babel/helper-validator-identifier@7.10.4", + "@babel-baseline/parser": "npm:@babel/parser@7.14.5", + "@babel/generator": "workspace:*", + "@babel/helper-validator-identifier": "workspace:*", + "@babel/parser": "workspace:*", + "benchmark": "^2.1.4" + } +} diff --git a/packages/babel-generator/benchmark/util.mjs b/benchmark/util.mjs similarity index 100% rename from packages/babel-generator/benchmark/util.mjs rename to benchmark/util.mjs diff --git a/package.json b/package.json index 256c0361a8af..55b8eda5c0be 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,8 @@ "eslint/*", "packages/*", "test/esm", - "test/runtime-integration/*" + "test/runtime-integration/*", + "benchmark" ], "resolutions": { "browserslist": "npm:4.16.6", diff --git a/packages/babel-generator/package.json b/packages/babel-generator/package.json index 53722f871695..b91ef01269be 100644 --- a/packages/babel-generator/package.json +++ b/packages/babel-generator/package.json @@ -24,12 +24,10 @@ "source-map": "^0.5.0" }, "devDependencies": { - "@babel-baseline/generator": "npm:@babel/generator@7.14.5", "@babel/helper-fixtures": "workspace:*", "@babel/parser": "workspace:*", "@types/jsesc": "^2.5.0", "@types/source-map": "^0.5.0", - "benchmark": "^2.1.4", "charcodes": "^0.2.0" }, "engines": { diff --git a/packages/babel-helper-validator-identifier/.npmignore b/packages/babel-helper-validator-identifier/.npmignore index 2ed0b52967ba..f9806945836e 100644 --- a/packages/babel-helper-validator-identifier/.npmignore +++ b/packages/babel-helper-validator-identifier/.npmignore @@ -1,4 +1,3 @@ -benchmark src test *.log diff --git a/packages/babel-helper-validator-identifier/benchmark/util.mjs b/packages/babel-helper-validator-identifier/benchmark/util.mjs deleted file mode 100644 index 086f8e039e79..000000000000 --- a/packages/babel-helper-validator-identifier/benchmark/util.mjs +++ /dev/null @@ -1,17 +0,0 @@ -export function report(event) { - const bench = event.target; - const timeMs = bench.stats.mean * 1000; - const time = - timeMs < 10 - ? `${Math.round(timeMs * 1000) / 1000}ms` - : `${Math.round(timeMs)}ms`; - const msg = `${bench.name}: ${formatNumber(bench.hz)} ops/sec ±${ - Math.round(bench.stats.rme * 100) / 100 - }% (${time})`; - console.log(msg); -} - -function formatNumber(x) { - if (x < 100) return `${Math.round(x * 100) / 100}`; - return `${Math.round(x)}`.replace(/\d(?=(?:\d{3})+$)/g, "$&_"); -} diff --git a/packages/babel-helper-validator-identifier/package.json b/packages/babel-helper-validator-identifier/package.json index a3f75b4ccd78..dea429474b09 100644 --- a/packages/babel-helper-validator-identifier/package.json +++ b/packages/babel-helper-validator-identifier/package.json @@ -14,9 +14,7 @@ "main": "./lib/index.js", "exports": "./lib/index.js", "devDependencies": { - "@babel/helper-validator-identifier-baseline": "npm:@babel/helper-validator-identifier@7.10.4", "@unicode/unicode-13.0.0": "^1.0.6", - "benchmark": "^2.1.4", "charcodes": "^0.2.0" }, "engines": { diff --git a/packages/babel-parser/benchmark/util.mjs b/packages/babel-parser/benchmark/util.mjs deleted file mode 100644 index 086f8e039e79..000000000000 --- a/packages/babel-parser/benchmark/util.mjs +++ /dev/null @@ -1,17 +0,0 @@ -export function report(event) { - const bench = event.target; - const timeMs = bench.stats.mean * 1000; - const time = - timeMs < 10 - ? `${Math.round(timeMs * 1000) / 1000}ms` - : `${Math.round(timeMs)}ms`; - const msg = `${bench.name}: ${formatNumber(bench.hz)} ops/sec ±${ - Math.round(bench.stats.rme * 100) / 100 - }% (${time})`; - console.log(msg); -} - -function formatNumber(x) { - if (x < 100) return `${Math.round(x * 100) / 100}`; - return `${Math.round(x)}`.replace(/\d(?=(?:\d{3})+$)/g, "$&_"); -} diff --git a/packages/babel-parser/package.json b/packages/babel-parser/package.json index 9a2cecd225b1..b363789aee52 100644 --- a/packages/babel-parser/package.json +++ b/packages/babel-parser/package.json @@ -33,11 +33,9 @@ "node": ">=6.0.0" }, "devDependencies": { - "@babel-baseline/parser": "npm:@babel/parser@^7.14.5", "@babel/code-frame": "workspace:*", "@babel/helper-fixtures": "workspace:*", "@babel/helper-validator-identifier": "workspace:*", - "benchmark": "^2.1.4", "charcodes": "^0.2.0" }, "bin": "./bin/babel-parser.js" diff --git a/yarn.lock b/yarn.lock index 42916384e3ad..76fbe220c062 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16,7 +16,14 @@ __metadata: languageName: node linkType: hard -"@babel-baseline/parser@npm:@babel/parser@^7.14.5": +"@babel-baseline/helper-validator-identifier@npm:@babel/helper-validator-identifier@7.10.4": + version: 7.10.4 + resolution: "@babel/helper-validator-identifier@npm:7.10.4" + checksum: 25098ef842e3ffecdd9a7216f6173da7ad7be1b0b3e454a9f6965055154b9ad7a4acd2f218ba3d2efc0821bdab97837b3cb815844af7d72f66f89d446a54efc6 + languageName: node + linkType: hard + +"@babel-baseline/parser@npm:@babel/parser@7.14.5": version: 7.14.5 resolution: "@babel/parser@npm:7.14.5" bin: @@ -74,6 +81,20 @@ __metadata: languageName: unknown linkType: soft +"@babel/benchmark@workspace:benchmark": + version: 0.0.0-use.local + resolution: "@babel/benchmark@workspace:benchmark" + dependencies: + "@babel-baseline/generator": "npm:@babel/generator@7.14.5" + "@babel-baseline/helper-validator-identifier": "npm:@babel/helper-validator-identifier@7.10.4" + "@babel-baseline/parser": "npm:@babel/parser@7.14.5" + "@babel/generator": "workspace:*" + "@babel/helper-validator-identifier": "workspace:*" + "@babel/parser": "workspace:*" + benchmark: ^2.1.4 + languageName: unknown + linkType: soft + "@babel/cli@npm:^7.14.5": version: 7.14.5 resolution: "@babel/cli@npm:7.14.5" @@ -346,13 +367,11 @@ __metadata: version: 0.0.0-use.local resolution: "@babel/generator@workspace:packages/babel-generator" dependencies: - "@babel-baseline/generator": "npm:@babel/generator@7.14.5" "@babel/helper-fixtures": "workspace:*" "@babel/parser": "workspace:*" "@babel/types": "workspace:^7.14.8" "@types/jsesc": ^2.5.0 "@types/source-map": ^0.5.0 - benchmark: ^2.1.4 charcodes: ^0.2.0 jsesc: "condition: BABEL_8_BREAKING ? ^3.0.2 : ^2.5.1" source-map: ^0.5.0 @@ -833,13 +852,6 @@ __metadata: languageName: unknown linkType: soft -"@babel/helper-validator-identifier-baseline@npm:@babel/helper-validator-identifier@7.10.4": - version: 7.10.4 - resolution: "@babel/helper-validator-identifier@npm:7.10.4" - checksum: 25098ef842e3ffecdd9a7216f6173da7ad7be1b0b3e454a9f6965055154b9ad7a4acd2f218ba3d2efc0821bdab97837b3cb815844af7d72f66f89d446a54efc6 - languageName: node - linkType: hard - "@babel/helper-validator-identifier@npm:^7.14.5": version: 7.14.5 resolution: "@babel/helper-validator-identifier@npm:7.14.5" @@ -851,9 +863,7 @@ __metadata: version: 0.0.0-use.local resolution: "@babel/helper-validator-identifier@workspace:packages/babel-helper-validator-identifier" dependencies: - "@babel/helper-validator-identifier-baseline": "npm:@babel/helper-validator-identifier@7.10.4" "@unicode/unicode-13.0.0": ^1.0.6 - benchmark: ^2.1.4 charcodes: ^0.2.0 languageName: unknown linkType: soft @@ -975,11 +985,9 @@ __metadata: version: 0.0.0-use.local resolution: "@babel/parser@workspace:packages/babel-parser" dependencies: - "@babel-baseline/parser": "npm:@babel/parser@^7.14.5" "@babel/code-frame": "workspace:*" "@babel/helper-fixtures": "workspace:*" "@babel/helper-validator-identifier": "workspace:*" - benchmark: ^2.1.4 charcodes: ^0.2.0 bin: parser: ./bin/babel-parser.js