Commit 605f94b7 authored by Clemens Hammacher's avatar Clemens Hammacher Committed by Commit Bot

[foozzie] Update existing configs for liftoff

Instead of having a separate liftoff config, which is tested against
the default (which currently means tier-up from liftoff to turbofan),
just choose reasonable liftoff configs for the existing configs.
'ignition' now implies pure liftoff execution.
'ignition_turbo_opt' always compiles with turbofan.
Other configs use the default (tier up).

R=machenbach@chromium.org

Bug: chromium:824098, v8:6600
Change-Id: I92c008fc1b1fa54d3161fb5695a095127d6ac263
Reviewed-on: https://chromium-review.googlesource.com/1141731Reviewed-by: 's avatarMichael Achenbach <machenbach@chromium.org>
Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54548}
parent 4498a282
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
# Compared x64,ignition with x64,ignition_turbo # Compared x64,ignition with x64,ignition_turbo
# #
# Flags of x64,ignition: # Flags of x64,ignition:
--abort_on_stack_or_string_length_overflow --expose-gc --allow-natives-syntax --invoke-weak-callbacks --omit-quit --es-staging --wasm-num-compilation-tasks=0 --random-seed 12345 --turbo-filter=~ --noopt --suppress-asm-messages --abort_on_stack_or_string_length_overflow --expose-gc --allow-natives-syntax --invoke-weak-callbacks --omit-quit --es-staging --wasm-num-compilation-tasks=0 --random-seed 12345 --turbo-filter=~ --noopt --suppress-asm-messages --liftoff --no-wasm-tier-up
# Flags of x64,ignition_turbo: # Flags of x64,ignition_turbo:
--abort_on_stack_or_string_length_overflow --expose-gc --allow-natives-syntax --invoke-weak-callbacks --omit-quit --es-staging --wasm-num-compilation-tasks=0 --random-seed 12345 --suppress-asm-messages --stress-scavenge=100 --abort_on_stack_or_string_length_overflow --expose-gc --allow-natives-syntax --invoke-weak-callbacks --omit-quit --es-staging --wasm-num-compilation-tasks=0 --random-seed 12345 --suppress-asm-messages --stress-scavenge=100
# #
......
...@@ -28,6 +28,8 @@ CONFIGS = dict( ...@@ -28,6 +28,8 @@ CONFIGS = dict(
'--turbo-filter=~', '--turbo-filter=~',
'--noopt', '--noopt',
'--suppress-asm-messages', '--suppress-asm-messages',
'--liftoff',
'--no-wasm-tier-up',
], ],
ignition_asm=[ ignition_asm=[
'--turbo-filter=~', '--turbo-filter=~',
...@@ -49,6 +51,8 @@ CONFIGS = dict( ...@@ -49,6 +51,8 @@ CONFIGS = dict(
ignition_turbo_opt=[ ignition_turbo_opt=[
'--always-opt', '--always-opt',
'--suppress-asm-messages', '--suppress-asm-messages',
'--no-liftoff',
'--no-wasm-tier-up',
], ],
ignition_turbo_opt_eager=[ ignition_turbo_opt_eager=[
'--always-opt', '--always-opt',
...@@ -56,11 +60,6 @@ CONFIGS = dict( ...@@ -56,11 +60,6 @@ CONFIGS = dict(
'--no-lazy-inner-functions', '--no-lazy-inner-functions',
'--suppress-asm-messages', '--suppress-asm-messages',
], ],
liftoff=[
'--liftoff',
'--no-wasm-tier-up',
'--suppress-asm-messages',
],
slow_path=[ slow_path=[
'--force-slow-path', '--force-slow-path',
'--suppress-asm-messages', '--suppress-asm-messages',
......
...@@ -39,7 +39,7 @@ class ConfigTest(unittest.TestCase): ...@@ -39,7 +39,7 @@ class ConfigTest(unittest.TestCase):
self.assertEqual( self.assertEqual(
[ [
'--first-config=ignition', '--first-config=ignition',
'--second-config=ignition_turbo_opt', '--second-config=ignition_turbo',
'--second-d8=d8', '--second-d8=d8',
], ],
v8_fuzz_config.Config('foo', Rng()).choose_foozzie_flags(), v8_fuzz_config.Config('foo', Rng()).choose_foozzie_flags(),
......
...@@ -13,15 +13,13 @@ FOOZZIE_EXPERIMENTS = [ ...@@ -13,15 +13,13 @@ FOOZZIE_EXPERIMENTS = [
[5, 'ignition', 'trusted_opt', 'd8'], [5, 'ignition', 'trusted_opt', 'd8'],
[10, 'ignition', 'slow_path', 'd8'], [10, 'ignition', 'slow_path', 'd8'],
[5, 'ignition', 'slow_path_opt', 'd8'], [5, 'ignition', 'slow_path_opt', 'd8'],
[20, 'ignition', 'ignition_turbo', 'd8'], [25, 'ignition', 'ignition_turbo', 'd8'],
[20, 'ignition', 'ignition_turbo_opt', 'd8'], [20, 'ignition', 'ignition_turbo_opt', 'd8'],
[4, 'ignition_turbo_opt', 'ignition_turbo_opt', 'clang_x86/d8'], [5, 'ignition_turbo_opt', 'ignition_turbo_opt', 'clang_x86/d8'],
[4, 'ignition_turbo', 'ignition_turbo', 'clang_x86/d8'], [5, 'ignition_turbo', 'ignition_turbo', 'clang_x86/d8'],
[4, 'ignition', 'ignition', 'clang_x86/d8'], [5, 'ignition', 'ignition', 'clang_x86/d8'],
[5, 'ignition', 'ignition', 'clang_x64_v8_arm64/d8'], [5, 'ignition', 'ignition', 'clang_x64_v8_arm64/d8'],
[5, 'ignition', 'ignition', 'clang_x86_v8_arm/d8'], [5, 'ignition', 'ignition', 'clang_x86_v8_arm/d8'],
[5, 'ignition', 'liftoff', 'd8'],
[3, 'liftoff', 'liftoff', 'clang_x86/d8'],
] ]
class Config(object): class Config(object):
......
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