From baa2840f9e448e051cb06fc0a6c66c00572c407c Mon Sep 17 00:00:00 2001 From: Clemens Backes Date: Mon, 26 Apr 2021 10:56:07 +0200 Subject: [PATCH] [wasm] Add variant for --wasm-write-protect-code-memory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This adds a test variant enabling --wasm-write-protect-code-memory, and enables it on linux64 debug and release bots. R=machenbach@chromium.org, jkummerow@chromium.org CC=​dlehmann@google.com Bug: v8:11667, v8:11663 Change-Id: I04f47d06d9720f7bc9e122d17b253646f2c203b1 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2839562 Commit-Queue: Clemens Backes Reviewed-by: Toon Verwaest Reviewed-by: Jakob Kummerow Reviewed-by: Michael Achenbach Cr-Commit-Position: refs/heads/master@{#74179} --- infra/testing/builders.pyl | 6 ++++++ tools/testrunner/local/variants.py | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/infra/testing/builders.pyl b/infra/testing/builders.pyl index 1727eac406..53d9f129ea 100644 --- a/infra/testing/builders.pyl +++ b/infra/testing/builders.pyl @@ -389,6 +389,8 @@ {'name': 'mjsunit', 'variant': 'experimental_regexp'}, # Concurrent inlining. {'name': 'mjsunit', 'variant': 'concurrent_inlining'}, + # Wasm write protect code space. + {'name': 'mjsunit', 'variant': 'wasm_write_protect_code'}, ], }, 'v8_linux64_gc_stress_custom_snapshot_dbg_ng_triggered': { @@ -1204,6 +1206,8 @@ {'name': 'mjsunit', 'variant': 'experimental_regexp'}, # Concurrent inlining. {'name': 'mjsunit', 'variant': 'concurrent_inlining'}, + # Wasm write protect code space. + {'name': 'mjsunit', 'variant': 'wasm_write_protect_code'}, ], }, 'V8 Linux64 - debug - perfetto': { @@ -1235,6 +1239,8 @@ {'name': 'mjsunit', 'variant': 'experimental_regexp'}, # Concurrent inlining. {'name': 'mjsunit', 'variant': 'concurrent_inlining'}, + # Wasm write protect code space. + {'name': 'mjsunit', 'variant': 'wasm_write_protect_code'}, ], }, 'V8 Linux64 - gcov coverage': { diff --git a/tools/testrunner/local/variants.py b/tools/testrunner/local/variants.py index 7bb0812e83..8b07b60e39 100644 --- a/tools/testrunner/local/variants.py +++ b/tools/testrunner/local/variants.py @@ -44,6 +44,7 @@ ALL_VARIANT_FLAGS = { "instruction_scheduling": [["--turbo-instruction-scheduling"]], "stress_instruction_scheduling": [["--turbo-stress-instruction-scheduling"]], "top_level_await": [["--harmony-top-level-await"]], + "wasm_write_protect_code": [["--wasm-write-protect-code-memory"]], } # Flags that lead to a contradiction with the flags provided by the respective @@ -76,6 +77,9 @@ INCOMPATIBLE_FLAGS_PER_VARIANT = { "no_local_heaps": ["--concurrent-inlining", "--turboprop"], "experimental_regexp": ["--no-enable-experimental-regexp-engine", "--no-default-to-experimental-regexp-engine"], + # There is a negative implication: --perf-prof disables + # --wasm-write-protect-code-memory. + "wasm_write_protect_code": ["--perf-prof"], } # Flags that lead to a contradiction under certain build variables.