From e6bcabd10cc288f4439f4d23b4a1be19fce13c7e Mon Sep 17 00:00:00 2001 From: Al Muthanna Athamina Date: Fri, 5 Aug 2022 15:24:12 +0200 Subject: [PATCH] Revert "Reland "[infra] Enable sandbox for x64 and arm64 builders and add a set of builders with Sandbox off"" This reverts commit fe327545e382e7ca2469c64accedee50de5de7cd. Reason for revert: https://ci.chromium.org/ui/p/v8/builders/ci/V8%20Linux64%20TSAN%20-%20stress-incremental-marking/8615/overview Original change's description: > Reland "[infra] Enable sandbox for x64 and arm64 builders and add a set of builders with Sandbox off" > > This is a reland of commit 2055c3b48233c2706ae5c22896508b5ad0621353 > > Original change's description: > > [infra] Enable sandbox for x64 and arm64 builders and add a set of builders with Sandbox off > > > > Bug: v8:13058 > > Change-Id: If9d500f46f02ed3588d2b0e3904567c61aaddd12 > > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3810184 > > Reviewed-by: Michael Achenbach > > Commit-Queue: Almothana Athamneh > > Cr-Commit-Position: refs/heads/main@{#82213} > > Bug: v8:13058 > Change-Id: I315fd1cd5c36464b1a15c635c8f31825769c3eb0 > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3812042 > Auto-Submit: Almothana Athamneh > Reviewed-by: Michael Achenbach > Commit-Queue: Almothana Athamneh > Commit-Queue: Michael Achenbach > Cr-Commit-Position: refs/heads/main@{#82221} Bug: v8:13058 Change-Id: Icb621fac3758384e0b04520585f5c998563c1f6f No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3811289 Reviewed-by: Michael Achenbach Auto-Submit: Almothana Athamneh Commit-Queue: Michael Achenbach Cr-Commit-Position: refs/heads/main@{#82224} --- BUILD.gn | 6 ------ infra/mb/mb_config.pyl | 41 +++++++++++--------------------------- infra/testing/builders.pyl | 36 --------------------------------- 3 files changed, 12 insertions(+), 71 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index f90ac9e622..0c1a72dfd2 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -496,12 +496,6 @@ if (v8_multi_arch_build && v8_enable_external_code_space = v8_enable_pointer_compression } -# Ensure the sandbox is on/off in the same way as pointer compression for -# correctness fuzzing builds. -if (v8_multi_arch_build) { - v8_enable_sandbox = v8_enable_pointer_compression -} - # Check if it is a Chromium build and activate PAC/BTI if needed. # TODO(cavalcantii): have a single point of integration with PAC/BTI flags. if (build_with_chromium && v8_current_cpu == "arm64" && diff --git a/infra/mb/mb_config.pyl b/infra/mb/mb_config.pyl index 7df62fb403..409aae492f 100644 --- a/infra/mb/mb_config.pyl +++ b/infra/mb/mb_config.pyl @@ -72,8 +72,6 @@ 'V8 Linux64 - heap sandbox - debug - builder': 'debug_x64_heap_sandbox', 'V8 Linux64 - internal snapshot - builder': 'release_x64_internal', 'V8 Linux64 - debug - header includes - builder': 'debug_x64_header_includes', - 'V8 Linux64 - no sandbox - debug builder': 'debug_x64_no_sandbox', - 'V8 Linux64 - no sandbox - builder': 'release_x64_no_sandbox', 'V8 Linux64 - shared - builder': 'release_x64_shared_verify_heap', 'V8 Linux64 - verify csa - builder': 'release_x64_verify_csa', 'V8 Linux64 - no wasm - builder': 'release_x64_webassembly_disabled', @@ -113,7 +111,7 @@ 'V8 iOS - sim - builder': 'release_x64_ios_simulator', 'V8 Linux64 - arm64 - sim - heap sandbox - debug - builder': 'debug_x64_heap_sandbox_arm64_sim', 'V8 Linux64 - arm64 - sim - no pointer compression - builder': - 'release_simulate_arm64_no_pointer_compression', + 'release_simulate_arm64_pointer_compression', 'V8 Linux64 - cppgc-non-default - debug - builder': 'debug_x64_non_default_cppgc', 'V8 Linux64 - debug - perfetto - builder': 'debug_x64_perfetto', 'V8 Linux64 - disable runtime call stats - builder': 'release_x64_disable_runtime_call_stats', @@ -226,10 +224,9 @@ 'v8_linux_shared_compile_rel': 'release_x86_shared_verify_heap', 'v8_linux_vtunejit': 'debug_x86_vtunejit', 'v8_linux64_arm64_no_pointer_compression_rel_ng': - 'release_simulate_arm64_no_pointer_compression', + 'release_simulate_arm64_pointer_compression', 'v8_linux64_cppgc_non_default_dbg_ng': 'debug_x64_non_default_cppgc', 'v8_linux64_dbg_ng': 'debug_x64_trybot', - 'v8_linux64_no_sandbox_dbg_ng': 'debug_x64_no_sandbox', 'v8_linux64_dict_tracking_dbg_ng': 'debug_x64_dict_tracking_trybot', 'v8_linux64_disable_runtime_call_stats_rel_ng': 'release_x64_disable_runtime_call_stats', 'v8_linux64_external_code_space_dbg_ng': 'debug_x64_external_code_space', @@ -249,7 +246,6 @@ 'v8_linux64_perfetto_dbg_ng': 'debug_x64_perfetto', 'v8_linux64_no_pointer_compression_rel_ng': 'release_x64_no_pointer_compression', 'v8_linux64_rel_ng': 'release_x64_test_features_trybot', - 'v8_linux64_no_sandbox_rel_ng': 'release_x64_no_sandbox', 'v8_linux64_shared_compile_rel': 'release_x64_shared_verify_heap', 'v8_linux64_single_generation_dbg_ng': 'debug_x64_single_generation', 'v8_linux64_no_wasm_compile_rel': 'release_x64_webassembly_disabled', @@ -427,8 +423,11 @@ 'release_bot', 'simulate_arm64'], 'release_simulate_arm64_cfi': [ 'release_bot', 'simulate_arm64', 'v8_control_flow_integrity'], - 'release_simulate_arm64_no_pointer_compression': [ - 'release_bot', 'simulate_arm64_no_sandbox', 'dcheck_always_on', + 'release_simulate_arm64_pointer_compression': [ + # TODO(v8:v7703): Make pointer compression bots testing non pointer + # compression mode while pointer compression is temporarily enabled + # on arm64 + 'release_bot', 'simulate_arm64', 'dcheck_always_on', 'v8_enable_slow_dchecks', 'v8_disable_pointer_compression'], 'release_simulate_arm64_msan': [ 'release_bot', 'simulate_arm64', 'msan'], @@ -463,7 +462,7 @@ 'debug_arm64': [ 'debug_bot', 'arm64'], 'debug_arm64_no_pointer_compression': [ - 'debug_bot', 'arm64_no_sandbox', 'dcheck_always_on', 'v8_enable_slow_dchecks', 'v8_enable_javascript_promise_hooks', + 'debug_bot', 'arm64', 'dcheck_always_on', 'v8_enable_slow_dchecks', 'v8_enable_javascript_promise_hooks', 'v8_disable_pointer_compression'], 'full_debug_arm64': [ 'debug_bot', 'arm64', 'v8_full_debug'], @@ -544,12 +543,10 @@ 'release_x64_minimal_symbols_reclient': [ 'release_bot_reclient', 'x64', 'minimal_symbols'], 'release_x64_no_pointer_compression': [ - 'release_bot', 'x64_no_sandbox', 'dcheck_always_on', 'v8_enable_slow_dchecks', 'v8_enable_javascript_promise_hooks', + 'release_bot', 'x64', 'dcheck_always_on', 'v8_enable_slow_dchecks', 'v8_enable_javascript_promise_hooks', 'v8_disable_pointer_compression'], 'release_x64_reclient': [ 'release_bot_reclient', 'x64'], - 'release_x64_no_sandbox': [ - 'release_bot', 'x64_no_sandbox'], 'release_x64_trybot': [ 'release_trybot', 'x64'], 'release_x64_test_features_trybot': [ @@ -609,8 +606,6 @@ 'debug_bot', 'x64', 'non_default_cppgc'], 'debug_x64_perfetto': [ 'debug_bot', 'x64', 'perfetto'], - 'debug_x64_no_sandbox': [ - 'debug_bot', 'x64_no_sandbox'], 'debug_x64_single_generation': [ 'debug_bot', 'x64', 'v8_enable_single_generation'], 'debug_x64_trybot': [ @@ -687,11 +682,7 @@ }, 'arm64': { - 'gn_args': 'target_cpu="arm64" v8_enable_sandbox=true', - }, - - 'arm64_no_sandbox': { - 'gn_args': 'target_cpu="arm64" v8_enable_sandbox=false', + 'gn_args': 'target_cpu="arm64"', }, 'asan': { @@ -873,11 +864,7 @@ }, 'simulate_arm64': { - 'gn_args': 'target_cpu="x64" v8_target_cpu="arm64" v8_enable_sandbox=true', - }, - - 'simulate_arm64_no_sandbox': { - 'gn_args': 'target_cpu="x64" v8_target_cpu="arm64" v8_enable_sandbox=false', + 'gn_args': 'target_cpu="x64" v8_target_cpu="arm64"', }, 'simulate_loong64': { @@ -1047,11 +1034,7 @@ }, 'x64': { - 'gn_args': 'target_cpu="x64" v8_enable_sandbox=true', - }, - - 'x64_no_sandbox': { - 'gn_args': 'target_cpu="x64" v8_enable_sandbox=false', + 'gn_args': 'target_cpu="x64"', }, 'x86': { diff --git a/infra/testing/builders.pyl b/infra/testing/builders.pyl index 368ee40910..ae7e1fe0cf 100644 --- a/infra/testing/builders.pyl +++ b/infra/testing/builders.pyl @@ -515,15 +515,6 @@ {'name': 'v8testing', 'shards': 3}, ], }, - 'v8_linux64_no_sandbox_dbg_ng_triggered': { - 'swarming_dimensions' : { - 'cpu': 'x86-64-avx2', - 'os': 'Ubuntu-18.04', - }, - 'tests': [ - {'name': 'v8testing', 'shards': 5}, - ], - }, 'v8_linux64_single_generation_dbg_ng_triggered': { 'swarming_dimensions' : { 'os': 'Ubuntu-18.04', @@ -554,15 +545,6 @@ {'name': 'mjsunit', 'variant': 'maglev'}, ], }, - 'v8_linux64_no_sandbox_rel_ng_triggered': { - 'swarming_dimensions' : { - 'cpu': 'x86-64-avx2', - 'os': 'Ubuntu-18.04', - }, - 'tests': [ - {'name': 'v8testing', 'shards': 2}, - ], - }, 'v8_linux64_tsan_rel_ng_triggered': { 'swarming_dimensions' : { 'os': 'Ubuntu-18.04', @@ -1446,24 +1428,6 @@ {'name': 'v8testing', 'shards': 2}, ], }, - 'V8 Linux64 - no sandbox': { - 'swarming_dimensions': { - 'cpu': 'x86-64-avx2', - 'os': 'Ubuntu-18.04', - }, - 'tests': [ - {'name': 'v8testing'}, - ], - }, - 'V8 Linux64 - no sandbox - debug': { - 'swarming_dimensions': { - 'cpu': 'x86-64-avx2', - 'os': 'Ubuntu-18.04', - }, - 'tests': [ - {'name': 'v8testing', 'shards': 2}, - ], - }, 'V8 Linux64 - shared': { 'swarming_dimensions' : { 'os': 'Ubuntu-18.04',