2000aea58a
This is a reland of0ba115e6a9Changes compared to last reland: - Fix Python code trying to write to expected_outcomes, which is now a computed property. - Fix remaining place in d8.cc that ignored the --fuzzing flag. - Expect flag contradictions for --cache in code_serializer variant. Original change's description: > Reland^3 "[flags] warn about contradictory flags" > > Changes: > - Also allow second parameter influenced by --cache to be reassigned. > - Fix --stress-opt to only --always-opt in the last iteration as before. > > Original change's description: > > Reland^2 "[flags] warn about contradictory flags" > > > > This is a reland ofd8f8a7e210> > Change compared to last reland: > > - Do not check for d8 flag contradictions in the presence of --fuzzing > > - Allow identical re-declaration of --cache=* > > > > Original change's description: > > > Reland "[flags] warn about contradictory flags" > > > > > > This is a reland ofb8f9166664> > > Difference to previous CL: Additional functionality to specify > > > incompatible flags based on GN variables and extra-flags, used > > > to fix the issues that came up on the waterfall. > > > > > > This also changes the rules regarding repeated flags: While > > > explicitly repeated flags are allowed for boolean values as long > > > as they are identical, repeated flags or explicit flags in the > > > presence of an active implication are disallowed for non-boolean > > > flags. The latter simplifies specifying conflict rules in > > > variants.py. Otherwise a rule like > > > > > > INCOMPATIBLE_FLAGS_PER_EXTRA_FLAG = { > > > "--gc-interval=*": ["--gc-interval=*"], > > > } > > > > > > wouldn't work because specifying the same GC interval twice > > > wouldn't actually count as a conflict. This was an issue with > > > test/mjsunit/wasm/gc-buffer.js, which specifies > > > --gc-interval=500 exactly like the extra flag by the stress bot. > > > > > > Also, this now expands contradictory flags checking to d8 flags > > > for consistency. > > > > > > Original change's description: > > > > [flags] warn about contradictory flags > > > > > > > > Design Doc: https://docs.google.com/document/d/1lkvu8crkK7Ei39qjkPCFijpNyxWXsOktG9GB-7K34jM/ > > > > > > > > Bug: v8:10577 > > > > Change-Id: Ib9cfdffa401c48c895bf31caed5ee03545beddab > > > > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2154792 > > > > Reviewed-by: Clemens Backes <clemensb@chromium.org> > > > > Reviewed-by: Michael Achenbach <machenbach@chromium.org> > > > > Reviewed-by: Georg Neis <neis@chromium.org> > > > > Reviewed-by: Tamer Tas <tmrts@chromium.org> > > > > Commit-Queue: Tobias Tebbi <tebbi@chromium.org> > > > > Cr-Commit-Position: refs/heads/master@{#68168} > > > > > > Bug: v8:10577 > > > Change-Id: I268e590ee18a535b13dee14eeb15ddd0a9ee8341 > > > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2235115 > > > Commit-Queue: Tobias Tebbi <tebbi@chromium.org> > > > Reviewed-by: Tamer Tas <tmrts@chromium.org> > > > Reviewed-by: Clemens Backes <clemensb@chromium.org> > > > Reviewed-by: Georg Neis <neis@chromium.org> > > > Cr-Commit-Position: refs/heads/master@{#68989} > > > > Bug: v8:10577 > > Change-Id: I31d2794d4f9ff630f3444210100c64d67d881276 > > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2339464 > > Commit-Queue: Tobias Tebbi <tebbi@chromium.org> > > Reviewed-by: Clemens Backes <clemensb@chromium.org> > > Cr-Commit-Position: refs/heads/master@{#69339} > > Bug: v8:10577 > Cq-Include-Trybots: luci.v8.try:v8_linux64_tsan_rel_ng > Cq-Include-Trybots: luci.v8.try:v8_linux64_tsan_isolates_rel_ng > Change-Id: I4a69dc57a102782cb453144323e3752ac8278624 > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2352770 > Commit-Queue: Tobias Tebbi <tebbi@chromium.org> > Reviewed-by: Tobias Tebbi <tebbi@chromium.org> > Reviewed-by: Clemens Backes <clemensb@chromium.org> > Cr-Commit-Position: refs/heads/master@{#69433} Change-Id: Ib6d2aeb495210f581ac671221c265df58e8e5e70 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2398640 Commit-Queue: Tobias Tebbi <tebbi@chromium.org> Reviewed-by: Clemens Backes <clemensb@chromium.org> Reviewed-by: Tamer Tas <tmrts@chromium.org> Cr-Commit-Position: refs/heads/master@{#69954}
121 lines
5.3 KiB
Python
121 lines
5.3 KiB
Python
# Copyright 2016 the V8 project authors. All rights reserved.
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
|
|
# Use this to run several variants of the tests.
|
|
ALL_VARIANT_FLAGS = {
|
|
"assert_types": [["--assert-types"]],
|
|
"code_serializer": [["--cache=code"]],
|
|
"default": [[]],
|
|
"future": [["--future"]],
|
|
"gc_stats": [["--gc-stats=1"]],
|
|
# Alias of exhaustive variants, but triggering new test framework features.
|
|
"infra_staging": [[]],
|
|
"interpreted_regexp": [["--regexp-interpret-all"]],
|
|
"experimental_regexp": [["--enable-experimental-regexp-engine"]],
|
|
"jitless": [["--jitless"]],
|
|
"minor_mc": [["--minor-mc"]],
|
|
"nci": [["--turbo-nci"]],
|
|
"nci_as_midtier": [["--turbo-nci-as-midtier"]],
|
|
"no_lfa": [["--no-lazy-feedback-allocation"]],
|
|
"no_local_heaps": [[
|
|
"--no-local-heaps",
|
|
"--no-turbo-direct-heap-access",
|
|
"--no-finalize-streaming-on-background"]],
|
|
# 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.
|
|
# 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", "--no-liftoff", "--stress-lazy-source-positions"]],
|
|
"stress_concurrent_allocation": [["--stress-concurrent-allocation"]],
|
|
"stress_js_bg_compile_wasm_code_gc": [["--stress-background-compile",
|
|
"--stress-wasm-code-gc"]],
|
|
"stress_incremental_marking": [["--stress-incremental-marking"]],
|
|
"stress_snapshot": [["--stress-snapshot"]],
|
|
# Trigger stress sampling allocation profiler with sample interval = 2^14
|
|
"stress_sampling": [["--stress-sampling-allocation-profiler=16384"]],
|
|
"trusted": [["--no-untrusted-code-mitigations"]],
|
|
"no_wasm_traps": [["--no-wasm-trap-handler"]],
|
|
"turboprop": [["--turboprop"]],
|
|
"instruction_scheduling": [["--turbo-instruction-scheduling"]],
|
|
"stress_instruction_scheduling": [["--turbo-stress-instruction-scheduling"]],
|
|
"top_level_await": [["--harmony-top-level-await"]],
|
|
}
|
|
|
|
# Flags that lead to a contradiction with the flags provided by the respective
|
|
# variant. This depends on the flags specified in ALL_VARIANT_FLAGS and on the
|
|
# implications defined in flag-definitions.h.
|
|
INCOMPATIBLE_FLAGS_PER_VARIANT = {
|
|
"assert_types": ["--no-assert-types"],
|
|
"jitless": ["--opt", "--liftoff", "--track-field-types", "--validate-asm"],
|
|
"no_wasm_traps": ["--wasm-trap-handler"],
|
|
"nooptimization": ["--opt", "--no-liftoff", "--predictable", "--wasm-tier-up"],
|
|
"slow_path": ["--no-force-slow-path"],
|
|
"stress_incremental_marking": ["--no-stress-incremental-marking"],
|
|
"stress_js_bg_compile_wasm_code_gc": ["--no-stress-background-compile"],
|
|
"stress": ["--no-stress-opt", "--always-opt", "--no-always-opt", "--liftoff", "--max-inlined-bytecode-size=*",
|
|
"--max-inlined-bytecode-size-cumulative=*", "--stress-inline"],
|
|
"turboprop": ["--turbo-inlining", "--interrupt-budget=*", "--no-turboprop"],
|
|
"code_serializer": ["--cache=after-execute", "--cache=full-code-cache", "--cache=none"],
|
|
"no_local_heaps": ["--concurrent-inlining", "--turboprop", ],
|
|
}
|
|
|
|
# Flags that lead to a contradiction under certain build variables.
|
|
# This corresponds to the build variables usable in status files as generated
|
|
# in _get_statusfile_variables in base_runner.py.
|
|
# The conflicts might be directly contradictory flags or be caused by the
|
|
# implications defined in flag-definitions.h.
|
|
INCOMPATIBLE_FLAGS_PER_BUILD_VARIABLE = {
|
|
"lite_mode": ["--no-lazy-feedback-allocation", "--max-semi-space-size=*"]
|
|
+ INCOMPATIBLE_FLAGS_PER_VARIANT["jitless"],
|
|
"predictable": ["--liftoff", "--parallel-compile-tasks",
|
|
"--concurrent-recompilation",
|
|
"--wasm-num-compilation-tasks=*"],
|
|
}
|
|
|
|
# Flags that lead to a contradiction when a certain extra-flag is present.
|
|
# Such extra-flags are defined for example in infra/testing/builders.pyl or in
|
|
# standard_runner.py.
|
|
# The conflicts might be directly contradictory flags or be caused by the
|
|
# implications defined in flag-definitions.h.
|
|
INCOMPATIBLE_FLAGS_PER_EXTRA_FLAG = {
|
|
"--concurrent-recompilation": ["--no-concurrent-recompilation", "--predictable"],
|
|
"--enable-armv8": ["--no-enable-armv8"],
|
|
"--gc-interval=*": ["--gc-interval=*"],
|
|
"--no-enable-sse3": ["--enable-sse3"],
|
|
"--no-enable-sse4-1": ["--enable-sse4-1"],
|
|
"--optimize-for-size": ["--max-semi-space-size=*"],
|
|
"--stress-flush-bytecode": ["--no-stress-flush-bytecode"],
|
|
"--stress-incremental-marking": INCOMPATIBLE_FLAGS_PER_VARIANT["stress_incremental_marking"],
|
|
}
|
|
|
|
SLOW_VARIANTS = set([
|
|
'stress',
|
|
'stress_snapshot',
|
|
'nooptimization',
|
|
])
|
|
|
|
FAST_VARIANTS = set([
|
|
'default'
|
|
])
|
|
|
|
|
|
def _variant_order_key(v):
|
|
if v in SLOW_VARIANTS:
|
|
return 0
|
|
if v in FAST_VARIANTS:
|
|
return 100
|
|
return 50
|
|
|
|
ALL_VARIANTS = sorted(ALL_VARIANT_FLAGS.keys(),
|
|
key=_variant_order_key)
|
|
|
|
# Check {SLOW,FAST}_VARIANTS entries
|
|
for variants in [SLOW_VARIANTS, FAST_VARIANTS]:
|
|
for v in variants:
|
|
assert v in ALL_VARIANT_FLAGS
|