Skip to content

Commit 562f95f

Browse files
targosnodejs-github-bot
authored andcommitted
tools: update V8 gypfiles for 13.4
Build Node.js with simdutf version from V8. Refs: v8/v8@d629051 Refs: v8/v8@616c875 Refs: v8/v8@e3204d5 Refs: v8/v8@e8293d2 Refs: v8/v8@aeb2220 Refs: v8/v8@5621164
1 parent 33946e2 commit 562f95f

File tree

5 files changed

+75
-3
lines changed

5 files changed

+75
-3
lines changed

node.gyp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1323,7 +1323,7 @@
13231323
],
13241324
'conditions': [
13251325
[ 'node_shared_simdutf=="false"', {
1326-
'dependencies': [ 'deps/simdutf/simdutf.gyp:simdutf#host' ],
1326+
'dependencies': [ 'tools/v8_gypfiles/v8.gyp:simdutf#host' ],
13271327
}],
13281328
[ 'node_shared_libuv=="false"', {
13291329
'dependencies': [ 'deps/uv/uv.gyp:libuv#host' ],

node.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@
222222
}],
223223

224224
[ 'node_shared_simdutf=="false"', {
225-
'dependencies': [ 'deps/simdutf/simdutf.gyp:simdutf' ],
225+
'dependencies': [ 'tools/v8_gypfiles/v8.gyp:simdutf' ],
226226
}],
227227

228228
[ 'node_shared_brotli=="false"', {

tools/v8_gypfiles/features.gypi

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,9 @@
242242
# Sets -DV8_ENABLE_SANDBOX.
243243
'v8_enable_sandbox%': 0,
244244

245+
# Enable leaptiering
246+
'v8_enable_leaptiering%': 1,
247+
245248
# Experimental feature for collecting per-class zone memory stats.
246249
# Requires use_rtti = true
247250
'v8_enable_precise_zone_stats%': 0,
@@ -483,6 +486,9 @@
483486
['v8_enable_extensible_ro_snapshot==1', {
484487
'defines': ['V8_ENABLE_EXTENSIBLE_RO_SNAPSHOT',],
485488
}],
489+
['v8_enable_leaptiering==1', {
490+
'defines': ['V8_ENABLE_LEAPTIERING',],
491+
}],
486492
['v8_enable_precise_zone_stats==1', {
487493
'defines': ['V8_ENABLE_PRECISE_ZONE_STATS',],
488494
}],

tools/v8_gypfiles/toolchain.gypi

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,10 @@
807807
}],
808808
# Temporary refs: https://github.com/nodejs/node/pull/23801
809809
['v8_enable_handle_zapping==1', {
810-
'defines': ['ENABLE_HANDLE_ZAPPING',],
810+
'defines': [
811+
'ENABLE_LOCAL_HANDLE_ZAPPING',
812+
'ENABLE_GLOBAL_HANDLE_ZAPPING',
813+
],
811814
}],
812815
],
813816

tools/v8_gypfiles/v8.gyp

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,6 +1004,8 @@
10041004
'v8_pch',
10051005
'v8_abseil',
10061006
'fp16',
1007+
'highway',
1008+
'simdutf',
10071009
],
10081010
'includes': ['inspector.gypi'],
10091011
'direct_dependent_settings': {
@@ -2527,5 +2529,66 @@
25272529
],
25282530
},
25292531
}, # fp16
2532+
{
2533+
'target_name': 'highway',
2534+
'type': 'static_library',
2535+
'toolsets': ['host', 'target'],
2536+
'variables': {
2537+
'HIGHWAY_ROOT': '../../deps/v8/third_party/highway',
2538+
},
2539+
'direct_dependent_settings': {
2540+
'include_dirs': [
2541+
'<(HIGHWAY_ROOT)/src',
2542+
],
2543+
'conditions': [
2544+
['v8_target_arch=="ia32"', {
2545+
'defines': ['HWY_BROKEN_TARGETS=(HWY_AVX2|HWY_AVX3)',],
2546+
}],
2547+
['v8_target_arch=="arm64"', {
2548+
'defines': ['HWY_BROKEN_TARGETS=HWY_ALL_SVE',],
2549+
}],
2550+
['v8_target_arch=="ppc64" or v8_target_arch=="s390x"', {
2551+
'defines': ['TOOLCHAIN_MISS_ASM_HWCAP_H',],
2552+
}],
2553+
['v8_target_arch=="s390x"', {
2554+
'defines': ['HWY_BROKEN_EMU128=0',],
2555+
}],
2556+
['OS == "aix"', {
2557+
'defines': ['HWY_BROKEN_EMU128=0',],
2558+
}],
2559+
],
2560+
},
2561+
'include_dirs': [
2562+
'<(HIGHWAY_ROOT)/src',
2563+
],
2564+
'conditions': [
2565+
['v8_target_arch=="ia32"', {
2566+
'defines': ['HWY_BROKEN_TARGETS=(HWY_AVX2|HWY_AVX3)',],
2567+
}],
2568+
['v8_target_arch=="arm64"', {
2569+
'defines': ['HWY_BROKEN_TARGETS=HWY_ALL_SVE',],
2570+
}],
2571+
['v8_target_arch=="ppc64" or v8_target_arch=="s390x"', {
2572+
'defines': ['TOOLCHAIN_MISS_ASM_HWCAP_H',],
2573+
}],
2574+
],
2575+
'sources': [
2576+
'<!@pymod_do_main(GN-scraper "<(HIGHWAY_ROOT)/BUILD.gn" "source_set.\\"libhwy.*?sources = ")',
2577+
],
2578+
}, # highway
2579+
{
2580+
'target_name': 'simdutf',
2581+
'type': 'static_library',
2582+
'toolsets': ['host', 'target'],
2583+
'direct_dependent_settings': {
2584+
'include_dirs': [
2585+
'<(V8_ROOT)/third_party/simdutf',
2586+
],
2587+
},
2588+
'include_dirs': ['.'],
2589+
'sources': [
2590+
'<(V8_ROOT)/third_party/simdutf/simdutf.cpp',
2591+
],
2592+
}, # simdutf
25302593
],
25312594
}

0 commit comments

Comments
 (0)