Skip to content

build: enable V8 Sparkplug+ with short builtin calls #67300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gurgunday wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −0
Open

build: enable V8 Sparkplug+ with short builtin calls #67300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
valid_intl_modes = ('none', 'small-icu', 'full-icu', 'system-icu')
icu_versions = json.loads((tools_path / 'icu' / 'icu_versions.json').read_text(encoding='utf-8'))
maglev_enabled_architectures = ('x64', 'arm', 'arm64', 'ppc64', 's390x', 'riscv64')
sparkplug_plus_enabled_architectures = ('x64', 'arm64', 'loong64')

# builtins may be removed later if they have been disabled by options
shareable_builtins = {'undici/undici': 'deps/undici/undici.js',
Expand Down Expand Up @@ -1235,6 +1236,17 @@
default=None,
help=f"Disable V8's Maglev compiler. {maglev_enabled_by_default_help}")

sparkplug_plus_enabled_by_default_help = (
f"(Sparkplug+ is enabled on {','.join(sparkplug_plus_enabled_architectures)} "
"when short builtin calls are enabled, which is the default on x64)")

parser.add_argument('--v8-disable-sparkplug-plus',
action='store_true',
dest='v8_disable_sparkplug_plus',
default=None,
help="Disable V8's Sparkplug+ (dynamic patching of baseline code). " +
sparkplug_plus_enabled_by_default_help)

parser.add_argument('--v8-enable-short-builtin-calls',
action='store_true',
dest='v8_enable_short_builtin_calls',
Expand Down Expand Up @@ -2281,6 +2293,12 @@ def configure_v8(o, configs):
o['variables']['v8_enable_hugepage'] = 1 if options.v8_enable_hugepage else 0
if options.v8_enable_short_builtin_calls or o['variables']['target_arch'] == 'x64':
o['variables']['v8_enable_short_builtin_calls'] = 1
# Sparkplug+ patches pc-relative builtin calls in baseline code, so V8 only
# uses it when short builtin calls are enabled.
o['variables']['v8_enable_sparkplug_plus'] = B(
not options.v8_disable_sparkplug_plus and
o['variables']['target_arch'] in sparkplug_plus_enabled_architectures and
o['variables'].get('v8_enable_short_builtin_calls') == 1)
if options.v8_enable_snapshot_compression:
o['variables']['v8_enable_snapshot_compression'] = 1
if all(opt in sys.argv for opt in ['--v8-enable-object-print', '--v8-disable-object-print']):
Expand Down
8 changes: 8 additions & 0 deletions tools/v8_gypfiles/features.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,11 @@
# Sets -DV8_ENABLE_SPARKPLUG.
'v8_enable_sparkplug%': 1,

# Enable Sparkplug+ (dynamic patching of Sparkplug baseline code).
# Requires v8_enable_sparkplug.
# Sets -DV8_ENABLE_SPARKPLUG_PLUS.
'v8_enable_sparkplug_plus%': 0,

# Whether custom embedder snapshots may extend (= allocate new objects in)
# ReadOnlySpace.
'v8_enable_extensible_ro_snapshot%': 1,
Expand Down Expand Up @@ -533,6 +538,9 @@
['v8_enable_sparkplug==1', {
'defines': ['V8_ENABLE_SPARKPLUG',],
}],
['v8_enable_sparkplug==1 and v8_enable_sparkplug_plus==1', {
'defines': ['V8_ENABLE_SPARKPLUG_PLUS',],
}],
['v8_enable_maglev==1', {
'defines': ['V8_ENABLE_MAGLEV',],
}],
Expand Down
Loading