Commit b7648be7 authored by Ross McIlroy's avatar Ross McIlroy Committed by Commit Bot

[Flags] Remove --ignition-staging flag.

Removes the --ignition-staging flag since it is no longer used
by anything and won't be a shipping configuration. Also removes
ignition_turbo variant from testrunner, since it is now 
the same as the turbofan variant.

BUG=v8:4280

Change-Id: I3b96e986879fc70b8e202fe9496334828acdd0ba
Reviewed-on: https://chromium-review.googlesource.com/452621
Commit-Queue: Ross McIlroy <rmcilroy@chromium.org>
Reviewed-by: 's avatarMichael Achenbach <machenbach@chromium.org>
Reviewed-by: 's avatarMichael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#43806}
parent 14d0930d
......@@ -268,15 +268,10 @@ DEFINE_BOOL(future, FUTURE_BOOL,
"not-too-far future")
DEFINE_IMPLICATION(future, turbo)
DEFINE_DUAL_IMPLICATION(turbo, ignition_staging)
DEFINE_DUAL_IMPLICATION(turbo, ignition)
DEFINE_DUAL_IMPLICATION(turbo, enable_fast_array_builtins)
DEFINE_DUAL_IMPLICATION(turbo, thin_strings)
// TODO(rmcilroy): Remove ignition-staging and set these implications directly
// with the turbo flag.
DEFINE_BOOL(ignition_staging, false, "use ignition with all staged features")
DEFINE_DUAL_IMPLICATION(ignition_staging, ignition)
// Flags for experimental implementation features.
DEFINE_BOOL(allocation_site_pretenuring, true,
"pretenure with allocation sites")
......
......@@ -366,10 +366,10 @@
}], # variant == turbofan_opt
##############################################################################
['variant == turbofan or variant == ignition_turbofan', {
['variant == turbofan', {
# BUG(4751). Flaky with Ignition.
'test-cpu-profiler/JsNativeJsSample': [SKIP],
}], # variant == turbofan or variant == ignition_turbofan
}], # variant == turbofan
##############################################################################
['variant == asm_wasm', {
......
......@@ -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: --validate-asm --ignition-staging --lazy-inner-functions
// Flags: --validate-asm --ignition --lazy-inner-functions
function outer() {
"use asm";
......
......@@ -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: --allow-natives-syntax --ignition-staging --turbo
// Flags: --allow-natives-syntax --ignition --turbo
function f(do_osr) {
for (var i = 0; i < 3; ++i) {
......
......@@ -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: --allow-natives-syntax --es-staging --ignition-staging --turbo
// Flags: --allow-natives-syntax --es-staging --ignition --turbo
"use strict";
......
......@@ -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: --ignition-staging --stack-size=100
// Flags: --ignition --stack-size=100
function Module(stdlib) {
"use asm";
......
......@@ -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: --allow-natives-syntax --expose-gc --ignition-staging --no-lazy
// Flags: --allow-natives-syntax --expose-gc --ignition --no-lazy
function f() {
for (var i = 0; i < 10; i++) if (i == 5) %OptimizeOsr();
......
......@@ -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: --ignition-staging --turbo --validate-asm --always-opt
// Flags: --ignition --turbo --validate-asm --always-opt
function Module() {
"use asm";
......
......@@ -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: --allow-natives-syntax --ignition-staging --turbo
// Flags: --allow-natives-syntax --ignition --turbo
class Base {}
class Subclass extends Base {
......
......@@ -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: --allow-natives-syntax --ignition-staging
// Flags: --allow-natives-syntax --ignition
function f() {
for (var i = 0; i < 3; ++i) {
......
......@@ -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: --allow-natives-syntax --stack-size=100 --ignition-staging --turbo
// Flags: --allow-natives-syntax --stack-size=100 --ignition --turbo
var source = "return 1" + new Array(2048).join(' + a') + "";
eval("function g(a) {" + source + "}");
......
......@@ -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: --ignition-staging --turbo --always-opt
// Flags: --ignition --turbo --always-opt
function f () {
var x = "";
......
......@@ -3,7 +3,7 @@
// found in the LICENSE file.
//
// Flags: --mark-shared-functions-for-tier-up --allow-natives-syntax
// Flags: --ignition-staging --turbo --crankshaft --no-always-opt
// Flags: --ignition --turbo --crankshaft --no-always-opt
// Flags: --turbo-filter=*
// If we are always or never optimizing it is useless.
......
#
# V8 correctness failure
# V8 correctness configs: x64,ignition:x64,ignition_staging
# V8 correctness configs: x64,ignition:x64,ignition_turbo
# V8 correctness sources: f60
# V8 correctness suppression:
#
# CHECK
#
# Compared x64,ignition with x64,ignition_staging
# Compared x64,ignition with x64,ignition_turbo
#
# Flags of x64,ignition:
--abort_on_stack_overflow --expose-gc --allow-natives-syntax --invoke-weak-callbacks --omit-quit --es-staging --random-seed 12345 --ignition --turbo-filter=~ --hydrogen-filter=~ --nocrankshaft
# Flags of x64,ignition_staging:
--abort_on_stack_overflow --expose-gc --allow-natives-syntax --invoke-weak-callbacks --omit-quit --es-staging --random-seed 12345 --ignition-staging
# Flags of x64,ignition_turbo:
--abort_on_stack_overflow --expose-gc --allow-natives-syntax --invoke-weak-callbacks --omit-quit --es-staging --random-seed 12345 --ignition --turbo
#
# Difference:
- unknown
......@@ -34,7 +34,7 @@ unknown
### End of configuration x64,ignition
#
### Start of configuration x64,ignition_staging:
### Start of configuration x64,ignition_turbo:
1
v8-foozzie source: name/to/a/file.js
......@@ -46,5 +46,5 @@ v8-foozzie source: name/to/file.js
not unknown
### End of configuration x64,ignition_staging
### End of configuration x64,ignition_turbo
......@@ -39,20 +39,17 @@ CONFIGS = dict(
'--no-lazy',
'--no-lazy-inner-functions',
],
ignition_staging=[
'--ignition-staging',
],
ignition_turbo=[
'--ignition-staging',
'--ignition',
'--turbo',
],
ignition_turbo_opt=[
'--ignition-staging',
'--ignition',
'--turbo',
'--always-opt',
],
ignition_turbo_opt_eager=[
'--ignition-staging',
'--ignition',
'--turbo',
'--always-opt',
'--no-lazy',
......
......@@ -96,7 +96,7 @@ def run_foozzie(first_d8, second_d8):
'--first-d8', os.path.join(TEST_DATA, first_d8),
'--second-d8', os.path.join(TEST_DATA, second_d8),
'--first-config', 'ignition',
'--second-config', 'ignition_staging',
'--second-config', 'ignition_turbo',
os.path.join(TEST_DATA, 'fuzz-123.js'),
])
......
......@@ -12,7 +12,6 @@ ALL_VARIANT_FLAGS = {
"noturbofan_stress": [["--no-turbo", "--stress-opt", "--always-opt"]],
"fullcode": [["--nocrankshaft", "--no-turbo"]],
"nooptimization": [["--nocrankshaft", "--turbo-filter=~"]],
"ignition_turbofan": [["--ignition-staging", "--turbo"]],
"asm_wasm": [["--validate-asm"]],
"wasm_traps": [["--wasm_guard_pages", "--wasm_trap_handler", "--invoke-weak-callbacks"]],
}
......@@ -26,12 +25,10 @@ FAST_VARIANT_FLAGS = {
"noturbofan_stress": [["--no-turbo", "--stress-opt"]],
"fullcode": [["--nocrankshaft", "--no-turbo"]],
"nooptimization": [["--nocrankshaft", "--turbo-filter=~"]],
"ignition_turbofan": [["--ignition-staging", "--turbo"]],
"asm_wasm": [["--validate-asm"]],
"wasm_traps": [["--wasm_guard_pages", "--wasm_trap_handler", "--invoke-weak-callbacks"]],
}
ALL_VARIANTS = set(["default", "stress", "turbofan", "turbofan_opt",
"noturbofan", "noturbofan_stress",
"fullcode", "nooptimization",
"ignition_turbofan", "asm_wasm", "wasm_traps"])
"noturbofan", "noturbofan_stress", "fullcode",
"nooptimization", "asm_wasm", "wasm_traps"])
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