Commit 577f983b authored by Clemens Backes's avatar Clemens Backes Committed by Commit Bot

[no-wasm] Exclude more targets from build

This excludes more targets and tests that won't work without
webassembly:
- wee8
- multi_return_fuzzer
- wasm-js
- wasm-spec-tests
- wasm-api-tests
- several cctests

R=jkummerow@chromium.org

Bug: v8:11238
Change-Id: I6d6ac43869a2b4a91e5b0e7e3183a476a98bf0af
Cq-Include-Trybots: luci.v8.try:v8_linux64_no_wasm_compile_rel
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2742617
Commit-Queue: Clemens Backes <clemensb@chromium.org>
Reviewed-by: 's avatarJakob Kummerow <jkummerow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#73288}
parent e2ce0eb4
...@@ -4990,27 +4990,29 @@ if (v8_monolithic) { ...@@ -4990,27 +4990,29 @@ if (v8_monolithic) {
} }
} }
v8_static_library("wee8") { if (v8_enable_webassembly) {
deps = [ v8_static_library("wee8") {
":v8_base", deps = [
":v8_libbase", ":v8_base",
":v8_libplatform", ":v8_libbase",
":v8_shared_internal_headers", ":v8_libplatform",
":v8_snapshot", ":v8_shared_internal_headers",
"//build/win:default_exe_manifest", ":v8_snapshot",
] "//build/win:default_exe_manifest",
]
# TODO: v8dll-main.cc equivalent for shared library builds # TODO: v8dll-main.cc equivalent for shared library builds
configs = [ ":internal_config" ] configs = [ ":internal_config" ]
sources = [ sources = [
### gcmole(all) ### ### gcmole(all) ###
"src/wasm/c-api.cc", "src/wasm/c-api.cc",
"src/wasm/c-api.h", "src/wasm/c-api.h",
"third_party/wasm-api/wasm.h", "third_party/wasm-api/wasm.h",
"third_party/wasm-api/wasm.hh", "third_party/wasm-api/wasm.hh",
] ]
}
} }
############################################################################### ###############################################################################
...@@ -5278,7 +5280,6 @@ group("v8_fuzzers") { ...@@ -5278,7 +5280,6 @@ group("v8_fuzzers") {
data_deps = [ data_deps = [
":v8_simple_inspector_fuzzer", ":v8_simple_inspector_fuzzer",
":v8_simple_json_fuzzer", ":v8_simple_json_fuzzer",
":v8_simple_multi_return_fuzzer",
":v8_simple_parser_fuzzer", ":v8_simple_parser_fuzzer",
":v8_simple_regexp_builtins_fuzzer", ":v8_simple_regexp_builtins_fuzzer",
":v8_simple_regexp_fuzzer", ":v8_simple_regexp_fuzzer",
...@@ -5286,6 +5287,7 @@ group("v8_fuzzers") { ...@@ -5286,6 +5287,7 @@ group("v8_fuzzers") {
if (v8_enable_webassembly) { if (v8_enable_webassembly) {
data_deps += [ data_deps += [
":v8_simple_multi_return_fuzzer",
":v8_simple_wasm_async_fuzzer", ":v8_simple_wasm_async_fuzzer",
":v8_simple_wasm_code_fuzzer", ":v8_simple_wasm_code_fuzzer",
":v8_simple_wasm_compile_fuzzer", ":v8_simple_wasm_compile_fuzzer",
...@@ -5580,20 +5582,6 @@ v8_source_set("json_fuzzer") { ...@@ -5580,20 +5582,6 @@ v8_source_set("json_fuzzer") {
v8_fuzzer("json_fuzzer") { v8_fuzzer("json_fuzzer") {
} }
v8_source_set("multi_return_fuzzer") {
sources = [ "test/fuzzer/multi-return.cc" ]
deps = [ ":fuzzer_support" ]
configs = [
":external_config",
":internal_config_base",
]
}
v8_fuzzer("multi_return_fuzzer") {
}
v8_source_set("parser_fuzzer") { v8_source_set("parser_fuzzer") {
sources = [ "test/fuzzer/parser.cc" ] sources = [ "test/fuzzer/parser.cc" ]
...@@ -5640,6 +5628,20 @@ v8_fuzzer("regexp_fuzzer") { ...@@ -5640,6 +5628,20 @@ v8_fuzzer("regexp_fuzzer") {
} }
if (v8_enable_webassembly) { if (v8_enable_webassembly) {
v8_source_set("multi_return_fuzzer") {
sources = [ "test/fuzzer/multi-return.cc" ]
deps = [ ":fuzzer_support" ]
configs = [
":external_config",
":internal_config_base",
]
}
v8_fuzzer("multi_return_fuzzer") {
}
v8_source_set("wasm_test_common") { v8_source_set("wasm_test_common") {
sources = [ sources = [
"test/common/flag-utils.h", "test/common/flag-utils.h",
......
...@@ -15,17 +15,22 @@ group("gn_all") { ...@@ -15,17 +15,22 @@ group("gn_all") {
"mjsunit:v8_mjsunit", "mjsunit:v8_mjsunit",
"mozilla:v8_mozilla", "mozilla:v8_mozilla",
"test262:v8_test262", "test262:v8_test262",
"wasm-js:v8_wasm_js",
"wasm-spec-tests:v8_wasm_spec_tests",
"webkit:v8_webkit", "webkit:v8_webkit",
] ]
deps = [ deps = [
"inspector:inspector-test", "inspector:inspector-test",
"mkgrokdump:mkgrokdump", "mkgrokdump:mkgrokdump",
"wasm-api-tests:wasm_api_tests",
] ]
if (v8_enable_webassembly) {
data_deps += [
"wasm-js:v8_wasm_js",
"wasm-spec-tests:v8_wasm_spec_tests",
]
deps += [ "wasm-api-tests:wasm_api_tests" ]
}
if (v8_fuzzilli) { if (v8_fuzzilli) {
deps += [ "fuzzilli:v8_fuzzilli_test" ] deps += [ "fuzzilli:v8_fuzzilli_test" ]
} }
...@@ -79,11 +84,16 @@ group("v8_bot_default") { ...@@ -79,11 +84,16 @@ group("v8_bot_default") {
"mjsunit:v8_mjsunit", "mjsunit:v8_mjsunit",
"mkgrokdump:mkgrokdump", "mkgrokdump:mkgrokdump",
"unittests:unittests", "unittests:unittests",
"wasm-api-tests:wasm_api_tests",
"wasm-js:v8_wasm_js",
"wasm-spec-tests:v8_wasm_spec_tests",
"webkit:v8_webkit", "webkit:v8_webkit",
] ]
if (v8_enable_webassembly) {
data_deps += [
"wasm-api-tests:wasm_api_tests",
"wasm-js:v8_wasm_js",
"wasm-spec-tests:v8_wasm_spec_tests",
]
}
} }
group("v8_default") { group("v8_default") {
...@@ -99,10 +109,15 @@ group("v8_default") { ...@@ -99,10 +109,15 @@ group("v8_default") {
"mjsunit:v8_mjsunit", "mjsunit:v8_mjsunit",
"mkgrokdump:mkgrokdump", "mkgrokdump:mkgrokdump",
"unittests:unittests", "unittests:unittests",
"wasm-api-tests:wasm_api_tests",
"wasm-js:v8_wasm_js",
"wasm-spec-tests:v8_wasm_spec_tests",
] ]
if (v8_enable_webassembly) {
data_deps += [
"wasm-api-tests:wasm_api_tests",
"wasm-js:v8_wasm_js",
"wasm-spec-tests:v8_wasm_spec_tests",
]
}
} }
group("v8_optimize_for_size") { group("v8_optimize_for_size") {
...@@ -154,8 +169,13 @@ v8_header_set("common_test_headers") { ...@@ -154,8 +169,13 @@ v8_header_set("common_test_headers") {
"common/assembler-tester.h", "common/assembler-tester.h",
"common/flag-utils.h", "common/flag-utils.h",
"common/types-fuzz.h", "common/types-fuzz.h",
"common/wasm/flag-utils.h",
"common/wasm/test-signatures.h",
"common/wasm/wasm-macro-gen.h",
] ]
if (v8_enable_webassembly) {
sources += [
"common/wasm/flag-utils.h",
"common/wasm/test-signatures.h",
"common/wasm/wasm-macro-gen.h",
]
}
} }
...@@ -107,7 +107,6 @@ v8_source_set("cctest_sources") { ...@@ -107,7 +107,6 @@ v8_source_set("cctest_sources") {
"compiler/test-linkage.cc", "compiler/test-linkage.cc",
"compiler/test-loop-analysis.cc", "compiler/test-loop-analysis.cc",
"compiler/test-machine-operator-reducer.cc", "compiler/test-machine-operator-reducer.cc",
"compiler/test-multiple-return.cc",
"compiler/test-node.cc", "compiler/test-node.cc",
"compiler/test-operator.cc", "compiler/test-operator.cc",
"compiler/test-representation-change.cc", "compiler/test-representation-change.cc",
...@@ -122,7 +121,6 @@ v8_source_set("cctest_sources") { ...@@ -122,7 +121,6 @@ v8_source_set("cctest_sources") {
"compiler/test-run-jsops.cc", "compiler/test-run-jsops.cc",
"compiler/test-run-load-store.cc", "compiler/test-run-load-store.cc",
"compiler/test-run-machops.cc", "compiler/test-run-machops.cc",
"compiler/test-run-native-calls.cc",
"compiler/test-run-retpoline.cc", "compiler/test-run-retpoline.cc",
"compiler/test-run-stackcheck.cc", "compiler/test-run-stackcheck.cc",
"compiler/test-run-tail-calls.cc", "compiler/test-run-tail-calls.cc",
...@@ -196,7 +194,6 @@ v8_source_set("cctest_sources") { ...@@ -196,7 +194,6 @@ v8_source_set("cctest_sources") {
"test-api-interceptors.cc", "test-api-interceptors.cc",
"test-api-stack-traces.cc", "test-api-stack-traces.cc",
"test-api-typed-array.cc", "test-api-typed-array.cc",
"test-api-wasm.cc",
"test-api.cc", "test-api.cc",
"test-api.h", "test-api.h",
"test-array-list.cc", "test-array-list.cc",
...@@ -248,7 +245,6 @@ v8_source_set("cctest_sources") { ...@@ -248,7 +245,6 @@ v8_source_set("cctest_sources") {
"test-inobject-slack-tracking.cc", "test-inobject-slack-tracking.cc",
"test-inspector.cc", "test-inspector.cc",
"test-intl.cc", "test-intl.cc",
"test-js-to-wasm.cc",
"test-js-weak-refs.cc", "test-js-weak-refs.cc",
"test-liveedit.cc", "test-liveedit.cc",
"test-local-handles.cc", "test-local-handles.cc",
...@@ -413,6 +409,12 @@ v8_source_set("cctest_sources") { ...@@ -413,6 +409,12 @@ v8_source_set("cctest_sources") {
"../common/wasm/flag-utils.h", "../common/wasm/flag-utils.h",
"../common/wasm/test-signatures.h", "../common/wasm/test-signatures.h",
"../common/wasm/wasm-macro-gen.h", "../common/wasm/wasm-macro-gen.h",
"compiler/test-multiple-return.cc",
# test-run-native-calls uses wasm's LinkageAllocator.
"compiler/test-run-native-calls.cc",
"test-api-wasm.cc",
"test-js-to-wasm.cc",
"wasm/test-backing-store.cc", "wasm/test-backing-store.cc",
"wasm/test-c-wasm-entry.cc", "wasm/test-c-wasm-entry.cc",
"wasm/test-compilation-cache.cc", "wasm/test-compilation-cache.cc",
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
import("../../gni/v8.gni")
group("v8_fuzzer") { group("v8_fuzzer") {
testonly = true testonly = true
...@@ -18,10 +20,15 @@ group("v8_fuzzer") { ...@@ -18,10 +20,15 @@ group("v8_fuzzer") {
"./parser/", "./parser/",
"./regexp/", "./regexp/",
"./regexp_builtins/", "./regexp_builtins/",
"./multi_return/",
"./wasm/",
"./wasm_async/",
"./wasm_code/",
"./wasm_compile/",
] ]
if (v8_enable_webassembly) {
data += [
"./multi_return/",
"./wasm/",
"./wasm_async/",
"./wasm_code/",
"./wasm_compile/",
]
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment