diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 0e901de78d9a..08bca5dfad60 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -71,14 +71,13 @@ jobs: include: - runner: ubuntu-24.04 system: x86_64-linux - perfetto: true - runner: ubuntu-24.04-arm system: aarch64-linux - runner: macos-15-intel system: x86_64-darwin - runner: macos-latest system: aarch64-darwin - name: '${{ matrix.system }}: with shared libraries${{ matrix.perfetto && '' and perfetto'' || '''' }}' + name: '${{ matrix.system }}: with shared libraries' runs-on: ${{ matrix.runner }} steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -121,7 +120,6 @@ jobs: --pure --keep TAR_DIR --keep FLAKY_TESTS \ --keep SCCACHE_GHA_ENABLED --keep SCCACHE_GHA_RW_MODE \ --keep ACTIONS_CACHE_SERVICE_V2 --keep ACTIONS_RESULTS_URL --keep ACTIONS_RUNTIME_TOKEN \ - --arg withPerfetto ${{ matrix.perfetto || false }} \ --arg ccache '(import {}).sccache' \ --run ' make build-ci -j4 V=1 && sccache --stop-server @@ -137,7 +135,6 @@ jobs: nix-shell \ -I nixpkgs=./tools/nix/pkgs.nix \ --pure --keep SCCACHE_LOCAL_RW_MODE \ - --arg withPerfetto ${{ matrix.perfetto || false }} \ --arg ccache '(import {}).sccache' \ --run ' make build-ci -j4 V=1 diff --git a/.github/workflows/test-linux-perfetto.yml b/.github/workflows/test-linux-perfetto.yml deleted file mode 100644 index f11970e8f6f5..000000000000 --- a/.github/workflows/test-linux-perfetto.yml +++ /dev/null @@ -1,73 +0,0 @@ -name: Test Linux (with Perfetto) - -on: - workflow_dispatch: - pull_request: - # Only targeting paths specific to the vendored version of Perfetto, `test-shared` - # is taking care of rest of the coverage. - paths: - - .github/workflows/test-linux-perfetto.yml - - common.gypi - - configure.py - - deps/perfetto/** - - node.gyp - - node.gypi - - tools/v8_gypfiles/v8.gyp - types: [opened, synchronize, reopened, ready_for_review] - -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true - -env: - PYTHON_VERSION: '3.14' - FLAKY_TESTS: keep_retrying - CLANG_VERSION: '19' - CC: ${{ (github.base_ref == 'main' || github.ref_name == 'main') && 'sccache' || '' }} clang-19 - CXX: ${{ (github.base_ref == 'main' || github.ref_name == 'main') && 'sccache' || '' }} clang++-19 - SCCACHE_GHA_ENABLED: ${{ github.base_ref == 'main' || github.ref_name == 'main' }} - SCCACHE_IDLE_TIMEOUT: '0' - RUSTC_VERSION: '1.88' - -permissions: - contents: read - -jobs: - test-perfetto: - if: github.event.pull_request.draft == false - runs-on: ubuntu-24.04-arm - steps: - - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - with: - persist-credentials: false - path: node - - name: Install Clang ${{ env.CLANG_VERSION }} - uses: $/.github/actions/install-clang - with: - clang-version: ${{ env.CLANG_VERSION }} - - name: Install Rust ${{ env.RUSTC_VERSION }} - run: | - rustup override set "$RUSTC_VERSION" - rustup --version - - name: Set up Python ${{ env.PYTHON_VERSION }} - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 - with: - python-version: ${{ env.PYTHON_VERSION }} - allow-prereleases: true - - name: Set up sccache - if: github.base_ref == 'main' || github.ref_name == 'main' - uses: Mozilla-Actions/sccache-action@fc920bf0ec8de6ee65d409111f7ec508035751ba # v0.0.11 - with: - version: v0.17.0 - - name: Build - working-directory: node - run: make build-ci -j4 V=1 CONFIG_FLAGS="--error-on-warn --v8-enable-temporal-support --with-perfetto" - - name: Get trace_processor - working-directory: node - run: make tools/perfetto/trace_processor_shell - - name: Test - working-directory: node - run: make test-ci -j1 V=1 TEST_CI_ARGS="-p actions --measure-flakiness 9" - - name: Ensure running tests did not cause any change in the tree - working-directory: node - run: git add -A && git diff --name-only --exit-code --staged diff --git a/.github/workflows/test-shared.yml b/.github/workflows/test-shared.yml index 8292ac253fd2..afd6c706c065 100644 --- a/.github/workflows/test-shared.yml +++ b/.github/workflows/test-shared.yml @@ -153,8 +153,6 @@ jobs: include: - runner: ubuntu-24.04 system: x86_64-linux - # Exercise the trace-event code against a perfetto-enabled V8. - perfetto: true # built separately in build-aarch64-linux-v8 # - runner: ubuntu-24.04-arm # system: aarch64-linux @@ -162,12 +160,11 @@ jobs: system: x86_64-darwin - runner: macos-latest system: aarch64-darwin - name: '${{ matrix.system }}: with shared libraries${{ matrix.perfetto && '' and perfetto'' || '''' }}' + name: '${{ matrix.system }}: with shared libraries' uses: $/.github/workflows/build-shared.yml with: runner: ${{ matrix.runner }} with-sccache: ${{ github.base_ref == 'main' || github.ref_name == 'main' }} - extra-nix-flags: ${{ matrix.perfetto && '--arg withPerfetto true' || '' }} secrets: CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} diff --git a/Makefile b/Makefile index 31d7d911c987..3716dfc0e3bf 100644 --- a/Makefile +++ b/Makefile @@ -321,7 +321,8 @@ v8: ## Build deps/v8. tools/make-v8.sh $(V8_ARCH).$(BUILDTYPE_LOWER) $(V8_BUILD_OPTIONS) .PHONY: jstest -jstest: build-addons build-js-native-api-tests build-node-api-tests build-sqlite-tests build-ffi-tests ## Run addon tests and JS tests. +## Run addon tests and JS tests. +jstest: build-addons build-js-native-api-tests build-node-api-tests build-sqlite-tests build-ffi-tests $(TRACE_PROCESSOR_SHELL_PATH) $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \ $(TEST_CI_ARGS) \ --skip-tests=$(CI_SKIP_TESTS) \ @@ -348,6 +349,7 @@ ifeq ($(TRACE_PROCESSOR_SHELL_PATH),tools/perfetto/trace_processor_shell) TRACE_PROCESSOR_SHELL_DEPS = deps/perfetto/VERSION endif +# Set TRACE_PROCESSOR_SHELL_PATH=/dev/null to disable the download $(TRACE_PROCESSOR_SHELL_PATH): $(TRACE_PROCESSOR_SHELL_DEPS) @tools/perfetto/get_trace_processor $@ @@ -660,7 +662,7 @@ test-ci-js: | clear-stalled ## Build and test JavaScript with building anything .PHONY: test-ci # Related CI jobs: most CI tests, excluding node-test-commit-arm-fanned test-ci: LOGLEVEL := info ## Build and test everything (CI). -test-ci: | clear-stalled bench-addons-build build-addons build-js-native-api-tests build-node-api-tests build-sqlite-tests build-ffi-tests doc-only +test-ci: | clear-stalled bench-addons-build build-addons build-js-native-api-tests build-node-api-tests build-sqlite-tests build-ffi-tests doc-only $(TRACE_PROCESSOR_SHELL_PATH) out/Release/cctest --gtest_output=xml:out/junit/cctest.xml $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \ --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \ diff --git a/configure.py b/configure.py index e769236cebe8..a93cf3578db5 100755 --- a/configure.py +++ b/configure.py @@ -1171,11 +1171,11 @@ default=None, help='disable the V8 inspector protocol') -parser.add_argument('--with-perfetto', +parser.add_argument('--without-perfetto', action='store_true', - dest='with_perfetto', + dest='without_perfetto', default=None, - help='enable perfetto support') + help='disable perfetto support') parser.add_argument('--shared', action='store_true', @@ -2273,7 +2273,7 @@ def configure_v8(o, configs): options.v8_disable_temporal_support = True o['variables']['v8_enable_temporal_support'] = 0 if options.v8_disable_temporal_support else 1 o['variables']['v8_trace_maps'] = 1 if options.trace_maps else 0 - o['variables']['v8_use_perfetto'] = 1 if options.with_perfetto else 0 + o['variables']['v8_use_perfetto'] = 0 if options.without_perfetto or not perfetto_supported() else 1 o['variables']['node_use_v8_platform'] = b(not options.without_v8_platform) o['variables']['node_use_bundled_v8'] = b(not options.without_bundled_v8) o['variables']['force_dynamic_crt'] = 1 if options.shared else 0 @@ -2396,12 +2396,20 @@ def configure_lief(o): configure_library('lief', o, pkgname='LIEF') +def perfetto_supported(): + return flavor not in ('aix', 'cloudabi', 'openbsd', 'os400', 'solaris') + def configure_perfetto(o): - if not options.with_perfetto: + if options.without_perfetto: if options.shared_perfetto: - error('--shared-perfetto requires --with-perfetto') + error('--without-perfetto is incompatible with --shared-perfetto') o['variables']['node_shared_perfetto'] = b(False) return + if options.without_perfetto is None and not perfetto_supported(): + warn(f'Perfetto is disabled for {flavor}: the bundled perfetto integration ' + 'is not available on this platform. Pass --without-perfetto to ' + 'silence this warning.') + return configure_library('perfetto', o) diff --git a/deps/perfetto/perfetto.gyp b/deps/perfetto/perfetto.gyp index 083d0b386dd2..697256401a3a 100644 --- a/deps/perfetto/perfetto.gyp +++ b/deps/perfetto/perfetto.gyp @@ -18,6 +18,14 @@ 'sources': [ '<@(perfetto_sdk_sources)', ], + 'conditions': [ + ['OS=="win"', { + 'defines': [ + 'WIN32_LEAN_AND_MEAN', + 'NOMINMAX', + ], + }], + ], }, ] } diff --git a/node.gypi b/node.gypi index 9eb972adc47f..3ca9d4633d04 100644 --- a/node.gypi +++ b/node.gypi @@ -93,6 +93,11 @@ [ 'OS=="linux" and target_arch=="s390x"', { 'cflags': [ '-march=z14' ], }], + [ 'v8_use_perfetto==1 and node_shared_perfetto=="false"', { + 'dependencies': [ + 'deps/perfetto/perfetto.gyp:perfetto_sdk', + ], + }], [ 'node_enable_d8=="true"', { 'dependencies': [ 'tools/v8_gypfiles/d8.gyp:d8' ], }], diff --git a/shell.nix b/shell.nix index a1d917bf864a..4700ce9bc520 100644 --- a/shell.nix +++ b/shell.nix @@ -13,13 +13,13 @@ # Build options icu ? pkgs.icu, withAmaro ? true, + withFFI ? true, withLief ? true, + withPerfetto ? true, withQuic ? false, withSQLite ? true, - withFFI ? true, withSSL ? true, withTemporal ? true, - withPerfetto ? false, sharedLibDeps ? ( import ./tools/nix/sharedLibDeps.nix { inherit @@ -87,7 +87,7 @@ let "--v8-${if withTemporal then "enable" else "disable"}-temporal-support" ] ++ builtins.map (depName: "--shared-${depName}") sharedV8Deps - ++ pkgs.lib.optional withPerfetto "--with-perfetto"; + ++ pkgs.lib.optional (!withPerfetto) "--without-perfetto"; in pkgs.mkShell { inherit nativeBuildInputs; @@ -144,6 +144,8 @@ pkgs.mkShell { ) ) ); + TRACE_PROCESSOR_SHELL_PATH = + if withPerfetto then "${pkgs.perfetto.tools}/bin/trace_processor_shell" else "/dev/null"; } // ( let @@ -172,9 +174,6 @@ pkgs.mkShell { // pkgs.lib.optionalAttrs (!withSQLite) { NOSQLITE = "1"; } - // pkgs.lib.optionalAttrs (withPerfetto) { - TRACE_PROCESSOR_SHELL_PATH = "${pkgs.perfetto.tools}/bin/trace_processor_shell"; - } // pkgs.lib.optionalAttrs (pkcs11 != false && pkcs11 != null) ( let pkcs11' = diff --git a/tools/nix/sharedLibDeps.nix b/tools/nix/sharedLibDeps.nix index 41a406237daa..f77ed162550a 100644 --- a/tools/nix/sharedLibDeps.nix +++ b/tools/nix/sharedLibDeps.nix @@ -1,11 +1,11 @@ { pkgs ? import ./pkgs.nix { }, + withFFI ? true, withLief ? true, + withPerfetto ? true, withQuic ? false, withSQLite ? true, withSSL ? true, - withFFI ? true, - withPerfetto ? false, withTemporal ? true, }: { diff --git a/tools/nix/v8.nix b/tools/nix/v8.nix index 8b9f1796e068..e757ebc69c04 100644 --- a/tools/nix/v8.nix +++ b/tools/nix/v8.nix @@ -59,7 +59,7 @@ let !(builtins.elem "--v8-disable-temporal-support" configureFlags) ) ../../deps/crates ++ lib.optional ( - builtins.elem "--with-perfetto" configureFlags && !useSharedPerfetto + !(builtins.elem "--without-perfetto" configureFlags) && !useSharedPerfetto ) ../../deps/perfetto ++ lib.optionals (icu != null) [ ../../tools/icu/icu_versions.json diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp index fd8394b3708e..5b3117d319bb 100644 --- a/tools/v8_gypfiles/v8.gyp +++ b/tools/v8_gypfiles/v8.gyp @@ -1771,7 +1771,11 @@ }], ['v8_use_perfetto==1', { 'sources!': [ - '