Skip to content

Commit 0426f99

Browse files
aduh95joyeecheung
authored andcommitted
deps: V8: backport a0607c5006b8
Original commit message: Rewrite simdutf include paths to allow getting it from system Change-Id: I2b7b4cb452c22ed72e0935662c3c7477954bc205 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/8319848 Commit-Queue: Jakob Kummerow <jkummerow@chromium.org> Reviewed-by: Jakob Kummerow <jkummerow@chromium.org> Reviewed-by: Omer Katz <omerkatz@chromium.org> Cr-Commit-Position: refs/heads/main@{#109702} Refs: v8/v8@a0607c5 PR-URL: nodejs#65891 Reviewed-By: Xuguang Mei <meixuguang@gmail.com> Signed-off-by: Joyee Cheung <joyeec9h3@gmail.com>
1 parent 4d95b0e commit 0426f99

10 files changed

Lines changed: 22 additions & 11 deletions

File tree

‎common.gypi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
# Reset this number to 0 on major V8 upgrades.
4646
# Increment by one for each non-official patch applied to deps/v8.
47-
'v8_embedder_string': '-node.13',
47+
'v8_embedder_string': '-node.14',
4848

4949
##### V8 defaults for Node.js #####
5050

‎deps/v8/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4664,6 +4664,7 @@ cc_library(
46644664
name = "simdutf",
46654665
srcs = ["third_party/simdutf/simdutf.cpp"],
46664666
hdrs = ["third_party/simdutf/simdutf.h"],
4667+
strip_include_prefix = "third_party/simdutf",
46674668
copts = select({
46684669
"@v8//bazel/config:is_clang": ["-std=c++20"],
46694670
"@v8//bazel/config:is_gcc": ["-std=gnu++2a"],

‎deps/v8/BUILD.gn‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2597,6 +2597,16 @@ group("v8_abseil") {
25972597
visibility = [ "./*" ]
25982598
}
25992599

2600+
group("v8_simdutf") {
2601+
public_deps = [ "//third_party/simdutf" ]
2602+
public_configs = [ ":simdutf_include_config" ]
2603+
2604+
visibility = [ "./*" ]
2605+
}
2606+
config("simdutf_include_config") {
2607+
include_dirs = [ "//third_party/simdutf" ]
2608+
}
2609+
26002610
group("zoslib") {
26012611
if (current_os == "zos") {
26022612
deps = [ "//third_party/zoslib" ]
@@ -5451,6 +5461,7 @@ v8_header_set("v8_internal_headers") {
54515461
":v8_headers",
54525462
":v8_maybe_icu",
54535463
":v8_shared_internal_headers",
5464+
":v8_simdutf",
54545465
"//third_party/fp16",
54555466
]
54565467

@@ -5466,7 +5477,6 @@ v8_header_set("v8_internal_headers") {
54665477
":v8_heap_base_headers",
54675478
":v8_libbase",
54685479
":v8_maybe_temporal",
5469-
"//third_party/simdutf",
54705480
]
54715481
if (v8_enable_experimental_tq_to_tsa) {
54725482
deps += [ ":run_torque_to_tsa" ]
@@ -6931,7 +6941,7 @@ v8_cluster_source_set("v8_base_without_compiler") {
69316941
":v8_headers",
69326942
":v8_internal_headers",
69336943
":v8_maybe_icu",
6934-
"//third_party/simdutf",
6944+
":v8_simdutf",
69356945
]
69366946
if (v8_enable_experimental_tq_to_tsa) {
69376947
public_deps += [ ":run_torque_to_tsa" ]
@@ -8554,9 +8564,9 @@ v8_executable("d8") {
85548564
":v8",
85558565
":v8_libbase",
85568566
":v8_libplatform",
8567+
":v8_simdutf",
85578568
":v8_tracing",
85588569
"//build/win:default_exe_manifest",
8559-
"//third_party/simdutf",
85608570
]
85618571

85628572
if (is_posix || is_fuchsia) {

‎deps/v8/DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,10 +612,10 @@ include_rules = [
612612
'+third_party/fp16/src/include',
613613
'+third_party/fuzztest',
614614
'+third_party/ittapi/include',
615-
'+third_party/simdutf',
616615
'+third_party/v8/codegen',
617616
'+third_party/vtune',
618617
'+hwy/highway.h',
618+
'+simdutf.h',
619619
# Abseil features are allow-listed. Please use your best judgement when adding
620620
# to this set -- if in doubt, email v8-dev@. For general guidance, refer to
621621
# the Chromium guidelines (though note that some requirements in V8 may be

‎deps/v8/src/builtins/builtins-typed-array.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
#include "simdutf.h"
56
#include "src/base/logging.h"
67
#include "src/base/macros.h"
78
#include "src/builtins/builtins-utils-inl.h"
@@ -15,7 +16,6 @@
1516
#include "src/objects/objects-inl.h"
1617
#include "src/objects/option-utils.h"
1718
#include "src/objects/simd.h"
18-
#include "third_party/simdutf/simdutf.h"
1919

2020
namespace v8::internal {
2121

‎deps/v8/src/objects/string-inl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "absl/functional/overload.h"
1515
#include "include/v8config.h"
1616
#include "src/base/logging.h"
17+
#include "simdutf.h"
1718
#include "src/common/assert-scope.h"
1819
#include "src/common/globals.h"
1920
#include "src/execution/isolate-utils-inl.h"
@@ -38,7 +39,6 @@
3839
#include "src/strings/string-hasher-inl.h"
3940
#include "src/strings/unicode-inl.h"
4041
#include "src/utils/utils.h"
41-
#include "third_party/simdutf/simdutf.h"
4242

4343
// Has to be the last include (doesn't have include guards):
4444
#include "src/objects/object-macros.h"

‎deps/v8/src/objects/string.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <optional>
1010

1111
#include "include/v8config.h"
12+
#include "simdutf.h"
1213
#include "src/base/bits.h"
1314
#include "src/base/export-template.h"
1415
#include "src/base/small-vector.h"
@@ -22,7 +23,6 @@
2223
#include "src/objects/tagged.h"
2324
#include "src/sandbox/external-pointer.h"
2425
#include "src/strings/unicode-decoder.h"
25-
#include "third_party/simdutf/simdutf.h"
2626

2727
// Has to be the last include (doesn't have include guards):
2828
#include "src/objects/object-macros.h"

‎deps/v8/src/strings/unicode-inl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#include "src/strings/unicode.h"
99
// Include the non-inl header before the rest of the headers.
1010

11+
#include "simdutf.h"
1112
#include "src/base/logging.h"
1213
#include "src/utils/utils.h"
13-
#include "third_party/simdutf/simdutf.h"
1414

1515
namespace unibrow {
1616

‎deps/v8/src/strings/unicode.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#endif
2323

2424
#include "hwy/highway.h"
25-
#include "third_party/simdutf/simdutf.h"
25+
#include "simdutf.h"
2626

2727
namespace unibrow {
2828

‎deps/v8/test/cctest/BUILD.gn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ v8_executable("cctest") {
1515
"../..:v8_for_testing",
1616
"../..:v8_libbase",
1717
"../..:v8_libplatform",
18+
"../..:v8_simdutf",
1819
"../../tools/debug_helper:v8_debug_helper",
19-
"//third_party/simdutf",
2020
]
2121

2222
data_deps = [ "../../tools:v8_testrunner" ]

0 commit comments

Comments
 (0)