Skip to content

Commit

Permalink
deps: V8: cherry-pick e6f62a41f5ee
Browse files Browse the repository at this point in the history 
Original commit message:

    [build] Remove jumbo build configs

    Bug: chromium:994387
    Change-Id: I7b37a416ce6cc79903fe04923e86af1d0065ac37
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1890090
    Reviewed-by: Maya Lekova <mslekova@chromium.org>
    Reviewed-by: Yang Guo <yangguo@chromium.org>
    Commit-Queue: Michael Achenbach <machenbach@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#64669}

Refs: v8/v8@e6f62a4

PR-URL: #39245
Refs: nodejs/build#2696
Reviewed-By: Richard Lau <rlau@redhat.com>
  • Loading branch information
@targos @richardlau
targos authored and richardlau committed Jul 23, 2021
1 parent 2b54156 commit 492b0d6
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 87 deletions.
2 changes: 1 addition & 1 deletion common.gypi
View file
Expand Up @@ -34,7 +34,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.49',
'v8_embedder_string': '-node.50',

##### V8 defaults for Node.js #####

Expand Down
35 changes: 0 additions & 35 deletions deps/v8/BUILD.gn
View file
Expand Up @@ -6,7 +6,6 @@ import("//build/config/android/config.gni")
import("//build/config/arm.gni")
import("//build/config/dcheck_always_on.gni")
import("//build/config/host_byteorder.gni")
import("//build/config/jumbo.gni")
import("//build/config/mips.gni")
import("//build/config/sanitizers/sanitizers.gni")
import("//build_overrides/build.gni")
Expand Down Expand Up @@ -1470,17 +1469,12 @@ if (v8_use_snapshot && v8_use_external_startup_data) {
if (v8_use_multi_snapshots) {
deps += [ ":asm_to_inline_asm_trusted" ]
sources += [ "$target_gen_dir/embedded_trusted.cc" ]
jumbo_excluded_sources = [ "$target_gen_dir/embedded_trusted.cc" ]
}
} else if (v8_enable_embedded_builtins) {
sources += [ "$target_gen_dir/embedded.S" ]

if (v8_use_multi_snapshots) {
sources += [ "$target_gen_dir/embedded_trusted.S" ]
jumbo_excluded_sources = [
# Duplicated symbols with embedded.S
"$target_gen_dir/embedded_trusted.S",
]
}
} else {
sources += [ "src/snapshot/embedded/embedded-empty.cc" ]
Expand Down Expand Up @@ -1577,17 +1571,6 @@ v8_source_set("v8_initializers") {
"src/interpreter/interpreter-intrinsics-generator.h",
]

jumbo_excluded_sources = [
# TODO(mostynb@vewd.com): don't exclude these http://crbug.com/752428
"src/builtins/builtins-async-iterator-gen.cc",
"src/builtins/builtins-async-generator-gen.cc",

# These source files take an unusually large amount of time to
# compile. Build them separately to avoid bottlenecks.
"src/builtins/builtins-regexp-gen.cc",
"src/codegen/code-stub-assembler.cc",
]

if (v8_current_cpu == "x86") {
sources += [
### gcmole(arch:ia32) ###
Expand Down Expand Up @@ -2996,19 +2979,6 @@ v8_source_set("v8_base_without_compiler") {
sources += check_header_includes_sources
}

jumbo_excluded_sources = [
# TODO(mostynb@vewd.com): don't exclude these http://crbug.com/752428
"src/profiler/heap-snapshot-generator.cc", # Macro clash in mman-linux.h

# These source files take an unusually large amount of time to
# compile. Build them separately to avoid bottlenecks.
"src/api/api.cc",
"src/heap/heap.cc",
"src/objects/elements.cc",
"src/objects/objects.cc",
"src/parsing/parser.cc",
]

if (v8_current_cpu == "x86") {
sources += [ ### gcmole(arch:ia32) ###
"src/codegen/ia32/assembler-ia32-inl.h",
Expand Down Expand Up @@ -3162,11 +3132,6 @@ v8_source_set("v8_base_without_compiler") {
"src/diagnostics/unwinding-info-win64.h",
]
}
jumbo_excluded_sources += [
# TODO(mostynb@vewd.com): fix this code so it doesn't need
# to be excluded, see the comments inside.
"src/codegen/arm64/instructions-arm64-constants.cc",
]
} else if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel") {
sources += [ ### gcmole(arch:mipsel) ###
"src/codegen/mips/assembler-mips-inl.h",
Expand Down
9 changes: 4 additions & 5 deletions deps/v8/gni/v8.gni
View file
Expand Up @@ -2,7 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

import("//build/config/jumbo.gni")
import("//build/config/sanitizers/sanitizers.gni")
import("//build/config/v8_target_cpu.gni")
import("//build/split_static_library.gni")
Expand Down Expand Up @@ -80,7 +79,7 @@ if (v8_use_multi_snapshots) {
# build configuration. This allows us to set v8_use_multi_snapshots=true on
# all bots, and e.g. no-snapshot bots will automatically do the right thing.
v8_use_multi_snapshots =
v8_use_external_startup_data && !build_with_chromium && !use_jumbo_build
v8_use_external_startup_data && !build_with_chromium
}

if (v8_enable_backtrace == "") {
Expand Down Expand Up @@ -149,9 +148,9 @@ template("v8_source_set") {
defined(v8_static_library) && v8_static_library && is_win) {
link_target_type = "jumbo_split_static_library"
} else if (defined(v8_static_library) && v8_static_library) {
link_target_type = "jumbo_static_library"
link_target_type = "static_library"
} else {
link_target_type = "jumbo_source_set"
link_target_type = "source_set"
}
target(link_target_type, target_name) {
forward_variables_from(invoker,
Expand All @@ -170,7 +169,7 @@ template("v8_source_set") {
}

template("v8_header_set") {
jumbo_source_set(target_name) {
source_set(target_name) {
forward_variables_from(invoker, "*", [ "configs" ])
configs -= v8_remove_configs
configs += v8_add_configs
Expand Down
27 changes: 0 additions & 27 deletions deps/v8/infra/mb/mb_config.pyl
View file
Expand Up @@ -64,11 +64,6 @@
'V8 Linux64 - debug - header includes': 'debug_x64_header_includes',
'V8 Linux64 - shared': 'release_x64_shared_verify_heap',
'V8 Linux64 - verify csa': 'release_x64_verify_csa',
# Jumbo.
'V8 Linux64 Jumbo': 'release_x64_jumbo',
'V8 Linux64 Jumbo - debug': 'debug_x64_jumbo',
'V8 Linux64 Jumbo - limited': 'release_x64_jumbo_limited',
'V8 Linux64 Jumbo - limited - debug': 'debug_x64_jumbo_limited',
# Windows.
'V8 Win32 - builder': 'release_x86_minimal_symbols',
'V8 Win32 - debug builder': 'debug_x86_minimal_symbols',
Expand Down Expand Up @@ -230,8 +225,6 @@
'v8_linux64_msan_rel': 'release_simulate_arm64_msan_minimal_symbols',
'v8_linux64_sanitizer_coverage_rel':
'release_x64_asan_minimal_symbols_coverage',
'v8_linux64_jumbo_compile_rel': 'release_x64_jumbo_trybot',
'v8_linux64_jumbo_limited_compile_rel': 'release_x64_jumbo_limited_trybot',
'v8_linux64_tsan_rel': 'release_x64_tsan_minimal_symbols',
'v8_linux64_tsan_isolates_rel_ng':
'release_x64_tsan_minimal_symbols',
Expand Down Expand Up @@ -448,14 +441,6 @@
'release_bot', 'x64', 'ios_simulator'],
'release_x64_internal': [
'release_bot', 'x64', 'v8_snapshot_internal'],
'release_x64_jumbo': [
'release_bot', 'x64', 'jumbo'],
'release_x64_jumbo_trybot': [
'release_trybot', 'x64', 'jumbo'],
'release_x64_jumbo_limited': [
'release_bot', 'x64', 'jumbo_limited'],
'release_x64_jumbo_limited_trybot': [
'release_trybot', 'x64', 'jumbo_limited'],
'release_x64_minimal_symbols': [
'release_bot', 'x64', 'minimal_symbols'],
'release_x64_pointer_compression': [
Expand Down Expand Up @@ -499,10 +484,6 @@
'debug_bot', 'x64', 'gcc', 'v8_check_header_includes'],
'debug_x64_header_includes': [
'debug_bot', 'x64', 'v8_check_header_includes'],
'debug_x64_jumbo': [
'debug_bot', 'x64', 'jumbo'],
'debug_x64_jumbo_limited': [
'debug_bot', 'x64', 'jumbo_limited'],
'debug_x64_minimal_symbols': [
'debug_bot', 'x64', 'minimal_symbols'],
'debug_x64_perfetto': [
Expand Down Expand Up @@ -668,14 +649,6 @@
'gn_args': 'target_cpu="x64" target_os="ios"',
},

'jumbo': {
'gn_args': 'use_jumbo_build=true',
},

'jumbo_limited': {
'gn_args': 'use_jumbo_build=true jumbo_file_merge_limit=50',
},

'lsan': {
'mixins': ['v8_enable_test_features'],
'gn_args': 'is_lsan=true',
Expand Down
10 changes: 0 additions & 10 deletions deps/v8/test/cctest/BUILD.gn
View file
Expand Up @@ -294,16 +294,6 @@ v8_source_set("cctest_sources") {
"wasm/wasm-run-utils.h",
]

if (use_jumbo_build) {
jumbo_excluded_sources = [
# TODO(mostynb@opera.com): figure out the jumbo issues with these source
# files, and include them in jumbo compilation units.
"interpreter/bytecode-expectations-printer.cc",
"interpreter/test-bytecode-generator.cc",
"test-api.cc",
]
}

if (v8_current_cpu == "arm") {
sources += [ ### gcmole(arch:arm) ###
"assembler-helper-arm.cc",
Expand Down
9 changes: 0 additions & 9 deletions deps/v8/test/unittests/BUILD.gn
View file
Expand Up @@ -233,15 +233,6 @@ v8_source_set("unittests_sources") {
"zone/zone-unittest.cc",
]

if (use_jumbo_build) {
jumbo_excluded_sources = [
# TODO(mostynb@opera.com): figure out how to make this build in both
# modes. Template issues on windows if we add a functional_unittest
# namespace as with the other files.
"base/functional-unittest.cc",
]
}

if (v8_current_cpu == "arm") {
sources += [
"assembler/turbo-assembler-arm-unittest.cc",
Expand Down

0 comments on commit 492b0d6

Please sign in to comment.