[testrunner] enable --wasm-generic-wrapper for nooptimization variant

The generic wrapper will be the baseline variant of the JavaScript-to-
WebAssembly wrapper. Enabling it in the nooptimization variant gives it
test coverage.

R=clemensb@chromium.org

Bug: v8:10701
Change-Id: I37d1f767c61ff70e103d1742ef84f874c3804d7d
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2461240
Auto-Submit: Andreas Haas <ahaas@chromium.org>
Reviewed-by: Clemens Backes <clemensb@chromium.org>
Commit-Queue: Andreas Haas <ahaas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#70472}
This commit is contained in:
Andreas Haas 2020-10-09 13:01:38 +02:00 committed by Commit Bot
parent 5168a84733
commit b206bdd0e0
2 changed files with 13 additions and 4 deletions

View File

@ -63,9 +63,17 @@ function checkError(message) {
// InspectorTest.log(function_names.join(', '));
// Check for at least one full cycle of
// fib -> wasm-to-js -> imp -> js-to-wasm -> fib.
const expected = ['fib', 'wasm-to-js:i:i', 'imp', 'js-to-wasm:i:i', 'fib'];
for (let i = 0; i <= function_names.length - expected.length; ++i) {
if (expected.every((val, idx) => val == function_names[i + idx])) {
// There are two different kinds of js-to-wasm-wrappers, so there are two
// possible positive traces.
const expected_generic =
['fib', 'wasm-to-js:i:i', 'imp', 'GenericJSToWasmWrapper', 'fib'];
const expected_optimized =
['fib', 'wasm-to-js:i:i', 'imp', 'js-to-wasm:i:i', 'fib'];
for (let i = 0; i <= function_names.length - expected_generic.length; ++i) {
if (expected_generic.every(
(val, idx) => val == function_names[i + idx]) ||
expected_optimized.every(
(val, idx) => val == function_names[i + idx])) {
found_good_profile = true;
}
}

View File

@ -28,7 +28,8 @@ ALL_VARIANT_FLAGS = {
# 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"]],
"nooptimization": [["--no-opt", "--liftoff", "--no-wasm-tier-up",
"--wasm-generic-wrapper"]],
"slow_path": [["--force-slow-path"]],
"stress": [["--stress-opt", "--no-liftoff", "--stress-lazy-source-positions"]],
"stress_concurrent_allocation": [["--stress-concurrent-allocation"]],