Skip to content

Commit 2bd1640

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 fb594cb commit 2bd1640

File tree

5 files changed

+77
-3
lines changed

5 files changed

+77
-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
@@ -814,7 +814,10 @@
814814
}],
815815
# Temporary refs: https://github.com/nodejs/node/pull/23801
816816
['v8_enable_handle_zapping==1', {
817-
'defines': ['ENABLE_HANDLE_ZAPPING',],
817+
'defines': [
818+
'ENABLE_LOCAL_HANDLE_ZAPPING',
819+
'ENABLE_GLOBAL_HANDLE_ZAPPING',
820+
],
818821
}],
819822
],
820823

tools/v8_gypfiles/v8.gyp

Lines changed: 65 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': {
@@ -2527,6 +2529,8 @@
25272529
'<(ABSEIL_ROOT)/absl/synchronization/internal/waiter.h',
25282530
'<(ABSEIL_ROOT)/absl/synchronization/internal/waiter_base.h',
25292531
'<(ABSEIL_ROOT)/absl/synchronization/internal/waiter_base.cc',
2532+
'<(ABSEIL_ROOT)/absl/synchronization/internal/win32_waiter.h',
2533+
'<(ABSEIL_ROOT)/absl/synchronization/internal/win32_waiter.cc',
25302534
'<(ABSEIL_ROOT)/absl/synchronization/mutex.h',
25312535
'<(ABSEIL_ROOT)/absl/synchronization/mutex.cc',
25322536
'<(ABSEIL_ROOT)/absl/time/civil_time.h',
@@ -2580,5 +2584,66 @@
25802584
],
25812585
},
25822586
}, # fp16
2587+
{
2588+
'target_name': 'highway',
2589+
'type': 'static_library',
2590+
'toolsets': ['host', 'target'],
2591+
'variables': {
2592+
'HIGHWAY_ROOT': '../../deps/v8/third_party/highway',
2593+
},
2594+
'direct_dependent_settings': {
2595+
'include_dirs': [
2596+
'<(HIGHWAY_ROOT)/src',
2597+
],
2598+
'conditions': [
2599+
['v8_target_arch=="ia32"', {
2600+
'defines': ['HWY_BROKEN_TARGETS=(HWY_AVX2|HWY_AVX3)',],
2601+
}],
2602+
['v8_target_arch=="arm64"', {
2603+
'defines': ['HWY_BROKEN_TARGETS=HWY_ALL_SVE',],
2604+
}],
2605+
['v8_target_arch=="ppc64" or v8_target_arch=="s390x"', {
2606+
'defines': ['TOOLCHAIN_MISS_ASM_HWCAP_H',],
2607+
}],
2608+
['v8_target_arch=="s390x"', {
2609+
'defines': ['HWY_BROKEN_EMU128=0',],
2610+
}],
2611+
['OS == "aix"', {
2612+
'defines': ['HWY_BROKEN_EMU128=0',],
2613+
}],
2614+
],
2615+
},
2616+
'include_dirs': [
2617+
'<(HIGHWAY_ROOT)/src',
2618+
],
2619+
'conditions': [
2620+
['v8_target_arch=="ia32"', {
2621+
'defines': ['HWY_BROKEN_TARGETS=(HWY_AVX2|HWY_AVX3)',],
2622+
}],
2623+
['v8_target_arch=="arm64"', {
2624+
'defines': ['HWY_BROKEN_TARGETS=HWY_ALL_SVE',],
2625+
}],
2626+
['v8_target_arch=="ppc64" or v8_target_arch=="s390x"', {
2627+
'defines': ['TOOLCHAIN_MISS_ASM_HWCAP_H',],
2628+
}],
2629+
],
2630+
'sources': [
2631+
'<!@pymod_do_main(GN-scraper "<(HIGHWAY_ROOT)/BUILD.gn" "source_set.\\"libhwy.*?sources = ")',
2632+
],
2633+
}, # highway
2634+
{
2635+
'target_name': 'simdutf',
2636+
'type': 'static_library',
2637+
'toolsets': ['host', 'target'],
2638+
'direct_dependent_settings': {
2639+
'include_dirs': [
2640+
'<(V8_ROOT)/third_party/simdutf',
2641+
],
2642+
},
2643+
'include_dirs': ['.'],
2644+
'sources': [
2645+
'<(V8_ROOT)/third_party/simdutf/simdutf.cpp',
2646+
],
2647+
}, # simdutf
25832648
],
25842649
}

0 commit comments

Comments
 (0)