Skip to content

Commit d62a452

Browse files
aduh95aduh95
committed
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 <[email protected]> Reviewed-by: Jakob Kummerow <[email protected]> Reviewed-by: Omer Katz <[email protected]> Cr-Commit-Position: refs/heads/main@{#109702} Refs: v8/v8@a0607c5 PR-URL: #65891 Reviewed-By: Xuguang Mei <[email protected]>
1 parent 66fd788 commit d62a452

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
@@ -43,7 +43,7 @@
4343

4444
# Reset this number to 0 on major V8 upgrades.
4545
# Increment by one for each non-official patch applied to deps/v8.
46-
'v8_embedder_string': '-node.32',
46+
'v8_embedder_string': '-node.33',
4747

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

‎deps/v8/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4578,6 +4578,7 @@ cc_library(
45784578
name = "simdutf",
45794579
srcs = ["third_party/simdutf/simdutf.cpp"],
45804580
hdrs = ["third_party/simdutf/simdutf.h"],
4581+
strip_include_prefix = "third_party/simdutf",
45814582
copts = select({
45824583
"@v8//bazel/config:is_clang": ["-std=c++20"],
45834584
"@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
@@ -2507,6 +2507,16 @@ group("v8_abseil") {
25072507
]
25082508
}
25092509

2510+
group("v8_simdutf") {
2511+
public_deps = [ "//third_party/simdutf" ]
2512+
public_configs = [ ":simdutf_include_config" ]
2513+
2514+
visibility = [ "./*" ]
2515+
}
2516+
config("simdutf_include_config") {
2517+
include_dirs = [ "//third_party/simdutf" ]
2518+
}
2519+
25102520
group("zoslib") {
25112521
if (current_os == "zos") {
25122522
deps = [ "//third_party/zoslib" ]
@@ -5297,6 +5307,7 @@ v8_header_set("v8_internal_headers") {
52975307
":v8_headers",
52985308
":v8_maybe_icu",
52995309
":v8_shared_internal_headers",
5310+
":v8_simdutf",
53005311
"//third_party/fp16",
53015312
]
53025313

@@ -5312,7 +5323,6 @@ v8_header_set("v8_internal_headers") {
53125323
":v8_heap_base_headers",
53135324
":v8_libbase",
53145325
":v8_maybe_temporal",
5315-
"//third_party/simdutf",
53165326
]
53175327
if (v8_enable_experimental_tq_to_tsa) {
53185328
deps += [ ":run_torque_to_tsa" ]
@@ -6716,7 +6726,7 @@ v8_source_set("v8_base_without_compiler") {
67166726
":v8_headers",
67176727
":v8_internal_headers",
67186728
":v8_maybe_icu",
6719-
"//third_party/simdutf",
6729+
":v8_simdutf",
67206730
]
67216731
if (v8_enable_experimental_tq_to_tsa) {
67226732
public_deps += [ ":run_torque_to_tsa" ]
@@ -8276,9 +8286,9 @@ v8_executable("d8") {
82768286
":v8",
82778287
":v8_libbase",
82788288
":v8_libplatform",
8289+
":v8_simdutf",
82798290
":v8_tracing",
82808291
"//build/win:default_exe_manifest",
8281-
"//third_party/simdutf",
82828292
]
82838293

82848294
if (is_posix || is_fuchsia) {

‎deps/v8/DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,10 +557,10 @@ include_rules = [
557557
'+third_party/fp16/src/include',
558558
'+third_party/fuzztest',
559559
'+third_party/ittapi/include',
560-
'+third_party/simdutf',
561560
'+third_party/v8/codegen',
562561
'+third_party/vtune',
563562
'+hwy/highway.h',
563+
'+simdutf.h',
564564
# Abseil features are allow-listed. Please use your best judgement when adding
565565
# to this set -- if in doubt, email v8-dev@. For general guidance, refer to
566566
# 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
@@ -12,6 +12,7 @@
1212
#include <type_traits>
1313

1414
#include "absl/functional/overload.h"
15+
#include "simdutf.h"
1516
#include "src/common/assert-scope.h"
1617
#include "src/common/globals.h"
1718
#include "src/execution/isolate-utils.h"
@@ -38,7 +39,6 @@
3839
#include "src/torque/runtime-macro-shims.h"
3940
#include "src/torque/runtime-support.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
@@ -8,6 +8,7 @@
88
#include <memory>
99
#include <optional>
1010

11+
#include "simdutf.h"
1112
#include "src/base/bits.h"
1213
#include "src/base/export-template.h"
1314
#include "src/base/small-vector.h"
@@ -21,7 +22,6 @@
2122
#include "src/objects/tagged.h"
2223
#include "src/sandbox/external-pointer.h"
2324
#include "src/strings/unicode-decoder.h"
24-
#include "third_party/simdutf/simdutf.h"
2525

2626
// Has to be the last include (doesn't have include guards):
2727
#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
@@ -14,8 +14,8 @@ v8_executable("cctest") {
1414
"../..:v8_for_testing",
1515
"../..:v8_libbase",
1616
"../..:v8_libplatform",
17+
"../..:v8_simdutf",
1718
"../../tools/debug_helper:v8_debug_helper",
18-
"//third_party/simdutf",
1919
]
2020

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

0 commit comments

Comments
 (0)