Skip to content

Commit e6f62a4

Browse files
mi-acCommit Bot
mi-ac
authored and
Commit Bot
committed
[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 <[email protected]> Reviewed-by: Yang Guo <[email protected]> Commit-Queue: Michael Achenbach <[email protected]> Cr-Commit-Position: refs/heads/master@{#64669}
1 parent 6032db4 commit e6f62a4

5 files changed

Lines changed: 4 additions & 86 deletions

File tree

‎BUILD.gn‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import("//build/config/android/config.gni")
66
import("//build/config/arm.gni")
77
import("//build/config/dcheck_always_on.gni")
88
import("//build/config/host_byteorder.gni")
9-
import("//build/config/jumbo.gni")
109
import("//build/config/mips.gni")
1110
import("//build/config/sanitizers/sanitizers.gni")
1211
import("//build_overrides/build.gni")
@@ -1403,17 +1402,12 @@ if (v8_use_external_startup_data) {
14031402
if (v8_use_multi_snapshots) {
14041403
deps += [ ":asm_to_inline_asm_trusted" ]
14051404
sources += [ "$target_gen_dir/embedded_trusted.cc" ]
1406-
jumbo_excluded_sources = [ "$target_gen_dir/embedded_trusted.cc" ]
14071405
}
14081406
} else {
14091407
sources += [ "$target_gen_dir/embedded.S" ]
14101408

14111409
if (v8_use_multi_snapshots) {
14121410
sources += [ "$target_gen_dir/embedded_trusted.S" ]
1413-
jumbo_excluded_sources = [
1414-
# Duplicated symbols with embedded.S
1415-
"$target_gen_dir/embedded_trusted.S",
1416-
]
14171411
}
14181412
}
14191413

@@ -1504,17 +1498,6 @@ v8_source_set("v8_initializers") {
15041498
"src/interpreter/interpreter-intrinsics-generator.h",
15051499
]
15061500

1507-
jumbo_excluded_sources = [
1508-
# TODO([email protected]): don't exclude these http://crbug.com/752428
1509-
"src/builtins/builtins-async-iterator-gen.cc",
1510-
"src/builtins/builtins-async-generator-gen.cc",
1511-
1512-
# These source files take an unusually large amount of time to
1513-
# compile. Build them separately to avoid bottlenecks.
1514-
"src/builtins/builtins-regexp-gen.cc",
1515-
"src/codegen/code-stub-assembler.cc",
1516-
]
1517-
15181501
if (v8_current_cpu == "x86") {
15191502
sources += [
15201503
### gcmole(arch:ia32) ###
@@ -2938,19 +2921,6 @@ v8_source_set("v8_base_without_compiler") {
29382921
sources += check_header_includes_sources
29392922
}
29402923

2941-
jumbo_excluded_sources = [
2942-
# TODO([email protected]): don't exclude these http://crbug.com/752428
2943-
"src/profiler/heap-snapshot-generator.cc", # Macro clash in mman-linux.h
2944-
2945-
# These source files take an unusually large amount of time to
2946-
# compile. Build them separately to avoid bottlenecks.
2947-
"src/api/api.cc",
2948-
"src/heap/heap.cc",
2949-
"src/objects/elements.cc",
2950-
"src/objects/objects.cc",
2951-
"src/parsing/parser.cc",
2952-
]
2953-
29542924
if (v8_current_cpu == "x86") {
29552925
sources += [ ### gcmole(arch:ia32) ###
29562926
"src/codegen/ia32/assembler-ia32-inl.h",
@@ -3104,11 +3074,6 @@ v8_source_set("v8_base_without_compiler") {
31043074
"src/diagnostics/unwinding-info-win64.h",
31053075
]
31063076
}
3107-
jumbo_excluded_sources += [
3108-
# TODO([email protected]): fix this code so it doesn't need
3109-
# to be excluded, see the comments inside.
3110-
"src/codegen/arm64/instructions-arm64-constants.cc",
3111-
]
31123077
} else if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel") {
31133078
sources += [ ### gcmole(arch:mipsel) ###
31143079
"src/codegen/mips/assembler-mips-inl.h",

‎gni/v8.gni‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
import("//build/config/jumbo.gni")
65
import("//build/config/sanitizers/sanitizers.gni")
76
import("//build/config/v8_target_cpu.gni")
87
import("//build/split_static_library.gni")
@@ -71,7 +70,7 @@ if (v8_use_multi_snapshots) {
7170
# build configuration. This allows us to set v8_use_multi_snapshots=true on
7271
# all bots, and e.g. no-snapshot bots will automatically do the right thing.
7372
v8_use_multi_snapshots =
74-
v8_use_external_startup_data && !build_with_chromium && !use_jumbo_build
73+
v8_use_external_startup_data && !build_with_chromium
7574
}
7675

7776
if (v8_enable_backtrace == "") {
@@ -140,9 +139,9 @@ template("v8_source_set") {
140139
defined(v8_static_library) && v8_static_library && is_win) {
141140
link_target_type = "split_static_library"
142141
} else if (defined(v8_static_library) && v8_static_library) {
143-
link_target_type = "jumbo_static_library"
142+
link_target_type = "static_library"
144143
} else {
145-
link_target_type = "jumbo_source_set"
144+
link_target_type = "source_set"
146145
}
147146
target(link_target_type, target_name) {
148147
forward_variables_from(invoker,
@@ -161,7 +160,7 @@ template("v8_source_set") {
161160
}
162161

163162
template("v8_header_set") {
164-
jumbo_source_set(target_name) {
163+
source_set(target_name) {
165164
forward_variables_from(invoker, "*", [ "configs" ])
166165
configs -= v8_remove_configs
167166
configs += v8_add_configs

‎infra/mb/mb_config.pyl‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@
6262
'V8 Linux64 - debug - header includes': 'debug_x64_header_includes',
6363
'V8 Linux64 - shared': 'release_x64_shared_verify_heap',
6464
'V8 Linux64 - verify csa': 'release_x64_verify_csa',
65-
# Jumbo.
66-
'V8 Linux64 Jumbo': 'release_x64_jumbo',
67-
'V8 Linux64 Jumbo - debug': 'debug_x64_jumbo',
68-
'V8 Linux64 Jumbo - limited': 'release_x64_jumbo_limited',
69-
'V8 Linux64 Jumbo - limited - debug': 'debug_x64_jumbo_limited',
7065
# Windows.
7166
'V8 Win32 - builder': 'release_x86_minimal_symbols',
7267
'V8 Win32 - debug builder': 'debug_x86_minimal_symbols',
@@ -226,8 +221,6 @@
226221
'v8_linux64_msan_rel': 'release_simulate_arm64_msan_minimal_symbols',
227222
'v8_linux64_sanitizer_coverage_rel':
228223
'release_x64_asan_minimal_symbols_coverage',
229-
'v8_linux64_jumbo_compile_rel': 'release_x64_jumbo_trybot',
230-
'v8_linux64_jumbo_limited_compile_rel': 'release_x64_jumbo_limited_trybot',
231224
'v8_linux64_tsan_rel': 'release_x64_tsan_minimal_symbols',
232225
'v8_linux64_tsan_isolates_rel_ng':
233226
'release_x64_tsan_minimal_symbols',
@@ -453,14 +446,6 @@
453446
'release_bot', 'x64', 'ios_simulator'],
454447
'release_x64_internal': [
455448
'release_bot', 'x64', 'v8_snapshot_internal'],
456-
'release_x64_jumbo': [
457-
'release_bot', 'x64', 'jumbo'],
458-
'release_x64_jumbo_trybot': [
459-
'release_trybot', 'x64', 'jumbo'],
460-
'release_x64_jumbo_limited': [
461-
'release_bot', 'x64', 'jumbo_limited'],
462-
'release_x64_jumbo_limited_trybot': [
463-
'release_trybot', 'x64', 'jumbo_limited'],
464449
'release_x64_minimal_symbols': [
465450
'release_bot', 'x64', 'minimal_symbols'],
466451
'release_x64_pointer_compression': [
@@ -508,10 +493,6 @@
508493
'debug_bot', 'x64', 'gcc', 'v8_check_header_includes'],
509494
'debug_x64_header_includes': [
510495
'debug_bot', 'x64', 'v8_check_header_includes'],
511-
'debug_x64_jumbo': [
512-
'debug_bot', 'x64', 'jumbo'],
513-
'debug_x64_jumbo_limited': [
514-
'debug_bot', 'x64', 'jumbo_limited'],
515496
'debug_x64_minimal_symbols': [
516497
'debug_bot', 'x64', 'minimal_symbols'],
517498
'debug_x64_perfetto': [
@@ -658,14 +639,6 @@
658639
'gn_args': 'target_cpu="x64" target_os="ios"',
659640
},
660641

661-
'jumbo': {
662-
'gn_args': 'use_jumbo_build=true',
663-
},
664-
665-
'jumbo_limited': {
666-
'gn_args': 'use_jumbo_build=true jumbo_file_merge_limit=50',
667-
},
668-
669642
'lsan': {
670643
'mixins': ['v8_enable_test_features'],
671644
'gn_args': 'is_lsan=true',

‎test/cctest/BUILD.gn‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -297,16 +297,6 @@ v8_source_set("cctest_sources") {
297297
"wasm/wasm-run-utils.h",
298298
]
299299

300-
if (use_jumbo_build) {
301-
jumbo_excluded_sources = [
302-
# TODO([email protected]): figure out the jumbo issues with these source
303-
# files, and include them in jumbo compilation units.
304-
"interpreter/bytecode-expectations-printer.cc",
305-
"interpreter/test-bytecode-generator.cc",
306-
"test-api.cc",
307-
]
308-
}
309-
310300
if (v8_current_cpu == "arm") {
311301
sources += [ ### gcmole(arch:arm) ###
312302
"assembler-helper-arm.cc",

‎test/unittests/BUILD.gn‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -235,15 +235,6 @@ v8_source_set("unittests_sources") {
235235
"zone/zone-unittest.cc",
236236
]
237237

238-
if (use_jumbo_build) {
239-
jumbo_excluded_sources = [
240-
# TODO([email protected]): figure out how to make this build in both
241-
# modes. Template issues on windows if we add a functional_unittest
242-
# namespace as with the other files.
243-
"base/functional-unittest.cc",
244-
]
245-
}
246-
247238
if (v8_current_cpu == "arm") {
248239
sources += [
249240
"assembler/turbo-assembler-arm-unittest.cc",

0 commit comments

Comments
 (0)