Skip to content

Commit 9b6a0b1

Browse files
committed
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 a2c1e4b commit 9b6a0b1

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
@@ -1330,7 +1330,7 @@
13301330
],
13311331
'conditions': [
13321332
[ 'node_shared_simdutf=="false"', {
1333-
'dependencies': [ 'deps/simdutf/simdutf.gyp:simdutf#host' ],
1333+
'dependencies': [ 'tools/v8_gypfiles/v8.gyp:simdutf#host' ],
13341334
}],
13351335
[ 'node_shared_libuv=="false"', {
13361336
'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
@@ -1057,6 +1057,8 @@
10571057
'v8_pch',
10581058
'v8_abseil',
10591059
'fp16',
1060+
'highway',
1061+
'simdutf',
10601062
],
10611063
'includes': ['inspector.gypi'],
10621064
'direct_dependent_settings': {
@@ -2580,5 +2582,66 @@
25802582
],
25812583
},
25822584
}, # fp16
2585+
{
2586+
'target_name': 'highway',
2587+
'type': 'static_library',
2588+
'toolsets': ['host', 'target'],
2589+
'variables': {
2590+
'HIGHWAY_ROOT': '../../deps/v8/third_party/highway',
2591+
},
2592+
'direct_dependent_settings': {
2593+
'include_dirs': [
2594+
'<(HIGHWAY_ROOT)/src',
2595+
],
2596+
'conditions': [
2597+
['v8_target_arch=="ia32"', {
2598+
'defines': ['HWY_BROKEN_TARGETS=(HWY_AVX2|HWY_AVX3)',],
2599+
}],
2600+
['v8_target_arch=="arm64"', {
2601+
'defines': ['HWY_BROKEN_TARGETS=HWY_ALL_SVE',],
2602+
}],
2603+
['v8_target_arch=="ppc64" or v8_target_arch=="s390x"', {
2604+
'defines': ['TOOLCHAIN_MISS_ASM_HWCAP_H',],
2605+
}],
2606+
['v8_target_arch=="s390x"', {
2607+
'defines': ['HWY_BROKEN_EMU128=0',],
2608+
}],
2609+
['OS == "aix"', {
2610+
'defines': ['HWY_BROKEN_EMU128=0',],
2611+
}],
2612+
],
2613+
},
2614+
'include_dirs': [
2615+
'<(HIGHWAY_ROOT)/src',
2616+
],
2617+
'conditions': [
2618+
['v8_target_arch=="ia32"', {
2619+
'defines': ['HWY_BROKEN_TARGETS=(HWY_AVX2|HWY_AVX3)',],
2620+
}],
2621+
['v8_target_arch=="arm64"', {
2622+
'defines': ['HWY_BROKEN_TARGETS=HWY_ALL_SVE',],
2623+
}],
2624+
['v8_target_arch=="ppc64" or v8_target_arch=="s390x"', {
2625+
'defines': ['TOOLCHAIN_MISS_ASM_HWCAP_H',],
2626+
}],
2627+
],
2628+
'sources': [
2629+
'<!@pymod_do_main(GN-scraper "<(HIGHWAY_ROOT)/BUILD.gn" "source_set.\\"libhwy.*?sources = ")',
2630+
],
2631+
}, # highway
2632+
{
2633+
'target_name': 'simdutf',
2634+
'type': 'static_library',
2635+
'toolsets': ['host', 'target'],
2636+
'direct_dependent_settings': {
2637+
'include_dirs': [
2638+
'<(V8_ROOT)/third_party/simdutf',
2639+
],
2640+
},
2641+
'include_dirs': ['.'],
2642+
'sources': [
2643+
'<(V8_ROOT)/third_party/simdutf/simdutf.cpp',
2644+
],
2645+
}, # simdutf
25832646
],
25842647
}

0 commit comments

Comments
 (0)