Commit 498264f4 authored by Victor Gomes's avatar Victor Gomes Committed by V8 LUCI CQ

[baseline] Fix concurrent sparkplug implications

Whenever running any test with --jitless, V8 crashes with
Contradictory flag implications, because:
jitless -> !sparkplug
concurrent_sparkplug -> sparkplug

Change-Id: I51206dfb8d6978a9f9bfdb73e9068dcd5d8f9274
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3423783
Commit-Queue: Victor Gomes <victorgomes@chromium.org>
Auto-Submit: Victor Gomes <victorgomes@chromium.org>
Reviewed-by: 's avatarCamillo Bruni <cbruni@chromium.org>
Commit-Queue: Camillo Bruni <cbruni@chromium.org>
Cr-Commit-Position: refs/heads/main@{#78870}
parent b531a7bc
...@@ -684,7 +684,6 @@ DEFINE_BOOL_READONLY(concurrent_sparkplug, false, ...@@ -684,7 +684,6 @@ DEFINE_BOOL_READONLY(concurrent_sparkplug, false,
#else #else
DEFINE_BOOL(concurrent_sparkplug, false, DEFINE_BOOL(concurrent_sparkplug, false,
"compile Sparkplug code in a background thread") "compile Sparkplug code in a background thread")
DEFINE_IMPLICATION(concurrent_sparkplug, sparkplug)
DEFINE_WEAK_IMPLICATION(future, concurrent_sparkplug) DEFINE_WEAK_IMPLICATION(future, concurrent_sparkplug)
DEFINE_NEG_IMPLICATION(predictable, concurrent_sparkplug) DEFINE_NEG_IMPLICATION(predictable, concurrent_sparkplug)
DEFINE_NEG_IMPLICATION(single_threaded, concurrent_sparkplug) DEFINE_NEG_IMPLICATION(single_threaded, concurrent_sparkplug)
......
...@@ -15,6 +15,7 @@ ALL_VARIANT_FLAGS = { ...@@ -15,6 +15,7 @@ ALL_VARIANT_FLAGS = {
"experimental_regexp": [["--default-to-experimental-regexp-engine"]], "experimental_regexp": [["--default-to-experimental-regexp-engine"]],
"jitless": [["--jitless"]], "jitless": [["--jitless"]],
"sparkplug": [["--sparkplug"]], "sparkplug": [["--sparkplug"]],
"concurrent_sparkplug": [["--concurrent-sparkplug", "--sparkplug"]],
"always_sparkplug": [[ "--always-sparkplug", "--sparkplug"]], "always_sparkplug": [[ "--always-sparkplug", "--sparkplug"]],
"minor_mc": [["--minor-mc"]], "minor_mc": [["--minor-mc"]],
"no_lfa": [["--no-lazy-feedback-allocation"]], "no_lfa": [["--no-lazy-feedback-allocation"]],
...@@ -50,8 +51,8 @@ ALL_VARIANT_FLAGS = { ...@@ -50,8 +51,8 @@ ALL_VARIANT_FLAGS = {
# implications defined in flag-definitions.h. # implications defined in flag-definitions.h.
INCOMPATIBLE_FLAGS_PER_VARIANT = { INCOMPATIBLE_FLAGS_PER_VARIANT = {
"jitless": ["--opt", "--always-opt", "--liftoff", "--track-field-types", "jitless": ["--opt", "--always-opt", "--liftoff", "--track-field-types",
"--validate-asm", "--sparkplug", "--always-sparkplug", "--validate-asm", "--sparkplug", "--concurrent-sparkplug",
"--regexp-tier-up", "--no-regexp-interpret-all"], "--always-sparkplug", "--regexp-tier-up", "--no-regexp-interpret-all"],
"nooptimization": ["--always-opt"], "nooptimization": ["--always-opt"],
"slow_path": ["--no-force-slow-path"], "slow_path": ["--no-force-slow-path"],
"stress_concurrent_allocation": ["--single-threaded-gc", "--predictable"], "stress_concurrent_allocation": ["--single-threaded-gc", "--predictable"],
...@@ -70,6 +71,7 @@ INCOMPATIBLE_FLAGS_PER_VARIANT = { ...@@ -70,6 +71,7 @@ INCOMPATIBLE_FLAGS_PER_VARIANT = {
"--liftoff-only", "--wasm-speculative-inlining", "--liftoff-only", "--wasm-speculative-inlining",
"--wasm-dynamic-tiering"], "--wasm-dynamic-tiering"],
"sparkplug": ["--jitless"], "sparkplug": ["--jitless"],
"concurrent_sparkplug": ["--jitless"],
"always_sparkplug": ["--jitless"], "always_sparkplug": ["--jitless"],
"code_serializer": ["--cache=after-execute", "--cache=full-code-cache", "code_serializer": ["--cache=after-execute", "--cache=full-code-cache",
"--cache=none"], "--cache=none"],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment