From 31b49aeeb07454520273dede2a75d535c245e01a Mon Sep 17 00:00:00 2001 From: Clemens Hammacher Date: Tue, 9 Apr 2019 15:00:38 +0200 Subject: [PATCH] [test] Test more wasm variants Since wasm optimizations are independent of JS optimizations, we can just combine the "no_liftoff" variant with the existing "stress" variant (which has the similar "--always-opt" option for JS), and add a "Liftoff only" variant as part of "nooptimization". This gives more coverage to find bugs like https://crrev.com/c/1543354 more easy. R=mstarzinger@chromium.org, machenbach@chromium.org Change-Id: I81bb22074c59dcb650a05252da43a4170cd467ac Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1559740 Commit-Queue: Clemens Hammacher Reviewed-by: Michael Starzinger Reviewed-by: Michael Achenbach Cr-Commit-Position: refs/heads/master@{#60714} --- test/webkit/webkit.status | 4 ++-- tools/testrunner/local/variants.py | 9 ++++++--- tools/testrunner/standard_runner.py | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/test/webkit/webkit.status b/test/webkit/webkit.status index 53d0c3b167..82584b56fe 100644 --- a/test/webkit/webkit.status +++ b/test/webkit/webkit.status @@ -109,10 +109,10 @@ }], # arch == arm64 and msan ############################################################################## -['variant in [no_liftoff, nooptimization, stress, stress_background_compile] and (arch == arm or arch == arm64) and simulator_run', { +['variant in [nooptimization, stress, stress_background_compile] and (arch == arm or arch == arm64) and simulator_run', { # Slow tests: https://crbug.com/v8/7783 'dfg-double-vote-fuzz': [SKIP], -}], # variant in [no_liftoff, nooptimization, stress, stress_background_compile] and (arch == arm or arch == arm64) and simulator_run +}], # variant in [nooptimization, stress, stress_background_compile] and (arch == arm or arch == arm64) and simulator_run ############################################################################## ['gcov_coverage', { diff --git a/tools/testrunner/local/variants.py b/tools/testrunner/local/variants.py index a0d884bc71..ed9b1b87f5 100644 --- a/tools/testrunner/local/variants.py +++ b/tools/testrunner/local/variants.py @@ -12,14 +12,17 @@ ALL_VARIANT_FLAGS = { "infra_staging": [[]], "interpreted_regexp": [["--regexp-interpret-all"]], "jitless": [["--jitless"]], - "no_liftoff": [["--no-wasm-tier-up"]], "minor_mc": [["--minor-mc"]], # No optimization means disable all optimizations. OptimizeFunctionOnNextCall # would not force optimization too. It turns into a Nop. Please see # https://chromium-review.googlesource.com/c/452620/ for more discussion. - "nooptimization": [["--noopt"]], + # For WebAssembly, we test "Liftoff-only" in the nooptimization variant and + # "TurboFan-only" in the stress variant. The WebAssembly configuration is + # independent of JS optimizations, so we can combine those configs. + "nooptimization": [["--no-opt", "--liftoff", "--no-wasm-tier-up"]], "slow_path": [["--force-slow-path"]], - "stress": [["--stress-opt", "--always-opt"]], + "stress": [["--stress-opt", "--always-opt", "--no-liftoff", + "--no-wasm-tier-up"]], "stress_background_compile": [["--stress-background-compile"]], "stress_incremental_marking": [["--stress-incremental-marking"]], # Trigger stress sampling allocation profiler with sample interval = 2^14 diff --git a/tools/testrunner/standard_runner.py b/tools/testrunner/standard_runner.py index f01ff59da3..85538133e1 100755 --- a/tools/testrunner/standard_runner.py +++ b/tools/testrunner/standard_runner.py @@ -46,7 +46,7 @@ VARIANT_ALIASES = { # Shortcut for the two above ("more" first - it has the longer running tests). "exhaustive": MORE_VARIANTS + VARIANTS, # Additional variants, run on a subset of bots. - "extra": ["nooptimization", "future", "no_liftoff", "no_wasm_traps"], + "extra": ["nooptimization", "future", "no_wasm_traps"], } GC_STRESS_FLAGS = ["--gc-interval=500", "--stress-compaction",