From a40734b3cc7366a154bdc66f0e5e3e4c9043fada Mon Sep 17 00:00:00 2001 From: Adam Klein Date: Tue, 13 Dec 2022 17:23:02 +0000 Subject: [PATCH] Revert "[maglev] Enable --maglev with --future" This reverts commit 4cc24b6a1c9d878093935269280111ccd02cd308. Reason for revert: sqlite-change-heap mjsunit test starts failing: https://ci.chromium.org/ui/p/v8/builders/ci/V8%20Linux64%20TSAN%20-%20no-concurrent-marking/12381/overview Original change's description: > [maglev] Enable --maglev with --future > > This also removes --nowrite-protect-code-memory from --future. > > Bug: v8:7700 > Change-Id: Ibf17f541906d5f586d380b00ce471b5e1f20f7e3 > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4100754 > Reviewed-by: Victor Gomes > Auto-Submit: Toon Verwaest > Commit-Queue: Victor Gomes > Cr-Commit-Position: refs/heads/main@{#84817} Bug: v8:7700 Change-Id: Ia9c4e5515cf24c8b96f7b05dc3c823bdfa285643 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4102360 Commit-Queue: Rubber Stamper Bot-Commit: Rubber Stamper Auto-Submit: Adam Klein Cr-Commit-Position: refs/heads/main@{#84818} --- src/flags/flag-definitions.h | 2 +- test/mjsunit/interrupt-budget-override.js | 2 +- test/mjsunit/never-optimize.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/flags/flag-definitions.h b/src/flags/flag-definitions.h index 8ab7708c7e..350540516a 100644 --- a/src/flags/flag-definitions.h +++ b/src/flags/flag-definitions.h @@ -455,7 +455,6 @@ DEFINE_BOOL(lower_tier_as_toptier, false, #ifdef V8_ENABLE_MAGLEV #define V8_ENABLE_MAGLEV_BOOL true DEFINE_BOOL(maglev, false, "enable the maglev optimizing compiler") -DEFINE_WEAK_IMPLICATION(future, maglev) DEFINE_BOOL(maglev_inlining, false, "enable inlining in the maglev optimizing compiler") DEFINE_BOOL(maglev_reuse_stack_slots, true, @@ -490,6 +489,7 @@ DEFINE_BOOL(maglev_ool_prologue, false, "use the Maglev out of line prologue") #if ENABLE_SPARKPLUG DEFINE_WEAK_IMPLICATION(future, flush_baseline_code) #endif +DEFINE_WEAK_NEG_IMPLICATION(future, write_protect_code_memory) DEFINE_BOOL_READONLY(dict_property_const_tracking, V8_DICT_PROPERTY_CONST_TRACKING_BOOL, diff --git a/test/mjsunit/interrupt-budget-override.js b/test/mjsunit/interrupt-budget-override.js index fe0a874de0..9f3784e793 100644 --- a/test/mjsunit/interrupt-budget-override.js +++ b/test/mjsunit/interrupt-budget-override.js @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Flags: --turbofan --interrupt-budget=100 --interrupt-budget-for-feedback-allocation=10 --allow-natives-syntax --nomaglev +// Flags: --turbofan --interrupt-budget=100 --interrupt-budget-for-feedback-allocation=10 --allow-natives-syntax function f() { let s = 0; diff --git a/test/mjsunit/never-optimize.js b/test/mjsunit/never-optimize.js index 5294edd9bc..8007eb5c2a 100644 --- a/test/mjsunit/never-optimize.js +++ b/test/mjsunit/never-optimize.js @@ -26,7 +26,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Flags: --allow-natives-syntax --turbofan --no-always-turbofan --no-use-osr -// Flags: --interrupt-budget=1024 --nomaglev +// Flags: --interrupt-budget=1024 function o1() { } %PrepareFunctionForOptimization(o1);