From 5bf1f4083299bd86a8499efb67dd0eb6256f5c92 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Thu, 20 Nov 2025 22:49:58 +0100 Subject: [PATCH 01/20] Backport Wayland DnD bug fix from upstream --- ...xtractData-support-for-text-uri-list.patch | 72 +++++++++++++++++++ chromium.spec | 8 ++- 2 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 chromium-142-Add-ExtractData-support-for-text-uri-list.patch diff --git a/chromium-142-Add-ExtractData-support-for-text-uri-list.patch b/chromium-142-Add-ExtractData-support-for-text-uri-list.patch new file mode 100644 index 0000000..71d7e94 --- /dev/null +++ b/chromium-142-Add-ExtractData-support-for-text-uri-list.patch @@ -0,0 +1,72 @@ +From 3e6fd579fa63e68c9d0092ea56f7a457c03bdb7d Mon Sep 17 00:00:00 2001 +From: LuK1337 +Date: Thu, 20 Nov 2025 14:27:50 -0800 +Subject: [PATCH] [ozone/wayland] Add ExtractData() support for text/uri-list + +When dragging a file from chrome://downloads to KDE Konsole, the +following message shows up in the debug output: "Cannot deliver data of +type text/uri-list and no text representation is available.". + +After making it so text/uri-list is handled the same way as +text/x-moz-url, the log message is gone and path to file is pasted into +terminal as one would expect. + +Bug: 460074619 +Test: ozone_unittests +Change-Id: Iab0144ca7d3d3983d0e61d74f42a53b366f9e830 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7145698 +Auto-Submit: Łukasz Patron +Reviewed-by: Kramer Ge +Reviewed-by: Peter McNeeley +Commit-Queue: Peter McNeeley +Cr-Commit-Position: refs/heads/main@{#1548075} +--- + +diff --git a/AUTHORS b/AUTHORS +index abceab66..98ced4a 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -943,6 +943,7 @@ + Luka Dojcilovic + Lukas Lihotzki + Lukasz Krakowiak ++Lukasz Patron + Luke Inman-Semerau + Luke Gu + Luke Warlow +diff --git a/ui/ozone/platform/wayland/host/wayland_exchange_data_provider.cc b/ui/ozone/platform/wayland/host/wayland_exchange_data_provider.cc +index 2d32cc9..da6da7ae 100644 +--- a/ui/ozone/platform/wayland/host/wayland_exchange_data_provider.cc ++++ b/ui/ozone/platform/wayland/host/wayland_exchange_data_provider.cc +@@ -277,7 +277,8 @@ + DCHECK(out_content); + DCHECK(IsMimeTypeSupported(mime_type)); + if (std::optional url_info; +- mime_type == ui::kMimeTypeMozillaUrl && ++ (mime_type == ui::kMimeTypeMozillaUrl || ++ mime_type == ui::kMimeTypeUriList) && + (url_info = GetURLAndTitle(kFilenameToURLPolicy)).has_value()) { + out_content->append(url_info->url.spec()); + return true; +diff --git a/ui/ozone/platform/wayland/host/wayland_exchange_data_provider_unittest.cc b/ui/ozone/platform/wayland/host/wayland_exchange_data_provider_unittest.cc +index 70b6d9d..29a8ad0 100644 +--- a/ui/ozone/platform/wayland/host/wayland_exchange_data_provider_unittest.cc ++++ b/ui/ozone/platform/wayland/host/wayland_exchange_data_provider_unittest.cc +@@ -61,6 +61,17 @@ + EXPECT_EQ("pickled-str", read_pickled_str); + } + ++TEST(WaylandExchangeDataProviderTest, FileNameAsUriList) { ++ WaylandExchangeDataProvider provider; ++ std::string extracted; ++ EXPECT_FALSE(provider.ExtractData(kMimeTypeUriList, &extracted)); ++ ++ extracted.clear(); ++ provider.AddData(ToClipboardData("file:///dev/null"), kMimeTypeUriList); ++ EXPECT_TRUE(provider.ExtractData(kMimeTypeUriList, &extracted)); ++ EXPECT_EQ("file:///dev/null", extracted); ++} ++ + TEST(WaylandExchangeDataProviderTest, FileContents) { + constexpr std::string kName("filename"); + constexpr std::string kContents("contents"); diff --git a/chromium.spec b/chromium.spec index cfe4b3e..857d545 100644 --- a/chromium.spec +++ b/chromium.spec @@ -245,7 +245,7 @@ Name: chromium Version: 142.0.7444.175 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Url: http://www.chromium.org/Home License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only) @@ -456,6 +456,8 @@ Patch511: 0002-Fix-Missing-OPENSSL_NO_ENGINE-Guard.patch # ../../base/containers/span.h:1387:63: error: arithmetic on a pointer to an incomplete type 'element_type' (aka 'const autofill::FormFieldData') # 1387 | typename iterator::AssumeValid(data(), data(), data() + size()))); Patch1000: chromium-142-missing-include-for-form_field_data.patch +# Fix Wayland URI DnD issue +Patch1001: chromium-142-Add-ExtractData-support-for-text-uri-list.patch # Use chromium-latest.py to generate clean tarball from released build tarballs, found here: # http://build.chromium.org/buildbot/official/ @@ -1115,6 +1117,7 @@ Qt6 UI for chromium. # Upstream patches %patch -P1000 -p1 -b .missing-include-for-form_field_data.patch +%patch -P1001 -p1 -b .Add-ExtractData-support-for-text-uri-list.patch # Change shebang in all relevant files in this directory and all subdirectories # See `man find` for how the `-exec command {} +` syntax works @@ -1746,6 +1749,9 @@ fi %endif %changelog +* Thu Nov 20 2025 LuK1337 - 142.0.7444.175-3 +- Backport Wayland DnD bug fix from upstream + * Wed Nov 19 2025 Than Ngo - 142.0.7444.175-2 - Fix typos in chromium.conf From c2f0304e514d7bda44124e0a8f2c216c852eeb58 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mon, 24 Nov 2025 09:28:20 +0100 Subject: [PATCH 02/20] - Enable system libcxx - Fix link error when building with system libcxx - Apply memory-allocator-dcheck-assert-fix for aarch64 --- chromium-131-fix-qt-ui.pach | 19 +++++++++++++++ chromium.spec | 47 +++++++++++++++++++++++++++++-------- 2 files changed, 56 insertions(+), 10 deletions(-) create mode 100644 chromium-131-fix-qt-ui.pach diff --git a/chromium-131-fix-qt-ui.pach b/chromium-131-fix-qt-ui.pach new file mode 100644 index 0000000..d0b778c --- /dev/null +++ b/chromium-131-fix-qt-ui.pach @@ -0,0 +1,19 @@ +From b9075d0e1f687f9a5cf80a7778bde99cece9fdf7 Mon Sep 17 00:00:00 2001 +From: Than Ngo +Date: Sat, 23 Nov 2024 12:33:22 +0100 +Subject: [PATCH] Enable qt-ui + + +diff -up chromium-131.0.6778.85/ui/qt/qt_shim.cc.me chromium-131.0.6778.85/ui/qt/qt_shim.cc +--- chromium-131.0.6778.85/ui/qt/qt_shim.cc.me 2024-11-23 10:04:16.789121846 +0100 ++++ chromium-131.0.6778.85/ui/qt/qt_shim.cc 2024-11-23 11:40:02.905064702 +0100 +@@ -265,7 +265,7 @@ FontRenderParams QtShim::GetFontRenderPa + FontDescription QtShim::GetFontDescription() const { + QFont font = app_.font(); + return { +- .family = String(font.family().toStdString().c_str()), ++ .family = String(font.family().toUtf8().constData()), + .size_pixels = font.pixelSize(), + .size_points = font.pointSize(), + .is_italic = IsStyleItalic(font.style()), + diff --git a/chromium.spec b/chromium.spec index 857d545..31e6242 100644 --- a/chromium.spec +++ b/chromium.spec @@ -9,6 +9,13 @@ # official builds have less debugging and go faster... but we have to shut some things off. %global official_build 1 +# enable|disble use_custom_libcxx +%global use_custom_libcxx 0 +%if 0%{?rhel} +# no libcxx in el +%global use_custom_libcxx 1 +%endif + # enable|disble bootstrap %global bootstrap 0 # workaround for old gn on el9, it causes build error: unknown function filter_labels_include() @@ -125,9 +132,6 @@ # enable|disable control flow integrity support %global cfi 0 -%ifarch x86_64 -%global cfi 0 -%endif # enable qt backend %global enable_qt 1 @@ -245,7 +249,7 @@ Name: chromium Version: 142.0.7444.175 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Url: http://www.chromium.org/Home License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only) @@ -262,6 +266,9 @@ Patch20: chromium-disable-font-tests.patch # don't download binary blob Patch21: chromium-123-screen-ai-service.patch +# Fix link error when building with system libcxx +Patch22: chromium-131-fix-qt-ui.pach + # Disable tests on remoting build Patch82: chromium-98.0.4758.102-remoting-no-tests.patch @@ -355,6 +362,8 @@ Patch316: chromium-122-clang-build-flags.patch # unknown warning option -Wno-nontrivial-memcall Patch317: chromium-142-clang++-unknown-argument.patch +Patch318: memory-allocator-dcheck-assert-fix.patch + # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2239523 # https://bugs.chromium.org/p/chromium/issues/detail?id=1145581#c60 # Disable BTI until this is fixed upstream. @@ -422,7 +431,6 @@ Patch402: fix-rust-linking.patch Patch403: fix-breakpad-compile.patch Patch404: fix-partition-alloc-compile.patch Patch405: fix-study-crash.patch -Patch406: memory-allocator-dcheck-assert-fix.patch Patch407: fix-different-data-layouts.patch Patch408: 0002-Add-ppc64-trap-instructions.patch @@ -496,6 +504,10 @@ BuildRequires: clang-tools-extra BuildRequires: llvm BuildRequires: lld +%if ! %{use_custom_libcxx} +BuildRequires: libcxx-devel +%endif + %if 0%{?rhel} && 0%{?rhel} <= 9 BuildRequires: gcc-toolset-14-libatomic-devel %endif @@ -972,6 +984,9 @@ Qt6 UI for chromium. %patch -P20 -p1 -b .disable-font-test %patch -P21 -p1 -b .screen-ai-service +%if ! %{use_custom_libcxx} +%patch -P22 -p1 -b .fix-qt-ui +%endif %patch -P82 -p1 -b .remoting-no-tests @@ -1050,6 +1065,8 @@ Qt6 UI for chromium. %patch -P317 -p1 -b .clang++-unsupported-argument %endif +%patch -P318 -p1 -b .memory-allocator-dcheck-assert-fix + %if %{disable_bti} %patch -P352 -p1 -b .workaround_for_crash_on_BTI_capable_system %endif @@ -1096,7 +1113,6 @@ Qt6 UI for chromium. %patch -P403 -p1 -b .fix-breakpad-compile %patch -P404 -p1 -b .fix-partition-alloc-compile %patch -P405 -p1 -b .fix-study-crash -%patch -P406 -p1 -b .memory-allocator-dcheck-assert-fix %patch -P407 -p1 -b .fix-different-data-layouts %patch -P408 -p1 -b .0002-Add-ppc64-trap-instructions %patch -P409 -p1 -b .fix-page-allocator-overflow @@ -1199,6 +1215,11 @@ CXXFLAGS="$FLAGS" CXXFLAGS+=' -faltivec-src-compat=mixed -Wno-deprecated-altivec-src-compat' %endif +%if ! %{use_custom_libcxx} +LDFLAGS="${LDFLAGS} -stdlib=libc++" +CXXFLAGS="${CXXFLAGS} -stdlib=libc++" +%endif + export CC=clang export CXX=clang++ export AR=llvm-ar @@ -1206,6 +1227,7 @@ export NM=llvm-nm export READELF=llvm-readelf export CFLAGS export CXXFLAGS +export LDFLAGS # need for error: the option `Z` is only accepted on the nightly compiler export RUSTC_BOOTSTRAP=1 @@ -1229,6 +1251,9 @@ CHROMIUM_CORE_GN_DEFINES="" # using system toolchain CHROMIUM_CORE_GN_DEFINES+=' custom_toolchain="//build/toolchain/linux/unbundle:default"' CHROMIUM_CORE_GN_DEFINES+=' host_toolchain="//build/toolchain/linux/unbundle:default"' +%if ! %{use_custom_libcxx} +CHROMIUM_BROWSER_GN_DEFINES+=' use_custom_libcxx=false' +%endif CHROMIUM_CORE_GN_DEFINES+=' is_debug=false dcheck_always_on=false dcheck_is_configurable=false' CHROMIUM_CORE_GN_DEFINES+=' enable_enterprise_companion=false' CHROMIUM_CORE_GN_DEFINES+=' system_libdir="%{_lib}"' @@ -1286,10 +1311,7 @@ CHROMIUM_CORE_GN_DEFINES+=' symbol_level=%{debug_level} blink_symbol_level=%{deb CHROMIUM_CORE_GN_DEFINES+=' angle_has_histograms=false' # drop unrar CHROMIUM_CORE_GN_DEFINES+=' safe_browsing_use_unrar=false' -# Disable --warning-suppression-mappings as it causes FTBFS on el/f40/f41 due to old llvm -%if 0%{?rhel} || 0%{?fedora} == 40 || 0%{?fedora} == 41 -CHROMIUM_CORE_GN_DEFINES+=' clang_warning_suppression_file=""' -%endif +CHROMIUM_CORE_GN_DEFINES+=' v8_enable_backtrace=true' export CHROMIUM_CORE_GN_DEFINES # browser gn defines @@ -1749,6 +1771,11 @@ fi %endif %changelog +* Mon Nov 24 2025 Than Ngo - 142.0.7444.175-4 +- Enable system libcxx +- Fix link error when building with system libcxx +- Apply memory-allocator-dcheck-assert-fix for aarch64 + * Thu Nov 20 2025 LuK1337 - 142.0.7444.175-3 - Backport Wayland DnD bug fix from upstream From c33bc728739f1bb39f0f35b1e13ddafcc39d6747 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 25 Nov 2025 17:55:14 +0100 Subject: [PATCH 03/20] Set gtk version to 3 by default --- chromium.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/chromium.conf b/chromium.conf index 4644c35..3685849 100644 --- a/chromium.conf +++ b/chromium.conf @@ -57,6 +57,10 @@ if [ "$MODE" != "none" ] ; then ENABLE_FEATURES="" fi +# Set gtk version to 3 by default +# todo: switch to gtk4 in the future +CHROMIUM_FLAGS+=" --gtk-version=3" + # Web Dark mode if [ "$WEB_DARKMODE" == "on" ] ; then darktype="WebContentsForceDark:inversion_method/cielab_based/image_behavior/none/foreground_lightness_threshold/150/background_lightness_threshold/205" From 21c645393dd764701f3c95f28a6471ce178c5c85 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Mon, 1 Dec 2025 09:07:42 +0100 Subject: [PATCH 04/20] Backport one more Wayland DnD bug fix from upstream --- ...date-pointer-position-during-draggin.patch | 80 +++++++++++++++++++ chromium.spec | 9 ++- 2 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 chromium-142-Update-pointer-position-during-draggin.patch diff --git a/chromium-142-Update-pointer-position-during-draggin.patch b/chromium-142-Update-pointer-position-during-draggin.patch new file mode 100644 index 0000000..eb0e1c8 --- /dev/null +++ b/chromium-142-Update-pointer-position-during-draggin.patch @@ -0,0 +1,80 @@ +From 4aed3650884fb2eb5605a051e92387204ae88cad Mon Sep 17 00:00:00 2001 +From: LuK1337 +Date: Sun, 30 Nov 2025 20:36:28 -0800 +Subject: [PATCH] [ozone/wayland] Update pointer position during dragging + +Prior to this change, dragging a file from chrome://downloads by its +filename would often open the file after it was dropped somewhere, this +is because the synthetic mouse release has outdated location. + +After ensuring that pointer location is updated during drag motion, +similarly to WaylandWindowDragController::OnDragLeave(), this is no +longer a problem. + +Bug: 462468355 +Test: ozone_unittests +Change-Id: Ib377b7ec04a9f5a02a21e36f7c43871a3e414798 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7182320 +Reviewed-by: Peter McNeeley +Commit-Queue: Peter McNeeley +Auto-Submit: Łukasz Patron +Reviewed-by: Kramer Ge +Cr-Commit-Position: refs/heads/main@{#1551919} +--- + +diff --git a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc +index b557e465..47b0911 100644 +--- a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc ++++ b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc +@@ -486,17 +486,9 @@ + if (drag_source_.has_value()) { + // Update the cursor position only for drag with mouse. + if (*drag_source_ == mojom::DragEventSource::kMouse) { +- auto* cursor_position = connection_->wayland_cursor_position(); +- if (cursor_position) { +- CHECK(window_); +- // TODO(crbug.com/41494257): Once we enable the input region for +- // subsurfaces, we need to update this part since the location will no +- // longer be relative to the window. +- auto location_in_screen = +- gfx::ToRoundedPoint(location) + +- window_->GetBoundsInDIP().origin().OffsetFromOrigin(); +- cursor_position->OnCursorPositionChanged(location_in_screen); +- } ++ pointer_delegate_->OnPointerMotionEvent( ++ location, timestamp, wl::EventDispatchPolicy::kImmediate, ++ /*is_synthesized=*/true); + } + } + +diff --git a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h +index e1239e6b..9a3ea8a2 100644 +--- a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h ++++ b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h +@@ -130,6 +130,10 @@ + // TODO(crbug.com/40598679): Remove once focus is fixed during DND sessions. + WaylandWindow* entered_window() const { return window_; } + ++ WaylandPointer::Delegate* pointer_delegate() const { ++ return pointer_delegate_; ++ } ++ + // Returns false iff the data is for a window dragging session. + bool ShouldReleaseCaptureForDrag(ui::OSExchangeData* data) const; + +diff --git a/ui/ozone/platform/wayland/host/wayland_data_drag_controller_unittest.cc b/ui/ozone/platform/wayland/host/wayland_data_drag_controller_unittest.cc +index 4156ce4..d2a867acaf 100644 +--- a/ui/ozone/platform/wayland/host/wayland_data_drag_controller_unittest.cc ++++ b/ui/ozone/platform/wayland/host/wayland_data_drag_controller_unittest.cc +@@ -1441,8 +1441,10 @@ + // Send a drag motion and see if cursor position is updated. + SendDndMotion(gfx::Point(10, 11)); + WaitForDragDropTasks(); +- // Cursor position should be updated. ++ // Cursor and pointer positions should be updated. ++ auto* pointer_delegate = drag_controller()->pointer_delegate(); + EXPECT_EQ(gfx::Point(10, 11), cursor_position->GetCursorSurfacePoint()); ++ EXPECT_EQ(gfx::PointF(10, 11), pointer_delegate->GetPointerLocation()); + + SendDndLeave(); + SendDndCancelled(); diff --git a/chromium.spec b/chromium.spec index 31e6242..b40b88d 100644 --- a/chromium.spec +++ b/chromium.spec @@ -249,7 +249,7 @@ Name: chromium Version: 142.0.7444.175 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Url: http://www.chromium.org/Home License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only) @@ -464,8 +464,9 @@ Patch511: 0002-Fix-Missing-OPENSSL_NO_ENGINE-Guard.patch # ../../base/containers/span.h:1387:63: error: arithmetic on a pointer to an incomplete type 'element_type' (aka 'const autofill::FormFieldData') # 1387 | typename iterator::AssumeValid(data(), data(), data() + size()))); Patch1000: chromium-142-missing-include-for-form_field_data.patch -# Fix Wayland URI DnD issue +# Fix Wayland URI DnD issues Patch1001: chromium-142-Add-ExtractData-support-for-text-uri-list.patch +Patch1002: chromium-142-Update-pointer-position-during-draggin.patch # Use chromium-latest.py to generate clean tarball from released build tarballs, found here: # http://build.chromium.org/buildbot/official/ @@ -1134,6 +1135,7 @@ Qt6 UI for chromium. # Upstream patches %patch -P1000 -p1 -b .missing-include-for-form_field_data.patch %patch -P1001 -p1 -b .Add-ExtractData-support-for-text-uri-list.patch +%patch -P1002 -p1 -b .Update-pointer-position-during-draggin.patch # Change shebang in all relevant files in this directory and all subdirectories # See `man find` for how the `-exec command {} +` syntax works @@ -1771,6 +1773,9 @@ fi %endif %changelog +* Mon Dec 01 2025 LuK1337 - 142.0.7444.175-5 +- Backport one more Wayland DnD bug fix from upstream + * Mon Nov 24 2025 Than Ngo - 142.0.7444.175-4 - Enable system libcxx - Fix link error when building with system libcxx From ffdc3cb0550bf5f3301dcf7a4a4275573f7fc624 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 3 Dec 2025 19:49:16 +0100 Subject: [PATCH 05/20] Update to 143.0.7499.40 * High CVE-2025-13630: Type Confusion in V8 * High CVE-2025-13631: Inappropriate implementation in Google Updater * High CVE-2025-13632: Inappropriate implementation in DevTools * High CVE-2025-13633: Use after free in Digital Credentials * Medium CVE-2025-13634: Inappropriate implementation in Downloads * Medium CVE-2025-13720: Bad cast in Loader * Medium CVE-2025-13721: Race in v8 * Low CVE-2025-13635: Inappropriate implementation in Downloads * Low CVE-2025-13636: Inappropriate implementation in Split View * Low CVE-2025-13637: Inappropriate implementation in Downloads * Low CVE-2025-13638: Use after free in Media Stream * Low CVE-2025-13639: Inappropriate implementation in WebRTC * Low CVE-2025-13640: Inappropriate implementation in Passwords - Drop workaround darkmode-image-policy.patch - Fix build error due to Unresolved dependencies - Fix swiftshader to compile with llvm-16.0 - Refresh python-3.9-ftbfs patch for el9 - Refresh ppc64le patches - Refresh chromium.conf --- 0001-Add-PPC64-support-for-boringssl.patch | 224 +++--- 0001-Add-ppc64-target-to-libaom.patch | 12 +- ...generated-config-for-libaom-on-ppc64.patch | 24 +- 0001-Enable-ppc64-pointer-compression.patch | 8 +- ...OWER8-AltiVec-VSX-CPU-features-when-.patch | 8 +- ...Implement-support-for-PPC64-on-Linux.patch | 206 ++--- ...Implement-support-for-ppc64-on-Linux.patch | 170 ++--- 0001-add-xnn-ppc64el-support.patch | 14 +- ...sandbox-Enable-seccomp_bpf-for-ppc64.patch | 703 +++++++++--------- 0001-swiftshader-fix-build.patch | 12 - ...e-Include-missing-header-cstddef-in-.patch | 6 +- ...ibvpx-Properly-generate-gni-on-ppc64.patch | 6 +- ...t-Include-altivec.h-on-ppc64-with-SI.patch | 6 +- ...-PPC64-generated-files-for-boringssl.patch | 40 +- 0002-Add-ppc64-trap-instructions.patch | 6 +- 0002-regenerate-xnn-buildgn.patch | 345 +++++---- ...party-libvpx-Remove-bad-ppc64-config.patch | 28 +- 0002-third_party-lss-kernel-structs.patch | 20 +- ...ty-libvpx-Add-ppc64-generated-config.patch | 28 +- ...y-crashpad-port-curl-transport-ppc64.patch | 6 +- ...rty-libvpx-work-around-ambiguous-vsx.patch | 18 +- HACK-debian-clang-disable-base-musttail.patch | 6 +- HACK-debian-clang-disable-pa-musttail.patch | 8 +- HACK-third_party-libvpx-use-generic-gnu.patch | 18 +- Rtc_base-system-arch.h-PPC.patch | 6 +- add-ppc64-architecture-string.patch | 8 +- add-ppc64-architecture-to-extensions.diff | 12 +- add-ppc64-pthread-stack-size.patch | 6 +- chromium-143-python-3.9-ftbfs.patch | 47 ++ chromium-143-revert-libpng_for_testonly.patch | 137 ++++ chromium-143-swiftshader-llvm-16.0.patch | 12 + chromium.conf | 8 +- chromium.spec | 41 +- dawn-fix-ppc64le-detection.patch | 6 +- fix-breakpad-compile.patch | 6 +- fix-clang-selection.patch | 10 +- fix-different-data-layouts.patch | 8 +- fix-page-allocator-overflow.patch | 14 +- fix-partition-alloc-compile.patch | 8 +- fix-rust-linking.patch | 10 +- fix-rustc.patch | 11 +- fix-study-crash.patch | 14 +- fix-unknown-warning-option-messages.diff | 10 +- skia-vsx-instructions.patch | 124 +-- sources | 2 +- 45 files changed, 1353 insertions(+), 1069 deletions(-) create mode 100644 chromium-143-python-3.9-ftbfs.patch create mode 100644 chromium-143-revert-libpng_for_testonly.patch create mode 100644 chromium-143-swiftshader-llvm-16.0.patch diff --git a/0001-Add-PPC64-support-for-boringssl.patch b/0001-Add-PPC64-support-for-boringssl.patch index 106c6f7..a9139b0 100644 --- a/0001-Add-PPC64-support-for-boringssl.patch +++ b/0001-Add-PPC64-support-for-boringssl.patch @@ -1,7 +1,7 @@ -Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/abi_self_test.cc +Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/abi_self_test.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/crypto/abi_self_test.cc -+++ chromium-140.0.7339.41/third_party/boringssl/src/crypto/abi_self_test.cc +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/abi_self_test.cc ++++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/abi_self_test.cc @@ -521,3 +521,289 @@ TEST(ABITest, AArch64) { CHECK_ABI_NO_UNWIND(abi_test_clobber_v15_upper); } @@ -292,10 +292,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/abi_self_test.cc + CHECK_ABI_NO_UNWIND(abi_test_clobber_lr); +} +#endif // OPENSSL_PPC64LE && SUPPORTS_ABI_TEST -Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/cpu_ppc64le.cc +Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/cpu_ppc64le.cc =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/boringssl/src/crypto/cpu_ppc64le.cc ++++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/cpu_ppc64le.cc @@ -0,0 +1,38 @@ +/* Copyright (c) 2016, Google Inc. + * @@ -335,10 +335,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/cpu_ppc64le.cc +} + +#endif // OPENSSL_PPC64LE -Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/crypto.cc +Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/crypto.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/crypto/crypto.cc -+++ chromium-140.0.7339.41/third_party/boringssl/src/crypto/crypto.cc +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/crypto.cc ++++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/crypto.cc @@ -67,6 +67,10 @@ uint32_t OPENSSL_get_ia32cap(int idx) { return OPENSSL_ia32cap_P[idx]; } @@ -350,10 +350,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/crypto.cc #elif (defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)) && \ !defined(OPENSSL_STATIC_ARMCAP) HIDDEN uint32_t OPENSSL_armcap_P = 0; -Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl +Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl ++++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl @@ -0,0 +1,3809 @@ +#! /usr/bin/env perl +# Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved. @@ -4164,10 +4164,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/aes/as +} + +close STDOUT or die "error closing STDOUT: $!"; -Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h +Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h -+++ chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h ++++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h @@ -81,6 +81,12 @@ inline int vpaes_capable(void) { return inline int vpaes_capable(void) { return CRYPTO_is_NEON_capable(); } #endif @@ -4195,11 +4195,11 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/aes/in #endif #endif // OPENSSL_NO_ASM -Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/bcm.cc +Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/bcm.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/crypto/fipsmodule/bcm.cc -+++ chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/bcm.cc -@@ -104,6 +104,7 @@ +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/bcm.cc ++++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/bcm.cc +@@ -105,6 +105,7 @@ #include "self_check/fips.cc.inc" #include "self_check/self_check.cc.inc" #include "service_indicator/service_indicator.cc.inc" @@ -4207,10 +4207,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/bcm.cc #include "sha/sha1.cc.inc" #include "sha/sha256.cc.inc" #include "sha/sha512.cc.inc" -Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc +Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc -+++ chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc ++++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc @@ -330,6 +330,23 @@ int bn_expand(BIGNUM *bn, size_t bits) { } @@ -4235,10 +4235,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/bn/bn. if ((size_t)bn->width <= words) { if (!bn_wexpand(bn, words)) { return 0; -Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc +Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc -+++ chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc ++++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc @@ -1229,6 +1229,8 @@ int EVP_has_aes_hardware(void) { return hwaes_capable() && crypto_gcm_clmul_enabled(); #elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64) @@ -4248,10 +4248,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/cipher #else return 0; #endif -Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/aes/asm/ghashp8-ppc.pl +Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/asm/ghashp8-ppc.pl =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/aes/asm/ghashp8-ppc.pl ++++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/asm/ghashp8-ppc.pl @@ -0,0 +1,671 @@ +#! /usr/bin/env perl +# Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved. @@ -4924,10 +4924,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/aes/as +} + +close STDOUT or die "error closing STDOUT: $!"; # enforce flush -Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc +Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc -+++ chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc ++++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc @@ -233,6 +233,13 @@ void CRYPTO_ghash_init(gmult_func *out_m *out_hash = gcm_ghash_neon; return; @@ -4942,10 +4942,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/aes/gc #endif gcm_init_nohw(out_table, H); -Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc +Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc -+++ chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc ++++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc @@ -169,5 +169,15 @@ TEST(GCMTest, ABI) { } } @@ -4962,10 +4962,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/aes/gc +#endif // GHASH_ASM_PPC64LE } #endif // SUPPORTS_ABI_TEST && !OPENSSL_NO_ASM -Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/rand/getrandom_fillin.h +Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/rand/getrandom_fillin.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/crypto/rand/getrandom_fillin.h -+++ chromium-140.0.7339.41/third_party/boringssl/src/crypto/rand/getrandom_fillin.h +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/rand/getrandom_fillin.h ++++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/rand/getrandom_fillin.h @@ -30,6 +30,8 @@ #define EXPECTED_NR_getrandom 278 #elif defined(OPENSSL_ARM) @@ -4975,11 +4975,11 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/rand/getrandom_fi #elif defined(OPENSSL_RISCV64) #define EXPECTED_NR_getrandom 278 #endif -Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc +Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc -+++ chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc -@@ -431,6 +431,11 @@ bcm_infallible BCM_rand_bytes_with_addit +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc ++++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc +@@ -425,6 +425,11 @@ bcm_infallible BCM_rand_bytes_with_addit // Take a read lock around accesses to |state->drbg|. This is needed to // avoid returning bad entropy if we race with // |rand_thread_state_clear_all|. @@ -4990,11 +4990,11 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/rand/r + // kernel, syscalls made with |syscall| did not abort the transaction. CRYPTO_MUTEX_lock_read(&state->clear_drbg_lock); #endif - if (!CTR_DRBG_reseed(&state->drbg, seed, reseed_additional_data, -Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h + if (!CTR_DRBG_reseed_ex(&state->drbg, seed, sizeof(seed), +Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h -+++ chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h ++++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h @@ -23,6 +23,16 @@ extern "C" { #endif @@ -5012,10 +5012,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/sha/in // Define SHA{n}[_{variant}]_ASM if sha{n}_block_data_order[_{variant}] is // defined in assembly. -Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc +Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc ++++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc @@ -0,0 +1,369 @@ +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.ccom) + * All rights reserved. @@ -5386,11 +5386,11 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/sha/sh +#undef BODY_20_39 +#undef BODY_40_59 +#undef BODY_60_79 -Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/internal.h +Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/internal.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/crypto/internal.h -+++ chromium-140.0.7339.41/third_party/boringssl/src/crypto/internal.h -@@ -62,8 +62,9 @@ extern "C" { +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/internal.h ++++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/internal.h +@@ -66,8 +66,9 @@ extern "C" { #if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_STATIC_ARMCAP) && \ (defined(OPENSSL_X86) || defined(OPENSSL_X86_64) || \ defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)) @@ -5402,7 +5402,7 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/internal.h #define NEED_CPUID // OPENSSL_cpuid_setup initializes the platform-specific feature cache. This -@@ -1412,6 +1413,16 @@ inline int CRYPTO_is_ARMv8_SHA512_capabl +@@ -1419,6 +1420,16 @@ inline int CRYPTO_is_ARMv8_SHA512_capabl #endif // OPENSSL_ARM || OPENSSL_AARCH64 @@ -5419,10 +5419,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/internal.h #if defined(BORINGSSL_DISPATCH_TEST) // Runtime CPU dispatch testing support -Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl +Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl ++++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl @@ -0,0 +1,320 @@ +#! /usr/bin/env perl +# Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. @@ -5744,10 +5744,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/perlasm/ppc-xlate +___ + +close STDOUT or die "error closing STDOUT: $!"; -Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/test/abi_test.h +Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/test/abi_test.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/crypto/test/abi_test.h -+++ chromium-140.0.7339.41/third_party/boringssl/src/crypto/test/abi_test.h +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/test/abi_test.h ++++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/test/abi_test.h @@ -179,7 +179,78 @@ struct alignas(16) Reg128 { CALLER_STATE_REGISTER(uint64_t, x28) \ CALLER_STATE_REGISTER(uint64_t, x29) @@ -5854,10 +5854,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/test/abi_test.h static_assert(sizeof...(args) <= 8, "too many arguments for abi_test_trampoline"); -Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl +Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl ++++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl @@ -0,0 +1,262 @@ +#!/usr/bin/env perl +# Copyright (c) 2019, Google Inc. @@ -6121,10 +6121,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/test/asm/trampoli + +print $code; +close STDOUT or die "error closing STDOUT: $!"; -Index: chromium-140.0.7339.41/third_party/boringssl/src/include/openssl/target.h +Index: chromium-143.0.7499.40/third_party/boringssl/src/include/openssl/target.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/include/openssl/target.h -+++ chromium-140.0.7339.41/third_party/boringssl/src/include/openssl/target.h +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/include/openssl/target.h ++++ chromium-143.0.7499.40/third_party/boringssl/src/include/openssl/target.h @@ -34,6 +34,9 @@ #elif defined(__ARMEL__) || defined(_M_ARM) #define OPENSSL_32_BIT @@ -6135,11 +6135,11 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/include/openssl/target.h #elif defined(__MIPSEL__) && !defined(__LP64__) #define OPENSSL_32_BIT #define OPENSSL_MIPS -Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc +Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc -+++ chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc -@@ -35,6 +35,8 @@ int main(int argc, char **argv) { +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc ++++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc +@@ -31,6 +31,8 @@ int main(int argc, char **argv) { puts("ARM (32-bit)"); #elif defined(OPENSSL_AARCH64) puts("aarch64 (64-bit)"); @@ -6148,10 +6148,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/acvp/modu #else #error "FIPS build not supported on this architecture" #endif -Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/delocate.go +Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/delocate.go =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.go -+++ chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/delocate.go +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.go ++++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/delocate.go @@ -56,7 +56,8 @@ type stringWriter interface { type processorType int @@ -6751,10 +6751,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/ case "str", "bl", "ldr", "st1": return aarch64 } -Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/delocate.peg +Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/delocate.peg =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.peg -+++ chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/delocate.peg +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.peg ++++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/delocate.peg @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. @@ -6768,10 +6768,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/ # To regenerate delocate.peg.go: # -Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go +Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go -+++ chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go ++++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go @@ -39,6 +39,11 @@ func (test *delocateTest) Path(file stri var delocateTests = []delocateTest{ @@ -6784,10 +6784,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/ {"x86_64-Basic", []string{"in.s"}, "out.s"}, {"x86_64-BSS", []string{"in.s"}, "out.s"}, {"x86_64-GOTRewrite", []string{"in.s"}, "out.s"}, -Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s +Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s ++++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s @@ -0,0 +1,9 @@ + .text +foo: @@ -6798,10 +6798,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/ + .localentry foo,.-foo +.LVL0: + bl -Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s +Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s ++++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s @@ -0,0 +1,62 @@ +.text +.file 1 "inserted_by_delocate.cc" @@ -6865,19 +6865,19 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/ +.byte 0xff +.byte 0x31 +.byte 0x80 -Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s +Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s ++++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s @@ -0,0 +1,4 @@ + .text +foo: + addis 22,2,bar@toc@ha + ld 0,bar@toc@l(22) -Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s +Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s ++++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s @@ -0,0 +1,72 @@ +.text +.file 1 "inserted_by_delocate.cc" @@ -6951,10 +6951,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/ +.byte 0xff +.byte 0x31 +.byte 0x80 -Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s +Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s ++++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s @@ -0,0 +1,161 @@ + .file "foo.cc" + .abiversion 2 @@ -7117,10 +7117,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/ + .size exported_function,.-exported_function + .ident "GCC: (Ubuntu 4.9.2-10ubuntu13) 4.9.2" + .section .note.GNU-stack,"",@progbits -Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s +Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s ++++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s @@ -0,0 +1,552 @@ +.text +.file 1 "inserted_by_delocate.cc" @@ -7674,10 +7674,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/ +.byte 0xff +.byte 0x31 +.byte 0x80 -Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s +Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s ++++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s @@ -0,0 +1,226 @@ + .file "foo.cc" + .abiversion 2 @@ -7905,10 +7905,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/ + .zero 20 + .ident "GCC: (Ubuntu 4.9.2-10ubuntu13) 4.9.2" + .section .note.GNU-stack,"",@progbits -Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s +Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s ++++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s @@ -0,0 +1,677 @@ +.text +.file 1 "inserted_by_delocate.cc" @@ -8587,10 +8587,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/ +.byte 0xff +.byte 0x31 +.byte 0x80 -Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s +Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s ++++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s @@ -0,0 +1,23 @@ + .text +foo: @@ -8615,10 +8615,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/ + + addis 4, 2, 1+foo-2@toc@ha+3 + addi 4, 4, 1+foo-2@toc@l+3 -Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s +Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s ++++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s @@ -0,0 +1,178 @@ +.text +.file 1 "inserted_by_delocate.cc" @@ -8798,10 +8798,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/util/fipstools/delocate/ +.byte 0xff +.byte 0x31 +.byte 0x80 -Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc +Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc -+++ chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc ++++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc @@ -377,6 +377,10 @@ static void sha1_block_data_order(uint32 return; } @@ -8813,11 +8813,11 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/crypto/fipsmodule/sha/sh sha1_block_data_order_nohw(state, data, num); } -Index: chromium-140.0.7339.41/third_party/boringssl/src/build.json +Index: chromium-143.0.7499.40/third_party/boringssl/src/build.json =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/build.json -+++ chromium-140.0.7339.41/third_party/boringssl/src/build.json -@@ -128,6 +128,10 @@ +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/build.json ++++ chromium-143.0.7499.40/third_party/boringssl/src/build.json +@@ -130,6 +130,10 @@ {"src": "crypto/fipsmodule/sha/asm/sha512-armv4.pl"}, {"src": "crypto/fipsmodule/aes/asm/vpaes-armv7.pl"} ], @@ -8828,7 +8828,7 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/build.json "perlasm_x86": [ {"src": "crypto/fipsmodule/aes/asm/aesni-x86.pl"}, {"src": "crypto/fipsmodule/bn/asm/bn-586.pl"}, -@@ -237,6 +241,7 @@ +@@ -239,6 +243,7 @@ "crypto/cpu_arm_freebsd.cc", "crypto/cpu_arm_linux.cc", "crypto/cpu_intel.cc", @@ -8836,7 +8836,7 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/build.json "crypto/crypto.cc", "crypto/curve25519/curve25519.cc", "crypto/curve25519/curve25519_64_adx.cc", -@@ -805,6 +810,9 @@ +@@ -803,6 +808,9 @@ "perlasm_arm": [ {"src": "crypto/test/asm/trampoline-armv4.pl"} ], @@ -8846,10 +8846,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/build.json "perlasm_x86": [ {"src": "crypto/test/asm/trampoline-x86.pl"} ], -Index: chromium-140.0.7339.41/third_party/boringssl/src/util/pregenerate/build.go +Index: chromium-143.0.7499.40/third_party/boringssl/src/util/pregenerate/build.go =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/util/pregenerate/build.go -+++ chromium-140.0.7339.41/third_party/boringssl/src/util/pregenerate/build.go +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/util/pregenerate/build.go ++++ chromium-143.0.7499.40/third_party/boringssl/src/util/pregenerate/build.go @@ -38,6 +38,7 @@ type InputTarget struct { // architecture. PerlasmAarch64 []PerlasmSource `json:"perlasm_aarch64,omitempty"` @@ -8868,10 +8868,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/util/pregenerate/build.g for _, p := range in.PerlasmX86 { addPerlasmTask(&out.Asm, &p, "-apple.S", []string{"macosx", "-fPIC"}) addPerlasmTask(&out.Asm, &p, "-linux.S", []string{"elf", "-fPIC"}) -Index: chromium-140.0.7339.41/third_party/boringssl/README.ppc64le +Index: chromium-143.0.7499.40/third_party/boringssl/README.ppc64le =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/boringssl/README.ppc64le ++++ chromium-143.0.7499.40/third_party/boringssl/README.ppc64le @@ -0,0 +1,8 @@ +============================================================== +To recreate boringssl pregenerated files patch for ppc64le: @@ -8881,11 +8881,11 @@ Index: chromium-140.0.7339.41/third_party/boringssl/README.ppc64le +go run ./util/pregenerate +cd ../../../../ +diff -urN chromium-*/third_party/boringssl/src/gen.orig chromium-*/third_party/boringssl/src/gen -Index: chromium-140.0.7339.41/third_party/boringssl/src/gen/sources.gni +Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.gni =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/gen/sources.gni -+++ chromium-140.0.7339.41/third_party/boringssl/src/gen/sources.gni -@@ -121,6 +121,7 @@ bcm_sources_asm = [ +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/gen/sources.gni ++++ chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.gni +@@ -123,6 +123,7 @@ bcm_sources_asm = [ "gen/bcm/aesv8-gcm-armv8-apple.S", "gen/bcm/aesv8-gcm-armv8-linux.S", "gen/bcm/aesv8-gcm-armv8-win.S", @@ -8893,7 +8893,7 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/gen/sources.gni "gen/bcm/armv4-mont-linux.S", "gen/bcm/armv8-mont-apple.S", "gen/bcm/armv8-mont-linux.S", -@@ -137,6 +138,7 @@ bcm_sources_asm = [ +@@ -139,6 +140,7 @@ bcm_sources_asm = [ "gen/bcm/ghash-neon-armv8-apple.S", "gen/bcm/ghash-neon-armv8-linux.S", "gen/bcm/ghash-neon-armv8-win.S", @@ -8901,7 +8901,7 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/gen/sources.gni "gen/bcm/ghash-ssse3-x86-apple.S", "gen/bcm/ghash-ssse3-x86-linux.S", "gen/bcm/ghash-ssse3-x86_64-apple.S", -@@ -336,6 +338,7 @@ crypto_sources = [ +@@ -338,6 +340,7 @@ crypto_sources = [ "crypto/cpu_arm_freebsd.cc", "crypto/cpu_arm_linux.cc", "crypto/cpu_intel.cc", diff --git a/0001-Add-ppc64-target-to-libaom.patch b/0001-Add-ppc64-target-to-libaom.patch index 5699f03..c328bda 100644 --- a/0001-Add-ppc64-target-to-libaom.patch +++ b/0001-Add-ppc64-target-to-libaom.patch @@ -8,10 +8,10 @@ Subject: [PATCH] Add ppc64 target to libaom third_party/libaom/cmake_update.sh | 3 +++ 2 files changed, 15 insertions(+) -Index: chromium-140.0.7339.41/third_party/libaom/BUILD.gn +Index: chromium-143.0.7499.40/third_party/libaom/BUILD.gn =================================================================== ---- chromium-140.0.7339.41.orig/third_party/libaom/BUILD.gn -+++ chromium-140.0.7339.41/third_party/libaom/BUILD.gn +--- chromium-143.0.7499.40.orig/third_party/libaom/BUILD.gn ++++ chromium-143.0.7499.40/third_party/libaom/BUILD.gn @@ -299,6 +299,18 @@ if (current_cpu == "arm64" || current_cp } } @@ -41,10 +41,10 @@ Index: chromium-140.0.7339.41/third_party/libaom/BUILD.gn if (is_android) { deps += [ "//third_party/cpu_features:ndk_compat" ] } -Index: chromium-140.0.7339.41/third_party/libaom/cmake_update.sh +Index: chromium-143.0.7499.40/third_party/libaom/cmake_update.sh =================================================================== ---- chromium-140.0.7339.41.orig/third_party/libaom/cmake_update.sh -+++ chromium-140.0.7339.41/third_party/libaom/cmake_update.sh +--- chromium-143.0.7499.40.orig/third_party/libaom/cmake_update.sh ++++ chromium-143.0.7499.40/third_party/libaom/cmake_update.sh @@ -167,6 +167,9 @@ egrep \ "#define [A-Z0-9_]+[[:space:]]+[01]" "${CFG}/win/ia32/config/aom_config.h" \ | awk '{print "%define " $2 " " $3}' > "${CFG}/win/ia32/config/aom_config.asm" diff --git a/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch b/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch index 2766473..176ab0d 100644 --- a/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch +++ b/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch @@ -1,7 +1,7 @@ -Index: chromium-140.0.7339.41/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm +Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm ++++ chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm @@ -0,0 +1,100 @@ +; +; Copyright (c) 2025, Alliance for Open Media. All rights reserved. @@ -103,10 +103,10 @@ Index: chromium-140.0.7339.41/third_party/libaom/source/config/linux/ppc64/confi +HAVE_VSX equ 1 +HAVE_WXWIDGETS equ 0 +STATIC_LINK_JXL equ 0 -Index: chromium-140.0.7339.41/third_party/libaom/source/config/linux/ppc64/config/aom_config.c +Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_config.c =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/libaom/source/config/linux/ppc64/config/aom_config.c ++++ chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_config.c @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2025, Alliance for Open Media. All rights reserved. @@ -121,10 +121,10 @@ Index: chromium-140.0.7339.41/third_party/libaom/source/config/linux/ppc64/confi +#include "aom/aom_codec.h" +static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/ppc-linux-gcc.cmake\" -DCONFIG_AV1_DECODER=0 -DCONFIG_AV1_ENCODER=1 -DCONFIG_AV1_HIGHBITDEPTH=0 -DCONFIG_AV1_TEMPORAL_DENOISING=1 -DCONFIG_QUANT_MATRIX=0 -DCONFIG_REALTIME_ONLY=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384"; +const char *aom_codec_build_config(void) {return cfg;} -Index: chromium-140.0.7339.41/third_party/libaom/source/config/linux/ppc64/config/aom_config.h +Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_config.h =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/libaom/source/config/linux/ppc64/config/aom_config.h ++++ chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_config.h @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2025, Alliance for Open Media. All rights reserved. @@ -229,10 +229,10 @@ Index: chromium-140.0.7339.41/third_party/libaom/source/config/linux/ppc64/confi +#define HAVE_WXWIDGETS 0 +#define STATIC_LINK_JXL 0 +#endif // AOM_CONFIG_H_ -Index: chromium-140.0.7339.41/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h +Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h ++++ chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h @@ -0,0 +1,1177 @@ +/* + * Copyright (c) 2025, Alliance for Open Media. All rights reserved. @@ -1411,10 +1411,10 @@ Index: chromium-140.0.7339.41/third_party/libaom/source/config/linux/ppc64/confi +#endif + +#endif // AOM_DSP_RTCD_H_ -Index: chromium-140.0.7339.41/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h +Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h ++++ chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2025, Alliance for Open Media. All rights reserved. @@ -1507,10 +1507,10 @@ Index: chromium-140.0.7339.41/third_party/libaom/source/config/linux/ppc64/confi +#endif + +#endif // AOM_SCALE_RTCD_H_ -Index: chromium-140.0.7339.41/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h +Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h ++++ chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h @@ -0,0 +1,405 @@ +/* + * Copyright (c) 2025, Alliance for Open Media. All rights reserved. diff --git a/0001-Enable-ppc64-pointer-compression.patch b/0001-Enable-ppc64-pointer-compression.patch index bea6992..b8ef777 100644 --- a/0001-Enable-ppc64-pointer-compression.patch +++ b/0001-Enable-ppc64-pointer-compression.patch @@ -1,8 +1,8 @@ -Index: chromium-140.0.7339.41/v8/gni/v8.gni +Index: chromium-143.0.7499.40/v8/gni/v8.gni =================================================================== ---- chromium-140.0.7339.41.orig/v8/gni/v8.gni -+++ chromium-140.0.7339.41/v8/gni/v8.gni -@@ -274,7 +274,7 @@ assert(!(v8_enable_webassembly && v8_ena +--- chromium-143.0.7499.40.orig/v8/gni/v8.gni ++++ chromium-143.0.7499.40/v8/gni/v8.gni +@@ -298,7 +298,7 @@ assert( if (v8_enable_pointer_compression == "") { v8_enable_pointer_compression = v8_current_cpu == "arm64" || v8_current_cpu == "x64" || diff --git a/0001-Force-baseline-POWER8-AltiVec-VSX-CPU-features-when-.patch b/0001-Force-baseline-POWER8-AltiVec-VSX-CPU-features-when-.patch index 13bf38d..6842368 100644 --- a/0001-Force-baseline-POWER8-AltiVec-VSX-CPU-features-when-.patch +++ b/0001-Force-baseline-POWER8-AltiVec-VSX-CPU-features-when-.patch @@ -8,11 +8,11 @@ Subject: [PATCH] Force baseline POWER8 / AltiVec / VSX CPU features when on a BUILD.gn | 6 ++++++ 1 file changed, 6 insertions(+) -Index: chromium-140.0.7339.41/v8/BUILD.gn +Index: chromium-143.0.7499.40/v8/BUILD.gn =================================================================== ---- chromium-140.0.7339.41.orig/v8/BUILD.gn -+++ chromium-140.0.7339.41/v8/BUILD.gn -@@ -1555,7 +1555,14 @@ config("toolchain") { +--- chromium-143.0.7499.40.orig/v8/BUILD.gn ++++ chromium-143.0.7499.40/v8/BUILD.gn +@@ -1577,7 +1577,14 @@ config("toolchain") { if (v8_current_cpu == "ppc64") { defines += [ "V8_TARGET_ARCH_PPC64" ] cflags += [ "-ffp-contract=off" ] diff --git a/0001-Implement-support-for-PPC64-on-Linux.patch b/0001-Implement-support-for-PPC64-on-Linux.patch index 2cdf46b..2bfce0a 100644 --- a/0001-Implement-support-for-PPC64-on-Linux.patch +++ b/0001-Implement-support-for-PPC64-on-Linux.patch @@ -40,20 +40,20 @@ This patch implements support for the PPC64 architecture on Linux hosts. util/misc/capture_context_test_util_linux.cc | 6 + 36 files changed, 932 insertions(+), 12 deletions(-) -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/CONTRIBUTORS +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/CONTRIBUTORS =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/CONTRIBUTORS -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/CONTRIBUTORS +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/CONTRIBUTORS ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/CONTRIBUTORS @@ -13,3 +13,5 @@ Mark Mentovai Robert Sesek Scott Graham Joshua Peraza +Shawn Anastasio +Timothy Pearson -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/minidump/minidump_context.h +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/minidump/minidump_context.h -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/minidump/minidump_context.h +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/minidump/minidump_context.h ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context.h @@ -686,6 +686,70 @@ struct MinidumpContextRISCV64 { uint32_t fcsr; }; @@ -125,10 +125,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/minidump/minidump_co } // namespace crashpad #endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_ -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc @@ -110,6 +110,13 @@ MinidumpContextWriter::CreateFromSnapsho break; } @@ -192,10 +192,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/minidump/minidump_co +} } // namespace crashpad -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/minidump/minidump_context_writer.h +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context_writer.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.h -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/minidump/minidump_context_writer.h +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.h ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context_writer.h @@ -413,6 +413,49 @@ class MinidumpContextRISCV64Writer final MinidumpContextRISCV64 context_; }; @@ -246,10 +246,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/minidump/minidump_co } // namespace crashpad #endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_ -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc @@ -322,6 +322,21 @@ TYPED_TEST(MinidumpContextWriter, RISCV6 TypeParam>(context, ExpectMinidumpContextRISCV64, kSeed); } @@ -272,10 +272,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/minidump/minidump_co } // namespace } // namespace test } // namespace crashpad -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc @@ -177,6 +177,8 @@ std::string MinidumpMiscInfoDebugBuildSt static constexpr char kCPU[] = "mips64"; #elif defined(ARCH_CPU_RISCV64) @@ -285,10 +285,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/minidump/minidump_mi #else #error define kCPU for this CPU #endif -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc @@ -297,6 +297,40 @@ void InitializeMinidumpContextRISCV64(Mi context->fcsr = value++; } @@ -369,10 +369,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/minidump/test/minidu + } // namespace test } // namespace crashpad -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h @@ -90,6 +90,9 @@ void ExpectMinidumpContextMIPS64(uint32_ void ExpectMinidumpContextRISCV64(uint32_t expect_seed, const MinidumpContextRISCV64* observed, @@ -383,10 +383,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/minidump/test/minidu //! \} } // namespace test -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/capture_memory.cc +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/capture_memory.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/snapshot/capture_memory.cc -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/capture_memory.cc +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/capture_memory.cc ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/capture_memory.cc @@ -123,6 +123,11 @@ void CaptureMemory::PointedToByContext(c for (size_t i = 0; i < std::size(context.riscv64->regs); ++i) { MaybeCaptureMemoryAround(delegate, context.riscv64->regs[i]); @@ -399,10 +399,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/capture_mem #else #error Port. #endif -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/cpu_architecture.h +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_architecture.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/snapshot/cpu_architecture.h -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/cpu_architecture.h +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/cpu_architecture.h ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_architecture.h @@ -47,6 +47,9 @@ enum CPUArchitecture { //! \brief 64-bit RISC-V. @@ -413,10 +413,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/cpu_archite }; } // namespace crashpad -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/cpu_context.cc +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_context.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/snapshot/cpu_context.cc -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/cpu_context.cc +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/cpu_context.cc ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_context.cc @@ -173,6 +173,8 @@ uint64_t CPUContext::InstructionPointer( return arm64->pc; case kCPUArchitectureRISCV64: @@ -443,10 +443,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/cpu_context case kCPUArchitectureRISCV64: return true; case kCPUArchitectureX86: -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/cpu_context.h +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_context.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/snapshot/cpu_context.h -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/cpu_context.h +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/cpu_context.h ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_context.h @@ -371,6 +371,24 @@ struct CPUContextRISCV64 { uint32_t fcsr; }; @@ -480,10 +480,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/cpu_context }; }; -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h @@ -15,6 +15,7 @@ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_ @@ -571,10 +571,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/linux/cpu_c } // namespace internal } // namespace crashpad -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc @@ -194,12 +194,15 @@ void TestAgainstTarget(PtraceConnection* device == 0 && inode == 0 && mapping_name == "[vdso]"; #if defined(ARCH_CPU_X86) @@ -592,10 +592,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/linux/debug }, module_mapping->name, module_mapping->device, -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc @@ -367,6 +367,69 @@ bool ExceptionSnapshotLinux::ReadContext return internal::ReadContext(reader, context_address, context_.riscv64); } @@ -666,10 +666,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/linux/excep #endif // ARCH_CPU_X86_FAMILY bool ExceptionSnapshotLinux::Initialize( -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h @@ -94,6 +94,8 @@ class ExceptionSnapshotLinux final : pub CPUContextMIPS64 mips64; #elif defined(ARCH_CPU_RISCV64) @@ -679,10 +679,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/linux/excep #endif } context_union_; CPUContext context_; -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc @@ -325,7 +325,28 @@ void ExpectContext(const CPUContext& act sizeof(actual.riscv64->fpregs)), 0); @@ -712,10 +712,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/linux/excep #else #error Port. #endif -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc @@ -129,6 +129,8 @@ void ProcessReaderLinux::Thread::Initial : thread_info.thread_context.t32.regs[29]; #elif defined(ARCH_CPU_RISCV64) @@ -725,10 +725,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/linux/proce #else #error Port. #endif -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/linux/signal_context.h +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/signal_context.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/snapshot/linux/signal_context.h -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/linux/signal_context.h +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/signal_context.h ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/signal_context.h @@ -456,6 +456,89 @@ static_assert(offsetof(UContextfcsr = value++; } @@ -937,10 +937,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/test/test_c + } // namespace test } // namespace crashpad -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h @@ -64,6 +64,7 @@ void InitializeCPUContextARM64(CPUContex void InitializeCPUContextMIPS(CPUContext* context, uint32_t seed); void InitializeCPUContextMIPS64(CPUContext* context, uint32_t seed); @@ -949,10 +949,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/snapshot/test/test_c //! \} } // namespace test -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/test/linux/get_tls.cc +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/test/linux/get_tls.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/test/linux/get_tls.cc -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/test/linux/get_tls.cc +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/test/linux/get_tls.cc ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/test/linux/get_tls.cc @@ -51,6 +51,8 @@ LinuxVMAddress GetTLS() { : "$3"); #elif defined(ARCH_CPU_RISCV64) @@ -962,10 +962,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/test/linux/get_tls.c #else #error Port. #endif // ARCH_CPU_ARMEL -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/test/multiprocess_posix.cc +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/test/multiprocess_posix.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/test/multiprocess_posix.cc -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/test/multiprocess_posix.cc +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/test/multiprocess_posix.cc ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/test/multiprocess_posix.cc @@ -162,7 +162,8 @@ void Multiprocess::SetExpectedChildTermi } @@ -976,10 +976,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/test/multiprocess_po SetExpectedChildTermination(kTerminationSignal, SIGTRAP); #else SetExpectedChildTermination(kTerminationSignal, SIGILL); -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc @@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect if (type == AT_IGNORE) { continue; @@ -992,10 +992,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/util/linux/auxiliary if (!MapInsertOrReplace(&values_, type, value, nullptr)) { LOG(ERROR) << "duplicate auxv entry"; return false; -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/util/linux/ptracer.cc +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/ptracer.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/util/linux/ptracer.cc -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/util/linux/ptracer.cc +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/linux/ptracer.cc ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/ptracer.cc @@ -430,6 +430,64 @@ bool GetThreadArea64(pid_t tid, return true; } @@ -1071,10 +1071,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/util/linux/ptracer.c GetThreadArea64(tid, info->thread_context, &info->thread_specific_data_address, -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/util/linux/thread_info.h +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/thread_info.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/util/linux/thread_info.h -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/util/linux/thread_info.h +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/linux/thread_info.h ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/thread_info.h @@ -34,6 +34,10 @@ #include #endif @@ -1193,10 +1193,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/util/linux/thread_in //! \brief The thread-local storage address for the thread. LinuxVMAddress thread_specific_data_address; }; -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/util/misc/capture_context.h +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/util/misc/capture_context.h -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/util/misc/capture_context.h +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/misc/capture_context.h ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context.h @@ -70,6 +70,7 @@ using NativeCPUContext = ucontext_t; //! Linux | ARM/ARM64 | `r0`/`x0` //! Linux | MIPS/MIPS64 | `$a0` @@ -1205,10 +1205,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/util/misc/capture_co //! //! Additionally, the value `LR` on ARM/ARM64 will be the return address of //! this function. -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/util/misc/capture_context_linux.S +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context_linux.S =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/util/misc/capture_context_linux.S -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/util/misc/capture_context_linux.S +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/misc/capture_context_linux.S ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context_linux.S @@ -30,7 +30,7 @@ .globl CAPTURECONTEXT_SYMBOL2 #if defined(__i386__) || defined(__x86_64__) @@ -1435,10 +1435,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/util/misc/capture_co #elif defined(__riscv) #define MCONTEXT_GREGS_OFFSET 176 -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/util/misc/capture_context_test.cc +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context_test.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/util/misc/capture_context_test.cc -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/util/misc/capture_context_test.cc +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/misc/capture_context_test.cc ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context_test.cc @@ -48,7 +48,7 @@ void TestCaptureContext() { uintptr_t pc = ProgramCounterFromContext(context_1); @@ -1448,10 +1448,10 @@ Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/util/misc/capture_co // Sanitizers can cause enough code bloat that the “nearby” check would // likely fail. const uintptr_t kReferencePC = -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc @@ -38,6 +38,8 @@ void SanityCheckContext(const NativeCPUC #elif defined(ARCH_CPU_RISCV64) EXPECT_EQ(context.uc_mcontext.__gregs[10], diff --git a/0001-Implement-support-for-ppc64-on-Linux.patch b/0001-Implement-support-for-ppc64-on-Linux.patch index f2f76ea..5923874 100644 --- a/0001-Implement-support-for-ppc64-on-Linux.patch +++ b/0001-Implement-support-for-ppc64-on-Linux.patch @@ -54,10 +54,10 @@ https://wiki.raptorcs.com/wiki/Porting/Chromium src/tools/linux/md2core/minidump-2-core.cc | 45 +++++++++++++++ 25 files changed, 281 insertions(+), 35 deletions(-) -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h @@ -51,6 +51,8 @@ typedef MDRawContextRISCV64 RawContextCP # else # error "Unexpected __riscv_xlen" @@ -67,10 +67,10 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/dum #else #error "This code has not been ported to your platform yet." #endif -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc @@ -336,7 +336,42 @@ void ThreadInfo::FillCPUContext(RawConte #error "Unexpected __riscv_xlen" #endif @@ -153,10 +153,10 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/dum +#endif + } // namespace google_breakpad -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h @@ -67,6 +67,10 @@ struct ThreadInfo { // Use the structures defined in struct user_regs_struct regs; @@ -180,10 +180,10 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/dum }; } // namespace google_breakpad -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc @@ -324,6 +324,48 @@ void UContextReader::FillCPUContext(RawC #error "Unexpected __riscv_xlen" #endif @@ -233,10 +233,10 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/dum #endif } // namespace google_breakpad -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h @@ -54,6 +54,9 @@ struct UContextReader { #elif defined(__aarch64__) static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc, @@ -247,11 +247,11 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/dum #else static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc); #endif -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -@@ -465,6 +465,13 @@ bool ExceptionHandler::HandleSignal(int +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +@@ -466,6 +466,13 @@ bool ExceptionHandler::HandleSignal(int memcpy(&g_crash_context_.float_state, fp_ptr, sizeof(g_crash_context_.float_state)); } @@ -265,7 +265,7 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/han #elif GOOGLE_BREAKPAD_CRASH_CONTEXT_HAS_FLOAT_STATE ucontext_t* uc_ptr = (ucontext_t*)uc; if (uc_ptr->uc_mcontext.fpregs) { -@@ -703,10 +710,18 @@ bool ExceptionHandler::WriteMinidump() { +@@ -704,10 +711,18 @@ bool ExceptionHandler::WriteMinidump() { } #endif @@ -285,7 +285,7 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/han context.tid = sys_gettid(); // Add an exception stream to the minidump for better reporting. -@@ -727,6 +742,9 @@ bool ExceptionHandler::WriteMinidump() { +@@ -728,6 +743,9 @@ bool ExceptionHandler::WriteMinidump() { #elif defined(__mips__) context.siginfo.si_addr = reinterpret_cast(context.context.uc_mcontext.pc); @@ -295,11 +295,11 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/han #elif defined(__riscv) context.siginfo.si_addr = reinterpret_cast(context.context.uc_mcontext.__gregs[REG_PC]); -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h -@@ -200,7 +200,11 @@ class ExceptionHandler { +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h +@@ -197,7 +197,11 @@ class ExceptionHandler { siginfo_t siginfo; pid_t tid; // the crashing thread. ucontext_t context; @@ -312,11 +312,11 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/han fpstate_t float_state; #endif }; -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc -@@ -326,7 +326,7 @@ TEST(ExceptionHandlerTest, ParallelChild +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc +@@ -325,7 +325,7 @@ TEST(ExceptionHandlerTest, ParallelChild ASSERT_EQ(SIGSEGV, WTERMSIG(status)); return; } else { @@ -325,7 +325,7 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/han } } -@@ -582,6 +582,8 @@ const unsigned char kIllegalInstruction[ +@@ -581,6 +581,8 @@ const unsigned char kIllegalInstruction[ #if defined(__mips__) // mfc2 zero,Impl - usually illegal in userspace. 0x48, 0x00, 0x00, 0x48 @@ -334,7 +334,7 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/han #else // This crashes with SIGILL on x86/x86-64/arm. 0xff, 0xff, 0xff, 0xff -@@ -777,10 +779,10 @@ TEST(ExceptionHandlerTest, InstructionPo +@@ -776,10 +778,10 @@ TEST(ExceptionHandlerTest, InstructionPo // These are defined here so the parent can use them to check the // data from the minidump afterwards. @@ -347,10 +347,10 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/han const int kOffset = kMemorySize - sizeof(kIllegalInstruction); const pid_t child = fork(); -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc @@ -143,7 +143,9 @@ class MicrodumpWriter { const MicrodumpExtraInfo& microdump_extra_info, LinuxDumper* dumper) @@ -393,11 +393,11 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/mic const google_breakpad::fpstate_t* const float_state_; #endif LinuxDumper* dumper_; -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc -@@ -282,10 +282,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc +@@ -281,10 +281,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf); ASSERT_TRUE(ContainsMicrodump(buf)); @@ -420,10 +420,10 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/mic #else ASSERT_NE(std::string::npos, buf.find("M 00001000 0000002A 00001000 " -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc @@ -118,6 +118,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd #elif defined(__riscv) stack_pointer = reinterpret_cast( @@ -446,10 +446,10 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/min # if defined(__ANDROID__) for (int i = EF_R0; i <= EF_R31; i++) info.mcontext.gregs[i - EF_R0] = status->pr_reg[i]; -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc @@ -789,7 +789,9 @@ bool LinuxDumper::GetStackInfo(const voi reinterpret_cast(int_stack_pointer & ~(page_size - 1)); @@ -461,10 +461,10 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/min const MappingInfo* mapping = FindMapping(stack_pointer); if (!mapping) -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h @@ -64,7 +64,8 @@ namespace google_breakpad { typedef Elf32_auxv_t elf_aux_entry; #elif defined(__x86_64) || defined(__aarch64__) || \ @@ -475,10 +475,10 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/min typedef Elf64_auxv_t elf_aux_entry; #endif -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc @@ -57,6 +57,8 @@ #define TID_PTR_REGISTER "$1" #elif defined(__riscv) @@ -488,10 +488,10 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/min #else #error This test has not been ported to this platform. #endif -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc @@ -208,12 +208,12 @@ bool LinuxPtraceDumper::ReadRegisterSet( #ifdef PTRACE_GETREGSET struct iovec io; @@ -533,11 +533,11 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/min #else # error "This code hasn't been ported to your platform yet." #endif -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc -@@ -470,6 +470,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc +@@ -469,6 +469,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR #elif defined(__riscv) pid_t* process_tid_location = reinterpret_cast(one_thread.mcontext.__gregs[4]); @@ -547,7 +547,7 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/min #else #error This test has not been ported to this platform. #endif -@@ -569,6 +572,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt +@@ -568,6 +571,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt uintptr_t heap_addr = thread_info.mcontext.gregs[1]; #elif defined(__riscv) uintptr_t heap_addr = thread_info.mcontext.__gregs[4]; @@ -556,10 +556,10 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/min #else #error This test has not been ported to this platform. #endif -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc @@ -145,7 +145,9 @@ class MinidumpWriter { : fd_(minidump_fd), path_(minidump_path), @@ -613,10 +613,10 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/min const google_breakpad::fpstate_t* const float_state_; // ditto #endif LinuxDumper* dumper_; -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h @@ -47,6 +47,8 @@ class ExceptionHandler; #if defined(__aarch64__) @@ -626,10 +626,10 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/min #elif !defined(__ARM_EABI__) && !defined(__mips__) typedef std::remove_pointer::type fpstate_t; #endif -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc @@ -723,6 +723,9 @@ TEST(MinidumpWriterTest, InvalidStackPoi #elif defined(__riscv) context.context.uc_mcontext.__gregs[MD_CONTEXT_RISCV_REG_SP] = @@ -640,10 +640,10 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/client/linux/min #else # error "This code has not been ported to your platform yet." #endif -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc @@ -72,8 +72,7 @@ bool MemoryMappedFile::Map(const char* p #if defined(__x86_64__) || defined(__aarch64__) || \ @@ -654,11 +654,11 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/common/linux/mem struct kernel_stat st; if (sys_fstat(fd, &st) == -1 || st.st_size < 0) { #else -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc -@@ -179,9 +179,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc +@@ -178,9 +178,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM TEST_F(MemoryMappedFileTest, MapWithOffset) { // Put more data in the test file this time. Offsets can only be // done on page boundaries, so we need a two page file to test this. @@ -672,10 +672,10 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/common/linux/mem for (size_t i = 0; i < data1_size; ++i) { data1[i] = i & 0x7f; } -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc @@ -64,8 +64,9 @@ TEST(PageAllocatorTest, LargeObject) { EXPECT_EQ(0U, allocator.pages_allocated()); @@ -687,11 +687,11 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/common/memory_al for (unsigned i = 1; i < 10; ++i) { uint8_t* p = reinterpret_cast(allocator.Alloc(i)); ASSERT_FALSE(p == nullptr); -Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc +Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc -+++ chromium-140.0.7339.41/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc -@@ -83,6 +83,8 @@ +--- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc ++++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc +@@ -82,6 +82,8 @@ #define ELF_ARCH EM_AARCH64 #elif defined(__riscv) #define ELF_ARCH EM_RISCV @@ -700,7 +700,7 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/tools/linux/md2c #endif #if defined(__arm__) -@@ -93,6 +95,8 @@ typedef user_regs user_regs_struct; +@@ -92,6 +94,8 @@ typedef user_regs user_regs_struct; #elif defined (__mips__) || defined(__riscv) // This file-local typedef simplifies the source code. typedef gregset_t user_regs_struct; @@ -709,7 +709,7 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/tools/linux/md2c #endif using google_breakpad::MDTypeHelper; -@@ -326,6 +330,9 @@ struct CrashedProcess { +@@ -325,6 +329,9 @@ struct CrashedProcess { #if defined(__aarch64__) user_fpsimd_struct fpregs; #endif @@ -719,7 +719,7 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/tools/linux/md2c uintptr_t stack_addr; const uint8_t* stack; size_t stack_length; -@@ -629,6 +636,38 @@ ParseThreadRegisters(CrashedProcess::Thr +@@ -628,6 +635,38 @@ ParseThreadRegisters(CrashedProcess::Thr #error "Unexpected __riscv_xlen" #endif } @@ -758,7 +758,7 @@ Index: chromium-140.0.7339.41/third_party/breakpad/breakpad/src/tools/linux/md2c #else #error "This code has not been ported to your platform yet" #endif -@@ -734,6 +773,12 @@ ParseSystemInfo(const Options& options, +@@ -733,6 +772,12 @@ ParseSystemInfo(const Options& options, # else # error "Unexpected __riscv_xlen" # endif diff --git a/0001-add-xnn-ppc64el-support.patch b/0001-add-xnn-ppc64el-support.patch index dfa5595..9fd2f46 100644 --- a/0001-add-xnn-ppc64el-support.patch +++ b/0001-add-xnn-ppc64el-support.patch @@ -1,8 +1,8 @@ -Index: chromium-140.0.7339.41/third_party/xnnpack/generate_build_gn.py +Index: chromium-143.0.7499.40/third_party/xnnpack/generate_build_gn.py =================================================================== ---- chromium-140.0.7339.41.orig/third_party/xnnpack/generate_build_gn.py -+++ chromium-140.0.7339.41/third_party/xnnpack/generate_build_gn.py -@@ -232,7 +232,10 @@ _PLATFORMS = [ +--- chromium-143.0.7499.40.orig/third_party/xnnpack/generate_build_gn.py ++++ chromium-143.0.7499.40/third_party/xnnpack/generate_build_gn.py +@@ -239,7 +239,10 @@ _PLATFORMS = [ bazel_platform='//:linux_aarch64'), _Platform(gn_cpu='riscv64', bazel_cpu='riscv64', @@ -14,10 +14,10 @@ Index: chromium-140.0.7339.41/third_party/xnnpack/generate_build_gn.py ] -Index: chromium-140.0.7339.41/third_party/xnnpack/bazelroot/BUILD +Index: chromium-143.0.7499.40/third_party/xnnpack/bazelroot/BUILD =================================================================== ---- chromium-140.0.7339.41.orig/third_party/xnnpack/bazelroot/BUILD -+++ chromium-140.0.7339.41/third_party/xnnpack/bazelroot/BUILD +--- chromium-143.0.7499.40.orig/third_party/xnnpack/bazelroot/BUILD ++++ chromium-143.0.7499.40/third_party/xnnpack/bazelroot/BUILD @@ -29,6 +29,14 @@ platform( ], ) diff --git a/0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch b/0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch index 8825b67..2e4cbc3 100644 --- a/0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch +++ b/0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch @@ -1,6 +1,32 @@ -diff -up chromium-141.0.7390.37/sandbox/features.gni.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/features.gni ---- chromium-141.0.7390.37/sandbox/features.gni.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/features.gni 2025-09-28 10:15:55.414893495 +0200 +Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf/trap.cc +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf/trap.cc ++++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf/trap.cc +@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo* + SetIsInSigHandler(); + } + ++#if defined(__powerpc64__) ++ // On ppc64+glibc, some syscalls seem to accidentally negate the first ++ // parameter which causes checks against it to fail. For now, manually ++ // negate them back. ++ // TODO(sanastasio@raptorengineering.com): investigate this issue further ++ auto nr = SECCOMP_SYSCALL(ctx); ++ if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat || ++ nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) { ++ if (static_cast(SECCOMP_PARM1(ctx)) > 0) { ++ SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx); ++ } ++ } ++#endif ++ + // Copy the seccomp-specific data into a arch_seccomp_data structure. This + // is what we are showing to TrapFnc callbacks that the system call + // evaluator registered with the sandbox. +Index: chromium-143.0.7499.40/sandbox/features.gni +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/features.gni ++++ chromium-143.0.7499.40/sandbox/features.gni @@ -9,4 +9,5 @@ use_seccomp_bpf = (is_linux || is_chromeos || is_android) && (current_cpu == "x86" || current_cpu == "x64" || @@ -8,9 +34,35 @@ diff -up chromium-141.0.7390.37/sandbox/features.gni.0001-sandbox-Enable-seccomp - current_cpu == "mipsel" || current_cpu == "mips64el") + current_cpu == "mipsel" || current_cpu == "mips64el" || + current_cpu == "ppc64") -diff -up chromium-141.0.7390.37/sandbox/linux/bpf_dsl/linux_syscall_ranges.h.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/linux/bpf_dsl/linux_syscall_ranges.h ---- chromium-141.0.7390.37/sandbox/linux/bpf_dsl/linux_syscall_ranges.h.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/linux/bpf_dsl/linux_syscall_ranges.h 2025-09-28 10:15:55.415120766 +0200 +Index: chromium-143.0.7499.40/sandbox/policy/linux/bpf_renderer_policy_linux.cc +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/policy/linux/bpf_renderer_policy_linux.cc ++++ chromium-143.0.7499.40/sandbox/policy/linux/bpf_renderer_policy_linux.cc +@@ -17,6 +17,11 @@ + #include "sandbox/linux/system_headers/linux_syscalls.h" + #include "sandbox/policy/linux/sandbox_linux.h" + ++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h ++#ifdef __powerpc64__ ++#include ++#endif ++ + // TODO(vignatti): replace the local definitions below with #include + // once kernel version 4.6 becomes widely used. + #include +@@ -86,7 +91,7 @@ ResultExpr RendererProcessPolicy::Evalua + case __NR_ftruncate64: + #endif + #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ +- defined(__aarch64__) ++ defined(__aarch64__) || defined(__powerpc64__) + case __NR_getrlimit: + case __NR_setrlimit: + // We allow setrlimit to dynamically adjust the address space limit as +Index: chromium-143.0.7499.40/sandbox/linux/bpf_dsl/linux_syscall_ranges.h +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/linux/bpf_dsl/linux_syscall_ranges.h ++++ chromium-143.0.7499.40/sandbox/linux/bpf_dsl/linux_syscall_ranges.h @@ -56,6 +56,13 @@ #define MAX_PUBLIC_SYSCALL __NR_syscalls #define MAX_SYSCALL MAX_PUBLIC_SYSCALL @@ -25,75 +77,11 @@ diff -up chromium-141.0.7390.37/sandbox/linux/bpf_dsl/linux_syscall_ranges.h.000 #else #error "Unsupported architecture" #endif -diff -up chromium-141.0.7390.37/sandbox/linux/bpf_dsl/seccomp_macros.h.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/linux/bpf_dsl/seccomp_macros.h ---- chromium-141.0.7390.37/sandbox/linux/bpf_dsl/seccomp_macros.h.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/linux/bpf_dsl/seccomp_macros.h 2025-09-28 10:15:55.416743928 +0200 -@@ -14,6 +14,9 @@ - #if defined(__mips__) - // sys/user.h in eglibc misses size_t definition - #include -+#elif defined(__powerpc64__) -+// Manually define greg_t on ppc64 -+typedef unsigned long long greg_t; - #endif - #endif - -@@ -343,6 +346,51 @@ struct regs_struct { - #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3] - #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4] - #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5] -+ -+#elif defined(__powerpc64__) -+#include -+ -+typedef struct pt_regs regs_struct; -+ -+#ifdef ARCH_CPU_LITTLE_ENDIAN -+#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE -+#else -+#define SECCOMP_ARCH AUDIT_ARCH_PPC64 -+#endif -+ -+#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg]) -+ -+#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3) -+#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0) -+#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip -+#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3) -+#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4) -+#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5) -+#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6) -+#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7) -+#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8) -+ -+#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr)) -+#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch)) -+#define SECCOMP_IP_MSB_IDX \ -+ (offsetof(struct arch_seccomp_data, instruction_pointer) + 4) -+#define SECCOMP_IP_LSB_IDX \ -+ (offsetof(struct arch_seccomp_data, instruction_pointer) + 0) -+#define SECCOMP_ARG_MSB_IDX(nr) \ -+ (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4) -+#define SECCOMP_ARG_LSB_IDX(nr) \ -+ (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0) -+ -+#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3] -+#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0] -+#define SECCOMP_PT_IP(_regs) (_regs).nip -+#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3] -+#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4] -+#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5] -+#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6] -+#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7] -+#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8] -+ - #else - #error Unsupported target platform - -diff -up chromium-141.0.7390.37/sandbox/linux/BUILD.gn.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/linux/BUILD.gn ---- chromium-141.0.7390.37/sandbox/linux/BUILD.gn.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/linux/BUILD.gn 2025-09-28 10:15:55.415227970 +0200 -@@ -377,6 +377,8 @@ component("sandbox_services") { +Index: chromium-143.0.7499.40/sandbox/linux/BUILD.gn +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/linux/BUILD.gn ++++ chromium-143.0.7499.40/sandbox/linux/BUILD.gn +@@ -376,6 +376,8 @@ component("sandbox_services") { source_set("sandbox_services_headers") { sources = [ @@ -102,9 +90,83 @@ diff -up chromium-141.0.7390.37/sandbox/linux/BUILD.gn.0001-sandbox-Enable-secco "system_headers/arm64_linux_syscalls.h", "system_headers/arm_linux_syscalls.h", "system_headers/arm_linux_ucontext.h", -diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc ---- chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc 2025-09-28 10:15:55.415675419 +0200 +Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_syscalls.h +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/linux/system_headers/linux_syscalls.h ++++ chromium-143.0.7499.40/sandbox/linux/system_headers/linux_syscalls.h +@@ -44,4 +44,8 @@ + #include "sandbox/linux/system_headers/arm64_linux_syscalls.h" + #endif + ++#if defined(__powerpc64__) ++#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h" ++#endif ++ + #endif // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_ +Index: chromium-143.0.7499.40/sandbox/linux/system_headers/ppc64_linux_syscalls.h +=================================================================== +--- /dev/null ++++ chromium-143.0.7499.40/sandbox/linux/system_headers/ppc64_linux_syscalls.h +@@ -0,0 +1,25 @@ ++// Copyright 2014 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_ ++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_ ++ ++#include ++ ++//TODO: is it necessary to redefine syscall numbers for PPC64? ++// Needed for Ubuntu/Debian/Centos/RHEL: ++#if !defined(__NR_shmget) ++#define __NR_shmget 395 ++#endif ++#if !defined(__NR_shmdt) ++#define __NR_shmdt 398 ++#endif ++#if !defined(__NR_shmctl) ++#define __NR_shmctl 396 ++#endif ++#if !defined(__NR_shmat) ++#define __NR_shmat 397 ++#endif ++ ++#endif // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_ +Index: chromium-143.0.7499.40/sandbox/linux/system_headers/ppc64_linux_ucontext.h +=================================================================== +--- /dev/null ++++ chromium-143.0.7499.40/sandbox/linux/system_headers/ppc64_linux_ucontext.h +@@ -0,0 +1,12 @@ ++// Copyright 2014 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_ ++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_ ++ ++#include ++ ++//TODO: is it necessary to redefine ucontext on PPC64? ++ ++#endif // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_ +Index: chromium-143.0.7499.40/sandbox/linux/syscall_broker/broker_process.cc +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/linux/syscall_broker/broker_process.cc ++++ chromium-143.0.7499.40/sandbox/linux/syscall_broker/broker_process.cc +@@ -167,7 +167,7 @@ bool BrokerProcess::IsSyscallBrokerable( + #if defined(__NR_fstatat64) + case __NR_fstatat64: + #endif +-#if defined(__x86_64__) || defined(__aarch64__) ++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__) + case __NR_newfstatat: + #endif + return !fast_check || policy_->allowed_command_set.test(COMMAND_STAT); +Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc ++++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc @@ -90,7 +90,8 @@ bool IsBaselinePolicyWatched(int sysno) SyscallSets::IsPrctl(sysno) || SyscallSets::IsProcessGroupOrSession(sysno) || @@ -134,45 +196,11 @@ diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/baseline_polic if (SyscallSets::IsSocketCall(sysno)) return RestrictSocketcallCommand(); #endif -diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc ---- chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc 2025-09-28 10:15:55.417132817 +0200 -@@ -350,8 +350,10 @@ TEST_BASELINE_SIGSYS(__NR_timer_create) - - #if !defined(__aarch64__) - TEST_BASELINE_SIGSYS(__NR_inotify_init) -+#if !defined(__powerpc64__) - TEST_BASELINE_SIGSYS(__NR_vserver) - #endif -+#endif - - #if defined(LIBC_GLIBC) && !BUILDFLAG(IS_CHROMEOS) - BPF_TEST_C(BaselinePolicy, FutexEINVAL, BaselinePolicy) { -diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc ---- chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc 2025-09-28 10:15:55.417609762 +0200 -@@ -389,7 +389,16 @@ intptr_t SIGSYSFstatatHandler(const stru - if (args.nr == __NR_fstatat_default) { - if (*reinterpret_cast(args.args[1]) == '\0' && - args.args[3] == static_cast(AT_EMPTY_PATH)) { -- return syscall(__NR_fstat_default, static_cast(args.args[0]), -+ int fd = static_cast(args.args[0]); -+#if defined(__powerpc64__) -+ // On ppc64+glibc, some syscalls seem to accidentally negate the first -+ // parameter which causes checks against it to fail. For now, manually -+ // negate them back. -+ // TODO: Investigate the root cause and fix in glibc -+ if (fd < 0) -+ fd = -fd; -+#endif -+ return syscall(__NR_fstat_default, fd, - reinterpret_cast(args.args[2])); - } - return -reinterpret_cast(fs_denied_errno); -diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc ---- chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc 2025-09-28 10:15:55.415814493 +0200 -@@ -43,7 +43,7 @@ +Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc ++++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc +@@ -44,7 +44,7 @@ #define MAP_DROPPABLE 0x08 // Zero memory under memory pressure. #endif @@ -181,7 +209,7 @@ diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_parame !defined(PTRACE_GET_THREAD_AREA) // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA. -@@ -52,6 +52,11 @@ +@@ -53,6 +53,11 @@ #include #endif @@ -193,7 +221,7 @@ diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_parame #if BUILDFLAG(IS_ANDROID) #if !defined(F_DUPFD_CLOEXEC) -@@ -109,6 +114,15 @@ inline bool IsArchitectureMips() { +@@ -110,6 +115,15 @@ inline bool IsArchitectureMips() { #endif } @@ -209,7 +237,7 @@ diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_parame // Ubuntu's version of glibc has a race condition in sem_post that can cause // it to call futex(2) with bogus op arguments. To workaround this, we need // to allow those futex(2) calls to fail with EINVAL, instead of crashing the -@@ -287,9 +301,11 @@ ResultExpr RestrictFcntlCommands() { +@@ -288,9 +302,11 @@ ResultExpr RestrictFcntlCommands() { // operator. // Glibc overrides the kernel's O_LARGEFILE value. Account for this. uint64_t kOLargeFileFlag = O_LARGEFILE; @@ -222,7 +250,7 @@ diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_parame const Arg cmd(1); const Arg long_arg(2); -@@ -312,8 +328,17 @@ ResultExpr RestrictFcntlCommands() { +@@ -313,8 +329,17 @@ ResultExpr RestrictFcntlCommands() { F_SETLKW, F_GETLK, F_DUPFD, @@ -242,7 +270,7 @@ diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_parame .Case(F_SETFL, If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS())) .Case(F_ADD_SEALS, -@@ -322,7 +347,7 @@ ResultExpr RestrictFcntlCommands() { +@@ -323,7 +348,7 @@ ResultExpr RestrictFcntlCommands() { // clang-format on } @@ -251,7 +279,7 @@ diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_parame ResultExpr RestrictSocketcallCommand() { // Unfortunately, we are unable to restrict the first parameter to // socketpair(2). Whilst initially sounding bad, it's noteworthy that very -@@ -488,7 +513,7 @@ ResultExpr RestrictPtrace() { +@@ -489,7 +514,7 @@ ResultExpr RestrictPtrace() { #endif return Switch(request) .Cases({ @@ -260,7 +288,7 @@ diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_parame PTRACE_GETREGS, PTRACE_GETFPREGS, PTRACE_GET_THREAD_AREA, PTRACE_GETREGSET, #endif -@@ -528,13 +553,14 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr +@@ -529,13 +554,14 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr size_t argIndex; switch (sysno) { #if defined(__arm__) || \ @@ -277,9 +305,10 @@ diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_parame case __NR_sendto: // Could specify destination. argIndex = 3; break; -diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h ---- chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h 2025-09-28 10:15:55.415949009 +0200 +Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h ++++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h @@ -56,7 +56,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME. SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands(); @@ -289,9 +318,10 @@ diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_parame // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2), // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2). SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand(); -diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ---- chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc 2025-09-28 10:15:55.416060681 +0200 +Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ++++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc @@ -29,7 +29,8 @@ bool SyscallSets::IsAllowedGettime(int s switch (sysno) { case __NR_gettimeofday: @@ -751,9 +781,10 @@ diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_sets.c case __NR_vserver: #endif return true; -diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h ---- chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h 2025-09-28 10:15:55.416557304 +0200 +Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h ++++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h @@ -46,13 +46,14 @@ class SANDBOX_EXPORT SyscallSets { static bool IsDeniedGetOrModifySocket(int sysno); @@ -803,9 +834,129 @@ diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h // Big system V multiplexing system call. static bool IsSystemVIpc(int sysno); #endif -diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf/syscall.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/linux/seccomp-bpf/syscall.cc ---- chromium-141.0.7390.37/sandbox/linux/seccomp-bpf/syscall.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/linux/seccomp-bpf/syscall.cc 2025-09-28 10:15:55.417019291 +0200 +Index: chromium-143.0.7499.40/sandbox/linux/services/syscall_wrappers.cc +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/linux/services/syscall_wrappers.cc ++++ chromium-143.0.7499.40/sandbox/linux/services/syscall_wrappers.cc +@@ -68,7 +68,7 @@ long sys_clone(unsigned long flags, + #if defined(ARCH_CPU_X86_64) + return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls); + #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \ +- defined(ARCH_CPU_MIPS_FAMILY) ++ defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY) + // CONFIG_CLONE_BACKWARDS defined. + return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid); + #endif +Index: chromium-143.0.7499.40/sandbox/linux/bpf_dsl/seccomp_macros.h +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/linux/bpf_dsl/seccomp_macros.h ++++ chromium-143.0.7499.40/sandbox/linux/bpf_dsl/seccomp_macros.h +@@ -14,6 +14,9 @@ + #if defined(__mips__) + // sys/user.h in eglibc misses size_t definition + #include ++#elif defined(__powerpc64__) ++// Manually define greg_t on ppc64 ++typedef unsigned long long greg_t; + #endif + #endif + +@@ -343,6 +346,51 @@ struct regs_struct { + #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3] + #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4] + #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5] ++ ++#elif defined(__powerpc64__) ++#include ++ ++typedef struct pt_regs regs_struct; ++ ++#ifdef ARCH_CPU_LITTLE_ENDIAN ++#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE ++#else ++#define SECCOMP_ARCH AUDIT_ARCH_PPC64 ++#endif ++ ++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg]) ++ ++#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3) ++#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0) ++#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip ++#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3) ++#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4) ++#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5) ++#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6) ++#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7) ++#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8) ++ ++#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr)) ++#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch)) ++#define SECCOMP_IP_MSB_IDX \ ++ (offsetof(struct arch_seccomp_data, instruction_pointer) + 4) ++#define SECCOMP_IP_LSB_IDX \ ++ (offsetof(struct arch_seccomp_data, instruction_pointer) + 0) ++#define SECCOMP_ARG_MSB_IDX(nr) \ ++ (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4) ++#define SECCOMP_ARG_LSB_IDX(nr) \ ++ (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0) ++ ++#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3] ++#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0] ++#define SECCOMP_PT_IP(_regs) (_regs).nip ++#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3] ++#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4] ++#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5] ++#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6] ++#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7] ++#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8] ++ + #else + #error Unsupported target platform + +Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_seccomp.h +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/linux/system_headers/linux_seccomp.h ++++ chromium-143.0.7499.40/sandbox/linux/system_headers/linux_seccomp.h +@@ -38,6 +38,9 @@ + #ifndef EM_AARCH64 + #define EM_AARCH64 183 + #endif ++#ifndef EM_PPC64 ++#define EM_PPC64 21 ++#endif + + #ifndef __AUDIT_ARCH_64BIT + #define __AUDIT_ARCH_64BIT 0x80000000 +@@ -70,6 +73,12 @@ + #ifndef AUDIT_ARCH_AARCH64 + #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE) + #endif ++#ifndef AUDIT_ARCH_PPC64 ++#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT) ++#endif ++#ifndef AUDIT_ARCH_PPC64LE ++#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE) ++#endif + + // For prctl.h + #ifndef PR_SET_SECCOMP +Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_signal.h +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/linux/system_headers/linux_signal.h ++++ chromium-143.0.7499.40/sandbox/linux/system_headers/linux_signal.h +@@ -13,7 +13,7 @@ + // (not undefined, but defined different values and in different memory + // layouts). So, fill the gap here. + #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \ +- defined(__aarch64__) ++ defined(__aarch64__) || defined(__powerpc64__) + + #define LINUX_SIGHUP 1 + #define LINUX_SIGINT 2 +Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf/syscall.cc +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf/syscall.cc ++++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf/syscall.cc @@ -19,7 +19,7 @@ namespace sandbox { namespace { @@ -900,33 +1051,58 @@ diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf/syscall.cc.0001-sandbo #endif SECCOMP_RESULT(ctx) = static_cast(ret_val); } -diff -up chromium-141.0.7390.37/sandbox/linux/seccomp-bpf/trap.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/linux/seccomp-bpf/trap.cc ---- chromium-141.0.7390.37/sandbox/linux/seccomp-bpf/trap.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/linux/seccomp-bpf/trap.cc 2025-09-28 10:15:55.414751305 +0200 -@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo* - SetIsInSigHandler(); - } +Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc ++++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc +@@ -350,8 +350,10 @@ TEST_BASELINE_SIGSYS(__NR_timer_create) -+#if defined(__powerpc64__) -+ // On ppc64+glibc, some syscalls seem to accidentally negate the first -+ // parameter which causes checks against it to fail. For now, manually -+ // negate them back. -+ // TODO(sanastasio@raptorengineering.com): investigate this issue further -+ auto nr = SECCOMP_SYSCALL(ctx); -+ if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat || -+ nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) { -+ if (static_cast(SECCOMP_PARM1(ctx)) > 0) { -+ SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx); -+ } -+ } + #if !defined(__aarch64__) + TEST_BASELINE_SIGSYS(__NR_inotify_init) ++#if !defined(__powerpc64__) + TEST_BASELINE_SIGSYS(__NR_vserver) + #endif +#endif -+ - // Copy the seccomp-specific data into a arch_seccomp_data structure. This - // is what we are showing to TrapFnc callbacks that the system call - // evaluator registered with the sandbox. -diff -up chromium-141.0.7390.37/sandbox/linux/services/credentials.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/linux/services/credentials.cc ---- chromium-141.0.7390.37/sandbox/linux/services/credentials.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/linux/services/credentials.cc 2025-09-28 10:18:58.609023878 +0200 + + #if defined(LIBC_GLIBC) && !BUILDFLAG(IS_CHROMEOS) + BPF_TEST_C(BaselinePolicy, FutexEINVAL, BaselinePolicy) { +Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_stat.h +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/linux/system_headers/linux_stat.h ++++ chromium-143.0.7499.40/sandbox/linux/system_headers/linux_stat.h +@@ -173,6 +173,28 @@ struct kernel_stat { + unsigned int __unused4; + unsigned int __unused5; + }; ++#elif defined(__powerpc64__) ++struct kernel_stat { ++ unsigned long st_dev; ++ ino_t st_ino; ++ unsigned long st_nlink; ++ mode_t st_mode; ++ uid_t st_uid; ++ gid_t st_gid; ++ unsigned long st_rdev; ++ long st_size; ++ unsigned long st_blksize; ++ unsigned long st_blocks; ++ // unsigned long st_atime; ++ unsigned long st_atime_nsec; ++ //unsigned long st_mtime; ++ unsigned long st_mtime_nsec; ++ //unsigned long st_ctime; ++ unsigned long st_ctime_nsec; ++ unsigned long __unused4; ++ unsigned long __unused5; ++ unsigned long __unused6; ++}; + #endif + + #if !defined(AT_EMPTY_PATH) +Index: chromium-143.0.7499.40/sandbox/linux/services/credentials.cc +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/linux/services/credentials.cc ++++ chromium-143.0.7499.40/sandbox/linux/services/credentials.cc @@ -85,7 +85,7 @@ bool ChrootToSafeEmptyDir() { alignas(16) std::array stack_buf; @@ -958,185 +1134,10 @@ diff -up chromium-141.0.7390.37/sandbox/linux/services/credentials.cc.0001-sandb clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS; char tls_buf[PTHREAD_STACK_MIN_CONST] = {}; -diff -up chromium-141.0.7390.37/sandbox/linux/services/syscall_wrappers.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/linux/services/syscall_wrappers.cc ---- chromium-141.0.7390.37/sandbox/linux/services/syscall_wrappers.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/linux/services/syscall_wrappers.cc 2025-09-28 10:15:55.416648236 +0200 -@@ -68,7 +68,7 @@ long sys_clone(unsigned long flags, - #if defined(ARCH_CPU_X86_64) - return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls); - #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \ -- defined(ARCH_CPU_MIPS_FAMILY) -+ defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY) - // CONFIG_CLONE_BACKWARDS defined. - return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid); - #endif -diff -up chromium-141.0.7390.37/sandbox/linux/syscall_broker/broker_process.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/linux/syscall_broker/broker_process.cc ---- chromium-141.0.7390.37/sandbox/linux/syscall_broker/broker_process.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/linux/syscall_broker/broker_process.cc 2025-09-28 10:15:55.415563066 +0200 -@@ -167,7 +167,7 @@ bool BrokerProcess::IsSyscallBrokerable( - #if defined(__NR_fstatat64) - case __NR_fstatat64: - #endif --#if defined(__x86_64__) || defined(__aarch64__) -+#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__) - case __NR_newfstatat: - #endif - return !fast_check || policy_->allowed_command_set.test(COMMAND_STAT); -diff -up chromium-141.0.7390.37/sandbox/linux/system_headers/linux_seccomp.h.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/linux/system_headers/linux_seccomp.h ---- chromium-141.0.7390.37/sandbox/linux/system_headers/linux_seccomp.h.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/linux/system_headers/linux_seccomp.h 2025-09-28 10:15:55.416845160 +0200 -@@ -38,6 +38,9 @@ - #ifndef EM_AARCH64 - #define EM_AARCH64 183 - #endif -+#ifndef EM_PPC64 -+#define EM_PPC64 21 -+#endif - - #ifndef __AUDIT_ARCH_64BIT - #define __AUDIT_ARCH_64BIT 0x80000000 -@@ -70,6 +73,12 @@ - #ifndef AUDIT_ARCH_AARCH64 - #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE) - #endif -+#ifndef AUDIT_ARCH_PPC64 -+#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT) -+#endif -+#ifndef AUDIT_ARCH_PPC64LE -+#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE) -+#endif - - // For prctl.h - #ifndef PR_SET_SECCOMP -diff -up chromium-141.0.7390.37/sandbox/linux/system_headers/linux_signal.h.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/linux/system_headers/linux_signal.h ---- chromium-141.0.7390.37/sandbox/linux/system_headers/linux_signal.h.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/linux/system_headers/linux_signal.h 2025-09-28 10:15:55.416926335 +0200 -@@ -13,7 +13,7 @@ - // (not undefined, but defined different values and in different memory - // layouts). So, fill the gap here. - #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \ -- defined(__aarch64__) -+ defined(__aarch64__) || defined(__powerpc64__) - - #define LINUX_SIGHUP 1 - #define LINUX_SIGINT 2 -diff -up chromium-141.0.7390.37/sandbox/linux/system_headers/linux_stat.h.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/linux/system_headers/linux_stat.h ---- chromium-141.0.7390.37/sandbox/linux/system_headers/linux_stat.h.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/linux/system_headers/linux_stat.h 2025-09-28 10:15:55.417253506 +0200 -@@ -173,6 +173,28 @@ struct kernel_stat { - unsigned int __unused4; - unsigned int __unused5; - }; -+#elif defined(__powerpc64__) -+struct kernel_stat { -+ unsigned long st_dev; -+ ino_t st_ino; -+ unsigned long st_nlink; -+ mode_t st_mode; -+ uid_t st_uid; -+ gid_t st_gid; -+ unsigned long st_rdev; -+ long st_size; -+ unsigned long st_blksize; -+ unsigned long st_blocks; -+ // unsigned long st_atime; -+ unsigned long st_atime_nsec; -+ //unsigned long st_mtime; -+ unsigned long st_mtime_nsec; -+ //unsigned long st_ctime; -+ unsigned long st_ctime_nsec; -+ unsigned long __unused4; -+ unsigned long __unused5; -+ unsigned long __unused6; -+}; - #endif - - #if !defined(AT_EMPTY_PATH) -diff -up chromium-141.0.7390.37/sandbox/linux/system_headers/linux_syscalls.h.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/linux/system_headers/linux_syscalls.h ---- chromium-141.0.7390.37/sandbox/linux/system_headers/linux_syscalls.h.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/linux/system_headers/linux_syscalls.h 2025-09-28 10:15:55.415341084 +0200 -@@ -35,5 +35,9 @@ - #include "sandbox/linux/system_headers/arm64_linux_syscalls.h" - #endif - -+#if defined(__powerpc64__) -+#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h" -+#endif -+ - #endif // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_ - -diff -up chromium-141.0.7390.37/sandbox/linux/system_headers/ppc64_linux_syscalls.h.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/linux/system_headers/ppc64_linux_syscalls.h ---- chromium-141.0.7390.37/sandbox/linux/system_headers/ppc64_linux_syscalls.h.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-28 10:15:55.415404074 +0200 -+++ chromium-141.0.7390.37/sandbox/linux/system_headers/ppc64_linux_syscalls.h 2025-09-28 10:15:55.415404074 +0200 -@@ -0,0 +1,25 @@ -+// Copyright 2014 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_ -+#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_ -+ -+#include -+ -+//TODO: is it necessary to redefine syscall numbers for PPC64? -+// Needed for Ubuntu/Debian/Centos/RHEL: -+#if !defined(__NR_shmget) -+#define __NR_shmget 395 -+#endif -+#if !defined(__NR_shmdt) -+#define __NR_shmdt 398 -+#endif -+#if !defined(__NR_shmctl) -+#define __NR_shmctl 396 -+#endif -+#if !defined(__NR_shmat) -+#define __NR_shmat 397 -+#endif -+ -+#endif // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_ -diff -up chromium-141.0.7390.37/sandbox/linux/system_headers/ppc64_linux_ucontext.h.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/linux/system_headers/ppc64_linux_ucontext.h ---- chromium-141.0.7390.37/sandbox/linux/system_headers/ppc64_linux_ucontext.h.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-28 10:15:55.415474818 +0200 -+++ chromium-141.0.7390.37/sandbox/linux/system_headers/ppc64_linux_ucontext.h 2025-09-28 10:15:55.415474818 +0200 -@@ -0,0 +1,12 @@ -+// Copyright 2014 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_ -+#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_ -+ -+#include -+ -+//TODO: is it necessary to redefine ucontext on PPC64? -+ -+#endif // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_ -diff -up chromium-141.0.7390.37/sandbox/policy/linux/bpf_renderer_policy_linux.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/policy/linux/bpf_renderer_policy_linux.cc ---- chromium-141.0.7390.37/sandbox/policy/linux/bpf_renderer_policy_linux.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/policy/linux/bpf_renderer_policy_linux.cc 2025-09-28 10:15:55.415005076 +0200 -@@ -17,6 +17,11 @@ - #include "sandbox/linux/system_headers/linux_syscalls.h" - #include "sandbox/policy/linux/sandbox_linux.h" - -+// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h -+#ifdef __powerpc64__ -+#include -+#endif -+ - // TODO(vignatti): replace the local definitions below with #include - // once kernel version 4.6 becomes widely used. - #include -@@ -86,7 +91,7 @@ ResultExpr RendererProcessPolicy::Evalua - case __NR_ftruncate64: - #endif - #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ -- defined(__aarch64__) -+ defined(__aarch64__) || defined(__powerpc64__) - case __NR_getrlimit: - case __NR_setrlimit: - // We allow setrlimit to dynamically adjust the address space limit as -diff -up chromium-141.0.7390.37/sandbox/policy/linux/bpf_utility_policy_linux.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 chromium-141.0.7390.37/sandbox/policy/linux/bpf_utility_policy_linux.cc ---- chromium-141.0.7390.37/sandbox/policy/linux/bpf_utility_policy_linux.cc.0001-sandbox-Enable-seccomp_bpf-for-ppc64 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/sandbox/policy/linux/bpf_utility_policy_linux.cc 2025-09-28 10:15:55.417510624 +0200 +Index: chromium-143.0.7499.40/sandbox/policy/linux/bpf_utility_policy_linux.cc +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/policy/linux/bpf_utility_policy_linux.cc ++++ chromium-143.0.7499.40/sandbox/policy/linux/bpf_utility_policy_linux.cc @@ -34,7 +34,7 @@ ResultExpr UtilityProcessPolicy::Evaluat case __NR_fdatasync: case __NR_fsync: @@ -1146,3 +1147,25 @@ diff -up chromium-141.0.7390.37/sandbox/policy/linux/bpf_utility_policy_linux.cc case __NR_getrlimit: #endif #if defined(__i386__) || defined(__arm__) +Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc +=================================================================== +--- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc ++++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc +@@ -389,7 +389,16 @@ intptr_t SIGSYSFstatatHandler(const stru + if (args.nr == __NR_fstatat_default) { + if (*reinterpret_cast(args.args[1]) == '\0' && + args.args[3] == static_cast(AT_EMPTY_PATH)) { +- return syscall(__NR_fstat_default, static_cast(args.args[0]), ++ int fd = static_cast(args.args[0]); ++#if defined(__powerpc64__) ++ // On ppc64+glibc, some syscalls seem to accidentally negate the first ++ // parameter which causes checks against it to fail. For now, manually ++ // negate them back. ++ // TODO: Investigate the root cause and fix in glibc ++ if (fd < 0) ++ fd = -fd; ++#endif ++ return syscall(__NR_fstat_default, fd, + reinterpret_cast(args.args[2])); + } + return -reinterpret_cast(fs_denied_errno); diff --git a/0001-swiftshader-fix-build.patch b/0001-swiftshader-fix-build.patch index 646e27b..c3f8771 100644 --- a/0001-swiftshader-fix-build.patch +++ b/0001-swiftshader-fix-build.patch @@ -1,15 +1,3 @@ -diff -up chromium-140.0.7339.80/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn.me chromium-140.0.7339.80/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn ---- chromium-140.0.7339.80/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn.me 2025-09-04 06:47:12.233139911 +0200 -+++ chromium-140.0.7339.80/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn 2025-09-04 06:52:37.001661643 +0200 -@@ -1261,6 +1261,8 @@ swiftshader_llvm_source_set("swiftshader - "llvm/lib/Target/PowerPC/PPCVSXFMAMutate.cpp", - "llvm/lib/Target/PowerPC/PPCVSXSwapRemoval.cpp", - "llvm/lib/Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp", -+ "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp", -+ "llvm/lib/MC/MCAsmInfoXCOFF.cpp", - ] - } - diff -up chromium-140.0.7339.80/third_party/swiftshader/third_party/llvm-16.0/BUILD.gn.me chromium-140.0.7339.80/third_party/swiftshader/third_party/llvm-16.0/BUILD.gn --- chromium-140.0.7339.80/third_party/swiftshader/third_party/llvm-16.0/BUILD.gn.me 2025-09-04 06:45:21.570780130 +0200 +++ chromium-140.0.7339.80/third_party/swiftshader/third_party/llvm-16.0/BUILD.gn 2025-09-04 06:55:56.278501043 +0200 diff --git a/0001-third_party-angle-Include-missing-header-cstddef-in-.patch b/0001-third_party-angle-Include-missing-header-cstddef-in-.patch index bbe406a..0377a9b 100644 --- a/0001-third_party-angle-Include-missing-header-cstddef-in-.patch +++ b/0001-third_party-angle-Include-missing-header-cstddef-in-.patch @@ -1,7 +1,7 @@ -Index: chromium-140.0.7339.41/third_party/angle/src/libANGLE/Constants.h +Index: chromium-143.0.7499.40/third_party/angle/src/libANGLE/Constants.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/angle/src/libANGLE/Constants.h -+++ chromium-140.0.7339.41/third_party/angle/src/libANGLE/Constants.h +--- chromium-143.0.7499.40.orig/third_party/angle/src/libANGLE/Constants.h ++++ chromium-143.0.7499.40/third_party/angle/src/libANGLE/Constants.h @@ -9,6 +9,7 @@ #ifndef LIBANGLE_CONSTANTS_H_ #define LIBANGLE_CONSTANTS_H_ diff --git a/0001-third_party-libvpx-Properly-generate-gni-on-ppc64.patch b/0001-third_party-libvpx-Properly-generate-gni-on-ppc64.patch index 3dd4ab9..8f06a2d 100644 --- a/0001-third_party-libvpx-Properly-generate-gni-on-ppc64.patch +++ b/0001-third_party-libvpx-Properly-generate-gni-on-ppc64.patch @@ -8,10 +8,10 @@ Subject: [PATCH] third_party/libvpx: Properly generate gni on ppc64 third_party/libvpx/generate_gni.sh | 10 ++++++++++ 2 files changed, 12 insertions(+) -Index: chromium-140.0.7339.41/third_party/libvpx/BUILD.gn +Index: chromium-143.0.7499.40/third_party/libvpx/BUILD.gn =================================================================== ---- chromium-140.0.7339.41.orig/third_party/libvpx/BUILD.gn -+++ chromium-140.0.7339.41/third_party/libvpx/BUILD.gn +--- chromium-143.0.7499.40.orig/third_party/libvpx/BUILD.gn ++++ chromium-143.0.7499.40/third_party/libvpx/BUILD.gn @@ -297,6 +297,8 @@ if (current_cpu == "x86" || (current_cpu } else if (current_cpu == "x64") { deps = [ ":libvpx_x86_64_headers" ] diff --git a/0001-third_party-pffft-Include-altivec.h-on-ppc64-with-SI.patch b/0001-third_party-pffft-Include-altivec.h-on-ppc64-with-SI.patch index c324852..2ba1e48 100644 --- a/0001-third_party-pffft-Include-altivec.h-on-ppc64-with-SI.patch +++ b/0001-third_party-pffft-Include-altivec.h-on-ppc64-with-SI.patch @@ -8,10 +8,10 @@ Subject: [PATCH] third_party/pffft: Include altivec.h on ppc64 with SIMD third_party/pffft/src/pffft.c | 1 + 1 file changed, 1 insertion(+) -Index: chromium-140.0.7339.41/third_party/pffft/src/pffft.c +Index: chromium-143.0.7499.40/third_party/pffft/src/pffft.c =================================================================== ---- chromium-140.0.7339.41.orig/third_party/pffft/src/pffft.c -+++ chromium-140.0.7339.41/third_party/pffft/src/pffft.c +--- chromium-143.0.7499.40.orig/third_party/pffft/src/pffft.c ++++ chromium-143.0.7499.40/third_party/pffft/src/pffft.c @@ -100,6 +100,7 @@ Altivec support macros */ diff --git a/0002-Add-PPC64-generated-files-for-boringssl.patch b/0002-Add-PPC64-generated-files-for-boringssl.patch index 6369cfe..12d7619 100644 --- a/0002-Add-PPC64-generated-files-for-boringssl.patch +++ b/0002-Add-PPC64-generated-files-for-boringssl.patch @@ -1,7 +1,7 @@ -Index: chromium-140.0.7339.41/third_party/boringssl/src/gen/bcm/aesp8-ppc-linux.S +Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/bcm/aesp8-ppc-linux.S =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/boringssl/src/gen/bcm/aesp8-ppc-linux.S ++++ chromium-143.0.7499.40/third_party/boringssl/src/gen/bcm/aesp8-ppc-linux.S @@ -0,0 +1,3673 @@ +// This file is generated from a similarly-named Perl script in the BoringSSL +// source tree. Do not edit by hand. @@ -3676,10 +3676,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/gen/bcm/aesp8-ppc-linux. +// See https://www.airs.ccom/blog/archives/518. +.section .note.GNU-stack,"",%progbits +#endif -Index: chromium-140.0.7339.41/third_party/boringssl/src/gen/bcm/ghashp8-ppc-linux.S +Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/bcm/ghashp8-ppc-linux.S =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/boringssl/src/gen/bcm/ghashp8-ppc-linux.S ++++ chromium-143.0.7499.40/third_party/boringssl/src/gen/bcm/ghashp8-ppc-linux.S @@ -0,0 +1,590 @@ +// This file is generated from a similarly-named Perl script in the BoringSSL +// source tree. Do not edit by hand. @@ -4271,11 +4271,11 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/gen/bcm/ghashp8-ppc-linu +// See https://www.airs.ccom/blog/archives/518. +.section .note.GNU-stack,"",%progbits +#endif -Index: chromium-140.0.7339.41/third_party/boringssl/src/gen/sources.cmake +Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.cmake =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/gen/sources.cmake -+++ chromium-140.0.7339.41/third_party/boringssl/src/gen/sources.cmake -@@ -120,6 +120,7 @@ set( +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/gen/sources.cmake ++++ chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.cmake +@@ -122,6 +122,7 @@ set( gen/bcm/aesni-x86-linux.S gen/bcm/aesni-x86_64-apple.S gen/bcm/aesni-x86_64-linux.S @@ -4283,7 +4283,7 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/gen/sources.cmake gen/bcm/aesv8-armv7-linux.S gen/bcm/aesv8-armv8-apple.S gen/bcm/aesv8-armv8-linux.S -@@ -151,6 +152,7 @@ set( +@@ -153,6 +154,7 @@ set( gen/bcm/ghash-x86-linux.S gen/bcm/ghash-x86_64-apple.S gen/bcm/ghash-x86_64-linux.S @@ -4291,7 +4291,7 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/gen/sources.cmake gen/bcm/ghashv8-armv7-linux.S gen/bcm/ghashv8-armv8-apple.S gen/bcm/ghashv8-armv8-linux.S -@@ -350,6 +352,7 @@ set( +@@ -352,6 +354,7 @@ set( crypto/cpu_arm_freebsd.cc crypto/cpu_arm_linux.cc crypto/cpu_intel.cc @@ -4299,7 +4299,7 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/gen/sources.cmake crypto/crypto.cc crypto/curve25519/curve25519.cc crypto/curve25519/curve25519_64_adx.cc -@@ -2925,6 +2928,7 @@ set( +@@ -2971,6 +2974,7 @@ set( gen/test_support/trampoline-armv8-apple.S gen/test_support/trampoline-armv8-linux.S gen/test_support/trampoline-armv8-win.S @@ -4307,11 +4307,11 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/gen/sources.cmake gen/test_support/trampoline-x86-apple.S gen/test_support/trampoline-x86-linux.S gen/test_support/trampoline-x86_64-apple.S -Index: chromium-140.0.7339.41/third_party/boringssl/src/gen/sources.json +Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.json =================================================================== ---- chromium-140.0.7339.41.orig/third_party/boringssl/src/gen/sources.json -+++ chromium-140.0.7339.41/third_party/boringssl/src/gen/sources.json -@@ -98,6 +98,7 @@ +--- chromium-143.0.7499.40.orig/third_party/boringssl/src/gen/sources.json ++++ chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.json +@@ -100,6 +100,7 @@ "gen/bcm/aesni-x86-linux.S", "gen/bcm/aesni-x86_64-apple.S", "gen/bcm/aesni-x86_64-linux.S", @@ -4319,7 +4319,7 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/gen/sources.json "gen/bcm/aesv8-armv7-linux.S", "gen/bcm/aesv8-armv8-apple.S", "gen/bcm/aesv8-armv8-linux.S", -@@ -129,6 +130,7 @@ +@@ -131,6 +132,7 @@ "gen/bcm/ghash-x86-linux.S", "gen/bcm/ghash-x86_64-apple.S", "gen/bcm/ghash-x86_64-linux.S", @@ -4327,7 +4327,7 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/gen/sources.json "gen/bcm/ghashv8-armv7-linux.S", "gen/bcm/ghashv8-armv8-apple.S", "gen/bcm/ghashv8-armv8-linux.S", -@@ -320,6 +322,7 @@ +@@ -322,6 +324,7 @@ "crypto/cpu_arm_freebsd.cc", "crypto/cpu_arm_linux.cc", "crypto/cpu_intel.cc", @@ -4335,7 +4335,7 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/gen/sources.json "crypto/crypto.cc", "crypto/curve25519/curve25519.cc", "crypto/curve25519/curve25519_64_adx.cc", -@@ -2841,6 +2844,7 @@ +@@ -2883,6 +2886,7 @@ "gen/test_support/trampoline-armv8-apple.S", "gen/test_support/trampoline-armv8-linux.S", "gen/test_support/trampoline-armv8-win.S", @@ -4343,10 +4343,10 @@ Index: chromium-140.0.7339.41/third_party/boringssl/src/gen/sources.json "gen/test_support/trampoline-x86-apple.S", "gen/test_support/trampoline-x86-linux.S", "gen/test_support/trampoline-x86_64-apple.S", -Index: chromium-140.0.7339.41/third_party/boringssl/src/gen/test_support/trampoline-ppc-linux.S +Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/test_support/trampoline-ppc-linux.S =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/boringssl/src/gen/test_support/trampoline-ppc-linux.S ++++ chromium-143.0.7499.40/third_party/boringssl/src/gen/test_support/trampoline-ppc-linux.S @@ -0,0 +1,1413 @@ +// This file is generated from a similarly-named Perl script in the BoringSSL +// source tree. Do not edit by hand. diff --git a/0002-Add-ppc64-trap-instructions.patch b/0002-Add-ppc64-trap-instructions.patch index e76ea40..61e9992 100644 --- a/0002-Add-ppc64-trap-instructions.patch +++ b/0002-Add-ppc64-trap-instructions.patch @@ -1,7 +1,7 @@ -Index: chromium-140.0.7339.41/v8/src/base/immediate-crash.h +Index: chromium-143.0.7499.40/v8/src/base/immediate-crash.h =================================================================== ---- chromium-140.0.7339.41.orig/v8/src/base/immediate-crash.h -+++ chromium-140.0.7339.41/v8/src/base/immediate-crash.h +--- chromium-143.0.7499.40.orig/v8/src/base/immediate-crash.h ++++ chromium-143.0.7499.40/v8/src/base/immediate-crash.h @@ -98,6 +98,13 @@ #define TRAP_SEQUENCE1_() asm volatile(".2byte 0x0001"); #define TRAP_SEQUENCE2_() asm volatile("") diff --git a/0002-regenerate-xnn-buildgn.patch b/0002-regenerate-xnn-buildgn.patch index 8633f39..09eb811 100644 --- a/0002-regenerate-xnn-buildgn.patch +++ b/0002-regenerate-xnn-buildgn.patch @@ -1,9 +1,10 @@ File regenerated by running 'python3 generate_build_gn.py' +Requires Bazel 8 or higher to regenerate -Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn =================================================================== ---- chromium-142.0.7444.52.orig/third_party/xnnpack/BUILD.gn -+++ chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +--- chromium-143.0.7499.40.orig/third_party/xnnpack/BUILD.gn ++++ chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn @@ -35,10 +35,10 @@ config("xnnpack_public_config") { } @@ -264,16 +265,16 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + ":f32-vunary_x64", + ":operators_x64", + ":qd8-f16-qb4w-gemm_f16c-fma-avx2", -+ ":qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma", ++ ":qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni", + ":qd8-f16-qc4w-gemm_f16c-fma-avx2", + ":qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", + ":qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", -+ ":qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma", ++ ":qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni", + ":qd8-f16-qc8w-gemm_f16c-fma-avx2", + ":qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", + ":qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", + ":qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8", -+ ":qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma", ++ ":qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni", + ":qd8-f16-qc8w-igemm_f16c-fma-avx2", + ":qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", + ":qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", @@ -285,7 +286,7 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + ":qd8-f32-qb4w-gemm_sse2-no-sse3", + ":qd8-f32-qb4w-gemm_sse4.1-no-sse4.2", + ":qd8-f32-qb4w-gemm_x64", -+ ":qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma", ++ ":qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni", + ":qd8-f32-qc4w-gemm_f16c-fma-avx2", + ":qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", + ":qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", @@ -294,7 +295,7 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + ":qd8-f32-qc4w-gemm_sse2-no-sse3", + ":qd8-f32-qc4w-gemm_ssse3-no-sse4.1", + ":qd8-f32-qc4w-gemm_x64", -+ ":qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma", ++ ":qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni", + ":qd8-f32-qc8w-gemm_f16c-fma-avx2", + ":qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", + ":qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", @@ -302,7 +303,7 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + ":qd8-f32-qc8w-gemm_sse2-no-sse3", + ":qd8-f32-qc8w-gemm_sse4.1-no-sse4.2", + ":qd8-f32-qc8w-gemm_x64", -+ ":qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma", ++ ":qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni", + ":qd8-f32-qc8w-igemm_f16c-fma-avx2", + ":qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", + ":qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", @@ -323,12 +324,12 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + ":qs8-f32-vcvt_sse2-no-sse3", + ":qs8-f32-vcvt_sse4.1-no-sse4.2", + ":qs8-f32-vcvt_x64", -+ ":qs8-packw_avx2-avxvnni-f16c-fma", ++ ":qs8-packw_avx2-avxvnni-f16c-fma-gfni", + ":qs8-packw_f16c-fma-avx2", + ":qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", + ":qs8-packw_x64", + ":qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma", -+ ":qs8-qc4w-gemm_avx2-avxvnni-f16c-fma", ++ ":qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni", + ":qs8-qc4w-gemm_f16c-fma-avx2", + ":qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", + ":qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", @@ -341,8 +342,8 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + ":qs8-qc8w-dwconv_sse4.1-no-sse4.2", + ":qs8-qc8w-dwconv_x64", + ":qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma", -+ ":qs8-qc8w-gemm_avx2-avxvnni-f16c-fma", -+ ":qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma", ++ ":qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni", ++ ":qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni", + ":qs8-qc8w-gemm_f16c-fma-avx2", + ":qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", + ":qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", @@ -351,8 +352,8 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + ":qs8-qc8w-gemm_sse4.1-no-sse4.2", + ":qs8-qc8w-gemm_x64", + ":qs8-qc8w-igemm_avx-no-avx2-no-f16c-no-fma", -+ ":qs8-qc8w-igemm_avx2-avxvnni-f16c-fma", -+ ":qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma", ++ ":qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni", ++ ":qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni", + ":qs8-qc8w-igemm_f16c-fma-avx2", + ":qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", + ":qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", @@ -360,14 +361,14 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + ":qs8-qc8w-igemm_sse2-no-sse3", + ":qs8-qc8w-igemm_sse4.1-no-sse4.2", + ":qs8-qc8w-igemm_x64", -+ ":qs8-qu8-packw_avx2-avxvnni-f16c-fma", ++ ":qs8-qu8-packw_avx2-avxvnni-f16c-fma-gfni", + ":qs8-qu8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", + ":qs8-qu8-packw_x64", + ":qs8-rdsum_f16c-fma-avx2", + ":qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", + ":qs8-rdsum_sse4.1-no-sse4.2", + ":qs8-rdsum_x64", -+ ":qs8-rsum_avx2-avxvnni-f16c-fma", ++ ":qs8-rsum_avx2-avxvnni-f16c-fma-gfni", + ":qs8-rsum_f16c-fma-avx2", + ":qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", + ":qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", @@ -785,16 +786,16 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + ":f32-vunary_x64_standalone", + ":operators_x64_standalone", + ":qd8-f16-qb4w-gemm_f16c-fma-avx2_standalone", -+ ":qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma_standalone", ++ ":qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone", + ":qd8-f16-qc4w-gemm_f16c-fma-avx2_standalone", + ":qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", -+ ":qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone", ++ ":qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone", + ":qd8-f16-qc8w-gemm_f16c-fma-avx2_standalone", + ":qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", + ":qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", -+ ":qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone", ++ ":qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone", + ":qd8-f16-qc8w-igemm_f16c-fma-avx2_standalone", + ":qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", @@ -806,7 +807,7 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + ":qd8-f32-qb4w-gemm_sse2-no-sse3_standalone", + ":qd8-f32-qb4w-gemm_sse4.1-no-sse4.2_standalone", + ":qd8-f32-qb4w-gemm_x64_standalone", -+ ":qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma_standalone", ++ ":qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone", + ":qd8-f32-qc4w-gemm_f16c-fma-avx2_standalone", + ":qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", @@ -815,7 +816,7 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + ":qd8-f32-qc4w-gemm_sse2-no-sse3_standalone", + ":qd8-f32-qc4w-gemm_ssse3-no-sse4.1_standalone", + ":qd8-f32-qc4w-gemm_x64_standalone", -+ ":qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone", ++ ":qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone", + ":qd8-f32-qc8w-gemm_f16c-fma-avx2_standalone", + ":qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", @@ -823,7 +824,7 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + ":qd8-f32-qc8w-gemm_sse2-no-sse3_standalone", + ":qd8-f32-qc8w-gemm_sse4.1-no-sse4.2_standalone", + ":qd8-f32-qc8w-gemm_x64_standalone", -+ ":qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone", ++ ":qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone", + ":qd8-f32-qc8w-igemm_f16c-fma-avx2_standalone", + ":qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", @@ -844,12 +845,12 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + ":qs8-f32-vcvt_sse2-no-sse3_standalone", + ":qs8-f32-vcvt_sse4.1-no-sse4.2_standalone", + ":qs8-f32-vcvt_x64_standalone", -+ ":qs8-packw_avx2-avxvnni-f16c-fma_standalone", ++ ":qs8-packw_avx2-avxvnni-f16c-fma-gfni_standalone", + ":qs8-packw_f16c-fma-avx2_standalone", + ":qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", + ":qs8-packw_x64_standalone", + ":qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone", -+ ":qs8-qc4w-gemm_avx2-avxvnni-f16c-fma_standalone", ++ ":qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone", + ":qs8-qc4w-gemm_f16c-fma-avx2_standalone", + ":qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", @@ -862,8 +863,8 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + ":qs8-qc8w-dwconv_sse4.1-no-sse4.2_standalone", + ":qs8-qc8w-dwconv_x64_standalone", + ":qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone", -+ ":qs8-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone", -+ ":qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma_standalone", ++ ":qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone", ++ ":qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni_standalone", + ":qs8-qc8w-gemm_f16c-fma-avx2_standalone", + ":qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", @@ -872,8 +873,8 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + ":qs8-qc8w-gemm_sse4.1-no-sse4.2_standalone", + ":qs8-qc8w-gemm_x64_standalone", + ":qs8-qc8w-igemm_avx-no-avx2-no-f16c-no-fma_standalone", -+ ":qs8-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone", -+ ":qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma_standalone", ++ ":qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone", ++ ":qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni_standalone", + ":qs8-qc8w-igemm_f16c-fma-avx2_standalone", + ":qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", @@ -881,14 +882,14 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + ":qs8-qc8w-igemm_sse2-no-sse3_standalone", + ":qs8-qc8w-igemm_sse4.1-no-sse4.2_standalone", + ":qs8-qc8w-igemm_x64_standalone", -+ ":qs8-qu8-packw_avx2-avxvnni-f16c-fma_standalone", ++ ":qs8-qu8-packw_avx2-avxvnni-f16c-fma-gfni_standalone", + ":qs8-qu8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", + ":qs8-qu8-packw_x64_standalone", + ":qs8-rdsum_f16c-fma-avx2_standalone", + ":qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qs8-rdsum_sse4.1-no-sse4.2_standalone", + ":qs8-rdsum_x64_standalone", -+ ":qs8-rsum_avx2-avxvnni-f16c-fma_standalone", ++ ":qs8-rsum_avx2-avxvnni-f16c-fma-gfni_standalone", + ":qs8-rsum_f16c-fma-avx2_standalone", + ":qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", + ":qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", @@ -1308,16 +1309,16 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - ":f32-vunary_x64", - ":operators_x64", - ":qd8-f16-qb4w-gemm_f16c-fma-avx2", -- ":qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma", +- ":qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni", - ":qd8-f16-qc4w-gemm_f16c-fma-avx2", - ":qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", - ":qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", -- ":qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma", +- ":qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni", - ":qd8-f16-qc8w-gemm_f16c-fma-avx2", - ":qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", - ":qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", - ":qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8", -- ":qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma", +- ":qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni", - ":qd8-f16-qc8w-igemm_f16c-fma-avx2", - ":qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", - ":qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", @@ -1329,7 +1330,7 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - ":qd8-f32-qb4w-gemm_sse2-no-sse3", - ":qd8-f32-qb4w-gemm_sse4.1-no-sse4.2", - ":qd8-f32-qb4w-gemm_x64", -- ":qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma", +- ":qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni", - ":qd8-f32-qc4w-gemm_f16c-fma-avx2", - ":qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", - ":qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", @@ -1338,7 +1339,7 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - ":qd8-f32-qc4w-gemm_sse2-no-sse3", - ":qd8-f32-qc4w-gemm_ssse3-no-sse4.1", - ":qd8-f32-qc4w-gemm_x64", -- ":qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma", +- ":qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni", - ":qd8-f32-qc8w-gemm_f16c-fma-avx2", - ":qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", - ":qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", @@ -1346,7 +1347,7 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - ":qd8-f32-qc8w-gemm_sse2-no-sse3", - ":qd8-f32-qc8w-gemm_sse4.1-no-sse4.2", - ":qd8-f32-qc8w-gemm_x64", -- ":qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma", +- ":qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni", - ":qd8-f32-qc8w-igemm_f16c-fma-avx2", - ":qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", - ":qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", @@ -1367,12 +1368,12 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - ":qs8-f32-vcvt_sse2-no-sse3", - ":qs8-f32-vcvt_sse4.1-no-sse4.2", - ":qs8-f32-vcvt_x64", -- ":qs8-packw_avx2-avxvnni-f16c-fma", +- ":qs8-packw_avx2-avxvnni-f16c-fma-gfni", - ":qs8-packw_f16c-fma-avx2", - ":qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", - ":qs8-packw_x64", - ":qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma", -- ":qs8-qc4w-gemm_avx2-avxvnni-f16c-fma", +- ":qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni", - ":qs8-qc4w-gemm_f16c-fma-avx2", - ":qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", - ":qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", @@ -1385,8 +1386,8 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - ":qs8-qc8w-dwconv_sse4.1-no-sse4.2", - ":qs8-qc8w-dwconv_x64", - ":qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma", -- ":qs8-qc8w-gemm_avx2-avxvnni-f16c-fma", -- ":qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma", +- ":qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni", +- ":qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni", - ":qs8-qc8w-gemm_f16c-fma-avx2", - ":qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", - ":qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", @@ -1395,8 +1396,8 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - ":qs8-qc8w-gemm_sse4.1-no-sse4.2", - ":qs8-qc8w-gemm_x64", - ":qs8-qc8w-igemm_avx-no-avx2-no-f16c-no-fma", -- ":qs8-qc8w-igemm_avx2-avxvnni-f16c-fma", -- ":qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma", +- ":qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni", +- ":qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni", - ":qs8-qc8w-igemm_f16c-fma-avx2", - ":qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", - ":qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", @@ -1404,14 +1405,14 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - ":qs8-qc8w-igemm_sse2-no-sse3", - ":qs8-qc8w-igemm_sse4.1-no-sse4.2", - ":qs8-qc8w-igemm_x64", -- ":qs8-qu8-packw_avx2-avxvnni-f16c-fma", +- ":qs8-qu8-packw_avx2-avxvnni-f16c-fma-gfni", - ":qs8-qu8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", - ":qs8-qu8-packw_x64", - ":qs8-rdsum_f16c-fma-avx2", - ":qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", - ":qs8-rdsum_sse4.1-no-sse4.2", - ":qs8-rdsum_x64", -- ":qs8-rsum_avx2-avxvnni-f16c-fma", +- ":qs8-rsum_avx2-avxvnni-f16c-fma-gfni", - ":qs8-rsum_f16c-fma-avx2", - ":qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl", - ":qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni", @@ -2046,16 +2047,16 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - ":f32-vunary_x64_standalone", - ":operators_x64_standalone", - ":qd8-f16-qb4w-gemm_f16c-fma-avx2_standalone", -- ":qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma_standalone", +- ":qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone", - ":qd8-f16-qc4w-gemm_f16c-fma-avx2_standalone", - ":qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", - ":qd8-f16-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", -- ":qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone", +- ":qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone", - ":qd8-f16-qc8w-gemm_f16c-fma-avx2_standalone", - ":qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", - ":qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", - ":qd8-f16-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", -- ":qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone", +- ":qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone", - ":qd8-f16-qc8w-igemm_f16c-fma-avx2_standalone", - ":qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", - ":qd8-f16-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", @@ -2067,7 +2068,7 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - ":qd8-f32-qb4w-gemm_sse2-no-sse3_standalone", - ":qd8-f32-qb4w-gemm_sse4.1-no-sse4.2_standalone", - ":qd8-f32-qb4w-gemm_x64_standalone", -- ":qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma_standalone", +- ":qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone", - ":qd8-f32-qc4w-gemm_f16c-fma-avx2_standalone", - ":qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", - ":qd8-f32-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni_standalone", @@ -2076,7 +2077,7 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - ":qd8-f32-qc4w-gemm_sse2-no-sse3_standalone", - ":qd8-f32-qc4w-gemm_ssse3-no-sse4.1_standalone", - ":qd8-f32-qc4w-gemm_x64_standalone", -- ":qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone", +- ":qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone", - ":qd8-f32-qc8w-gemm_f16c-fma-avx2_standalone", - ":qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", - ":qd8-f32-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", @@ -2084,7 +2085,7 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - ":qd8-f32-qc8w-gemm_sse2-no-sse3_standalone", - ":qd8-f32-qc8w-gemm_sse4.1-no-sse4.2_standalone", - ":qd8-f32-qc8w-gemm_x64_standalone", -- ":qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone", +- ":qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone", - ":qd8-f32-qc8w-igemm_f16c-fma-avx2_standalone", - ":qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", - ":qd8-f32-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", @@ -2105,12 +2106,12 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - ":qs8-f32-vcvt_sse2-no-sse3_standalone", - ":qs8-f32-vcvt_sse4.1-no-sse4.2_standalone", - ":qs8-f32-vcvt_x64_standalone", -- ":qs8-packw_avx2-avxvnni-f16c-fma_standalone", +- ":qs8-packw_avx2-avxvnni-f16c-fma-gfni_standalone", - ":qs8-packw_f16c-fma-avx2_standalone", - ":qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", - ":qs8-packw_x64_standalone", - ":qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone", -- ":qs8-qc4w-gemm_avx2-avxvnni-f16c-fma_standalone", +- ":qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone", - ":qs8-qc4w-gemm_f16c-fma-avx2_standalone", - ":qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", - ":qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", @@ -2123,8 +2124,8 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - ":qs8-qc8w-dwconv_sse4.1-no-sse4.2_standalone", - ":qs8-qc8w-dwconv_x64_standalone", - ":qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone", -- ":qs8-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone", -- ":qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma_standalone", +- ":qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone", +- ":qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni_standalone", - ":qs8-qc8w-gemm_f16c-fma-avx2_standalone", - ":qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", - ":qs8-qc8w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", @@ -2133,8 +2134,8 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - ":qs8-qc8w-gemm_sse4.1-no-sse4.2_standalone", - ":qs8-qc8w-gemm_x64_standalone", - ":qs8-qc8w-igemm_avx-no-avx2-no-f16c-no-fma_standalone", -- ":qs8-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone", -- ":qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma_standalone", +- ":qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone", +- ":qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni_standalone", - ":qs8-qc8w-igemm_f16c-fma-avx2_standalone", - ":qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni-gfni-amx-tile-amx-int8_standalone", - ":qs8-qc8w-igemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", @@ -2142,14 +2143,14 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - ":qs8-qc8w-igemm_sse2-no-sse3_standalone", - ":qs8-qc8w-igemm_sse4.1-no-sse4.2_standalone", - ":qs8-qc8w-igemm_x64_standalone", -- ":qs8-qu8-packw_avx2-avxvnni-f16c-fma_standalone", +- ":qs8-qu8-packw_avx2-avxvnni-f16c-fma-gfni_standalone", - ":qs8-qu8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", - ":qs8-qu8-packw_x64_standalone", - ":qs8-rdsum_f16c-fma-avx2_standalone", - ":qs8-rdsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", - ":qs8-rdsum_sse4.1-no-sse4.2_standalone", - ":qs8-rdsum_x64_standalone", -- ":qs8-rsum_avx2-avxvnni-f16c-fma_standalone", +- ":qs8-rsum_avx2-avxvnni-f16c-fma-gfni_standalone", - ":qs8-rsum_f16c-fma-avx2_standalone", - ":qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone", - ":qs8-rsum_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone", @@ -4070,7 +4071,7 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn public_configs = [ ":xnnpack_public_config" ] -@@ -1989,56261 +2254,65773 @@ if (build_with_internal_optimization_gui +@@ -1989,56289 +2254,65801 @@ if (build_with_internal_optimization_gui } if (current_cpu == "x64" || current_cpu == "x86") { @@ -25208,12 +25209,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} - if (build_with_chromium) { -- source_set("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma") { +- source_set("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -25269,12 +25271,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma_standalone") { +- source_set("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -25717,12 +25720,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} - if (build_with_chromium) { -- source_set("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma") { +- source_set("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -25779,12 +25783,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone") { +- source_set("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -26361,12 +26366,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} - if (build_with_chromium) { -- source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma") { +- source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -26421,12 +26427,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone") { +- source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -27871,12 +27878,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} - if (build_with_chromium) { -- source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma") { +- source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -27931,12 +27939,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma_standalone") { +- source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -28999,12 +29008,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} - if (build_with_chromium) { -- source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma") { +- source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -29061,12 +29071,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone") { +- source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -30136,12 +30147,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} - if (build_with_chromium) { -- source_set("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma") { +- source_set("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -30199,12 +30211,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone") { +- source_set("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -33634,12 +33647,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} - if (build_with_chromium) { -- source_set("qs8-packw_avx2-avxvnni-f16c-fma") { +- source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -33721,12 +33735,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("qs8-packw_avx2-avxvnni-f16c-fma_standalone") { +- source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -34546,12 +34561,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} - if (build_with_chromium) { -- source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma") { +- source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -34635,12 +34651,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma_standalone") { +- source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -37606,12 +37623,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} + +if (build_with_chromium) { -+ source_set("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma") { ++ source_set("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -37638,12 +37656,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma_standalone") { ++ source_set("qd8-f16-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -37886,12 +37905,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} + +if (build_with_chromium) { -+ source_set("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma") { ++ source_set("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -37918,12 +37938,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone") { ++ source_set("qd8-f16-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -38247,12 +38268,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} + +if (build_with_chromium) { -+ source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma") { ++ source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -38279,12 +38301,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone") { ++ source_set("qd8-f16-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -39079,12 +39102,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} + +if (build_with_chromium) { -+ source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma") { ++ source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -39111,12 +39135,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma_standalone") { ++ source_set("qd8-f32-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -39708,12 +39733,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} + +if (build_with_chromium) { -+ source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma") { ++ source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -39740,12 +39766,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone") { ++ source_set("qd8-f32-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -40262,12 +40289,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} + +if (build_with_chromium) { -+ source_set("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma") { ++ source_set("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -40294,12 +40322,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone") { ++ source_set("qd8-f32-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -41655,12 +41684,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} + +if (build_with_chromium) { -+ source_set("qs8-packw_avx2-avxvnni-f16c-fma") { ++ source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -41687,12 +41717,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-packw_avx2-avxvnni-f16c-fma_standalone") { ++ source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -41994,12 +42025,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} + +if (build_with_chromium) { -+ source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma") { ++ source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -42026,12 +42058,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma_standalone") { ++ source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -42879,12 +42912,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} + +if (build_with_chromium) { -+ source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma") { ++ source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -42911,12 +42945,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone") { ++ source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -42946,12 +42981,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} + +if (build_with_chromium) { -+ source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma") { ++ source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni") { + cflags = [ + "-mavx2", + "-mavxvnniint8", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -42978,12 +43014,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma_standalone") { ++ source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni_standalone") { + cflags = [ + "-mavx2", + "-mavxvnniint8", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -43565,12 +43602,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} + +if (build_with_chromium) { -+ source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma") { ++ source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -43597,12 +43635,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone") { ++ source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -43632,12 +43671,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} + +if (build_with_chromium) { -+ source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma") { ++ source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni") { + cflags = [ + "-mavx2", + "-mavxvnniint8", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -43664,12 +43704,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma_standalone") { ++ source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni_standalone") { + cflags = [ + "-mavx2", + "-mavxvnniint8", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -44184,12 +44225,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} + +if (build_with_chromium) { -+ source_set("qs8-qu8-packw_avx2-avxvnni-f16c-fma") { ++ source_set("qs8-qu8-packw_avx2-avxvnni-f16c-fma-gfni") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -44215,12 +44257,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-qu8-packw_avx2-avxvnni-f16c-fma_standalone") { ++ source_set("qs8-qu8-packw_avx2-avxvnni-f16c-fma-gfni_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -44635,12 +44678,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} + +if (build_with_chromium) { -+ source_set("qs8-rsum_avx2-avxvnni-f16c-fma") { ++ source_set("qs8-rsum_avx2-avxvnni-f16c-fma-gfni") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -44666,12 +44710,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-rsum_avx2-avxvnni-f16c-fma_standalone") { ++ source_set("qs8-rsum_avx2-avxvnni-f16c-fma-gfni_standalone") { + cflags = [ + "-mavx2", + "-mavxvnni", + "-mf16c", -+ "-mfma" ++ "-mfma", ++ "-mgfni" + ] + + sources = [ @@ -66904,12 +66949,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + configs += [ ":xnnpack_private_config" ] - if (build_with_chromium) { -- source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma") { +- source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -66944,12 +66990,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma_standalone") { +- source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -66987,12 +67034,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + asmflags = cflags - if (build_with_chromium) { -- source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma") { +- source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni") { - cflags = [ - "-mavx2", - "-mavxvnniint8", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -67030,12 +67078,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma_standalone") { +- source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni_standalone") { - cflags = [ - "-mavx2", - "-mavxvnniint8", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -67788,12 +67837,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + ] - if (build_with_chromium) { -- source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma") { +- source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -67830,12 +67880,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma_standalone") { +- source_set("qs8-qc8w-igemm_avx2-avxvnni-f16c-fma-gfni_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -67870,12 +67921,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn +} - if (build_with_chromium) { -- source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma") { +- source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni") { - cflags = [ - "-mavx2", - "-mavxvnniint8", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -67918,12 +67970,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma_standalone") { +- source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni_standalone") { - cflags = [ - "-mavx2", - "-mavxvnniint8", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -68595,12 +68648,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + configs += [ ":xnnpack_private_config" ] - if (build_with_chromium) { -- source_set("qs8-qu8-packw_avx2-avxvnni-f16c-fma") { +- source_set("qs8-qu8-packw_avx2-avxvnni-f16c-fma-gfni") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -68634,12 +68688,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("qs8-qu8-packw_avx2-avxvnni-f16c-fma_standalone") { +- source_set("qs8-qu8-packw_avx2-avxvnni-f16c-fma-gfni_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -69219,12 +69274,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn + configs += [ ":xnnpack_private_config" ] - if (build_with_chromium) { -- source_set("qs8-rsum_avx2-avxvnni-f16c-fma") { +- source_set("qs8-rsum_avx2-avxvnni-f16c-fma-gfni") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ @@ -69257,12 +69313,13 @@ Index: chromium-142.0.7444.52/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("qs8-rsum_avx2-avxvnni-f16c-fma_standalone") { +- source_set("qs8-rsum_avx2-avxvnni-f16c-fma-gfni_standalone") { - cflags = [ - "-mavx2", - "-mavxvnni", - "-mf16c", - "-mfma", +- "-mgfni", - ] - - sources = [ diff --git a/0002-third_party-libvpx-Remove-bad-ppc64-config.patch b/0002-third_party-libvpx-Remove-bad-ppc64-config.patch index e58e489..c8c0a6e 100644 --- a/0002-third_party-libvpx-Remove-bad-ppc64-config.patch +++ b/0002-third_party-libvpx-Remove-bad-ppc64-config.patch @@ -1,6 +1,6 @@ -Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h +Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h +--- chromium-143.0.7499.40.orig/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h +++ /dev/null @@ -1,186 +0,0 @@ -/* @@ -189,9 +189,9 @@ Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vp8_r -#endif - -#endif // VP8_RTCD_H_ -Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h +Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h +--- chromium-143.0.7499.40.orig/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h +++ /dev/null @@ -1,119 +0,0 @@ -/* @@ -313,9 +313,9 @@ Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vp9_r -#endif - -#endif // VP9_RTCD_H_ -Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm +Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm =================================================================== ---- chromium-140.0.7339.41.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm +--- chromium-143.0.7499.40.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm +++ /dev/null @@ -1,107 +0,0 @@ -@ This file was created from a .asm file @@ -425,9 +425,9 @@ Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_c -.equ DECODE_WIDTH_LIMIT , 16384 -.equ DECODE_HEIGHT_LIMIT , 16384 - .section .note.GNU-stack,"",%progbits -Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_config.c +Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.c =================================================================== ---- chromium-140.0.7339.41.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.c +--- chromium-143.0.7499.40.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.c +++ /dev/null @@ -1,10 +0,0 @@ -/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */ @@ -440,9 +440,9 @@ Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_c -#include "vpx/vpx_codec.h" -static const char* const cfg = "--target=ppc64le-linux-gcc --enable-external-build --enable-postproc --enable-multi-res-encoding --enable-temporal-denoising --enable-vp9-temporal-denoising --enable-vp9-postproc --size-limit=16384x16384 --enable-realtime-only --disable-install-docs --disable-libyuv --enable-unit-tests"; -const char *vpx_codec_build_config(void) {return cfg;} -Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_config.h +Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.h +--- chromium-143.0.7499.40.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.h +++ /dev/null @@ -1,116 +0,0 @@ -/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */ @@ -561,9 +561,9 @@ Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_c -#define DECODE_WIDTH_LIMIT 16384 -#define DECODE_HEIGHT_LIMIT 16384 -#endif /* VPX_CONFIG_H */ -Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h +Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h +--- chromium-143.0.7499.40.orig/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h +++ /dev/null @@ -1,858 +0,0 @@ -/* @@ -1424,9 +1424,9 @@ Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_d -#endif - -#endif // VPX_DSP_RTCD_H_ -Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h +Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h +--- chromium-143.0.7499.40.orig/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h +++ /dev/null @@ -1,83 +0,0 @@ -/* diff --git a/0002-third_party-lss-kernel-structs.patch b/0002-third_party-lss-kernel-structs.patch index b234a14..9b2d8e5 100644 --- a/0002-third_party-lss-kernel-structs.patch +++ b/0002-third_party-lss-kernel-structs.patch @@ -1,7 +1,7 @@ -Index: chromium-140.0.7339.41/third_party/lss/linux_syscall_support.h +Index: chromium-143.0.7499.40/third_party/lss/linux_syscall_support.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/lss/linux_syscall_support.h -+++ chromium-140.0.7339.41/third_party/lss/linux_syscall_support.h +--- chromium-143.0.7499.40.orig/third_party/lss/linux_syscall_support.h ++++ chromium-143.0.7499.40/third_party/lss/linux_syscall_support.h @@ -86,7 +86,7 @@ * Porting to other related platforms should not be difficult. */ @@ -11,7 +11,7 @@ Index: chromium-140.0.7339.41/third_party/lss/linux_syscall_support.h defined(__aarch64__) || defined(__s390__) || defined(__e2k__) || \ (defined(__riscv) && __riscv_xlen == 64) || defined(__loongarch_lp64)) \ && (defined(__linux) || defined(__ANDROID__)) -@@ -398,7 +398,7 @@ struct kernel_stat64 { +@@ -400,7 +400,7 @@ struct kernel_stat64 { unsigned __pad2; unsigned long long st_blocks; }; @@ -20,7 +20,7 @@ Index: chromium-140.0.7339.41/third_party/lss/linux_syscall_support.h struct kernel_stat64 { unsigned long long st_dev; unsigned long long st_ino; -@@ -420,6 +420,28 @@ struct kernel_stat64 { +@@ -422,6 +422,28 @@ struct kernel_stat64 { unsigned long __unused4; unsigned long __unused5; }; @@ -49,7 +49,7 @@ Index: chromium-140.0.7339.41/third_party/lss/linux_syscall_support.h #elif defined(__e2k__) struct kernel_stat64 { unsigned long long st_dev; -@@ -536,7 +558,7 @@ struct kernel_stat { +@@ -538,7 +560,7 @@ struct kernel_stat { uint64_t st_ctime_nsec_; int64_t __unused4[3]; }; @@ -58,7 +58,7 @@ Index: chromium-140.0.7339.41/third_party/lss/linux_syscall_support.h typedef unsigned long kernel_blkcnt_t; typedef unsigned long kernel_blksize_t; typedef unsigned kernel_dev_t; -@@ -567,6 +589,37 @@ struct kernel_stat { +@@ -569,6 +591,37 @@ struct kernel_stat { unsigned long __unused4; unsigned long __unused5; }; @@ -96,7 +96,7 @@ Index: chromium-140.0.7339.41/third_party/lss/linux_syscall_support.h #elif (defined(__mips__) && _MIPS_SIM != _MIPS_SIM_ABI64) typedef int kernel_blkcnt_t; typedef int kernel_blksize_t; -@@ -1823,6 +1876,28 @@ struct kernel_statx { +@@ -1825,6 +1878,28 @@ struct kernel_statx { #ifndef __NR_getcpu #define __NR_getcpu 302 #endif @@ -125,7 +125,7 @@ Index: chromium-140.0.7339.41/third_party/lss/linux_syscall_support.h /* End of powerpc definitions */ #elif defined(__s390__) #ifndef __NR_quotactl -@@ -4824,7 +4899,7 @@ struct kernel_statx { +@@ -4826,7 +4901,7 @@ struct kernel_statx { LSS_INLINE _syscall6(void*, mmap, void*, addr, size_t, length, int, prot, int, flags, int, fd, int64_t, offset) #endif @@ -134,7 +134,7 @@ Index: chromium-140.0.7339.41/third_party/lss/linux_syscall_support.h #undef LSS_SC_LOADARGS_0 #define LSS_SC_LOADARGS_0(dummy...) #undef LSS_SC_LOADARGS_1 -@@ -5214,7 +5289,11 @@ struct kernel_statx { +@@ -5216,7 +5291,11 @@ struct kernel_statx { #endif #if !defined(__NR_pipe) diff --git a/0003-third_party-libvpx-Add-ppc64-generated-config.patch b/0003-third_party-libvpx-Add-ppc64-generated-config.patch index 73fb10f..b4d484c 100644 --- a/0003-third_party-libvpx-Add-ppc64-generated-config.patch +++ b/0003-third_party-libvpx-Add-ppc64-generated-config.patch @@ -1,7 +1,7 @@ -Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h +Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h ++++ chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h @@ -0,0 +1,316 @@ +// This file is generated. Do not edit. +#ifndef VP8_RTCD_H_ @@ -319,10 +319,10 @@ Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vp8_r +#endif + +#endif -Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h +Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h ++++ chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h @@ -0,0 +1,267 @@ +// This file is generated. Do not edit. +#ifndef VP9_RTCD_H_ @@ -591,10 +591,10 @@ Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vp9_r +#endif + +#endif -Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm +Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm ++++ chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm @@ -0,0 +1,107 @@ +@ This file was created from a .asm file +@ using the ads2gas.pl script. @@ -703,10 +703,10 @@ Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_c +.equ DECODE_WIDTH_LIMIT , 16384 +.equ DECODE_HEIGHT_LIMIT , 16384 + .section .note.GNU-stack,"",%progbits -Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_config.c +Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.c =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_config.c ++++ chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.c @@ -0,0 +1,10 @@ +/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */ +/* */ @@ -718,10 +718,10 @@ Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_c +#include "vpx/vpx_codec.h" +static const char* const cfg = "--target=generic-gnu --enable-vp9-highbitdepth --enable-external-build --enable-postproc --enable-multi-res-encoding --enable-temporal-denoising --enable-vp9-temporal-denoising --enable-vp9-postproc --size-limit=16384x16384 --enable-realtime-only --disable-install-docs --disable-libyuv"; +const char *vpx_codec_build_config(void) {return cfg;} -Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_config.h +Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.h =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_config.h ++++ chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.h @@ -0,0 +1,116 @@ +/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */ +/* */ @@ -839,10 +839,10 @@ Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_c +#define DECODE_WIDTH_LIMIT 16384 +#define DECODE_HEIGHT_LIMIT 16384 +#endif /* VPX_CONFIG_H */ -Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h +Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h ++++ chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h @@ -0,0 +1,4128 @@ +// This file is generated. Do not edit. +#ifndef VPX_DSP_RTCD_H_ @@ -4972,10 +4972,10 @@ Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_d +#endif + +#endif -Index: chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h +Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h =================================================================== --- /dev/null -+++ chromium-140.0.7339.41/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h ++++ chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h @@ -0,0 +1,96 @@ +// This file is generated. Do not edit. +#ifndef VPX_SCALE_RTCD_H_ diff --git a/0004-third_party-crashpad-port-curl-transport-ppc64.patch b/0004-third_party-crashpad-port-curl-transport-ppc64.patch index edaff0a..550213d 100644 --- a/0004-third_party-crashpad-port-curl-transport-ppc64.patch +++ b/0004-third_party-crashpad-port-curl-transport-ppc64.patch @@ -1,7 +1,7 @@ -Index: chromium-140.0.7339.41/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc +Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc -+++ chromium-140.0.7339.41/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc +--- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc ++++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc @@ -239,6 +239,12 @@ std::string UserAgent() { #endif #elif defined (ARCH_CPU_RISCV64) diff --git a/0004-third_party-libvpx-work-around-ambiguous-vsx.patch b/0004-third_party-libvpx-work-around-ambiguous-vsx.patch index 727edd7..58aed49 100644 --- a/0004-third_party-libvpx-work-around-ambiguous-vsx.patch +++ b/0004-third_party-libvpx-work-around-ambiguous-vsx.patch @@ -1,7 +1,7 @@ -Index: chromium-140.0.7339.41/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c +Index: chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c =================================================================== ---- chromium-140.0.7339.41.orig/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c -+++ chromium-140.0.7339.41/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c +--- chromium-143.0.7499.40.orig/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c ++++ chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c @@ -38,6 +38,28 @@ static INLINE int16x8_t vec_max_across(i return vec_max(a, vec_perm(a, a, vec_perm16)); } @@ -137,10 +137,10 @@ Index: chromium-140.0.7339.41/third_party/libvpx/source/libvpx/vp9/encoder/ppc/v eob = vec_max(eob, vec_or(scan0, zero_coeff0)); eob2 = vec_max(vec_or(scan1, zero_coeff1), vec_or(scan2, zero_coeff2)); -Index: chromium-140.0.7339.41/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c +Index: chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c =================================================================== ---- chromium-140.0.7339.41.orig/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c -+++ chromium-140.0.7339.41/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c +--- chromium-143.0.7499.40.orig/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c ++++ chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c @@ -15,6 +15,28 @@ #include "vpx_dsp/ppc/txfm_common_vsx.h" #include "vpx_dsp/ppc/types_vsx.h" @@ -255,10 +255,10 @@ Index: chromium-140.0.7339.41/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct3 } // Returns 1 if negative 0 if positive -Index: chromium-140.0.7339.41/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c +Index: chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c =================================================================== ---- chromium-140.0.7339.41.orig/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c -+++ chromium-140.0.7339.41/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c +--- chromium-143.0.7499.40.orig/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c ++++ chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c @@ -13,6 +13,28 @@ #include "./vpx_dsp_rtcd.h" #include "vpx_dsp/ppc/types_vsx.h" diff --git a/HACK-debian-clang-disable-base-musttail.patch b/HACK-debian-clang-disable-base-musttail.patch index 73026f5..566c8d9 100644 --- a/HACK-debian-clang-disable-base-musttail.patch +++ b/HACK-debian-clang-disable-base-musttail.patch @@ -1,7 +1,7 @@ -Index: chromium-140.0.7339.41/base/compiler_specific.h +Index: chromium-143.0.7499.40/base/compiler_specific.h =================================================================== ---- chromium-140.0.7339.41.orig/base/compiler_specific.h -+++ chromium-140.0.7339.41/base/compiler_specific.h +--- chromium-143.0.7499.40.orig/base/compiler_specific.h ++++ chromium-143.0.7499.40/base/compiler_specific.h @@ -198,7 +198,7 @@ // MUSTTAIL return Func1(d + 1); // `Func1()` will be tail-called. // } diff --git a/HACK-debian-clang-disable-pa-musttail.patch b/HACK-debian-clang-disable-pa-musttail.patch index 22a4618..f124de4 100644 --- a/HACK-debian-clang-disable-pa-musttail.patch +++ b/HACK-debian-clang-disable-pa-musttail.patch @@ -1,8 +1,8 @@ -Index: chromium-140.0.7339.41/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h +Index: chromium-143.0.7499.40/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h =================================================================== ---- chromium-140.0.7339.41.orig/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h -+++ chromium-140.0.7339.41/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h -@@ -144,7 +144,7 @@ +--- chromium-143.0.7499.40.orig/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h ++++ chromium-143.0.7499.40/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h +@@ -139,7 +139,7 @@ // PA_MUSTTAIL return Func1(d + 1); // `Func1()` will be tail-called. // } // ``` diff --git a/HACK-third_party-libvpx-use-generic-gnu.patch b/HACK-third_party-libvpx-use-generic-gnu.patch index e735cf0..44c118d 100644 --- a/HACK-third_party-libvpx-use-generic-gnu.patch +++ b/HACK-third_party-libvpx-use-generic-gnu.patch @@ -1,7 +1,7 @@ -Index: chromium-140.0.7339.41/third_party/libvpx/generate_gni.sh +Index: chromium-143.0.7499.40/third_party/libvpx/generate_gni.sh =================================================================== ---- chromium-140.0.7339.41.orig/third_party/libvpx/generate_gni.sh -+++ chromium-140.0.7339.41/third_party/libvpx/generate_gni.sh +--- chromium-143.0.7499.40.orig/third_party/libvpx/generate_gni.sh ++++ chromium-143.0.7499.40/third_party/libvpx/generate_gni.sh @@ -429,7 +429,7 @@ gen_config_files linux/mipsel "--target= gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}" gen_config_files linux/loongarch \ @@ -11,10 +11,10 @@ Index: chromium-140.0.7339.41/third_party/libvpx/generate_gni.sh gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}" gen_config_files win/arm64-highbd \ "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD} ${disable_sve}" -Index: chromium-140.0.7339.41/third_party/libvpx/source/libvpx/build/make/rtcd.pl +Index: chromium-143.0.7499.40/third_party/libvpx/source/libvpx/build/make/rtcd.pl =================================================================== ---- chromium-140.0.7339.41.orig/third_party/libvpx/source/libvpx/build/make/rtcd.pl -+++ chromium-140.0.7339.41/third_party/libvpx/source/libvpx/build/make/rtcd.pl +--- chromium-143.0.7499.40.orig/third_party/libvpx/source/libvpx/build/make/rtcd.pl ++++ chromium-143.0.7499.40/third_party/libvpx/source/libvpx/build/make/rtcd.pl @@ -527,8 +527,9 @@ if ($opts{arch} eq 'x86') { } arm; @@ -27,10 +27,10 @@ Index: chromium-140.0.7339.41/third_party/libvpx/source/libvpx/build/make/rtcd.p } elsif ($opts{arch} =~ /loongarch/ ) { @ALL_ARCHS = filter(qw/lsx lasx/); loongarch; -Index: chromium-140.0.7339.41/third_party/libvpx/BUILD.gn +Index: chromium-143.0.7499.40/third_party/libvpx/BUILD.gn =================================================================== ---- chromium-140.0.7339.41.orig/third_party/libvpx/BUILD.gn -+++ chromium-140.0.7339.41/third_party/libvpx/BUILD.gn +--- chromium-143.0.7499.40.orig/third_party/libvpx/BUILD.gn ++++ chromium-143.0.7499.40/third_party/libvpx/BUILD.gn @@ -98,6 +98,14 @@ config("libvpx_config") { "-Wno-sign-compare", ] diff --git a/Rtc_base-system-arch.h-PPC.patch b/Rtc_base-system-arch.h-PPC.patch index c2cf7cc..4985a70 100644 --- a/Rtc_base-system-arch.h-PPC.patch +++ b/Rtc_base-system-arch.h-PPC.patch @@ -1,7 +1,7 @@ -Index: chromium-140.0.7339.41/third_party/webrtc/rtc_base/system/arch.h +Index: chromium-143.0.7499.40/third_party/webrtc/rtc_base/system/arch.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/webrtc/rtc_base/system/arch.h -+++ chromium-140.0.7339.41/third_party/webrtc/rtc_base/system/arch.h +--- chromium-143.0.7499.40.orig/third_party/webrtc/rtc_base/system/arch.h ++++ chromium-143.0.7499.40/third_party/webrtc/rtc_base/system/arch.h @@ -46,6 +46,18 @@ #endif #if defined(__MIPSEL__) diff --git a/add-ppc64-architecture-string.patch b/add-ppc64-architecture-string.patch index 32942bc..ab36e41 100644 --- a/add-ppc64-architecture-string.patch +++ b/add-ppc64-architecture-string.patch @@ -1,8 +1,8 @@ -Index: chromium-140.0.7339.41/base/system/sys_info.cc +Index: chromium-143.0.7499.40/base/system/sys_info.cc =================================================================== ---- chromium-140.0.7339.41.orig/base/system/sys_info.cc -+++ chromium-140.0.7339.41/base/system/sys_info.cc -@@ -254,6 +254,8 @@ std::string SysInfo::ProcessCPUArchitect +--- chromium-143.0.7499.40.orig/base/system/sys_info.cc ++++ chromium-143.0.7499.40/base/system/sys_info.cc +@@ -263,6 +263,8 @@ std::string SysInfo::ProcessCPUArchitect return "ARM"; #elif defined(ARCH_CPU_ARM64) return "ARM_64"; diff --git a/add-ppc64-architecture-to-extensions.diff b/add-ppc64-architecture-to-extensions.diff index 14c3b1f..2053505 100644 --- a/add-ppc64-architecture-to-extensions.diff +++ b/add-ppc64-architecture-to-extensions.diff @@ -1,7 +1,7 @@ -Index: chromium-142.0.7444.52/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc +Index: chromium-143.0.7499.40/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc =================================================================== ---- chromium-142.0.7444.52.orig/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc -+++ chromium-142.0.7444.52/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc +--- chromium-143.0.7499.40.orig/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc ++++ chromium-143.0.7499.40/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc @@ -383,6 +383,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatfo info->arch = extensions::api::runtime::PlatformArch::kMips64; } else if (arch == "riscv64") { @@ -11,10 +11,10 @@ Index: chromium-142.0.7444.52/chrome/browser/extensions/api/runtime/chrome_runti } else { NOTREACHED(); } -Index: chromium-142.0.7444.52/extensions/common/api/runtime.json +Index: chromium-143.0.7499.40/extensions/common/api/runtime.json =================================================================== ---- chromium-142.0.7444.52.orig/extensions/common/api/runtime.json -+++ chromium-142.0.7444.52/extensions/common/api/runtime.json +--- chromium-143.0.7499.40.orig/extensions/common/api/runtime.json ++++ chromium-143.0.7499.40/extensions/common/api/runtime.json @@ -98,7 +98,8 @@ {"name": "x86-64", "description": "Specifies the processer architecture as x86-64."}, {"name": "mips", "description": "Specifies the processer architecture as mips."}, diff --git a/add-ppc64-pthread-stack-size.patch b/add-ppc64-pthread-stack-size.patch index b70c238..ceb2849 100644 --- a/add-ppc64-pthread-stack-size.patch +++ b/add-ppc64-pthread-stack-size.patch @@ -1,7 +1,7 @@ -Index: chromium-140.0.7339.41/base/process/launch.h +Index: chromium-143.0.7499.40/base/process/launch.h =================================================================== ---- chromium-140.0.7339.41.orig/base/process/launch.h -+++ chromium-140.0.7339.41/base/process/launch.h +--- chromium-143.0.7499.40.orig/base/process/launch.h ++++ chromium-143.0.7499.40/base/process/launch.h @@ -58,6 +58,9 @@ enum TerminationStatus : int; #if defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_LOONGARCH64) #define PTHREAD_STACK_MIN_CONST \ diff --git a/chromium-143-python-3.9-ftbfs.patch b/chromium-143-python-3.9-ftbfs.patch new file mode 100644 index 0000000..fc7dc46 --- /dev/null +++ b/chromium-143-python-3.9-ftbfs.patch @@ -0,0 +1,47 @@ +diff -up chromium-143.0.7499.40/tools/metrics/histograms/extract_histograms.py.python-3.9-ftbfs chromium-143.0.7499.40/tools/metrics/histograms/extract_histograms.py +--- chromium-143.0.7499.40/tools/metrics/histograms/extract_histograms.py.python-3.9-ftbfs 2025-11-19 22:40:05.000000000 +0100 ++++ chromium-143.0.7499.40/tools/metrics/histograms/extract_histograms.py 2025-12-02 17:23:41.996802101 +0100 +@@ -18,6 +18,7 @@ import re + import sys + from typing import TypedDict + import xml.dom.minidom ++from typing import Optional, Union + + sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'common')) + import xml_utils +@@ -84,7 +85,7 @@ class EnumDict(TypedDict, total=False): + """A dict representing an enum.""" + + name: str +- type: str | None ++ type: Optional[str] + buckets: list[_BucketDict] + summary: str + +@@ -108,7 +109,7 @@ def ExpandHistogramNameWithSuffixes( + suffix_name: str, + histogram_name: str, + histogram_suffixes_node: xml.dom.minidom.Element, +-) -> tuple[str | None, ExtractionErrors]: ++) -> tuple[Optional[str], ExtractionErrors]: + """Creates a new histogram name based on a histogram suffix. + + Args: +@@ -310,7 +311,7 @@ def _ExtractOwners(node: xml.dom.minidom + + def _ExtractImprovementDirection( + histogram_node: xml.dom.minidom.Element, +-) -> tuple[str | None, ExtractionErrors]: ++) -> tuple[Union[str, None], ExtractionErrors]: + """Extracts improvement direction from the given histogram element, if any. + + Args: +@@ -644,7 +645,7 @@ def ExtractVariantsFromXmlTree( + return variants_dict, errors + + +-def _GetObsoleteReason(node: xml.dom.minidom.Element) -> str | None: ++def _GetObsoleteReason(node: xml.dom.minidom.Element) -> Optional[str]: + """If the node's histogram is obsolete, returns a string explanation. + + Otherwise, returns None. diff --git a/chromium-143-revert-libpng_for_testonly.patch b/chromium-143-revert-libpng_for_testonly.patch new file mode 100644 index 0000000..7ece43c --- /dev/null +++ b/chromium-143-revert-libpng_for_testonly.patch @@ -0,0 +1,137 @@ +commit 4f7637304eca894adf2e70078a55654a88224a30 +Author: Lukasz Anforowicz +Date: Tue Sep 30 07:08:03 2025 -0700 + + [rust png] Reland: Reinforce `testonly`-ness of some users of `libpng`. + + This reverts commit 7fa4c2d7ab42a48247ce8e0290cbb7e854990f1e and + effectively relands https://crrev.com/c/6976870. The reland is + attempted after using wildcards to cover extra gni-generated targets. + `Cq-Include-Trybots` directives in the CL description should verify + correctness of the reland. Original CL description follows: + + This CL extracts a separate `third_party/libpng:libpng_for_testonly` + target which: + + 1) Is a `group` that proxies/forwards to the `libpng` target by listing + it as its `public_deps` + 2) Has limited visibility (based on the new `libpng_testonly_visibility` + introduced in the refactored `third_party/libpng/visibility.gni`). + The new visibility is almost unchanged, except for explicitly + spelling out some targets instead of using wildcards + 3) Is marked as `testonly` + + Bug: 443128323 + Change-Id: If7ba0d184324a5c662aaf2d52122994ea778d452 + Cq-Include-Trybots: luci.chromium.try:ios-catalyst + Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6991491 + Auto-Submit: Łukasz Anforowicz + Commit-Queue: Łukasz Anforowicz + Reviewed-by: Nico Weber + Cr-Commit-Position: refs/heads/main@{#1522830} + +diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn +index a4703c3692d..2d70f7a5fe9 100644 +--- a/chrome/test/BUILD.gn ++++ b/chrome/test/BUILD.gn +@@ -11152,7 +11152,7 @@ if (!is_android) { + "//testing/gtest", + "//third_party/hunspell", + "//third_party/icu", +- "//third_party/libpng", ++ "//third_party/libpng:libpng_for_testonly", + "//ui/base:test_support", + "//ui/events:test_support", + "//ui/ozone", +@@ -11512,7 +11512,7 @@ if (!is_android && !is_chromeos_device) { + "//testing/gtest", + "//third_party/hunspell", + "//third_party/icu", +- "//third_party/libpng", ++ "//third_party/libpng:libpng_for_testonly", + "//ui/base:base_interactive_ui_tests", + "//ui/base:ozone_buildflags", + "//ui/base:test_support", +@@ -12470,7 +12470,7 @@ if (!is_android) { + "//testing/gtest", + "//third_party/hunspell", + "//third_party/icu", +- "//third_party/libpng", ++ "//third_party/libpng:libpng_for_testonly", + "//ui/base:test_support", + "//ui/resources:ui_test_pak", + "//ui/views", +diff --git a/testing/libfuzzer/fuzzers/BUILD.gn b/testing/libfuzzer/fuzzers/BUILD.gn +index 7d242e177f0..1c67eee1598 100644 +--- a/testing/libfuzzer/fuzzers/BUILD.gn ++++ b/testing/libfuzzer/fuzzers/BUILD.gn +@@ -104,7 +104,7 @@ fuzzer_test("libpng_progressive_read_fuzzer") { + sources = [ "libpng_read_fuzzer.cc" ] + deps = [ + "//base", +- "//third_party/libpng", ++ "//third_party/libpng:libpng_for_testonly", + ] + dict = "dicts/png.dict" + seed_corpuses = libpng_seed_corpuses +diff --git a/third_party/libpng/BUILD.gn b/third_party/libpng/BUILD.gn +index d4bdea1e33c..3e31348b94f 100644 +--- a/third_party/libpng/BUILD.gn ++++ b/third_party/libpng/BUILD.gn +@@ -130,6 +130,14 @@ if (is_win) { + } + } + ++group("libpng_for_testonly") { ++ testonly = true ++ public_deps = [ ":libpng" ] ++ ++ visibility = [] ++ visibility = libpng_testonly_visibility ++} ++ + if (build_with_chromium) { + libpng_ossfuzz_seed_corpuses = [ + "//components/test/data/viz", +diff --git a/tools/imagediff/BUILD.gn b/tools/imagediff/BUILD.gn +index d56651bedc7..2b5f3d38488 100644 +--- a/tools/imagediff/BUILD.gn ++++ b/tools/imagediff/BUILD.gn +@@ -34,6 +34,7 @@ if (target_os == "win" && host_os != "win") { + # If the current toolchain is the test host toolchain, build the tool. + if (current_toolchain == imagediff_toolchain) { + executable("imagediff") { ++ testonly = true + output_name = "image_diff" # Different than dir name for historical + # reasons. + sources = [ +@@ -47,7 +48,7 @@ if (current_toolchain == imagediff_toolchain) { + deps = [ + "//base", + "//build/win:default_exe_manifest", +- "//third_party/libpng", ++ "//third_party/libpng:libpng_for_testonly", + "//third_party/zlib", + ] + } +@@ -60,6 +61,7 @@ if (current_toolchain == imagediff_toolchain) { + } else if (current_toolchain == default_toolchain && + default_toolchain != imagediff_toolchain) { + binary_symlink("imagediff") { ++ testonly = true + binary_label = ":$target_name($imagediff_toolchain)" + binary_output_name = "image_diff" + +diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn +index f6a40abfe99..83d8f55027a 100644 +--- a/ui/gfx/BUILD.gn ++++ b/ui/gfx/BUILD.gn +@@ -906,7 +906,7 @@ test("gfx_unittests") { + "//skia:skcms", + "//testing/gtest", + "//third_party/icu:icuuc", +- "//third_party/libpng", ++ "//third_party/libpng:libpng_for_testonly", + "//third_party/zlib", + "//ui/base", + "//ui/gfx/animation", diff --git a/chromium-143-swiftshader-llvm-16.0.patch b/chromium-143-swiftshader-llvm-16.0.patch new file mode 100644 index 0000000..c74a900 --- /dev/null +++ b/chromium-143-swiftshader-llvm-16.0.patch @@ -0,0 +1,12 @@ +diff -up chromium-143.0.7499.40/third_party/swiftshader/src/Reactor/BUILD.gn.llvm-16 chromium-143.0.7499.40/third_party/swiftshader/src/Reactor/BUILD.gn +--- chromium-143.0.7499.40/third_party/swiftshader/src/Reactor/BUILD.gn.llvm-16 2025-12-02 23:25:25.379315827 +0100 ++++ chromium-143.0.7499.40/third_party/swiftshader/src/Reactor/BUILD.gn 2025-12-02 23:25:58.697291861 +0100 +@@ -307,7 +307,7 @@ if (supports_subzero) { + + if (supports_llvm) { + swiftshader_source_set("swiftshader_llvm_reactor") { +- llvm_dir = "../../third_party/llvm-10.0" ++ llvm_dir = "../../third_party/llvm-16.0" + + deps = [ + ":swiftshader_reactor_base", diff --git a/chromium.conf b/chromium.conf index 3685849..d0a610e 100644 --- a/chromium.conf +++ b/chromium.conf @@ -6,8 +6,8 @@ MODE="$(systemd-detect-virt)" # GRAPHIC_DRIVER=[amd|intel|nvidia|default] GRAPHIC_DRIVER=default -# WEB_DARKMODE=[on|off] -WEB_DARKMODE=off +# WEB_AUTO_DARKMODE_WEBCONTENT=[on|off] +WEB_AUTO_DARKMODE_WEBCONTENT=off # NATIVE_WAYLAND=[on|off] # chromium >=141 switched to --ozone-platform-hint=auto @@ -62,8 +62,8 @@ fi CHROMIUM_FLAGS+=" --gtk-version=3" # Web Dark mode -if [ "$WEB_DARKMODE" == "on" ] ; then - darktype="WebContentsForceDark:inversion_method/cielab_based/image_behavior/none/foreground_lightness_threshold/150/background_lightness_threshold/205" +if [ "$WEB_AUTO_DARKMODE_WEBCONTENT" == "on" ] ; then + darktype="WebContentsForceDark" if [ -z "$ENABLE_FEATURES" ] ; then ENABLE_FEATURES+="$darktype" else diff --git a/chromium.spec b/chromium.spec index b40b88d..f099d8a 100644 --- a/chromium.spec +++ b/chromium.spec @@ -248,8 +248,8 @@ %endif Name: chromium -Version: 142.0.7444.175 -Release: 5%{?dist} +Version: 143.0.7499.40 +Release: 1%{?dist} Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Url: http://www.chromium.org/Home License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only) @@ -269,6 +269,11 @@ Patch21: chromium-123-screen-ai-service.patch # Fix link error when building with system libcxx Patch22: chromium-131-fix-qt-ui.pach +# Workaround for build error: ERROR Unresolved dependencies. +#//chrome/test:captured_sites_interactive_tests(//build/toolchain/linux/unbundle:default) +# needs //third_party/libpng:libpng_for_testonly(//build/toolchain/linux/unbundle:default) +Patch23: chromium-143-revert-libpng_for_testonly.patch + # Disable tests on remoting build Patch82: chromium-98.0.4758.102-remoting-no-tests.patch @@ -287,9 +292,6 @@ Patch92: chromium-138-checkversion-nodejs.patch # fix build error Patch93: chromium-141-csss_style_sheet.patch -# Revert due to incorrect display of links on startpage in Darkmode -Patch94: chromium-141-revert-remove-darkmode-image-policy.patch - # FTBFS - error: cannot find attribute `sanitize` in this scope # --> ../../third_party/crabbyavif/src/src/capi/io.rs:210:41 # | @@ -320,7 +322,7 @@ Patch136: chromium-133-workaround-system-ffmpeg-whitelist.patch Patch141: chromium-118-dma_buf_export_sync_file-conflict.patch # fix ftbfs caused by old python-3.9 on el8 -Patch142: chromium-142-python-3.9-ftbfs.patch +Patch142: chromium-143-python-3.9-ftbfs.patch # add correct path for Qt6Gui header and libs Patch150: chromium-124-qt6.patch @@ -364,6 +366,9 @@ Patch317: chromium-142-clang++-unknown-argument.patch Patch318: memory-allocator-dcheck-assert-fix.patch +# compile swiftshader against llvm-16.0 +Patch319: chromium-143-swiftshader-llvm-16.0.patch + # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2239523 # https://bugs.chromium.org/p/chromium/issues/detail?id=1145581#c60 # Disable BTI until this is fixed upstream. @@ -460,10 +465,6 @@ Patch511: 0002-Fix-Missing-OPENSSL_NO_ENGINE-Guard.patch %endif # upstream patches -# Fix FTBFS -# ../../base/containers/span.h:1387:63: error: arithmetic on a pointer to an incomplete type 'element_type' (aka 'const autofill::FormFieldData') -# 1387 | typename iterator::AssumeValid(data(), data(), data() + size()))); -Patch1000: chromium-142-missing-include-for-form_field_data.patch # Fix Wayland URI DnD issues Patch1001: chromium-142-Add-ExtractData-support-for-text-uri-list.patch Patch1002: chromium-142-Update-pointer-position-during-draggin.patch @@ -989,6 +990,8 @@ Qt6 UI for chromium. %patch -P22 -p1 -b .fix-qt-ui %endif +%patch -P23 -p1 -R -b .revert-libpng_for_testonly + %patch -P82 -p1 -b .remoting-no-tests %if ! %{bundlebrotli} @@ -1007,7 +1010,6 @@ Qt6 UI for chromium. %patch -P92 -p1 -b .nodejs-checkversion %patch -P93 -p1 -b .ftbfs-csss_style_sheet -%patch -P94 -p1 -R -b .revert-remove-darkmode-image-policy %patch -P96 -p1 -b .crabbyavif-ftbfs-old-rust %if 0%{?fedora} > 43 @@ -1133,7 +1135,6 @@ Qt6 UI for chromium. %endif # Upstream patches -%patch -P1000 -p1 -b .missing-include-for-form_field_data.patch %patch -P1001 -p1 -b .Add-ExtractData-support-for-text-uri-list.patch %patch -P1002 -p1 -b .Update-pointer-position-during-draggin.patch @@ -1773,6 +1774,22 @@ fi %endif %changelog +* Tue Dec 02 2025 Than Ngo - 143.0.7499.40-1 +- Update to 143.0.7499.40 + * High CVE-2025-13630: Type Confusion in V8 + * High CVE-2025-13631: Inappropriate implementation in Google Updater + * High CVE-2025-13632: Inappropriate implementation in DevTools + * High CVE-2025-13633: Use after free in Digital Credentials + * Medium CVE-2025-13634: Inappropriate implementation in Downloads + * Medium CVE-2025-13720: Bad cast in Loader + * Medium CVE-2025-13721: Race in v8 + * Low CVE-2025-13635: Inappropriate implementation in Downloads + * Low CVE-2025-13636: Inappropriate implementation in Split View + * Low CVE-2025-13637: Inappropriate implementation in Downloads + * Low CVE-2025-13638: Use after free in Media Stream + * Low CVE-2025-13639: Inappropriate implementation in WebRTC + * Low CVE-2025-13640: Inappropriate implementation in Passwords + * Mon Dec 01 2025 LuK1337 - 142.0.7444.175-5 - Backport one more Wayland DnD bug fix from upstream diff --git a/dawn-fix-ppc64le-detection.patch b/dawn-fix-ppc64le-detection.patch index 6f84774..a32fa4e 100644 --- a/dawn-fix-ppc64le-detection.patch +++ b/dawn-fix-ppc64le-detection.patch @@ -1,7 +1,7 @@ -Index: chromium-140.0.7339.41/third_party/dawn/src/dawn/common/Platform.h +Index: chromium-143.0.7499.40/third_party/dawn/src/dawn/common/Platform.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/dawn/src/dawn/common/Platform.h -+++ chromium-140.0.7339.41/third_party/dawn/src/dawn/common/Platform.h +--- chromium-143.0.7499.40.orig/third_party/dawn/src/dawn/common/Platform.h ++++ chromium-143.0.7499.40/third_party/dawn/src/dawn/common/Platform.h @@ -163,10 +163,12 @@ #elif defined(__s390x__) #define DAWN_PLATFORM_IS_S390X 1 diff --git a/fix-breakpad-compile.patch b/fix-breakpad-compile.patch index 670194e..1ce2a60 100644 --- a/fix-breakpad-compile.patch +++ b/fix-breakpad-compile.patch @@ -1,7 +1,7 @@ -Index: chromium-140.0.7339.41/third_party/breakpad/BUILD.gn +Index: chromium-143.0.7499.40/third_party/breakpad/BUILD.gn =================================================================== ---- chromium-140.0.7339.41.orig/third_party/breakpad/BUILD.gn -+++ chromium-140.0.7339.41/third_party/breakpad/BUILD.gn +--- chromium-143.0.7499.40.orig/third_party/breakpad/BUILD.gn ++++ chromium-143.0.7499.40/third_party/breakpad/BUILD.gn @@ -804,7 +804,6 @@ if (is_linux || is_chromeos || is_androi "breakpad/src/client/minidump_file_writer.h", "breakpad/src/common/convert_UTF.cc", diff --git a/fix-clang-selection.patch b/fix-clang-selection.patch index ef15813..a503030 100644 --- a/fix-clang-selection.patch +++ b/fix-clang-selection.patch @@ -1,12 +1,12 @@ -Index: chromium-140.0.7339.41/build/config/BUILDCONFIG.gn +Index: chromium-143.0.7499.40/build/config/BUILDCONFIG.gn =================================================================== ---- chromium-140.0.7339.41.orig/build/config/BUILDCONFIG.gn -+++ chromium-140.0.7339.41/build/config/BUILDCONFIG.gn +--- chromium-143.0.7499.40.orig/build/config/BUILDCONFIG.gn ++++ chromium-143.0.7499.40/build/config/BUILDCONFIG.gn @@ -138,7 +138,6 @@ declare_args() { # Set to true when compiling with the Clang compiler. is_clang = current_os != "linux" || (current_cpu != "s390x" && current_cpu != "s390" && - current_cpu != "ppc64" && current_cpu != "ppc" && - current_cpu != "mips" && current_cpu != "mips64" && - current_cpu != "riscv64") + current_cpu != "mips" && current_cpu != "mips64") + # Allows the path to a custom target toolchain to be injected as a single diff --git a/fix-different-data-layouts.patch b/fix-different-data-layouts.patch index c62678f..f2e5403 100644 --- a/fix-different-data-layouts.patch +++ b/fix-different-data-layouts.patch @@ -24,11 +24,11 @@ inconsistency in data layouts when targeting this particular platform. The error reported by the linker is not technically an error, however, only a warning goosed up by a --fatal-warnings flag. -Index: chromium-140.0.7339.41/build/config/compiler/BUILD.gn +Index: chromium-143.0.7499.40/build/config/compiler/BUILD.gn =================================================================== ---- chromium-140.0.7339.41.orig/build/config/compiler/BUILD.gn -+++ chromium-140.0.7339.41/build/config/compiler/BUILD.gn -@@ -455,7 +455,7 @@ config("compiler") { +--- chromium-143.0.7499.40.orig/build/config/compiler/BUILD.gn ++++ chromium-143.0.7499.40/build/config/compiler/BUILD.gn +@@ -470,7 +470,7 @@ config("compiler") { # Linker warnings. if (fatal_linker_warnings && !is_apple && current_os != "aix" && diff --git a/fix-page-allocator-overflow.patch b/fix-page-allocator-overflow.patch index 7770b86..dbfc560 100644 --- a/fix-page-allocator-overflow.patch +++ b/fix-page-allocator-overflow.patch @@ -1,7 +1,7 @@ -Index: chromium-140.0.7339.41/base/allocator/dispatcher/tls.h +Index: chromium-143.0.7499.40/base/allocator/dispatcher/tls.h =================================================================== ---- chromium-140.0.7339.41.orig/base/allocator/dispatcher/tls.h -+++ chromium-140.0.7339.41/base/allocator/dispatcher/tls.h +--- chromium-143.0.7499.40.orig/base/allocator/dispatcher/tls.h ++++ chromium-143.0.7499.40/base/allocator/dispatcher/tls.h @@ -88,6 +88,8 @@ struct BASE_EXPORT MMapAllocator { constexpr static size_t AllocationChunkSize = 16384; #elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) @@ -11,11 +11,11 @@ Index: chromium-140.0.7339.41/base/allocator/dispatcher/tls.h #else constexpr static size_t AllocationChunkSize = 4096; #endif -Index: chromium-140.0.7339.41/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h +Index: chromium-143.0.7499.40/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h =================================================================== ---- chromium-140.0.7339.41.orig/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h -+++ chromium-140.0.7339.41/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h -@@ -397,7 +397,7 @@ PA_ALWAYS_INLINE constexpr size_t MaxDir +--- chromium-143.0.7499.40.orig/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h ++++ chromium-143.0.7499.40/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h +@@ -399,7 +399,7 @@ PA_ALWAYS_INLINE constexpr size_t MaxDir // TODO(casey.smalley@arm.com): under 64k pages we can end up in a situation // where a normal slot span will be large enough to contain multiple items, // but the address will go over the final partition page after being aligned. diff --git a/fix-partition-alloc-compile.patch b/fix-partition-alloc-compile.patch index 0c27718..8721f1b 100644 --- a/fix-partition-alloc-compile.patch +++ b/fix-partition-alloc-compile.patch @@ -1,10 +1,10 @@ kIndex: chromium-114.0.5735.45/base/allocator/partition_allocator/partition_alloc.gni =================================================================== -Index: chromium-140.0.7339.41/base/allocator/partition_allocator/partition_alloc.gni +Index: chromium-143.0.7499.40/base/allocator/partition_allocator/partition_alloc.gni =================================================================== ---- chromium-140.0.7339.41.orig/base/allocator/partition_allocator/partition_alloc.gni -+++ chromium-140.0.7339.41/base/allocator/partition_allocator/partition_alloc.gni -@@ -66,7 +66,7 @@ is_clang_or_gcc = is_clang || !is_win +--- chromium-143.0.7499.40.orig/base/allocator/partition_allocator/partition_alloc.gni ++++ chromium-143.0.7499.40/base/allocator/partition_allocator/partition_alloc.gni +@@ -71,7 +71,7 @@ is_clang_or_gcc = is_clang || !is_win # Whether 64-bit pointers are used. # A static_assert in partition_alloc_config.h verifies that. if (current_cpu == "x64" || current_cpu == "arm64" || current_cpu == "arm64e" || diff --git a/fix-rust-linking.patch b/fix-rust-linking.patch index 5f06471..28f2a1f 100644 --- a/fix-rust-linking.patch +++ b/fix-rust-linking.patch @@ -1,8 +1,8 @@ -Index: chromium-140.0.7339.41/build/toolchain/gcc_toolchain.gni +Index: chromium-143.0.7499.40/build/toolchain/gcc_toolchain.gni =================================================================== ---- chromium-140.0.7339.41.orig/build/toolchain/gcc_toolchain.gni -+++ chromium-140.0.7339.41/build/toolchain/gcc_toolchain.gni -@@ -430,7 +430,13 @@ template("single_gcc_toolchain") { +--- chromium-143.0.7499.40.orig/build/toolchain/gcc_toolchain.gni ++++ chromium-143.0.7499.40/build/toolchain/gcc_toolchain.gni +@@ -422,7 +422,13 @@ template("single_gcc_toolchain") { # -soname flag is not available on aix ld soname_flag = "-Wl,-soname=\"$soname\"" } @@ -17,7 +17,7 @@ Index: chromium-140.0.7339.41/build/toolchain/gcc_toolchain.gni # Generate a map file to be used for binary size analysis. # Map file adds ~10% to the link time on a z620. -@@ -542,7 +548,13 @@ template("single_gcc_toolchain") { +@@ -534,7 +540,13 @@ template("single_gcc_toolchain") { whole_archive_flag = "-Wl,--whole-archive" no_whole_archive_flag = "-Wl,--no-whole-archive" } diff --git a/fix-rustc.patch b/fix-rustc.patch index a3f4669..1655042 100644 --- a/fix-rustc.patch +++ b/fix-rustc.patch @@ -1,7 +1,10 @@ -diff -up chromium-141.0.7390.37/build/config/rust.gni.fix-rustc chromium-141.0.7390.37/build/config/rust.gni ---- chromium-141.0.7390.37/build/config/rust.gni.fix-rustc 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/build/config/rust.gni 2025-09-28 10:23:04.982735749 +0200 -@@ -179,6 +179,9 @@ rust_abi_target = "" +author: Andres Salomon +description: allow ppc64le to build by using proper rustc target +Index: chromium-143.0.7499.40/build/config/rust.gni +=================================================================== +--- chromium-143.0.7499.40.orig/build/config/rust.gni ++++ chromium-143.0.7499.40/build/config/rust.gni +@@ -176,6 +176,9 @@ rust_abi_target = "" if (is_linux || is_chromeos) { if (current_cpu == "arm64") { rust_abi_target = "aarch64-unknown-linux-gnu" diff --git a/fix-study-crash.patch b/fix-study-crash.patch index e186c89..2d1058a 100644 --- a/fix-study-crash.patch +++ b/fix-study-crash.patch @@ -1,8 +1,8 @@ -Index: chromium-140.0.7339.41/components/variations/proto/study.proto +Index: chromium-143.0.7499.40/components/variations/proto/study.proto =================================================================== ---- chromium-140.0.7339.41.orig/components/variations/proto/study.proto -+++ chromium-140.0.7339.41/components/variations/proto/study.proto -@@ -262,6 +262,9 @@ message Study { +--- chromium-143.0.7499.40.orig/components/variations/proto/study.proto ++++ chromium-143.0.7499.40/components/variations/proto/study.proto +@@ -293,6 +293,9 @@ message Study { // A Mac-only value, indicating an x86-64 binary running on an arm64 host // via "Rosetta 2" binary translation. TRANSLATED_X86_64 = 4; @@ -12,10 +12,10 @@ Index: chromium-140.0.7339.41/components/variations/proto/study.proto } // Enum to pass as optional bool. -Index: chromium-140.0.7339.41/components/variations/service/variations_field_trial_creator.cc +Index: chromium-143.0.7499.40/components/variations/service/variations_field_trial_creator.cc =================================================================== ---- chromium-140.0.7339.41.orig/components/variations/service/variations_field_trial_creator.cc -+++ chromium-140.0.7339.41/components/variations/service/variations_field_trial_creator.cc +--- chromium-143.0.7499.40.orig/components/variations/service/variations_field_trial_creator.cc ++++ chromium-143.0.7499.40/components/variations/service/variations_field_trial_creator.cc @@ -105,6 +105,9 @@ Study::CpuArchitecture GetCurrentCpuArch if (process_arch == "x86") { return Study::X86_32; diff --git a/fix-unknown-warning-option-messages.diff b/fix-unknown-warning-option-messages.diff index b8138a2..8c767e1 100644 --- a/fix-unknown-warning-option-messages.diff +++ b/fix-unknown-warning-option-messages.diff @@ -1,8 +1,8 @@ -Index: chromium-140.0.7339.41/build/config/compiler/BUILD.gn +Index: chromium-143.0.7499.40/build/config/compiler/BUILD.gn =================================================================== ---- chromium-140.0.7339.41.orig/build/config/compiler/BUILD.gn -+++ chromium-140.0.7339.41/build/config/compiler/BUILD.gn -@@ -2086,7 +2086,9 @@ config("default_warnings") { +--- chromium-143.0.7499.40.orig/build/config/compiler/BUILD.gn ++++ chromium-143.0.7499.40/build/config/compiler/BUILD.gn +@@ -2134,7 +2134,9 @@ config("default_warnings") { # Don't warn about "maybe" uninitialized. Clang doesn't include this # in -Wall but gcc does, and it gives false positives. @@ -13,7 +13,7 @@ Index: chromium-140.0.7339.41/build/config/compiler/BUILD.gn cflags += [ "-Wno-deprecated-declarations" ] # -Wcomment gives too many false positives in the case a -@@ -2097,7 +2099,9 @@ config("default_warnings") { +@@ -2145,7 +2147,9 @@ config("default_warnings") { # -Wpacked-not-aligned complains all generated mojom-shared-internal.h # files. diff --git a/skia-vsx-instructions.patch b/skia-vsx-instructions.patch index 610bb88..b84166c 100644 --- a/skia-vsx-instructions.patch +++ b/skia-vsx-instructions.patch @@ -1,8 +1,8 @@ -Index: chromium-140.0.7339.41/third_party/skia/BUILD.gn +Index: chromium-143.0.7499.40/third_party/skia/BUILD.gn =================================================================== ---- chromium-140.0.7339.41.orig/third_party/skia/BUILD.gn -+++ chromium-140.0.7339.41/third_party/skia/BUILD.gn -@@ -188,6 +188,12 @@ opts("lasx") { +--- chromium-143.0.7499.40.orig/third_party/skia/BUILD.gn ++++ chromium-143.0.7499.40/third_party/skia/BUILD.gn +@@ -192,6 +192,12 @@ opts("lasx") { cflags = [ "-mlasx" ] } @@ -15,7 +15,7 @@ Index: chromium-140.0.7339.41/third_party/skia/BUILD.gn # Any feature of Skia that requires third-party code should be optional and use this template. template("optional") { if (invoker.enabled) { -@@ -1694,6 +1700,7 @@ skia_component("skia") { +@@ -1686,6 +1692,7 @@ skia_component("skia") { ":skx", ":typeface_fontations", ":vello", @@ -23,11 +23,11 @@ Index: chromium-140.0.7339.41/third_party/skia/BUILD.gn ":webp_decode", ":wuffs", ":xml", -Index: chromium-140.0.7339.41/third_party/skia/gn/skia/BUILD.gn +Index: chromium-143.0.7499.40/third_party/skia/gn/skia/BUILD.gn =================================================================== ---- chromium-140.0.7339.41.orig/third_party/skia/gn/skia/BUILD.gn -+++ chromium-140.0.7339.41/third_party/skia/gn/skia/BUILD.gn -@@ -152,6 +152,8 @@ config("default") { +--- chromium-143.0.7499.40.orig/third_party/skia/gn/skia/BUILD.gn ++++ chromium-143.0.7499.40/third_party/skia/gn/skia/BUILD.gn +@@ -142,6 +142,8 @@ config("default") { "-mfpmath=sse", ] ldflags += [ "-m32" ] @@ -36,10 +36,10 @@ Index: chromium-140.0.7339.41/third_party/skia/gn/skia/BUILD.gn } else if (current_cpu == "loong64") { cflags += [ "-mlsx", -Index: chromium-140.0.7339.41/third_party/skia/include/core/SkTypes.h +Index: chromium-143.0.7499.40/third_party/skia/include/core/SkTypes.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/skia/include/core/SkTypes.h -+++ chromium-140.0.7339.41/third_party/skia/include/core/SkTypes.h +--- chromium-143.0.7499.40.orig/third_party/skia/include/core/SkTypes.h ++++ chromium-143.0.7499.40/third_party/skia/include/core/SkTypes.h @@ -198,4 +198,43 @@ static constexpr uint32_t SK_InvalidGenI */ static constexpr uint32_t SK_InvalidUniqueID = 0; @@ -84,10 +84,10 @@ Index: chromium-140.0.7339.41/third_party/skia/include/core/SkTypes.h +#endif + #endif -Index: chromium-140.0.7339.41/third_party/skia/src/base/SkSpinlock.cpp +Index: chromium-143.0.7499.40/third_party/skia/src/base/SkSpinlock.cpp =================================================================== ---- chromium-140.0.7339.41.orig/third_party/skia/src/base/SkSpinlock.cpp -+++ chromium-140.0.7339.41/third_party/skia/src/base/SkSpinlock.cpp +--- chromium-143.0.7499.40.orig/third_party/skia/src/base/SkSpinlock.cpp ++++ chromium-143.0.7499.40/third_party/skia/src/base/SkSpinlock.cpp @@ -33,7 +33,8 @@ #endif @@ -98,10 +98,10 @@ Index: chromium-140.0.7339.41/third_party/skia/src/base/SkSpinlock.cpp #include static void do_pause() { _mm_pause(); } #else -Index: chromium-140.0.7339.41/third_party/skia/src/opts/SkBitmapProcState_opts.h +Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkBitmapProcState_opts.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/skia/src/opts/SkBitmapProcState_opts.h -+++ chromium-140.0.7339.41/third_party/skia/src/opts/SkBitmapProcState_opts.h +--- chromium-143.0.7499.40.orig/third_party/skia/src/opts/SkBitmapProcState_opts.h ++++ chromium-143.0.7499.40/third_party/skia/src/opts/SkBitmapProcState_opts.h @@ -21,7 +21,13 @@ // The rest are scattershot at the moment but I want to get them // all migrated to be normal code inside SkBitmapProcState.cpp. @@ -117,10 +117,10 @@ Index: chromium-140.0.7339.41/third_party/skia/src/opts/SkBitmapProcState_opts.h #include #elif defined(SK_ARM_HAS_NEON) #include -Index: chromium-140.0.7339.41/third_party/skia/src/opts/SkBlitRow_opts.h +Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkBlitRow_opts.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/skia/src/opts/SkBlitRow_opts.h -+++ chromium-140.0.7339.41/third_party/skia/src/opts/SkBlitRow_opts.h +--- chromium-143.0.7499.40.orig/third_party/skia/src/opts/SkBlitRow_opts.h ++++ chromium-143.0.7499.40/third_party/skia/src/opts/SkBlitRow_opts.h @@ -69,7 +69,7 @@ #endif @@ -130,10 +130,10 @@ Index: chromium-140.0.7339.41/third_party/skia/src/opts/SkBlitRow_opts.h static inline __m128i SkPMSrcOver_SSE2(const __m128i& src, const __m128i& dst) { __m128i scale = _mm_sub_epi32(_mm_set1_epi32(256), -Index: chromium-140.0.7339.41/third_party/skia/src/opts/SkRasterPipeline_opts.h +Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/skia/src/opts/SkRasterPipeline_opts.h -+++ chromium-140.0.7339.41/third_party/skia/src/opts/SkRasterPipeline_opts.h +--- chromium-143.0.7499.40.orig/third_party/skia/src/opts/SkRasterPipeline_opts.h ++++ chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h @@ -1,5 +1,6 @@ /* * Copyright 2018 Google Inc. @@ -394,7 +394,7 @@ Index: chromium-140.0.7339.41/third_party/skia/src/opts/SkRasterPipeline_opts.h // These platforms are ideal for wider stages, and their default ABI is ideal. #define ABI #define SKRP_NARROW_STAGES 0 -@@ -5563,6 +5773,10 @@ SI F sqrt_(F x) { +@@ -5574,6 +5784,10 @@ SI F sqrt_(F x) { float32x4_t lo,hi; split(x, &lo,&hi); return join(sqrt(lo), sqrt(hi)); @@ -405,7 +405,7 @@ Index: chromium-140.0.7339.41/third_party/skia/src/opts/SkRasterPipeline_opts.h #elif defined(SKRP_CPU_LASX) __m256 lo,hi; split(x, &lo,&hi); -@@ -5594,6 +5808,10 @@ SI F floor_(F x) { +@@ -5605,6 +5819,10 @@ SI F floor_(F x) { __m128 lo,hi; split(x, &lo,&hi); return join(_mm_floor_ps(lo), _mm_floor_ps(hi)); @@ -416,7 +416,7 @@ Index: chromium-140.0.7339.41/third_party/skia/src/opts/SkRasterPipeline_opts.h #elif defined(SKRP_CPU_LASX) __m256 lo,hi; split(x, &lo,&hi); -@@ -5613,6 +5831,7 @@ SI F floor_(F x) { +@@ -5624,6 +5842,7 @@ SI F floor_(F x) { // (2 * a * b + (1 << 15)) >> 16 // The result is a number on [-1, 1). // Note: on neon this is a saturating multiply while the others are not. @@ -424,7 +424,7 @@ Index: chromium-140.0.7339.41/third_party/skia/src/opts/SkRasterPipeline_opts.h SI I16 scaled_mult(I16 a, I16 b) { #if defined(SKRP_CPU_SKX) return (I16)_mm256_mulhrs_epi16((__m256i)a, (__m256i)b); -@@ -5624,6 +5843,22 @@ SI I16 scaled_mult(I16 a, I16 b) { +@@ -5635,6 +5854,22 @@ SI I16 scaled_mult(I16 a, I16 b) { return vqrdmulhq_s16(a, b); #elif defined(SKRP_CPU_NEON) return vqrdmulhq_s16(a, b); @@ -447,7 +447,7 @@ Index: chromium-140.0.7339.41/third_party/skia/src/opts/SkRasterPipeline_opts.h #elif defined(SKRP_CPU_LASX) I16 res = __lasx_xvmuh_h(a, b); return __lasx_xvslli_h(res, 1); -@@ -5651,7 +5886,26 @@ SI U16 constrained_add(I16 a, U16 b) { +@@ -5662,7 +5897,26 @@ SI U16 constrained_add(I16 a, U16 b) { SkASSERT(-ib <= ia && ia <= 65535 - ib); } #endif @@ -474,7 +474,7 @@ Index: chromium-140.0.7339.41/third_party/skia/src/opts/SkRasterPipeline_opts.h } SI F fract(F x) { return x - floor_(x); } -@@ -6707,8 +6961,14 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S +@@ -6718,8 +6972,14 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S // 2^-8 * v = 2^-9 * (tx*(R - L) + (R + L)) // v = 1/2 * (tx*(R - L) + (R + L)) auto lerpX = [&](U16 left, U16 right) -> U16 { @@ -489,7 +489,7 @@ Index: chromium-140.0.7339.41/third_party/skia/src/opts/SkRasterPipeline_opts.h // The constrained_add is the most subtle part of lerp. The first term is on the interval // [-1, 1), and the second term is on the interval is on the interval [0, 1) because // both terms are too high by a factor of 2 which will be handled below. (Both R and L are -@@ -6720,7 +6980,12 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S +@@ -6731,7 +6991,12 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S U16 v2 = constrained_add(scaled_mult(tx, width), middle) + 1; // Divide by 2 to calculate v and at the same time bring the intermediate value onto the // interval [0, 1/2] to set up for the lerpY. @@ -502,7 +502,7 @@ Index: chromium-140.0.7339.41/third_party/skia/src/opts/SkRasterPipeline_opts.h }; const uint32_t* ptr; -@@ -6754,9 +7019,15 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S +@@ -6765,9 +7030,15 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S I16 width = (I16)bottom - (I16)top; U16 middle = bottom + top; // Add + 0x80 for rounding. @@ -519,10 +519,10 @@ Index: chromium-140.0.7339.41/third_party/skia/src/opts/SkRasterPipeline_opts.h }; r = lerpY(topR, bottomR); -Index: chromium-140.0.7339.41/third_party/skia/src/base/SkVx.h +Index: chromium-143.0.7499.40/third_party/skia/src/base/SkVx.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/skia/src/base/SkVx.h -+++ chromium-140.0.7339.41/third_party/skia/src/base/SkVx.h +--- chromium-143.0.7499.40.orig/third_party/skia/src/base/SkVx.h ++++ chromium-143.0.7499.40/third_party/skia/src/base/SkVx.h @@ -41,7 +41,12 @@ #endif @@ -537,10 +537,10 @@ Index: chromium-140.0.7339.41/third_party/skia/src/base/SkVx.h #include #elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41 #include -Index: chromium-140.0.7339.41/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp +Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp =================================================================== ---- chromium-140.0.7339.41.orig/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp -+++ chromium-140.0.7339.41/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp +--- chromium-143.0.7499.40.orig/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp ++++ chromium-143.0.7499.40/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp @@ -9,7 +9,7 @@ #include "src/core/SkBlitMask.h" #include "src/core/SkOptsTargets.h" @@ -550,10 +550,10 @@ Index: chromium-140.0.7339.41/third_party/skia/src/core/SkBlitMask_opts_ssse3.cp // The order of these includes is important: // 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget -Index: chromium-140.0.7339.41/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp +Index: chromium-143.0.7499.40/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp =================================================================== ---- chromium-140.0.7339.41.orig/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp -+++ chromium-140.0.7339.41/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp +--- chromium-143.0.7499.40.orig/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp ++++ chromium-143.0.7499.40/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp @@ -10,7 +10,7 @@ #include "src/core/SkOptsTargets.h" #include "src/core/SkSwizzlePriv.h" @@ -563,10 +563,10 @@ Index: chromium-140.0.7339.41/third_party/skia/src/core/SkSwizzler_opts_ssse3.cp !defined(SK_ENABLE_OPTIMIZE_SIZE) && \ SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3 -Index: chromium-140.0.7339.41/third_party/skia/src/core/SkBlitMask_opts.cpp +Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBlitMask_opts.cpp =================================================================== ---- chromium-140.0.7339.41.orig/third_party/skia/src/core/SkBlitMask_opts.cpp -+++ chromium-140.0.7339.41/third_party/skia/src/core/SkBlitMask_opts.cpp +--- chromium-143.0.7499.40.orig/third_party/skia/src/core/SkBlitMask_opts.cpp ++++ chromium-143.0.7499.40/third_party/skia/src/core/SkBlitMask_opts.cpp @@ -25,7 +25,7 @@ namespace SkOpts { static bool init() { #if defined(SK_ENABLE_OPTIMIZE_SIZE) @@ -576,10 +576,10 @@ Index: chromium-140.0.7339.41/third_party/skia/src/core/SkBlitMask_opts.cpp #if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3 if (SkCpu::Supports(SkCpu::SSSE3)) { Init_BlitMask_ssse3(); } #endif -Index: chromium-140.0.7339.41/third_party/skia/src/core/SkBitmapProcState_opts.cpp +Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBitmapProcState_opts.cpp =================================================================== ---- chromium-140.0.7339.41.orig/third_party/skia/src/core/SkBitmapProcState_opts.cpp -+++ chromium-140.0.7339.41/third_party/skia/src/core/SkBitmapProcState_opts.cpp +--- chromium-143.0.7499.40.orig/third_party/skia/src/core/SkBitmapProcState_opts.cpp ++++ chromium-143.0.7499.40/third_party/skia/src/core/SkBitmapProcState_opts.cpp @@ -27,7 +27,7 @@ namespace SkOpts { static bool init() { #if defined(SK_ENABLE_OPTIMIZE_SIZE) @@ -589,10 +589,10 @@ Index: chromium-140.0.7339.41/third_party/skia/src/core/SkBitmapProcState_opts.c #if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3 if (SkCpu::Supports(SkCpu::SSSE3)) { Init_BitmapProcState_ssse3(); } #endif -Index: chromium-140.0.7339.41/third_party/skia/src/core/SkCpu.h +Index: chromium-143.0.7499.40/third_party/skia/src/core/SkCpu.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/skia/src/core/SkCpu.h -+++ chromium-140.0.7339.41/third_party/skia/src/core/SkCpu.h +--- chromium-143.0.7499.40.orig/third_party/skia/src/core/SkCpu.h ++++ chromium-143.0.7499.40/third_party/skia/src/core/SkCpu.h @@ -60,7 +60,7 @@ inline bool SkCpu::Supports(uint32_t mas // If we mask in compile-time known lower limits, the compiler can @@ -602,10 +602,10 @@ Index: chromium-140.0.7339.41/third_party/skia/src/core/SkCpu.h #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1 features |= SSE1; #endif -Index: chromium-140.0.7339.41/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp +Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp =================================================================== ---- chromium-140.0.7339.41.orig/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp -+++ chromium-140.0.7339.41/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp +--- chromium-143.0.7499.40.orig/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp ++++ chromium-143.0.7499.40/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp @@ -8,7 +8,7 @@ #include "include/private/base/SkFeatures.h" #include "src/core/SkOptsTargets.h" @@ -615,10 +615,10 @@ Index: chromium-140.0.7339.41/third_party/skia/src/core/SkBitmapProcState_opts_s // The order of these includes is important: // 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget -Index: chromium-140.0.7339.41/third_party/skia/include/private/base/SkFeatures.h +Index: chromium-143.0.7499.40/third_party/skia/include/private/base/SkFeatures.h =================================================================== ---- chromium-140.0.7339.41.orig/third_party/skia/include/private/base/SkFeatures.h -+++ chromium-140.0.7339.41/third_party/skia/include/private/base/SkFeatures.h +--- chromium-143.0.7499.40.orig/third_party/skia/include/private/base/SkFeatures.h ++++ chromium-143.0.7499.40/third_party/skia/include/private/base/SkFeatures.h @@ -63,6 +63,8 @@ #if defined(__i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64) @@ -628,10 +628,10 @@ Index: chromium-140.0.7339.41/third_party/skia/include/private/base/SkFeatures.h #endif #if defined(__loongarch__) || defined (__loongarch64) -Index: chromium-140.0.7339.41/third_party/skia/src/opts/SkSwizzler_opts.inc +Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkSwizzler_opts.inc =================================================================== ---- chromium-140.0.7339.41.orig/third_party/skia/src/opts/SkSwizzler_opts.inc -+++ chromium-140.0.7339.41/third_party/skia/src/opts/SkSwizzler_opts.inc +--- chromium-143.0.7499.40.orig/third_party/skia/src/opts/SkSwizzler_opts.inc ++++ chromium-143.0.7499.40/third_party/skia/src/opts/SkSwizzler_opts.inc @@ -14,7 +14,10 @@ #include #include @@ -678,10 +678,10 @@ Index: chromium-140.0.7339.41/third_party/skia/src/opts/SkSwizzler_opts.inc #elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1 && (defined(__clang__) || !defined(_MSC_VER)) // -- SSE -- Harden against timing attacks -- MSVC is not supported. using F4 = __m128; -Index: chromium-140.0.7339.41/third_party/skia/src/core/SkBlitter_ARGB32.cpp +Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBlitter_ARGB32.cpp =================================================================== ---- chromium-140.0.7339.41.orig/third_party/skia/src/core/SkBlitter_ARGB32.cpp -+++ chromium-140.0.7339.41/third_party/skia/src/core/SkBlitter_ARGB32.cpp +--- chromium-143.0.7499.40.orig/third_party/skia/src/core/SkBlitter_ARGB32.cpp ++++ chromium-143.0.7499.40/third_party/skia/src/core/SkBlitter_ARGB32.cpp @@ -129,6 +129,16 @@ static inline SkPMColor blend_lcd16_opaq #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2 #include diff --git a/sources b/sources index 47c25ae..f3053ba 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (node-v22.14.0-stripped.tar.gz) = affddb541009c6d378049c2d7845b981335d9e7aa387efcc472e5efb621c345cd58ca69778a394f7e4ebbb5e4b1a115a389838ef1b6458ef5e98f2071b166e15 -SHA512 (chromium-142.0.7444.175-clean.tar.xz) = 5840ab104f4993f4b7033cd2b5fdc3f468d8ac06f1477e643d4e70dbc42dcf15f2e4f60456dc568a3e15f8f3c8e365d332a9fcac3f9b7701fe88151b55d70d17 +SHA512 (chromium-143.0.7499.40-clean.tar.xz) = 482721d372000d05a3e86c91f231c5ee206389890a19ad210e99de1ed86ccbb4dd155f461f98daf8648b6c9a6eeec3c9b4ae17e192bd816ead561a77174bd00c From a0dda14ce464623354c6e69e68d5d820efe73304 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 4 Dec 2025 00:59:02 -0500 Subject: [PATCH 06/20] Update flatpak patches from flathub --- flatpak-Add-initial-sandbox-support.patch | 78 +++++++++---------- flatpak-Adjust-paths-for-the-sandbox.patch | 18 ++--- ...pak-Expose-Widevine-into-the-sandbox.patch | 18 ++--- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/flatpak-Add-initial-sandbox-support.patch b/flatpak-Add-initial-sandbox-support.patch index 3551ae3..9a042f7 100644 --- a/flatpak-Add-initial-sandbox-support.patch +++ b/flatpak-Add-initial-sandbox-support.patch @@ -1,4 +1,4 @@ -From 1915558377f7dc194ff2238c79b70ceacd88f474 Mon Sep 17 00:00:00 2001 +From c82dcae326090d3b7e31694a7e229f536ead56b7 Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez Date: Tue, 17 Mar 2020 13:18:27 -0500 Subject: [PATCH] flatpak: Add initial sandbox support @@ -30,10 +30,10 @@ Subject: [PATCH] flatpak: Add initial sandbox support create mode 100644 sandbox/linux/services/flatpak_sandbox.h diff --git a/.gitignore b/.gitignore -index 375db3d02ce28..1eee661c2bed4 100644 +index 22985d0edf211..62631942103f0 100644 --- a/.gitignore +++ b/.gitignore -@@ -75,6 +75,7 @@ vs-chromium-project.txt +@@ -79,6 +79,7 @@ vs-chromium-project.txt /.android_emulator/ /.clangd/ /.clangd-index/ @@ -42,10 +42,10 @@ index 375db3d02ce28..1eee661c2bed4 100644 /.externalToolBuilders/ /.settings/ diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h -index 56ddbc2d4fa33..736a06ab1d673 100644 +index 7739b7379ba67..01d99a3ac5772 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h -@@ -405,6 +405,9 @@ class ScopedAllowThreadJoinForWebRtcTransport; +@@ -410,6 +410,9 @@ class ScopedAllowThreadJoinForWebRtcTransport; namespace rlz_lib { class FinancialPing; } @@ -63,7 +63,7 @@ index 56ddbc2d4fa33..736a06ab1d673 100644 friend class ui::DrmDisplayHostManager; friend class ui::ScopedAllowBlockingForGbmSurface; friend class ui::SelectFileDialogLinux; -@@ -783,6 +787,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives { +@@ -780,6 +784,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives { friend class rlz_lib::FinancialPing; friend class shell_integration_linux:: LaunchXdgUtilityScopedAllowBaseSyncPrimitives; @@ -125,10 +125,10 @@ index 1174a704b8126..e7fd738b705fb 100644 status & sandbox::policy::SandboxLinux::kNetNS; // A second-layer sandbox is also required to be adequately sandboxed. diff --git a/content/browser/child_process_host_impl.cc b/content/browser/child_process_host_impl.cc -index 583a386414590..c1cf93992da5b 100644 +index 685af654e0832..cb2d7fb0966d1 100644 --- a/content/browser/child_process_host_impl.cc +++ b/content/browser/child_process_host_impl.cc -@@ -46,6 +46,7 @@ +@@ -37,6 +37,7 @@ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #include "base/linux_util.h" @@ -136,7 +136,7 @@ index 583a386414590..c1cf93992da5b 100644 #elif BUILDFLAG(IS_MAC) #include "base/apple/foundation_util.h" #include "content/browser/mac_helpers.h" -@@ -72,7 +73,12 @@ base::FilePath ChildProcessHost::GetChildPath(int flags) { +@@ -62,7 +63,12 @@ base::FilePath ChildProcessHost::GetChildPath(int flags) { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) // Use /proc/self/exe rather than our known binary path so updates // can't swap out the binary from underneath us. @@ -151,10 +151,10 @@ index 583a386414590..c1cf93992da5b 100644 } #endif diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc -index e84c86a30d504..595a469c765a6 100644 +index 5707dd93fd5e9..c87e1248171cf 100644 --- a/content/browser/zygote_host/zygote_host_impl_linux.cc +++ b/content/browser/zygote_host/zygote_host_impl_linux.cc -@@ -17,6 +17,7 @@ +@@ -13,6 +13,7 @@ #include "base/logging.h" #include "base/posix/unix_domain_socket.h" #include "base/process/kill.h" @@ -162,7 +162,7 @@ index e84c86a30d504..595a469c765a6 100644 #include "base/process/memory.h" #include "base/strings/string_number_conversions.h" #include "base/types/fixed_array.h" -@@ -26,6 +27,7 @@ +@@ -22,6 +23,7 @@ #include "content/common/zygote/zygote_handle_impl_linux.h" #include "content/public/common/zygote/zygote_handle.h" #include "sandbox/linux/services/credentials.h" @@ -170,7 +170,7 @@ index e84c86a30d504..595a469c765a6 100644 #include "sandbox/linux/services/namespace_sandbox.h" #include "sandbox/linux/suid/client/setuid_sandbox_host.h" #include "sandbox/linux/suid/common/sandbox.h" -@@ -76,6 +78,7 @@ ZygoteHostImpl::ZygoteHostImpl() +@@ -72,6 +74,7 @@ ZygoteHostImpl::ZygoteHostImpl() : use_namespace_sandbox_(false), use_suid_sandbox_(false), use_suid_sandbox_for_adj_oom_score_(false), @@ -178,7 +178,7 @@ index e84c86a30d504..595a469c765a6 100644 sandbox_binary_(), zygote_pids_lock_(), zygote_pids_() {} -@@ -114,9 +117,12 @@ void ZygoteHostImpl::Init(const base::CommandLine& command_line) { +@@ -110,9 +113,12 @@ void ZygoteHostImpl::Init(const base::CommandLine& command_line) { sandbox_binary_ = setuid_sandbox_host->GetSandboxBinaryPath().value(); } @@ -194,7 +194,7 @@ index e84c86a30d504..595a469c765a6 100644 use_namespace_sandbox_ = true; } else if (!command_line.HasSwitch( sandbox::policy::switches::kDisableSetuidSandbox) && -@@ -187,10 +193,16 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -183,10 +189,16 @@ pid_t ZygoteHostImpl::LaunchZygote( sandbox_host->SetupLaunchEnvironment(); } @@ -215,7 +215,7 @@ index e84c86a30d504..595a469c765a6 100644 CHECK(process.IsValid()) << "Failed to launch zygote process"; dummy_fd.reset(); -@@ -199,7 +211,8 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -195,7 +207,8 @@ pid_t ZygoteHostImpl::LaunchZygote( pid_t pid = process.Pid(); @@ -225,7 +225,7 @@ index e84c86a30d504..595a469c765a6 100644 // The namespace and SUID sandbox will execute the zygote in a new // PID namespace, and the main zygote process will then fork from // there. Watch now our elaborate dance to find and validate the -@@ -227,7 +240,11 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -223,7 +236,11 @@ pid_t ZygoteHostImpl::LaunchZygote( if (real_pid != pid) { // Reap the sandbox. @@ -238,7 +238,7 @@ index e84c86a30d504..595a469c765a6 100644 } pid = real_pid; } -@@ -278,6 +295,10 @@ void ZygoteHostImpl::AdjustRendererOOMScore(base::ProcessHandle pid, +@@ -274,6 +291,10 @@ void ZygoteHostImpl::AdjustRendererOOMScore(base::ProcessHandle pid, selinux_valid = true; } @@ -262,10 +262,10 @@ index 8ef884a7db6f4..f441900dd6343 100644 // This lock protects the |zygote_pids_| set. diff --git a/content/zygote/zygote_linux.cc b/content/zygote/zygote_linux.cc -index f2c3b43281d53..9f3f3f6b1bc12 100644 +index c90abfaf2e346..5b9cb3e1bd313 100644 --- a/content/zygote/zygote_linux.cc +++ b/content/zygote/zygote_linux.cc -@@ -126,7 +126,7 @@ bool Zygote::ProcessRequests() { +@@ -122,7 +122,7 @@ bool Zygote::ProcessRequests() { PCHECK(sigaddset(&sigset, SIGCHLD) == 0); PCHECK(sigprocmask(SIG_BLOCK, &sigset, &orig_sigmask) == 0); @@ -274,7 +274,7 @@ index f2c3b43281d53..9f3f3f6b1bc12 100644 // Let the ZygoteHost know we are ready to go. // The receiving code is in // content/browser/zygote_host/zygote_host_impl_linux.cc. -@@ -231,6 +231,10 @@ bool Zygote::UsingNSSandbox() const { +@@ -227,6 +227,10 @@ bool Zygote::UsingNSSandbox() const { return sandbox_flags_ & sandbox::policy::SandboxLinux::kUserNS; } @@ -362,10 +362,10 @@ index c7ee91878e6dd..9c2c7a04bd968 100644 base::GlobalDescriptors::Descriptor( static_cast(kSandboxIPCChannel), GetSandboxFD())); diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn -index 4eac178764a41..8bd0de35f246f 100644 +index 478194aaf43a8..c97710907565e 100644 --- a/sandbox/linux/BUILD.gn +++ b/sandbox/linux/BUILD.gn -@@ -309,6 +309,10 @@ if (is_linux || is_chromeos) { +@@ -303,6 +303,10 @@ if (is_linux || is_chromeos) { component("sandbox_services") { sources = [ @@ -376,7 +376,7 @@ index 4eac178764a41..8bd0de35f246f 100644 "services/init_process_reaper.cc", "services/init_process_reaper.h", "services/proc_util.cc", -@@ -327,8 +331,10 @@ component("sandbox_services") { +@@ -321,8 +325,10 @@ component("sandbox_services") { defines = [ "SANDBOX_IMPLEMENTATION" ] @@ -506,7 +506,7 @@ index 0000000000000..22799eb42f782 +#endif diff --git a/sandbox/linux/services/flatpak_sandbox.cc b/sandbox/linux/services/flatpak_sandbox.cc new file mode 100644 -index 0000000000000..b5da5a5801fde +index 0000000000000..c854f32b185a3 --- /dev/null +++ b/sandbox/linux/services/flatpak_sandbox.cc @@ -0,0 +1,576 @@ @@ -756,7 +756,7 @@ index 0000000000000..b5da5a5801fde + options.connection_type = dbus::Bus::PRIVATE; + options.dbus_task_runner = base::SequencedTaskRunner::GetCurrentDefault(); + -+ return base::MakeRefCounted(options); ++ return base::MakeRefCounted(std::move(options)); + }()); + + return bus->get(); @@ -1211,10 +1211,10 @@ index 0000000000000..167bbc85945ad + +#endif // SANDBOX_LINUX_SERVICES_FLATPAK_SANDBOX_H_ diff --git a/sandbox/policy/BUILD.gn b/sandbox/policy/BUILD.gn -index 793c68d50e59f..b44c986fd72ab 100644 +index 1a3c7c6cf8b15..4c1b121160df6 100644 --- a/sandbox/policy/BUILD.gn +++ b/sandbox/policy/BUILD.gn -@@ -114,6 +114,9 @@ component("policy") { +@@ -118,6 +118,9 @@ component("policy") { "//sandbox/linux:suid_sandbox_client", ] } @@ -1225,10 +1225,10 @@ index 793c68d50e59f..b44c986fd72ab 100644 sources += [ "linux/bpf_ime_policy_linux.cc", diff --git a/sandbox/policy/linux/sandbox_linux.cc b/sandbox/policy/linux/sandbox_linux.cc -index 427604b2b8a00..7384c01cc9123 100644 +index 714cb2e115b84..e85a3fb68ee90 100644 --- a/sandbox/policy/linux/sandbox_linux.cc +++ b/sandbox/policy/linux/sandbox_linux.cc -@@ -36,6 +36,7 @@ +@@ -35,6 +35,7 @@ #include "sandbox/constants.h" #include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h" #include "sandbox/linux/services/credentials.h" @@ -1236,7 +1236,7 @@ index 427604b2b8a00..7384c01cc9123 100644 #include "sandbox/linux/services/libc_interceptor.h" #include "sandbox/linux/services/namespace_sandbox.h" #include "sandbox/linux/services/proc_util.h" -@@ -231,6 +232,9 @@ void SandboxLinux::PreinitializeSandbox() { +@@ -220,6 +221,9 @@ void SandboxLinux::PreinitializeSandbox() { const int yama_status = Yama::GetStatus(); yama_is_enforcing_ = (yama_status & Yama::STATUS_PRESENT) && (yama_status & Yama::STATUS_ENFORCING); @@ -1246,7 +1246,7 @@ index 427604b2b8a00..7384c01cc9123 100644 pre_initialized_ = true; } -@@ -269,6 +273,10 @@ int SandboxLinux::GetStatus() { +@@ -258,6 +262,10 @@ int SandboxLinux::GetStatus() { sandbox_status_flags_ |= kPIDNS; if (NamespaceSandbox::InNewNetNamespace()) sandbox_status_flags_ |= kNetNS; @@ -1256,9 +1256,9 @@ index 427604b2b8a00..7384c01cc9123 100644 + sandbox_status_flags_ |= kFlatpak | kPIDNS | kNetNS; } - // We report whether the sandbox will be activated when renderers, workers + // We report whether the sandbox will be activated when renderers and diff --git a/sandbox/policy/linux/sandbox_linux.h b/sandbox/policy/linux/sandbox_linux.h -index 0e4f78b9e6cb7..91b638d8a96e0 100644 +index 76e20d21b71d3..3339b852fc948 100644 --- a/sandbox/policy/linux/sandbox_linux.h +++ b/sandbox/policy/linux/sandbox_linux.h @@ -13,6 +13,7 @@ @@ -1279,7 +1279,7 @@ index 0e4f78b9e6cb7..91b638d8a96e0 100644 // A flag that denotes an invalid sandbox status. kInvalid = 1 << 31, }; -@@ -292,6 +296,10 @@ class SANDBOX_POLICY_EXPORT SandboxLinux { +@@ -289,6 +293,10 @@ class SANDBOX_POLICY_EXPORT SandboxLinux { bool seccomp_bpf_with_tsync_supported_; // Accurate if pre_initialized_. bool yama_is_enforcing_; // Accurate if pre_initialized_. bool initialize_sandbox_ran_; // InitializeSandbox() was called. @@ -1291,10 +1291,10 @@ index 0e4f78b9e6cb7..91b638d8a96e0 100644 #if BUILDFLAG(USING_SANITIZER) std::unique_ptr<__sanitizer_sandbox_arguments> sanitizer_args_; diff --git a/services/service_manager/service_process_launcher.cc b/services/service_manager/service_process_launcher.cc -index bb99780fb878d..4dcdee34d2338 100644 +index 60484255e653b..797f3b9ad6cd8 100644 --- a/services/service_manager/service_process_launcher.cc +++ b/services/service_manager/service_process_launcher.cc -@@ -40,6 +40,7 @@ +@@ -41,6 +41,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -1302,7 +1302,7 @@ index bb99780fb878d..4dcdee34d2338 100644 #include "sandbox/linux/services/namespace_sandbox.h" #endif -@@ -285,8 +286,15 @@ void ServiceProcessLauncher::ProcessState::StopInBackground() { +@@ -286,8 +287,15 @@ void ServiceProcessLauncher::ProcessState::StopInBackground() { return; int rv = -1; @@ -1321,5 +1321,5 @@ index bb99780fb878d..4dcdee34d2338 100644 } -- -2.47.1 +2.51.2 diff --git a/flatpak-Adjust-paths-for-the-sandbox.patch b/flatpak-Adjust-paths-for-the-sandbox.patch index c396242..eeac905 100644 --- a/flatpak-Adjust-paths-for-the-sandbox.patch +++ b/flatpak-Adjust-paths-for-the-sandbox.patch @@ -1,4 +1,4 @@ -From e7fd5c3a43aed07cf0a1561c408b631090be8374 Mon Sep 17 00:00:00 2001 +From 4cf3b38a276a3963a356d22ffa01b1ca07c686ee Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez Date: Tue, 25 Aug 2020 19:26:07 -0500 Subject: [PATCH] flatpak: Adjust paths for the sandbox @@ -9,10 +9,10 @@ Subject: [PATCH] flatpak: Adjust paths for the sandbox 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn -index 40e1d1c431dd0..e4a19c80e1afc 100644 +index 45a080086dfd8..ef631e6ad5f80 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -621,6 +621,10 @@ static_library("constants") { +@@ -614,6 +614,10 @@ static_library("constants") { "//third_party/widevine/cdm:headers", ] } @@ -24,10 +24,10 @@ index 40e1d1c431dd0..e4a19c80e1afc 100644 # Use a static library here because many test binaries depend on this but don't diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc -index 6476c59ba6378..9f1b950b14adc 100644 +index 9c4d73b730baa..318d3eef58979 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc -@@ -38,6 +38,10 @@ +@@ -39,6 +39,10 @@ #include "base/win/registry.h" #endif @@ -38,7 +38,7 @@ index 6476c59ba6378..9f1b950b14adc 100644 #if BUILDFLAG(ENABLE_WIDEVINE) #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck #endif -@@ -502,6 +506,14 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -407,6 +411,14 @@ bool PathProvider(int key, base::FilePath* result) { #endif #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD) case chrome::DIR_POLICY_FILES: { @@ -53,7 +53,7 @@ index 6476c59ba6378..9f1b950b14adc 100644 cur = base::FilePath(policy::kPolicyPath); break; } -@@ -518,7 +530,13 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -423,7 +435,13 @@ bool PathProvider(int key, base::FilePath* result) { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { @@ -68,7 +68,7 @@ index 6476c59ba6378..9f1b950b14adc 100644 break; } #endif -@@ -565,6 +583,12 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -471,6 +489,12 @@ bool PathProvider(int key, base::FilePath* result) { "/Library/Application Support/Chromium/NativeMessagingHosts")); #endif #else // BUILDFLAG(IS_MAC) @@ -82,5 +82,5 @@ index 6476c59ba6378..9f1b950b14adc 100644 cur = base::FilePath( FILE_PATH_LITERAL("/etc/opt/chrome/native-messaging-hosts")); -- -2.47.1 +2.51.2 diff --git a/flatpak-Expose-Widevine-into-the-sandbox.patch b/flatpak-Expose-Widevine-into-the-sandbox.patch index 1e9bafa..bacf9c9 100644 --- a/flatpak-Expose-Widevine-into-the-sandbox.patch +++ b/flatpak-Expose-Widevine-into-the-sandbox.patch @@ -1,4 +1,4 @@ -From c5330fa947e1db2db4055994e0da993620f2b5ef Mon Sep 17 00:00:00 2001 +From 895ee4ca3d52eee03c9604465ad5e90591969d64 Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez Date: Tue, 17 Nov 2020 13:00:39 -0600 Subject: [PATCH] flatpak: Expose Widevine into the sandbox @@ -10,12 +10,12 @@ Subject: [PATCH] flatpak: Expose Widevine into the sandbox 3 files changed, 131 insertions(+), 24 deletions(-) diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc -index 595a469c765a6..56cbbb33addde 100644 +index c87e1248171cf..11f17a19ff949 100644 --- a/content/browser/zygote_host/zygote_host_impl_linux.cc +++ b/content/browser/zygote_host/zygote_host_impl_linux.cc -@@ -14,7 +14,10 @@ - #include +@@ -10,7 +10,10 @@ + #include "base/compiler_specific.h" #include "base/files/file_enumerator.h" +#include "base/files/file_util.h" #include "base/logging.h" @@ -24,7 +24,7 @@ index 595a469c765a6..56cbbb33addde 100644 #include "base/posix/unix_domain_socket.h" #include "base/process/kill.h" #include "base/process/launch.h" -@@ -22,9 +25,12 @@ +@@ -18,9 +21,12 @@ #include "base/strings/string_number_conversions.h" #include "base/types/fixed_array.h" #include "build/build_config.h" @@ -37,7 +37,7 @@ index 595a469c765a6..56cbbb33addde 100644 #include "content/public/common/zygote/zygote_handle.h" #include "sandbox/linux/services/credentials.h" #include "sandbox/linux/services/flatpak_sandbox.h" -@@ -33,6 +39,7 @@ +@@ -29,6 +35,7 @@ #include "sandbox/linux/suid/common/sandbox.h" #include "sandbox/policy/linux/sandbox_linux.h" #include "sandbox/policy/switches.h" @@ -45,7 +45,7 @@ index 595a469c765a6..56cbbb33addde 100644 #if BUILDFLAG(IS_CHROMEOS) #include "content/common/zygote/zygote_communication_linux.h" -@@ -197,8 +204,51 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -193,8 +200,51 @@ pid_t ZygoteHostImpl::LaunchZygote( if (is_sandboxed_zygote && use_namespace_sandbox_) { process = sandbox::NamespaceSandbox::LaunchProcess(*cmd_line, options); } else if (is_sandboxed_zygote && use_flatpak_sandbox_) { @@ -100,7 +100,7 @@ index 595a469c765a6..56cbbb33addde 100644 process = base::LaunchProcess(*cmd_line, options); } diff --git a/sandbox/linux/services/flatpak_sandbox.cc b/sandbox/linux/services/flatpak_sandbox.cc -index b5da5a5801fde..7c9205e7bf602 100644 +index c854f32b185a3..bcfd8df2e3cb5 100644 --- a/sandbox/linux/services/flatpak_sandbox.cc +++ b/sandbox/linux/services/flatpak_sandbox.cc @@ -4,6 +4,7 @@ @@ -322,5 +322,5 @@ index 167bbc85945ad..de8e7165b4573 100644 base::WaitableEvent* event, dbus::Response* response, -- -2.47.1 +2.51.2 From 42d5249d171b6f648acc28de8796abd9803a33e0 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 4 Dec 2025 09:57:38 +0100 Subject: [PATCH 07/20] apply swiftshader-llvm-16.0 patch --- chromium.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/chromium.spec b/chromium.spec index f099d8a..5557436 100644 --- a/chromium.spec +++ b/chromium.spec @@ -1069,6 +1069,7 @@ Qt6 UI for chromium. %endif %patch -P318 -p1 -b .memory-allocator-dcheck-assert-fix +%patch -P319 -p1 -b .swiftshader-llvm-16.0 %if %{disable_bti} %patch -P352 -p1 -b .workaround_for_crash_on_BTI_capable_system From c285730bf0a6318c7ca6ff8a691f36c5267fe8ef Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 4 Dec 2025 14:39:50 +0100 Subject: [PATCH 08/20] Fix build error caused by old rustc on el9 --- ...=> chromium-143-el9-rust-no-alloc-shim-is-unstable.patch | 2 +- ...mium-143-el9-rust_alloc_error_handler_should_panic.patch | 2 +- chromium.spec | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) rename chromium-142-el9-rust-no-alloc-shim-is-unstable.patch => chromium-143-el9-rust-no-alloc-shim-is-unstable.patch (97%) rename chromium-142-el9-rust_alloc_error_handler_should_panic.patch => chromium-143-el9-rust_alloc_error_handler_should_panic.patch (96%) diff --git a/chromium-142-el9-rust-no-alloc-shim-is-unstable.patch b/chromium-143-el9-rust-no-alloc-shim-is-unstable.patch similarity index 97% rename from chromium-142-el9-rust-no-alloc-shim-is-unstable.patch rename to chromium-143-el9-rust-no-alloc-shim-is-unstable.patch index 8c5a339..4154fb0 100644 --- a/chromium-142-el9-rust-no-alloc-shim-is-unstable.patch +++ b/chromium-143-el9-rust-no-alloc-shim-is-unstable.patch @@ -13,7 +13,7 @@ diff -up chromium-141.0.7390.37/build/rust/allocator/lib.rs.rust-no-alloc-shim-i static __rust_alloc_error_handler_should_panic: u8 = 0; + // Mangle the symbol name as rustc (1.84) expects on EL9 -+ #[no_mangle] ++ #[unsafe(no_mangle)] + #[linkage = "weak"] + static __rust_no_alloc_shim_is_unstable: u8 = 0; + diff --git a/chromium-142-el9-rust_alloc_error_handler_should_panic.patch b/chromium-143-el9-rust_alloc_error_handler_should_panic.patch similarity index 96% rename from chromium-142-el9-rust_alloc_error_handler_should_panic.patch rename to chromium-143-el9-rust_alloc_error_handler_should_panic.patch index 032c4a2..190f1ab 100644 --- a/chromium-142-el9-rust_alloc_error_handler_should_panic.patch +++ b/chromium-143-el9-rust_alloc_error_handler_should_panic.patch @@ -13,5 +13,5 @@ diff -up chromium-142.0.7444.162/build/rust/allocator/lib.rs.el9-rust_alloc_erro + } + // Mangle the symbol name as rustc (1.84) expects on EL9 - #[no_mangle] + #[unsafe(no_mangle)] #[linkage = "weak"] diff --git a/chromium.spec b/chromium.spec index 5557436..af92db3 100644 --- a/chromium.spec +++ b/chromium.spec @@ -348,11 +348,13 @@ Patch310: chromium-139-rust-FTBFS-suppress-warnings.patch Patch311: chromium-123-fstack-protector-strong.patch # Fix FTBFS: undefined symbol: __rust_no_alloc_shim_is_unstable on EL9 -Patch312: chromium-142-el9-rust-no-alloc-shim-is-unstable.patch +# Error: unsafe attribute used without unsafe +# --> ../../build/rust/allocator/lib.rs:107:7 +Patch312: chromium-143-el9-rust-no-alloc-shim-is-unstable.patch # Fix FTBFS on EL9 # - error: undefined symbol: __rust_alloc_error_handler_should_panic -Patch313: chromium-142-el9-rust_alloc_error_handler_should_panic.patch +Patch313: chromium-143-el9-rust_alloc_error_handler_should_panic.patch # old rust version causes build error on el8: # error[E0599]: no method named `is_none_or` found for enum `Option` in the current scope From fe4b6492581ba8e782e491115ba0107d972b934d Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 4 Dec 2025 18:25:39 +0100 Subject: [PATCH 09/20] Fix build error caused by python-3.9 on EL9 --- chromium-142-python-3.9-ftbfs.patch | 65 ----------------------------- chromium-143-python-3.9-ftbfs.patch | 26 ++++++++++++ 2 files changed, 26 insertions(+), 65 deletions(-) delete mode 100644 chromium-142-python-3.9-ftbfs.patch diff --git a/chromium-142-python-3.9-ftbfs.patch b/chromium-142-python-3.9-ftbfs.patch deleted file mode 100644 index 093205a..0000000 --- a/chromium-142-python-3.9-ftbfs.patch +++ /dev/null @@ -1,65 +0,0 @@ -Fix FTBFS caused by old python-3.9.x on el9 - -File "/builddir/build/BUILD/chromium-142.0.7444.52/tools/metrics/histograms/extract_histograms.py", line 81, in EnumDict - type: str | None -TypeError: unsupported operand type(s) for |: 'type' and 'NoneType' - -File "/builddir/build/BUILD/chromium-142.0.7444.52/tools/metrics/histograms/extract_histograms.py", line 106, in - - ) -> tuple[str | None, ExtractionErrors]: - -TypeError: unsupported operand type(s) for |: 'type' and 'NoneType' - -File "/builddir/build/BUILD/chromium-142.0.7444.52/tools/metrics/histograms/extract_histograms.py", line 643, in - - def _GetObsoleteReason(node: xml.dom.minidom.Element) -> str | None: - -TypeError: unsupported operand type(s) for |: 'type' and 'NoneType' - -diff -up chromium-142.0.7444.52/tools/metrics/histograms/extract_histograms.py.me chromium-142.0.7444.52/tools/metrics/histograms/extract_histograms.py ---- chromium-142.0.7444.52/tools/metrics/histograms/extract_histograms.py.me 2025-10-28 20:14:35.609014587 +0100 -+++ chromium-142.0.7444.52/tools/metrics/histograms/extract_histograms.py 2025-10-28 20:30:30.123641508 +0100 -@@ -21,6 +21,7 @@ from typing import Any, TypedDict - import xml.dom.minidom - - import histogram_configuration_model -+from typing import Optional, Union - - sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'common')) - import xml_utils -@@ -78,7 +79,7 @@ class EnumDict(TypedDict, total=False): - """A dict representing an enum.""" - - name: str -- type: str | None -+ type: Optional[str] - buckets: list[_BucketDict] - summary: str - -@@ -102,7 +103,7 @@ def ExpandHistogramNameWithSuffixes( - suffix_name: str, - histogram_name: str, - histogram_suffixes_node: xml.dom.minidom.Element, --) -> tuple[str | None, ExtractionErrors]: -+) -> tuple[Optional[str], ExtractionErrors]: - """Creates a new histogram name based on a histogram suffix. - - Args: -@@ -304,7 +305,7 @@ def _ExtractOwners(node: xml.dom.minidom - - def _ExtractImprovementDirection( - histogram_node: xml.dom.minidom.Element, --) -> tuple[str | None, ExtractionErrors]: -+) -> tuple[Union[str, None], ExtractionErrors]: - """Extracts improvement direction from the given histogram element, if any. - - Args: -@@ -639,7 +640,7 @@ def ExtractVariantsFromXmlTree( - return variants_dict, errors - - --def _GetObsoleteReason(node: xml.dom.minidom.Element) -> str | None: -+def _GetObsoleteReason(node: xml.dom.minidom.Element) -> Optional[str]: - """If the node's histogram is obsolete, returns a string explanation. - - Otherwise, returns None. diff --git a/chromium-143-python-3.9-ftbfs.patch b/chromium-143-python-3.9-ftbfs.patch index fc7dc46..d69e5c3 100644 --- a/chromium-143-python-3.9-ftbfs.patch +++ b/chromium-143-python-3.9-ftbfs.patch @@ -1,3 +1,16 @@ +Author: + +Fix build error caused by python-3.9 on EL9 + +Traceback (most recent call last): + File "/builddir/build/BUILD/chromium-143.0.7499.40/out/Release/../../tools/metrics/histograms/generate_allowlist_from_histograms_file.py", line 10, in + import extract_histograms + File "/builddir/build/BUILD/chromium-143.0.7499.40/tools/metrics/histograms/extract_histograms.py", line 24, in + import xml_utils + File "/builddir/build/BUILD/chromium-143.0.7499.40/tools/metrics/histograms/../common/xml_utils.py", line 14, in + DomTree = minidom.Element | minidom.Document +TypeError: unsupported operand type(s) for |: 'type' and 'type' + diff -up chromium-143.0.7499.40/tools/metrics/histograms/extract_histograms.py.python-3.9-ftbfs chromium-143.0.7499.40/tools/metrics/histograms/extract_histograms.py --- chromium-143.0.7499.40/tools/metrics/histograms/extract_histograms.py.python-3.9-ftbfs 2025-11-19 22:40:05.000000000 +0100 +++ chromium-143.0.7499.40/tools/metrics/histograms/extract_histograms.py 2025-12-02 17:23:41.996802101 +0100 @@ -45,3 +58,16 @@ diff -up chromium-143.0.7499.40/tools/metrics/histograms/extract_histograms.py.p """If the node's histogram is obsolete, returns a string explanation. Otherwise, returns None. +diff -up chromium-143.0.7499.40/tools/metrics/common/xml_utils.py.than chromium-143.0.7499.40/tools/metrics/common/xml_utils.py +--- chromium-143.0.7499.40/tools/metrics/common/xml_utils.py.than 2025-12-04 17:48:11.924111675 +0100 ++++ chromium-143.0.7499.40/tools/metrics/common/xml_utils.py 2025-12-04 17:49:42.451979769 +0100 +@@ -11,7 +11,8 @@ from xml.dom import minidom + # The implementation of Node type is possible with extra runtime checks, however + # using a more specific type makes the intent clearer and avoids potential + # warnings about attributes like `tagName` not being present on all Node types. +-DomTree = minidom.Element | minidom.Document ++from typing import Union ++DomTree = Union[minidom.Element, minidom.Document] + + _ELEMENT_NODE = minidom.Node.ELEMENT_NODE + From 538383ec0040335d67647a1affba04afc73a520a Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Tue, 9 Dec 2025 17:00:17 +0100 Subject: [PATCH 10/20] Backport Wayland Omnibox bug fix from upstream --- ...rove-cutout-mouse-handling-for-Wayla.patch | 94 +++++++++++++++++++ chromium.spec | 8 +- 2 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 chromium-143-omnibox-next-Improve-cutout-mouse-handling-for-Wayla.patch diff --git a/chromium-143-omnibox-next-Improve-cutout-mouse-handling-for-Wayla.patch b/chromium-143-omnibox-next-Improve-cutout-mouse-handling-for-Wayla.patch new file mode 100644 index 0000000..0f4b452 --- /dev/null +++ b/chromium-143-omnibox-next-Improve-cutout-mouse-handling-for-Wayla.patch @@ -0,0 +1,94 @@ +From 88e4cfe5112964f9ee82926539821790c1041832 Mon Sep 17 00:00:00 2001 +From: Aviv Kiss +Date: Tue, 09 Dec 2025 09:27:11 -0800 +Subject: [PATCH] [omnibox][next] Improve cutout mouse handling for Wayland users. + +Partial revert of https://crrev.com/c/7151889 maintaining +`forward_mouse_events_` while reverting the event/lifecycle changes that +caused b:465871759. + +https://crrev.com/c/7151889 introduced a bug impacting Linux users with +Wayland windowing that results in the Omnibox ignoring click events. +Weirdly this bug doesn't seem to reproduce when the WebUI dropdown popup +is enabled although I'm not sure why. + +Keren explains why this bug is happening in +https://crrev.com/c/7240486/6/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc#b373 +on this change. Keren also suggested a simpler version of this fix that +is the version of this change that is submitted. The suggestion is to +revert back to the state prior to https://crrev.com/c/7151889 while +maintaining the `forward_mouse_events_` bool that allows the composebox +to opt out of forwarding. + +While drafting https://crrev.com/c/7151889 I recall testing this +approach and composebox mouse events being forwarded to the Omnibox +anyways. Either I didn't test what I thought I tested or perhaps I ran +into a build caching issue with Cider/Cog/Chrome. Since this seems to +work now I've updated the change to use the simpler approach. + +Bug: b:465871759 +Change-Id: Ib1ebc2ef5cb6d3bd6a00be5b59eb4b635d30c531 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7240486 +Reviewed-by: Moe Ahmadi +Reviewed-by: Keren Zhu +Auto-Submit: Aviv Kiss +Commit-Queue: Keren Zhu +Cr-Commit-Position: refs/heads/main@{#1556206} +--- + +diff --git a/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc b/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc +index 119d5fd..feb71623 100644 +--- a/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc ++++ b/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc +@@ -17,7 +17,6 @@ + #include "chrome/browser/ui/views/frame/browser_view.h" + #include "chrome/browser/ui/views/location_bar/location_bar_view.h" + #include "chrome/browser/ui/views/omnibox/omnibox_aim_popup_webui_content.h" +-#include "components/omnibox/common/omnibox_features.h" + #include "ui/base/cursor/cursor.h" + #include "ui/base/metadata/metadata_header_macros.h" + #include "ui/base/metadata/metadata_impl_macros.h" +@@ -356,24 +355,16 @@ + contents_->SetBoundsRect(results_bounds); + } + +-void RoundedOmniboxResultsFrame::VisibilityChanged(View* starting_from, +- bool is_visible) { +- views::View::VisibilityChanged(starting_from, is_visible); ++void RoundedOmniboxResultsFrame::AddedToWidget() { + #if defined(USE_AURA) + if (!forward_mouse_events_) { + return; + } +- +- if (is_visible) { +- // Use a ui::EventTargeter that allows mouse and touch events in the top +- // portion of the Widget to pass through to the omnibox beneath it. +- auto results_targeter = std::make_unique(); +- results_targeter->SetInsets(GetContentInsets()); +- GetWidget()->GetNativeWindow()->SetEventTargeter( +- std::move(results_targeter)); +- } else { +- GetWidget()->GetNativeWindow()->SetEventTargeter(nullptr); +- } ++ // Use a ui::EventTargeter that allows mouse and touch events in the top ++ // portion of the Widget to pass through to the omnibox beneath it. ++ auto results_targeter = std::make_unique(); ++ results_targeter->SetInsets(GetContentInsets()); ++ GetWidget()->GetNativeWindow()->SetEventTargeter(std::move(results_targeter)); + #endif // USE_AURA + } + +diff --git a/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.h b/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.h +index d83435dc..529703f 100644 +--- a/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.h ++++ b/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.h +@@ -51,7 +51,7 @@ + + // views::View: + void Layout(PassKey) override; +- void VisibilityChanged(View* starting_from, bool is_visible) override; ++ void AddedToWidget() override; + #if !defined(USE_AURA) + void OnMouseMoved(const ui::MouseEvent& event) override; + void OnMouseEvent(ui::MouseEvent* event) override; diff --git a/chromium.spec b/chromium.spec index af92db3..b7a26c3 100644 --- a/chromium.spec +++ b/chromium.spec @@ -249,7 +249,7 @@ Name: chromium Version: 143.0.7499.40 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Url: http://www.chromium.org/Home License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only) @@ -470,6 +470,8 @@ Patch511: 0002-Fix-Missing-OPENSSL_NO_ENGINE-Guard.patch # Fix Wayland URI DnD issues Patch1001: chromium-142-Add-ExtractData-support-for-text-uri-list.patch Patch1002: chromium-142-Update-pointer-position-during-draggin.patch +# Fix Wayland Omnibox issue +Patch1003: chromium-143-omnibox-next-Improve-cutout-mouse-handling-for-Wayla.patch # Use chromium-latest.py to generate clean tarball from released build tarballs, found here: # http://build.chromium.org/buildbot/official/ @@ -1140,6 +1142,7 @@ Qt6 UI for chromium. # Upstream patches %patch -P1001 -p1 -b .Add-ExtractData-support-for-text-uri-list.patch %patch -P1002 -p1 -b .Update-pointer-position-during-draggin.patch +%patch -P1003 -p1 -b .Improve-cutout-mouse-handling-for-Wayla.patch # Change shebang in all relevant files in this directory and all subdirectories # See `man find` for how the `-exec command {} +` syntax works @@ -1777,6 +1780,9 @@ fi %endif %changelog +* Tue Dec 09 2025 LuK1337 - 143.0.7499.40-2 +- Backport Wayland Omnibox bug fix from upstream + * Tue Dec 02 2025 Than Ngo - 143.0.7499.40-1 - Update to 143.0.7499.40 * High CVE-2025-13630: Type Confusion in V8 From 6196c5742999b91e3dedf1a6038616ecd0e78e46 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 11 Dec 2025 10:08:45 +0100 Subject: [PATCH 11/20] - Update to 143.0.7499.109 * High: Under coordination * Medium CVE-2025-14372: Use after free in Password Manager * Medium CVE-2025-14373: Inappropriate implementation in Toolbar - Workaround problem of auto dark mode inverting images and making them unreadable --- ...-revert-remove-darkmode-image-policy.patch | 145 ------------------ chromium-143-autodarkmode-workaround.patch | 26 ++++ chromium.spec | 16 +- sources | 2 +- 4 files changed, 40 insertions(+), 149 deletions(-) delete mode 100644 chromium-141-revert-remove-darkmode-image-policy.patch create mode 100644 chromium-143-autodarkmode-workaround.patch diff --git a/chromium-141-revert-remove-darkmode-image-policy.patch b/chromium-141-revert-remove-darkmode-image-policy.patch deleted file mode 100644 index 45891d5..0000000 --- a/chromium-141-revert-remove-darkmode-image-policy.patch +++ /dev/null @@ -1,145 +0,0 @@ -Revert it due to incorrect display of links on startpage - -commit 8e24867a503c142393388f117df94bb9b7c4b597 -Author: Prashant Nevase -Date: Mon Aug 18 10:26:18 2025 -0700 - - Remove dark mode kFilterNone image policy. - - This cl removes DarkModeImagePolicy::kFilterNone and virtual tests - related to it. DarkModeImagePolicy::kFilterSmart is used as default. - - Bug: 429404798 - Change-Id: I5983aa8bca9ed4da110130f8bc49a184c7d339dc - Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6810968 - Commit-Queue: Prashant Nevase - Reviewed-by: Philip Rogers - Cr-Commit-Position: refs/heads/main@{#1502799} - -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index d4ed3585d95..62f30a3103c 100644 ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -813,19 +813,16 @@ const FeatureEntry::Choice kSafetyHubUnifiedPasswordsModuleChoices[] = { - #if !BUILDFLAG(IS_CHROMEOS) - const FeatureEntry::FeatureParam kForceDark_SimpleHsl[] = { - {"inversion_method", "hsl_based"}, -- {"image_behavior", "none"}, - {"foreground_lightness_threshold", "150"}, - {"background_lightness_threshold", "205"}}; - - const FeatureEntry::FeatureParam kForceDark_SimpleCielab[] = { - {"inversion_method", "cielab_based"}, -- {"image_behavior", "none"}, - {"foreground_lightness_threshold", "150"}, - {"background_lightness_threshold", "205"}}; - - const FeatureEntry::FeatureParam kForceDark_SimpleRgb[] = { - {"inversion_method", "rgb_based"}, -- {"image_behavior", "none"}, - {"foreground_lightness_threshold", "150"}, - {"background_lightness_threshold", "205"}}; - -@@ -839,7 +836,6 @@ const FeatureEntry::FeatureParam kForceDark_SelectiveImageInversion[] = { - - const FeatureEntry::FeatureParam kForceDark_SelectiveElementInversion[] = { - {"inversion_method", "cielab_based"}, -- {"image_behavior", "none"}, - {"foreground_lightness_threshold", "150"}, - {"background_lightness_threshold", "205"}}; - -diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc -index 14409e52162..0af032f4dbf 100644 ---- a/third_party/blink/common/features.cc -+++ b/third_party/blink/common/features.cc -@@ -1036,7 +1036,6 @@ const base::FeatureParam::Option - forcedark_image_behavior_options[] = { - {ForceDarkImageBehavior::kUseBlinkSettings, - "use_blink_settings_for_images"}, -- {ForceDarkImageBehavior::kInvertNone, "none"}, - {ForceDarkImageBehavior::kInvertSelectively, "selective"}}; - - BASE_FEATURE_ENUM_PARAM(ForceDarkImageBehavior, -diff --git a/third_party/blink/public/common/forcedark/forcedark_switches.h b/third_party/blink/public/common/forcedark/forcedark_switches.h -index 9661628ce5c..ad606effc28 100644 ---- a/third_party/blink/public/common/forcedark/forcedark_switches.h -+++ b/third_party/blink/public/common/forcedark/forcedark_switches.h -@@ -31,9 +31,6 @@ enum class ForceDarkImageBehavior { - // Same as ForceDarkInversionMethod::kUseBlinkSettings above. - kUseBlinkSettings, - -- // Do not invert any images. -- kInvertNone, -- - // Invert only some images. Images that act as icons or text should be - // inverted, but photos, avatars, etc. should not be. - kInvertSelectively -diff --git a/third_party/blink/renderer/platform/graphics/dark_mode_filter.cc b/third_party/blink/renderer/platform/graphics/dark_mode_filter.cc -index 1929af787b7..7cb0924924a 100644 ---- a/third_party/blink/renderer/platform/graphics/dark_mode_filter.cc -+++ b/third_party/blink/renderer/platform/graphics/dark_mode_filter.cc -@@ -205,7 +205,6 @@ void DarkModeFilter::ApplyFilterToImage(Image* image, - const SkRect& src) { - DCHECK(image); - DCHECK(flags); -- DCHECK_NE(GetDarkModeImagePolicy(), DarkModeImagePolicy::kFilterNone); - - // Raster-side dark mode path - Just set the dark mode on flags and dark - // mode will be applied at compositor side during rasterization. -@@ -224,10 +223,6 @@ void DarkModeFilter::ApplyFilterToImage(Image* image, - } - - bool DarkModeFilter::ShouldApplyFilterToImage(ImageType type) const { -- DarkModeImagePolicy image_policy = GetDarkModeImagePolicy(); -- if (image_policy == DarkModeImagePolicy::kFilterNone) -- return false; -- - // kIcon: Do not consider images being drawn into bigger rect as these - // images are not meant for icons or representing smaller widgets. These - // images are considered as photos which should be untouched. -@@ -241,7 +236,6 @@ bool DarkModeFilter::ShouldApplyFilterToImage(ImageType type) const { - sk_sp DarkModeFilter::GenerateImageFilter( - const SkPixmap& pixmap, - const SkIRect& src) const { -- DCHECK(immutable_.settings.image_policy == DarkModeImagePolicy::kFilterSmart); - DCHECK(immutable_.image_filter); - - return (immutable_.image_classifier->Classify(pixmap, src) == -diff --git a/third_party/blink/renderer/platform/graphics/dark_mode_settings.h b/third_party/blink/renderer/platform/graphics/dark_mode_settings.h -index 19b3796f457..bce2653148a 100644 ---- a/third_party/blink/renderer/platform/graphics/dark_mode_settings.h -+++ b/third_party/blink/renderer/platform/graphics/dark_mode_settings.h -@@ -21,10 +21,9 @@ enum class DarkModeInversionAlgorithm { - // This enum will be removed soon to make dark mode simpler. - enum class DarkModeImagePolicy { - kFilterSmart, // Apply dark-mode based on image content. -- kFilterNone, // Never apply dark-mode filter to any images. - - kFirst = kFilterSmart, // First enum value. -- kLast = kFilterNone, // Last enum value. -+ kLast = kFilterSmart, // Last enum value. - }; - - enum class DarkModeImageClassifierPolicy { -@@ -45,7 +44,7 @@ struct DarkModeSettings { - DarkModeInversionAlgorithm mode = - DarkModeInversionAlgorithm::kInvertLightnessLAB; - float contrast = 0.0; // Valid range from -1.0 to 1.0 -- DarkModeImagePolicy image_policy = DarkModeImagePolicy::kFilterNone; -+ DarkModeImagePolicy image_policy = DarkModeImagePolicy::kFilterSmart; - DarkModeImageClassifierPolicy image_classifier_policy = - DarkModeImageClassifierPolicy::kNumColorsWithMlFallback; - -diff --git a/third_party/blink/renderer/platform/graphics/dark_mode_settings_builder.cc b/third_party/blink/renderer/platform/graphics/dark_mode_settings_builder.cc -index 61498c0a809..318652cb2f2 100644 ---- a/third_party/blink/renderer/platform/graphics/dark_mode_settings_builder.cc -+++ b/third_party/blink/renderer/platform/graphics/dark_mode_settings_builder.cc -@@ -115,8 +115,6 @@ DarkModeImagePolicy GetImagePolicy(const SwitchParams& switch_params) { - case ForceDarkImageBehavior::kUseBlinkSettings: - return GetIntegerSwitchParamValue( - switch_params, "ImagePolicy", kDefaultDarkModeImagePolicy); -- case ForceDarkImageBehavior::kInvertNone: -- return DarkModeImagePolicy::kFilterNone; - case ForceDarkImageBehavior::kInvertSelectively: - return DarkModeImagePolicy::kFilterSmart; - } diff --git a/chromium-143-autodarkmode-workaround.patch b/chromium-143-autodarkmode-workaround.patch new file mode 100644 index 0000000..5bd4f87 --- /dev/null +++ b/chromium-143-autodarkmode-workaround.patch @@ -0,0 +1,26 @@ +Workaround auto darkmode issue, image are not inverted correctly in darkmode + +diff -up chromium-143.0.7499.40/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc.than chromium-143.0.7499.40/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc +--- chromium-143.0.7499.40/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc.than 2025-12-09 12:28:52.592092242 +0100 ++++ chromium-143.0.7499.40/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc 2025-12-09 12:42:57.776716951 +0100 +@@ -276,16 +276,20 @@ DarkModeResult DarkModeImageClassifier:: + float high_color_count_threshold = + kHighColorCountThreshold[features.is_colorful]; + ++#if 0 + // Very few colors means it's not a photo, apply the filter. + if (features.color_buckets_ratio < low_color_count_threshold) + return DarkModeResult::kApplyFilter; ++#endif + + // Too many colors means it's probably photorealistic, do not apply it. + if (features.color_buckets_ratio > high_color_count_threshold) + return DarkModeResult::kDoNotApplyFilter; + ++#if 0 + // In-between, decision tree cannot give a precise result. + return DarkModeResult::kNotClassified; ++#endif + } + + } // namespace blink diff --git a/chromium.spec b/chromium.spec index b7a26c3..987331a 100644 --- a/chromium.spec +++ b/chromium.spec @@ -248,8 +248,8 @@ %endif Name: chromium -Version: 143.0.7499.40 -Release: 2%{?dist} +Version: 143.0.7499.109 +Release: 1%{?dist} Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Url: http://www.chromium.org/Home License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only) @@ -274,6 +274,9 @@ Patch22: chromium-131-fix-qt-ui.pach # needs //third_party/libpng:libpng_for_testonly(//build/toolchain/linux/unbundle:default) Patch23: chromium-143-revert-libpng_for_testonly.patch +# Get around the problem of auto darkmode webcontent inverting and making them unreadable +Patch30: chromium-143-autodarkmode-workaround.patch + # Disable tests on remoting build Patch82: chromium-98.0.4758.102-remoting-no-tests.patch @@ -995,7 +998,7 @@ Qt6 UI for chromium. %endif %patch -P23 -p1 -R -b .revert-libpng_for_testonly - +%patch -P30 -p1 -b .autodarkmode-workaround %patch -P82 -p1 -b .remoting-no-tests %if ! %{bundlebrotli} @@ -1780,6 +1783,13 @@ fi %endif %changelog +* Thu Dec 11 2025 Than Ngo - 143.0.7499.109-1 +- Update to 143.0.7499.109 + * High: Under coordination + * Medium CVE-2025-14372: Use after free in Password Manager + * Medium CVE-2025-14373: Inappropriate implementation in Toolbar +- Workaround problem of auto dark mode inverting images and making them unreadable + * Tue Dec 09 2025 LuK1337 - 143.0.7499.40-2 - Backport Wayland Omnibox bug fix from upstream diff --git a/sources b/sources index f3053ba..d53ee0f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (node-v22.14.0-stripped.tar.gz) = affddb541009c6d378049c2d7845b981335d9e7aa387efcc472e5efb621c345cd58ca69778a394f7e4ebbb5e4b1a115a389838ef1b6458ef5e98f2071b166e15 -SHA512 (chromium-143.0.7499.40-clean.tar.xz) = 482721d372000d05a3e86c91f231c5ee206389890a19ad210e99de1ed86ccbb4dd155f461f98daf8648b6c9a6eeec3c9b4ae17e192bd816ead561a77174bd00c +SHA512 (chromium-143.0.7499.109-clean.tar.xz) = 353e4334516821ac491c01d4104c469ba280d3acf6d11dd1c44db0f7baad4127bbbb7c60fd750e9d6e931b311f2ee52e0fb9760bbb2e04d9b90925c0f48daab4 From 9334d87d2ce9b28d32eee05403623ef5e4bface5 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 11 Dec 2025 23:14:37 +0100 Subject: [PATCH 12/20] Enable gtk4 by default --- chromium.conf | 4 ---- chromium.spec | 11 +++++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/chromium.conf b/chromium.conf index d0a610e..09adb8e 100644 --- a/chromium.conf +++ b/chromium.conf @@ -57,10 +57,6 @@ if [ "$MODE" != "none" ] ; then ENABLE_FEATURES="" fi -# Set gtk version to 3 by default -# todo: switch to gtk4 in the future -CHROMIUM_FLAGS+=" --gtk-version=3" - # Web Dark mode if [ "$WEB_AUTO_DARKMODE_WEBCONTENT" == "on" ] ; then darktype="WebContentsForceDark" diff --git a/chromium.spec b/chromium.spec index 987331a..2b7fbcd 100644 --- a/chromium.spec +++ b/chromium.spec @@ -249,7 +249,7 @@ Name: chromium Version: 143.0.7499.109 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Url: http://www.chromium.org/Home License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only) @@ -761,7 +761,7 @@ BuildRequires: opus-devel %endif BuildRequires: %{chromium_pybin} -BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: gtk4-devel %if ! %{bundlepylibs} %if 0%{?fedora} || 0%{?rhel} >= 8 @@ -805,8 +805,7 @@ BuildRequires: simdutf-devel Requires: nss%{_isa} >= 3.26 Requires: nss-mdns%{_isa} -# GTK modules it expects to find for some reason. -Requires: libcanberra-gtk3%{_isa} +Requires: gtk4 %if 0%{?fedora} && %{undefined flatpak} # This enables support for u2f tokens @@ -1359,6 +1358,7 @@ CHROMIUM_BROWSER_GN_DEFINES+=" use_qt6=true moc_qt6_path=\"$(%{_qt6_qmake} -quer %else CHROMIUM_BROWSER_GN_DEFINES+=' use_qt6=false' %endif +CHROMIUM_BROWSER_GN_DEFINES+=' use_gtk=true gtk_version=4' CHROMIUM_BROWSER_GN_DEFINES+=' use_gio=true use_pulseaudio=true' CHROMIUM_BROWSER_GN_DEFINES+=' enable_hangout_services_extension=true' @@ -1783,6 +1783,9 @@ fi %endif %changelog +* Thu Dec 11 2025 Than Ngo - 143.0.7499.109-2 +- Enable gtk4 by default + * Thu Dec 11 2025 Than Ngo - 143.0.7499.109-1 - Update to 143.0.7499.109 * High: Under coordination From 9cf22f9f1c757258e07e576e5ee46bd0200cb9ff Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Fri, 12 Dec 2025 09:43:04 +0100 Subject: [PATCH 13/20] Add BR for gtk4 --- chromium.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/chromium.spec b/chromium.spec index 2b7fbcd..8e42f23 100644 --- a/chromium.spec +++ b/chromium.spec @@ -761,7 +761,21 @@ BuildRequires: opus-devel %endif BuildRequires: %{chromium_pybin} -BuildRequires: gtk4-devel +BuildRequires: pkgconfig(gtk4) +BuildRequires: pkgconfig(xrandr) +BuildRequires: pkgconfig(atspi-2) +BuildRequires: pkgconfig(atk-bridge-2.0) +BuildRequires: pkgconfig(xcomposite) +BuildRequires: pkgconfig(xcursor) +BuildRequires: pkgconfig(xi) +BuildRequires: pkgconfig(xrender) +BuildRequires: pkgconfig(xscrnsaver) +BuildRequires: pkgconfig(xshmfence) +BuildRequires: pkgconfig(xt) +BuildRequires: pkgconfig(xtst) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xcb-dri3) +BuildRequires: pkgconfig(xcb-proto) %if ! %{bundlepylibs} %if 0%{?fedora} || 0%{?rhel} >= 8 From d0c2893c13e6a9779200a5c90f3f59fdb9e9d5c0 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Fri, 12 Dec 2025 11:58:21 +0100 Subject: [PATCH 14/20] Enable gtk3 for el9 as it still has old gtk4 version --- chromium.spec | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/chromium.spec b/chromium.spec index 8e42f23..472ec62 100644 --- a/chromium.spec +++ b/chromium.spec @@ -51,6 +51,12 @@ %global system_nodejs 0 %endif +# enable gtk4 for fedora and el>9 +%global gtk_version 4 +%if 0%{?rhel} == 9 +%global gtk_version 3 +%endif + %if 0%{?rhel} == 8 %global chromium_pybin /usr/bin/python3.9 %else @@ -761,6 +767,7 @@ BuildRequires: opus-devel %endif BuildRequires: %{chromium_pybin} +%if %{gtk_version} == 4 BuildRequires: pkgconfig(gtk4) BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(atspi-2) @@ -776,7 +783,12 @@ BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb-dri3) BuildRequires: pkgconfig(xcb-proto) - +Requires: gtk4 +%else +BuildRequires: pkgconfig(gtk+-3.0) +# GTK modules it expects to find for some reason. +Requires: libcanberra-gtk3%{_isa} +%endif %if ! %{bundlepylibs} %if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: python3-jinja2 @@ -819,8 +831,6 @@ BuildRequires: simdutf-devel Requires: nss%{_isa} >= 3.26 Requires: nss-mdns%{_isa} -Requires: gtk4 - %if 0%{?fedora} && %{undefined flatpak} # This enables support for u2f tokens Requires: u2f-hidraw-policy @@ -1372,7 +1382,7 @@ CHROMIUM_BROWSER_GN_DEFINES+=" use_qt6=true moc_qt6_path=\"$(%{_qt6_qmake} -quer %else CHROMIUM_BROWSER_GN_DEFINES+=' use_qt6=false' %endif -CHROMIUM_BROWSER_GN_DEFINES+=' use_gtk=true gtk_version=4' +CHROMIUM_BROWSER_GN_DEFINES+=' use_gtk=true gtk_version=%{gtk_version}' CHROMIUM_BROWSER_GN_DEFINES+=' use_gio=true use_pulseaudio=true' CHROMIUM_BROWSER_GN_DEFINES+=' enable_hangout_services_extension=true' From fa84178555617e070365ee581cf4c470984609c9 Mon Sep 17 00:00:00 2001 From: Hoshino Lina Date: Sat, 13 Dec 2025 14:43:33 +0900 Subject: [PATCH 15/20] Move core BRs out of GTK4 section & add missing ones These BRs are required by Chromium proper, even when built without any toolkits (e.g. as CEF). Add a few missing ones (wayland-devel, xkbcommon, pangocairo) and move others out of the GTK4 conditional, since they aren't actually related to GTK4, they just happened to be pulled in by gtk3-devel. --- chromium.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/chromium.spec b/chromium.spec index 472ec62..a659713 100644 --- a/chromium.spec +++ b/chromium.spec @@ -769,10 +769,6 @@ BuildRequires: opus-devel BuildRequires: %{chromium_pybin} %if %{gtk_version} == 4 BuildRequires: pkgconfig(gtk4) -BuildRequires: pkgconfig(xrandr) -BuildRequires: pkgconfig(atspi-2) -BuildRequires: pkgconfig(atk-bridge-2.0) -BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xrender) @@ -789,6 +785,17 @@ BuildRequires: pkgconfig(gtk+-3.0) # GTK modules it expects to find for some reason. Requires: libcanberra-gtk3%{_isa} %endif + +# Build deps of Chromium proper which are often transitively pulled in by toolkits (GTK, Qt), +# but are still required without them. +BuildRequires: pkgconfig(atspi-2) +BuildRequires: pkgconfig(atk-bridge-2.0) +BuildRequires: pkgconfig(pangocairo) +BuildRequires: pkgconfig(xkbcommon) +BuildRequires: pkgconfig(xcomposite) +BuildRequires: pkgconfig(xrandr) +BuildRequires: wayland-devel + %if ! %{bundlepylibs} %if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: python3-jinja2 From cbf28082932227ac2c0a3d47e4aa0702f619596c Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 17 Dec 2025 11:30:05 +0100 Subject: [PATCH 16/20] - Update to 143.0.7499.146 * High CVE-2025-14765: Use after free in WebGPU * High CVE-2025-14766: Out of bounds read and write in V8 - Force dark mode when auto dark mode web content is on - Remove omnibox-next-Improve-cutout-mouse-handling-for-Wayla patch, as it's merged --- ...rove-cutout-mouse-handling-for-Wayla.patch | 94 ------------------- chromium.conf | 1 + chromium.spec | 14 ++- sources | 2 +- 4 files changed, 11 insertions(+), 100 deletions(-) delete mode 100644 chromium-143-omnibox-next-Improve-cutout-mouse-handling-for-Wayla.patch diff --git a/chromium-143-omnibox-next-Improve-cutout-mouse-handling-for-Wayla.patch b/chromium-143-omnibox-next-Improve-cutout-mouse-handling-for-Wayla.patch deleted file mode 100644 index 0f4b452..0000000 --- a/chromium-143-omnibox-next-Improve-cutout-mouse-handling-for-Wayla.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 88e4cfe5112964f9ee82926539821790c1041832 Mon Sep 17 00:00:00 2001 -From: Aviv Kiss -Date: Tue, 09 Dec 2025 09:27:11 -0800 -Subject: [PATCH] [omnibox][next] Improve cutout mouse handling for Wayland users. - -Partial revert of https://crrev.com/c/7151889 maintaining -`forward_mouse_events_` while reverting the event/lifecycle changes that -caused b:465871759. - -https://crrev.com/c/7151889 introduced a bug impacting Linux users with -Wayland windowing that results in the Omnibox ignoring click events. -Weirdly this bug doesn't seem to reproduce when the WebUI dropdown popup -is enabled although I'm not sure why. - -Keren explains why this bug is happening in -https://crrev.com/c/7240486/6/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc#b373 -on this change. Keren also suggested a simpler version of this fix that -is the version of this change that is submitted. The suggestion is to -revert back to the state prior to https://crrev.com/c/7151889 while -maintaining the `forward_mouse_events_` bool that allows the composebox -to opt out of forwarding. - -While drafting https://crrev.com/c/7151889 I recall testing this -approach and composebox mouse events being forwarded to the Omnibox -anyways. Either I didn't test what I thought I tested or perhaps I ran -into a build caching issue with Cider/Cog/Chrome. Since this seems to -work now I've updated the change to use the simpler approach. - -Bug: b:465871759 -Change-Id: Ib1ebc2ef5cb6d3bd6a00be5b59eb4b635d30c531 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7240486 -Reviewed-by: Moe Ahmadi -Reviewed-by: Keren Zhu -Auto-Submit: Aviv Kiss -Commit-Queue: Keren Zhu -Cr-Commit-Position: refs/heads/main@{#1556206} ---- - -diff --git a/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc b/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc -index 119d5fd..feb71623 100644 ---- a/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc -+++ b/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc -@@ -17,7 +17,6 @@ - #include "chrome/browser/ui/views/frame/browser_view.h" - #include "chrome/browser/ui/views/location_bar/location_bar_view.h" - #include "chrome/browser/ui/views/omnibox/omnibox_aim_popup_webui_content.h" --#include "components/omnibox/common/omnibox_features.h" - #include "ui/base/cursor/cursor.h" - #include "ui/base/metadata/metadata_header_macros.h" - #include "ui/base/metadata/metadata_impl_macros.h" -@@ -356,24 +355,16 @@ - contents_->SetBoundsRect(results_bounds); - } - --void RoundedOmniboxResultsFrame::VisibilityChanged(View* starting_from, -- bool is_visible) { -- views::View::VisibilityChanged(starting_from, is_visible); -+void RoundedOmniboxResultsFrame::AddedToWidget() { - #if defined(USE_AURA) - if (!forward_mouse_events_) { - return; - } -- -- if (is_visible) { -- // Use a ui::EventTargeter that allows mouse and touch events in the top -- // portion of the Widget to pass through to the omnibox beneath it. -- auto results_targeter = std::make_unique(); -- results_targeter->SetInsets(GetContentInsets()); -- GetWidget()->GetNativeWindow()->SetEventTargeter( -- std::move(results_targeter)); -- } else { -- GetWidget()->GetNativeWindow()->SetEventTargeter(nullptr); -- } -+ // Use a ui::EventTargeter that allows mouse and touch events in the top -+ // portion of the Widget to pass through to the omnibox beneath it. -+ auto results_targeter = std::make_unique(); -+ results_targeter->SetInsets(GetContentInsets()); -+ GetWidget()->GetNativeWindow()->SetEventTargeter(std::move(results_targeter)); - #endif // USE_AURA - } - -diff --git a/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.h b/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.h -index d83435dc..529703f 100644 ---- a/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.h -+++ b/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.h -@@ -51,7 +51,7 @@ - - // views::View: - void Layout(PassKey) override; -- void VisibilityChanged(View* starting_from, bool is_visible) override; -+ void AddedToWidget() override; - #if !defined(USE_AURA) - void OnMouseMoved(const ui::MouseEvent& event) override; - void OnMouseEvent(ui::MouseEvent* event) override; diff --git a/chromium.conf b/chromium.conf index 09adb8e..31173c6 100644 --- a/chromium.conf +++ b/chromium.conf @@ -65,6 +65,7 @@ if [ "$WEB_AUTO_DARKMODE_WEBCONTENT" == "on" ] ; then else ENABLE_FEATURES+=",$darktype" fi + CHROMIUM_FLAGS+=" --force-dark-mode" fi [ -z "$DISABLE_FEATURES" ] || CHROMIUM_FLAGS+=" --disable-features=$DISABLE_FEATURES" diff --git a/chromium.spec b/chromium.spec index a659713..32afd29 100644 --- a/chromium.spec +++ b/chromium.spec @@ -254,8 +254,8 @@ %endif Name: chromium -Version: 143.0.7499.109 -Release: 2%{?dist} +Version: 143.0.7499.146 +Release: 1%{?dist} Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Url: http://www.chromium.org/Home License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only) @@ -479,8 +479,6 @@ Patch511: 0002-Fix-Missing-OPENSSL_NO_ENGINE-Guard.patch # Fix Wayland URI DnD issues Patch1001: chromium-142-Add-ExtractData-support-for-text-uri-list.patch Patch1002: chromium-142-Update-pointer-position-during-draggin.patch -# Fix Wayland Omnibox issue -Patch1003: chromium-143-omnibox-next-Improve-cutout-mouse-handling-for-Wayla.patch # Use chromium-latest.py to generate clean tarball from released build tarballs, found here: # http://build.chromium.org/buildbot/official/ @@ -1175,7 +1173,6 @@ Qt6 UI for chromium. # Upstream patches %patch -P1001 -p1 -b .Add-ExtractData-support-for-text-uri-list.patch %patch -P1002 -p1 -b .Update-pointer-position-during-draggin.patch -%patch -P1003 -p1 -b .Improve-cutout-mouse-handling-for-Wayla.patch # Change shebang in all relevant files in this directory and all subdirectories # See `man find` for how the `-exec command {} +` syntax works @@ -1814,6 +1811,13 @@ fi %endif %changelog +* Wed Dec 17 2025 Than Ngo - 143.0.7499.146-1 +- Update to 143.0.7499.146 + * High CVE-2025-14765: Use after free in WebGPU + * High CVE-2025-14766: Out of bounds read and write in V8 +- Force dark mode when auto dark mode web content is on +- Remove omnibox-next-Improve-cutout-mouse-handling-for-Wayla patch, as it's merged + * Thu Dec 11 2025 Than Ngo - 143.0.7499.109-2 - Enable gtk4 by default diff --git a/sources b/sources index d53ee0f..290f4a3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (node-v22.14.0-stripped.tar.gz) = affddb541009c6d378049c2d7845b981335d9e7aa387efcc472e5efb621c345cd58ca69778a394f7e4ebbb5e4b1a115a389838ef1b6458ef5e98f2071b166e15 -SHA512 (chromium-143.0.7499.109-clean.tar.xz) = 353e4334516821ac491c01d4104c469ba280d3acf6d11dd1c44db0f7baad4127bbbb7c60fd750e9d6e931b311f2ee52e0fb9760bbb2e04d9b90925c0f48daab4 +SHA512 (chromium-143.0.7499.146-clean.tar.xz) = e88a1b6c18a3424a51f9df05189c147d24bdf078a58e942a04446e2ec186fc71127869c422b34baba1a3d748ff99ba8adc86aafe5ac5c0ff42cd49bf96d2bf1b From 5d3124cac242bdf495ccebc4b607c987550ac01e Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Sat, 20 Dec 2025 10:24:21 +0100 Subject: [PATCH 17/20] Update to 143.0.7499.169 --- chromium.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/chromium.spec b/chromium.spec index 32afd29..1fd4d4e 100644 --- a/chromium.spec +++ b/chromium.spec @@ -254,7 +254,7 @@ %endif Name: chromium -Version: 143.0.7499.146 +Version: 143.0.7499.169 Release: 1%{?dist} Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Url: http://www.chromium.org/Home @@ -1811,6 +1811,9 @@ fi %endif %changelog +* Sat Dec 20 2025 Than Ngo - 143.0.7499.169-1 +- Update to 143.0.7499.169 + * Wed Dec 17 2025 Than Ngo - 143.0.7499.146-1 - Update to 143.0.7499.146 * High CVE-2025-14765: Use after free in WebGPU diff --git a/sources b/sources index 290f4a3..4745341 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (node-v22.14.0-stripped.tar.gz) = affddb541009c6d378049c2d7845b981335d9e7aa387efcc472e5efb621c345cd58ca69778a394f7e4ebbb5e4b1a115a389838ef1b6458ef5e98f2071b166e15 -SHA512 (chromium-143.0.7499.146-clean.tar.xz) = e88a1b6c18a3424a51f9df05189c147d24bdf078a58e942a04446e2ec186fc71127869c422b34baba1a3d748ff99ba8adc86aafe5ac5c0ff42cd49bf96d2bf1b +SHA512 (chromium-143.0.7499.169-clean.tar.xz) = c4b456b7ce87c53c79bf2483f6903c2ef0a1af6204ea9c44d924f5d7b099d01b2f9c36f029ccb1134332e6ae16936231b8b5306bd9b68a2865f84c650269c19f From 9fa42d3890a4bae4720fb451545932a4bfc2c7a7 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 7 Jan 2026 15:49:11 +0100 Subject: [PATCH 18/20] - Update tp 143.0.7499.192 * High CVE-2026-0628: Insufficient policy enforcement in WebView tag - Fix rhbz#2425338, Enable control flow integrity support for x86_64/aarch64 - Enable build for epel10.1 --- chromium.spec | 16 ++++++++++++++-- sources | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/chromium.spec b/chromium.spec index 1fd4d4e..85c31f5 100644 --- a/chromium.spec +++ b/chromium.spec @@ -1,3 +1,6 @@ +*# macro for el10 minor version +%define rhel_minor_version %(grep -oP '10\.[0-9.]*' /etc/redhat-release | cut -d '.' -f2) + %define _lto_cflags %{nil} %global _default_patch_fuzz 2 @@ -138,6 +141,9 @@ # enable|disable control flow integrity support %global cfi 0 +%ifarch x86_64 aarch64 +%global cfi 1 +%endif # enable qt backend %global enable_qt 1 @@ -254,7 +260,7 @@ %endif Name: chromium -Version: 143.0.7499.169 +Version: 143.0.7499.192 Release: 1%{?dist} Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Url: http://www.chromium.org/Home @@ -1089,7 +1095,7 @@ Qt6 UI for chromium. %patch -P310 -p1 -b .rust-FTBFS-suppress-warnings %patch -P311 -p1 -b .fstack-protector-strong -%if 0%{?rhel} == 9 +%if 0%{?rhel} == 9 || 0%{?rhel_minor_version} == 1 %patch -P312 -p1 -b .el9-rust-no-alloc-shim-is-unstable %patch -P313 -p1 -b .el9-rust_alloc_error_handler_should_panic %endif @@ -1811,6 +1817,12 @@ fi %endif %changelog +* Wed Jan 07 2026 Than Ngo - 143.0.7499.192-1 +- Update tp 143.0.7499.192 + * High CVE-2026-0628: Insufficient policy enforcement in WebView tag +- Fix rhbz#2425338, Enable control flow integrity support for x86_64/aarch64 +- Enable build for epel10.1 + * Sat Dec 20 2025 Than Ngo - 143.0.7499.169-1 - Update to 143.0.7499.169 diff --git a/sources b/sources index 4745341..fb67321 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (node-v22.14.0-stripped.tar.gz) = affddb541009c6d378049c2d7845b981335d9e7aa387efcc472e5efb621c345cd58ca69778a394f7e4ebbb5e4b1a115a389838ef1b6458ef5e98f2071b166e15 -SHA512 (chromium-143.0.7499.169-clean.tar.xz) = c4b456b7ce87c53c79bf2483f6903c2ef0a1af6204ea9c44d924f5d7b099d01b2f9c36f029ccb1134332e6ae16936231b8b5306bd9b68a2865f84c650269c19f +SHA512 (chromium-143.0.7499.192-clean.tar.xz) = 252f3feb974a9618f649c3ba6b848f87b747bee173d86c956a3c822305343574cfd369414c94c8e648c3d65d4f4e54c171d364989c0fb937240ed16abe6dda9a From 9d700ef13fdbc155aa5eee2671c31edd760fa701 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 7 Jan 2026 15:50:15 +0100 Subject: [PATCH 19/20] Fix typo --- chromium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium.spec b/chromium.spec index 85c31f5..a65c8b5 100644 --- a/chromium.spec +++ b/chromium.spec @@ -1,4 +1,4 @@ -*# macro for el10 minor version +# macro for el10 minor version %define rhel_minor_version %(grep -oP '10\.[0-9.]*' /etc/redhat-release | cut -d '.' -f2) %define _lto_cflags %{nil} From 8afd224270843061fbdb2d9d3d7a1d84f5a3ba82 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 14 Jan 2026 11:03:27 +0100 Subject: [PATCH 20/20] - Update to 144.0.7559.59 * CVE-2026-0899: Out of bounds memory access in V8 * CVE-2026-0900: Inappropriate implementation in V8 * CVE-2026-0901: Inappropriate implementation in Blink * CVE-2026-0902: Inappropriate implementation in V8 * CVE-2026-0903: Insufficient validation of untrusted input in Downloads * CVE-2026-0904: Incorrect security UI in Digital Credentials * CVE-2026-0905: Insufficient policy enforcement in Network * CVE-2026-0906: Incorrect security UI * CVE-2026-0907: Incorrect security UI in Split View * CVE-2026-0908: Use after free in ANGLE --- 0001-Add-PPC64-support-for-boringssl.patch | 206 +- 0001-Add-ppc64-target-to-libaom.patch | 12 +- ...generated-config-for-libaom-on-ppc64.patch | 24 +- 0001-Enable-ppc64-pointer-compression.patch | 8 +- ...OWER8-AltiVec-VSX-CPU-features-when-.patch | 8 +- ...Implement-support-for-PPC64-on-Linux.patch | 198 +- ...Implement-support-for-ppc64-on-Linux.patch | 138 +- 0001-add-xnn-ppc64el-support.patch | 12 +- ...sandbox-Enable-seccomp_bpf-for-ppc64.patch | 168 +- 0001-swiftshader-fix-build.patch | 13 +- ...e-Include-missing-header-cstddef-in-.patch | 6 +- ...ibvpx-Properly-generate-gni-on-ppc64.patch | 6 +- ...t-Include-altivec.h-on-ppc64-with-SI.patch | 6 +- ...-PPC64-generated-files-for-boringssl.patch | 28 +- 0002-Add-ppc64-trap-instructions.patch | 6 +- 0002-regenerate-xnn-buildgn.patch | 9917 +++++++++-------- ...party-libvpx-Remove-bad-ppc64-config.patch | 28 +- 0002-third_party-lss-kernel-structs.patch | 6 +- ...ty-libvpx-Add-ppc64-generated-config.patch | 28 +- ...y-crashpad-port-curl-transport-ppc64.patch | 6 +- ...rty-libvpx-work-around-ambiguous-vsx.patch | 18 +- HACK-debian-clang-disable-base-musttail.patch | 6 +- HACK-debian-clang-disable-pa-musttail.patch | 6 +- HACK-third_party-libvpx-use-generic-gnu.patch | 18 +- Rtc_base-system-arch.h-PPC.patch | 6 +- add-ppc64-architecture-string.patch | 6 +- add-ppc64-architecture-to-extensions.diff | 12 +- add-ppc64-pthread-stack-size.patch | 6 +- chromium-141-rust-clanglib.patch | 60 - ...xtractData-support-for-text-uri-list.patch | 72 - ...date-pointer-position-during-draggin.patch | 80 - chromium-144-rust-clanglib.patch | 66 + chromium-144-rust-libadler2.patch | 16 + chromium.spec | 37 +- dawn-fix-ppc64le-detection.patch | 6 +- fix-breakpad-compile.patch | 6 +- fix-clang-selection.patch | 12 - fix-different-data-layouts.patch | 6 +- fix-page-allocator-overflow.patch | 12 +- fix-partition-alloc-compile.patch | 6 +- fix-rust-linking.patch | 10 +- fix-rustc.patch | 8 +- fix-study-crash.patch | 14 +- fix-unknown-warning-option-messages.diff | 10 +- skia-vsx-instructions.patch | 122 +- sources | 2 +- 46 files changed, 5797 insertions(+), 5650 deletions(-) delete mode 100644 chromium-141-rust-clanglib.patch delete mode 100644 chromium-142-Add-ExtractData-support-for-text-uri-list.patch delete mode 100644 chromium-142-Update-pointer-position-during-draggin.patch create mode 100644 chromium-144-rust-clanglib.patch create mode 100644 chromium-144-rust-libadler2.patch delete mode 100644 fix-clang-selection.patch diff --git a/0001-Add-PPC64-support-for-boringssl.patch b/0001-Add-PPC64-support-for-boringssl.patch index a9139b0..11ef25c 100644 --- a/0001-Add-PPC64-support-for-boringssl.patch +++ b/0001-Add-PPC64-support-for-boringssl.patch @@ -1,7 +1,7 @@ -Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/abi_self_test.cc +Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/abi_self_test.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/abi_self_test.cc -+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/abi_self_test.cc +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/abi_self_test.cc ++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/abi_self_test.cc @@ -521,3 +521,289 @@ TEST(ABITest, AArch64) { CHECK_ABI_NO_UNWIND(abi_test_clobber_v15_upper); } @@ -292,10 +292,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/abi_self_test.cc + CHECK_ABI_NO_UNWIND(abi_test_clobber_lr); +} +#endif // OPENSSL_PPC64LE && SUPPORTS_ABI_TEST -Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/cpu_ppc64le.cc +Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/cpu_ppc64le.cc =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/cpu_ppc64le.cc ++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/cpu_ppc64le.cc @@ -0,0 +1,38 @@ +/* Copyright (c) 2016, Google Inc. + * @@ -335,10 +335,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/cpu_ppc64le.cc +} + +#endif // OPENSSL_PPC64LE -Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/crypto.cc +Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/crypto.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/crypto.cc -+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/crypto.cc +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/crypto.cc ++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/crypto.cc @@ -67,6 +67,10 @@ uint32_t OPENSSL_get_ia32cap(int idx) { return OPENSSL_ia32cap_P[idx]; } @@ -350,10 +350,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/crypto.cc #elif (defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)) && \ !defined(OPENSSL_STATIC_ARMCAP) HIDDEN uint32_t OPENSSL_armcap_P = 0; -Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl +Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl ++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl @@ -0,0 +1,3809 @@ +#! /usr/bin/env perl +# Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved. @@ -4164,10 +4164,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/as +} + +close STDOUT or die "error closing STDOUT: $!"; -Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h +Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h -+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h ++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h @@ -81,6 +81,12 @@ inline int vpaes_capable(void) { return inline int vpaes_capable(void) { return CRYPTO_is_NEON_capable(); } #endif @@ -4195,10 +4195,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/in #endif #endif // OPENSSL_NO_ASM -Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/bcm.cc +Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/bcm.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/bcm.cc -+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/bcm.cc +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/bcm.cc ++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/bcm.cc @@ -105,6 +105,7 @@ #include "self_check/fips.cc.inc" #include "self_check/self_check.cc.inc" @@ -4207,10 +4207,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/bcm.cc #include "sha/sha1.cc.inc" #include "sha/sha256.cc.inc" #include "sha/sha512.cc.inc" -Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc +Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc -+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc ++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc @@ -330,6 +330,23 @@ int bn_expand(BIGNUM *bn, size_t bits) { } @@ -4235,11 +4235,11 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/bn/bn. if ((size_t)bn->width <= words) { if (!bn_wexpand(bn, words)) { return 0; -Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc +Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc -+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc -@@ -1229,6 +1229,8 @@ int EVP_has_aes_hardware(void) { +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc ++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc +@@ -1234,6 +1234,8 @@ int EVP_has_aes_hardware(void) { return hwaes_capable() && crypto_gcm_clmul_enabled(); #elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64) return hwaes_capable() && CRYPTO_is_ARMv8_PMULL_capable(); @@ -4248,10 +4248,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/cipher #else return 0; #endif -Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/asm/ghashp8-ppc.pl +Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/asm/ghashp8-ppc.pl =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/asm/ghashp8-ppc.pl ++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/asm/ghashp8-ppc.pl @@ -0,0 +1,671 @@ +#! /usr/bin/env perl +# Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved. @@ -4924,10 +4924,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/as +} + +close STDOUT or die "error closing STDOUT: $!"; # enforce flush -Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc +Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc -+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc ++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc @@ -233,6 +233,13 @@ void CRYPTO_ghash_init(gmult_func *out_m *out_hash = gcm_ghash_neon; return; @@ -4942,10 +4942,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/gc #endif gcm_init_nohw(out_table, H); -Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc +Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc -+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc ++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc @@ -169,5 +169,15 @@ TEST(GCMTest, ABI) { } } @@ -4962,10 +4962,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/aes/gc +#endif // GHASH_ASM_PPC64LE } #endif // SUPPORTS_ABI_TEST && !OPENSSL_NO_ASM -Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/rand/getrandom_fillin.h +Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/rand/getrandom_fillin.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/rand/getrandom_fillin.h -+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/rand/getrandom_fillin.h +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/rand/getrandom_fillin.h ++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/rand/getrandom_fillin.h @@ -30,6 +30,8 @@ #define EXPECTED_NR_getrandom 278 #elif defined(OPENSSL_ARM) @@ -4975,10 +4975,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/rand/getrandom_fi #elif defined(OPENSSL_RISCV64) #define EXPECTED_NR_getrandom 278 #endif -Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc +Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc -+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc ++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc @@ -425,6 +425,11 @@ bcm_infallible BCM_rand_bytes_with_addit // Take a read lock around accesses to |state->drbg|. This is needed to // avoid returning bad entropy if we race with @@ -4991,10 +4991,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/rand/r CRYPTO_MUTEX_lock_read(&state->clear_drbg_lock); #endif if (!CTR_DRBG_reseed_ex(&state->drbg, seed, sizeof(seed), -Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h +Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h -+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h ++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h @@ -23,6 +23,16 @@ extern "C" { #endif @@ -5012,10 +5012,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/in // Define SHA{n}[_{variant}]_ASM if sha{n}_block_data_order[_{variant}] is // defined in assembly. -Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc +Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc ++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc @@ -0,0 +1,369 @@ +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.ccom) + * All rights reserved. @@ -5386,10 +5386,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/sh +#undef BODY_20_39 +#undef BODY_40_59 +#undef BODY_60_79 -Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/internal.h +Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/internal.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/internal.h -+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/internal.h +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/internal.h ++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/internal.h @@ -66,8 +66,9 @@ extern "C" { #if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_STATIC_ARMCAP) && \ (defined(OPENSSL_X86) || defined(OPENSSL_X86_64) || \ @@ -5402,7 +5402,7 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/internal.h #define NEED_CPUID // OPENSSL_cpuid_setup initializes the platform-specific feature cache. This -@@ -1419,6 +1420,16 @@ inline int CRYPTO_is_ARMv8_SHA512_capabl +@@ -1420,6 +1421,16 @@ inline int CRYPTO_is_ARMv8_SHA512_capabl #endif // OPENSSL_ARM || OPENSSL_AARCH64 @@ -5419,10 +5419,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/internal.h #if defined(BORINGSSL_DISPATCH_TEST) // Runtime CPU dispatch testing support -Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl +Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl ++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl @@ -0,0 +1,320 @@ +#! /usr/bin/env perl +# Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. @@ -5744,10 +5744,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/perlasm/ppc-xlate +___ + +close STDOUT or die "error closing STDOUT: $!"; -Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/test/abi_test.h +Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/test/abi_test.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/test/abi_test.h -+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/test/abi_test.h +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/test/abi_test.h ++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/test/abi_test.h @@ -179,7 +179,78 @@ struct alignas(16) Reg128 { CALLER_STATE_REGISTER(uint64_t, x28) \ CALLER_STATE_REGISTER(uint64_t, x29) @@ -5854,10 +5854,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/test/abi_test.h static_assert(sizeof...(args) <= 8, "too many arguments for abi_test_trampoline"); -Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl +Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl ++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl @@ -0,0 +1,262 @@ +#!/usr/bin/env perl +# Copyright (c) 2019, Google Inc. @@ -6121,10 +6121,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/test/asm/trampoli + +print $code; +close STDOUT or die "error closing STDOUT: $!"; -Index: chromium-143.0.7499.40/third_party/boringssl/src/include/openssl/target.h +Index: chromium-144.0.7559.59/third_party/boringssl/src/include/openssl/target.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/include/openssl/target.h -+++ chromium-143.0.7499.40/third_party/boringssl/src/include/openssl/target.h +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/include/openssl/target.h ++++ chromium-144.0.7559.59/third_party/boringssl/src/include/openssl/target.h @@ -34,6 +34,9 @@ #elif defined(__ARMEL__) || defined(_M_ARM) #define OPENSSL_32_BIT @@ -6135,10 +6135,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/include/openssl/target.h #elif defined(__MIPSEL__) && !defined(__LP64__) #define OPENSSL_32_BIT #define OPENSSL_MIPS -Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc +Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc -+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc ++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc @@ -31,6 +31,8 @@ int main(int argc, char **argv) { puts("ARM (32-bit)"); #elif defined(OPENSSL_AARCH64) @@ -6148,10 +6148,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/acvp/modu #else #error "FIPS build not supported on this architecture" #endif -Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/delocate.go +Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/delocate.go =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.go -+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/delocate.go +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.go ++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/delocate.go @@ -56,7 +56,8 @@ type stringWriter interface { type processorType int @@ -6751,10 +6751,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/ case "str", "bl", "ldr", "st1": return aarch64 } -Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/delocate.peg +Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/delocate.peg =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.peg -+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/delocate.peg +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.peg ++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/delocate.peg @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. @@ -6768,10 +6768,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/ # To regenerate delocate.peg.go: # -Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go +Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go -+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go ++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go @@ -39,6 +39,11 @@ func (test *delocateTest) Path(file stri var delocateTests = []delocateTest{ @@ -6784,10 +6784,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/ {"x86_64-Basic", []string{"in.s"}, "out.s"}, {"x86_64-BSS", []string{"in.s"}, "out.s"}, {"x86_64-GOTRewrite", []string{"in.s"}, "out.s"}, -Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s +Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s ++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s @@ -0,0 +1,9 @@ + .text +foo: @@ -6798,10 +6798,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/ + .localentry foo,.-foo +.LVL0: + bl -Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s +Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s ++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s @@ -0,0 +1,62 @@ +.text +.file 1 "inserted_by_delocate.cc" @@ -6865,19 +6865,19 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/ +.byte 0xff +.byte 0x31 +.byte 0x80 -Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s +Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s ++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s @@ -0,0 +1,4 @@ + .text +foo: + addis 22,2,bar@toc@ha + ld 0,bar@toc@l(22) -Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s +Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s ++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s @@ -0,0 +1,72 @@ +.text +.file 1 "inserted_by_delocate.cc" @@ -6951,10 +6951,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/ +.byte 0xff +.byte 0x31 +.byte 0x80 -Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s +Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s ++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s @@ -0,0 +1,161 @@ + .file "foo.cc" + .abiversion 2 @@ -7117,10 +7117,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/ + .size exported_function,.-exported_function + .ident "GCC: (Ubuntu 4.9.2-10ubuntu13) 4.9.2" + .section .note.GNU-stack,"",@progbits -Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s +Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s ++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s @@ -0,0 +1,552 @@ +.text +.file 1 "inserted_by_delocate.cc" @@ -7674,10 +7674,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/ +.byte 0xff +.byte 0x31 +.byte 0x80 -Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s +Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s ++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s @@ -0,0 +1,226 @@ + .file "foo.cc" + .abiversion 2 @@ -7905,10 +7905,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/ + .zero 20 + .ident "GCC: (Ubuntu 4.9.2-10ubuntu13) 4.9.2" + .section .note.GNU-stack,"",@progbits -Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s +Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s ++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s @@ -0,0 +1,677 @@ +.text +.file 1 "inserted_by_delocate.cc" @@ -8587,10 +8587,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/ +.byte 0xff +.byte 0x31 +.byte 0x80 -Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s +Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s ++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s @@ -0,0 +1,23 @@ + .text +foo: @@ -8615,10 +8615,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/ + + addis 4, 2, 1+foo-2@toc@ha+3 + addi 4, 4, 1+foo-2@toc@l+3 -Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s +Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s ++++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s @@ -0,0 +1,178 @@ +.text +.file 1 "inserted_by_delocate.cc" @@ -8798,10 +8798,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/fipstools/delocate/ +.byte 0xff +.byte 0x31 +.byte 0x80 -Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc +Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc -+++ chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc ++++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc @@ -377,6 +377,10 @@ static void sha1_block_data_order(uint32 return; } @@ -8813,10 +8813,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/crypto/fipsmodule/sha/sh sha1_block_data_order_nohw(state, data, num); } -Index: chromium-143.0.7499.40/third_party/boringssl/src/build.json +Index: chromium-144.0.7559.59/third_party/boringssl/src/build.json =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/build.json -+++ chromium-143.0.7499.40/third_party/boringssl/src/build.json +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/build.json ++++ chromium-144.0.7559.59/third_party/boringssl/src/build.json @@ -130,6 +130,10 @@ {"src": "crypto/fipsmodule/sha/asm/sha512-armv4.pl"}, {"src": "crypto/fipsmodule/aes/asm/vpaes-armv7.pl"} @@ -8836,7 +8836,7 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/build.json "crypto/crypto.cc", "crypto/curve25519/curve25519.cc", "crypto/curve25519/curve25519_64_adx.cc", -@@ -803,6 +808,9 @@ +@@ -805,6 +810,9 @@ "perlasm_arm": [ {"src": "crypto/test/asm/trampoline-armv4.pl"} ], @@ -8846,10 +8846,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/build.json "perlasm_x86": [ {"src": "crypto/test/asm/trampoline-x86.pl"} ], -Index: chromium-143.0.7499.40/third_party/boringssl/src/util/pregenerate/build.go +Index: chromium-144.0.7559.59/third_party/boringssl/src/util/pregenerate/build.go =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/util/pregenerate/build.go -+++ chromium-143.0.7499.40/third_party/boringssl/src/util/pregenerate/build.go +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/util/pregenerate/build.go ++++ chromium-144.0.7559.59/third_party/boringssl/src/util/pregenerate/build.go @@ -38,6 +38,7 @@ type InputTarget struct { // architecture. PerlasmAarch64 []PerlasmSource `json:"perlasm_aarch64,omitempty"` @@ -8868,10 +8868,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/util/pregenerate/build.g for _, p := range in.PerlasmX86 { addPerlasmTask(&out.Asm, &p, "-apple.S", []string{"macosx", "-fPIC"}) addPerlasmTask(&out.Asm, &p, "-linux.S", []string{"elf", "-fPIC"}) -Index: chromium-143.0.7499.40/third_party/boringssl/README.ppc64le +Index: chromium-144.0.7559.59/third_party/boringssl/README.ppc64le =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/boringssl/README.ppc64le ++++ chromium-144.0.7559.59/third_party/boringssl/README.ppc64le @@ -0,0 +1,8 @@ +============================================================== +To recreate boringssl pregenerated files patch for ppc64le: @@ -8881,10 +8881,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/README.ppc64le +go run ./util/pregenerate +cd ../../../../ +diff -urN chromium-*/third_party/boringssl/src/gen.orig chromium-*/third_party/boringssl/src/gen -Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.gni +Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.gni =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/gen/sources.gni -+++ chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.gni +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/gen/sources.gni ++++ chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.gni @@ -123,6 +123,7 @@ bcm_sources_asm = [ "gen/bcm/aesv8-gcm-armv8-apple.S", "gen/bcm/aesv8-gcm-armv8-linux.S", diff --git a/0001-Add-ppc64-target-to-libaom.patch b/0001-Add-ppc64-target-to-libaom.patch index c328bda..b6d5ffe 100644 --- a/0001-Add-ppc64-target-to-libaom.patch +++ b/0001-Add-ppc64-target-to-libaom.patch @@ -8,10 +8,10 @@ Subject: [PATCH] Add ppc64 target to libaom third_party/libaom/cmake_update.sh | 3 +++ 2 files changed, 15 insertions(+) -Index: chromium-143.0.7499.40/third_party/libaom/BUILD.gn +Index: chromium-144.0.7559.59/third_party/libaom/BUILD.gn =================================================================== ---- chromium-143.0.7499.40.orig/third_party/libaom/BUILD.gn -+++ chromium-143.0.7499.40/third_party/libaom/BUILD.gn +--- chromium-144.0.7559.59.orig/third_party/libaom/BUILD.gn ++++ chromium-144.0.7559.59/third_party/libaom/BUILD.gn @@ -299,6 +299,18 @@ if (current_cpu == "arm64" || current_cp } } @@ -41,10 +41,10 @@ Index: chromium-143.0.7499.40/third_party/libaom/BUILD.gn if (is_android) { deps += [ "//third_party/cpu_features:ndk_compat" ] } -Index: chromium-143.0.7499.40/third_party/libaom/cmake_update.sh +Index: chromium-144.0.7559.59/third_party/libaom/cmake_update.sh =================================================================== ---- chromium-143.0.7499.40.orig/third_party/libaom/cmake_update.sh -+++ chromium-143.0.7499.40/third_party/libaom/cmake_update.sh +--- chromium-144.0.7559.59.orig/third_party/libaom/cmake_update.sh ++++ chromium-144.0.7559.59/third_party/libaom/cmake_update.sh @@ -167,6 +167,9 @@ egrep \ "#define [A-Z0-9_]+[[:space:]]+[01]" "${CFG}/win/ia32/config/aom_config.h" \ | awk '{print "%define " $2 " " $3}' > "${CFG}/win/ia32/config/aom_config.asm" diff --git a/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch b/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch index 176ab0d..2f82037 100644 --- a/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch +++ b/0001-Add-pregenerated-config-for-libaom-on-ppc64.patch @@ -1,7 +1,7 @@ -Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm +Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm ++++ chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm @@ -0,0 +1,100 @@ +; +; Copyright (c) 2025, Alliance for Open Media. All rights reserved. @@ -103,10 +103,10 @@ Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/confi +HAVE_VSX equ 1 +HAVE_WXWIDGETS equ 0 +STATIC_LINK_JXL equ 0 -Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_config.c +Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_config.c =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_config.c ++++ chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_config.c @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2025, Alliance for Open Media. All rights reserved. @@ -121,10 +121,10 @@ Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/confi +#include "aom/aom_codec.h" +static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/ppc-linux-gcc.cmake\" -DCONFIG_AV1_DECODER=0 -DCONFIG_AV1_ENCODER=1 -DCONFIG_AV1_HIGHBITDEPTH=0 -DCONFIG_AV1_TEMPORAL_DENOISING=1 -DCONFIG_QUANT_MATRIX=0 -DCONFIG_REALTIME_ONLY=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384"; +const char *aom_codec_build_config(void) {return cfg;} -Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_config.h +Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_config.h =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_config.h ++++ chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_config.h @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2025, Alliance for Open Media. All rights reserved. @@ -229,10 +229,10 @@ Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/confi +#define HAVE_WXWIDGETS 0 +#define STATIC_LINK_JXL 0 +#endif // AOM_CONFIG_H_ -Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h +Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h ++++ chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h @@ -0,0 +1,1177 @@ +/* + * Copyright (c) 2025, Alliance for Open Media. All rights reserved. @@ -1411,10 +1411,10 @@ Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/confi +#endif + +#endif // AOM_DSP_RTCD_H_ -Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h +Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h ++++ chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2025, Alliance for Open Media. All rights reserved. @@ -1507,10 +1507,10 @@ Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/confi +#endif + +#endif // AOM_SCALE_RTCD_H_ -Index: chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h +Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h ++++ chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h @@ -0,0 +1,405 @@ +/* + * Copyright (c) 2025, Alliance for Open Media. All rights reserved. diff --git a/0001-Enable-ppc64-pointer-compression.patch b/0001-Enable-ppc64-pointer-compression.patch index b8ef777..a7197a5 100644 --- a/0001-Enable-ppc64-pointer-compression.patch +++ b/0001-Enable-ppc64-pointer-compression.patch @@ -1,8 +1,8 @@ -Index: chromium-143.0.7499.40/v8/gni/v8.gni +Index: chromium-144.0.7559.59/v8/gni/v8.gni =================================================================== ---- chromium-143.0.7499.40.orig/v8/gni/v8.gni -+++ chromium-143.0.7499.40/v8/gni/v8.gni -@@ -298,7 +298,7 @@ assert( +--- chromium-144.0.7559.59.orig/v8/gni/v8.gni ++++ chromium-144.0.7559.59/v8/gni/v8.gni +@@ -317,7 +317,7 @@ assert( if (v8_enable_pointer_compression == "") { v8_enable_pointer_compression = v8_current_cpu == "arm64" || v8_current_cpu == "x64" || diff --git a/0001-Force-baseline-POWER8-AltiVec-VSX-CPU-features-when-.patch b/0001-Force-baseline-POWER8-AltiVec-VSX-CPU-features-when-.patch index 6842368..3c1c68d 100644 --- a/0001-Force-baseline-POWER8-AltiVec-VSX-CPU-features-when-.patch +++ b/0001-Force-baseline-POWER8-AltiVec-VSX-CPU-features-when-.patch @@ -8,11 +8,11 @@ Subject: [PATCH] Force baseline POWER8 / AltiVec / VSX CPU features when on a BUILD.gn | 6 ++++++ 1 file changed, 6 insertions(+) -Index: chromium-143.0.7499.40/v8/BUILD.gn +Index: chromium-144.0.7559.59/v8/BUILD.gn =================================================================== ---- chromium-143.0.7499.40.orig/v8/BUILD.gn -+++ chromium-143.0.7499.40/v8/BUILD.gn -@@ -1577,7 +1577,14 @@ config("toolchain") { +--- chromium-144.0.7559.59.orig/v8/BUILD.gn ++++ chromium-144.0.7559.59/v8/BUILD.gn +@@ -1596,7 +1596,14 @@ config("toolchain") { if (v8_current_cpu == "ppc64") { defines += [ "V8_TARGET_ARCH_PPC64" ] cflags += [ "-ffp-contract=off" ] diff --git a/0001-Implement-support-for-PPC64-on-Linux.patch b/0001-Implement-support-for-PPC64-on-Linux.patch index 2bfce0a..772cd3c 100644 --- a/0001-Implement-support-for-PPC64-on-Linux.patch +++ b/0001-Implement-support-for-PPC64-on-Linux.patch @@ -40,20 +40,20 @@ This patch implements support for the PPC64 architecture on Linux hosts. util/misc/capture_context_test_util_linux.cc | 6 + 36 files changed, 932 insertions(+), 12 deletions(-) -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/CONTRIBUTORS +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/CONTRIBUTORS =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/CONTRIBUTORS -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/CONTRIBUTORS +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/CONTRIBUTORS ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/CONTRIBUTORS @@ -13,3 +13,5 @@ Mark Mentovai Robert Sesek Scott Graham Joshua Peraza +Shawn Anastasio +Timothy Pearson -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context.h +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/minidump/minidump_context.h -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context.h +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/minidump/minidump_context.h ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context.h @@ -686,6 +686,70 @@ struct MinidumpContextRISCV64 { uint32_t fcsr; }; @@ -125,10 +125,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_co } // namespace crashpad #endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_ -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc @@ -110,6 +110,13 @@ MinidumpContextWriter::CreateFromSnapsho break; } @@ -192,10 +192,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_co +} } // namespace crashpad -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context_writer.h +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context_writer.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.h -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context_writer.h +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.h ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context_writer.h @@ -413,6 +413,49 @@ class MinidumpContextRISCV64Writer final MinidumpContextRISCV64 context_; }; @@ -246,10 +246,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_co } // namespace crashpad #endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_ -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc @@ -322,6 +322,21 @@ TYPED_TEST(MinidumpContextWriter, RISCV6 TypeParam>(context, ExpectMinidumpContextRISCV64, kSeed); } @@ -272,10 +272,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_co } // namespace } // namespace test } // namespace crashpad -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc @@ -177,6 +177,8 @@ std::string MinidumpMiscInfoDebugBuildSt static constexpr char kCPU[] = "mips64"; #elif defined(ARCH_CPU_RISCV64) @@ -285,10 +285,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/minidump_mi #else #error define kCPU for this CPU #endif -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc @@ -297,6 +297,40 @@ void InitializeMinidumpContextRISCV64(Mi context->fcsr = value++; } @@ -369,10 +369,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/test/minidu + } // namespace test } // namespace crashpad -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h @@ -90,6 +90,9 @@ void ExpectMinidumpContextMIPS64(uint32_ void ExpectMinidumpContextRISCV64(uint32_t expect_seed, const MinidumpContextRISCV64* observed, @@ -383,10 +383,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/minidump/test/minidu //! \} } // namespace test -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/capture_memory.cc +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/capture_memory.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/capture_memory.cc -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/capture_memory.cc +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/capture_memory.cc ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/capture_memory.cc @@ -123,6 +123,11 @@ void CaptureMemory::PointedToByContext(c for (size_t i = 0; i < std::size(context.riscv64->regs); ++i) { MaybeCaptureMemoryAround(delegate, context.riscv64->regs[i]); @@ -399,10 +399,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/capture_mem #else #error Port. #endif -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_architecture.h +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/cpu_architecture.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/cpu_architecture.h -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_architecture.h +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/cpu_architecture.h ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/cpu_architecture.h @@ -47,6 +47,9 @@ enum CPUArchitecture { //! \brief 64-bit RISC-V. @@ -413,10 +413,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_archite }; } // namespace crashpad -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_context.cc +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/cpu_context.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/cpu_context.cc -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_context.cc +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/cpu_context.cc ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/cpu_context.cc @@ -173,6 +173,8 @@ uint64_t CPUContext::InstructionPointer( return arm64->pc; case kCPUArchitectureRISCV64: @@ -443,10 +443,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_context case kCPUArchitectureRISCV64: return true; case kCPUArchitectureX86: -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_context.h +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/cpu_context.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/cpu_context.h -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_context.h +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/cpu_context.h ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/cpu_context.h @@ -371,6 +371,24 @@ struct CPUContextRISCV64 { uint32_t fcsr; }; @@ -480,10 +480,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/cpu_context }; }; -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h @@ -15,6 +15,7 @@ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_ @@ -571,10 +571,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/cpu_c } // namespace internal } // namespace crashpad -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc @@ -194,12 +194,15 @@ void TestAgainstTarget(PtraceConnection* device == 0 && inode == 0 && mapping_name == "[vdso]"; #if defined(ARCH_CPU_X86) @@ -592,10 +592,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/debug }, module_mapping->name, module_mapping->device, -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc @@ -367,6 +367,69 @@ bool ExceptionSnapshotLinux::ReadContext return internal::ReadContext(reader, context_address, context_.riscv64); } @@ -666,10 +666,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/excep #endif // ARCH_CPU_X86_FAMILY bool ExceptionSnapshotLinux::Initialize( -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h @@ -94,6 +94,8 @@ class ExceptionSnapshotLinux final : pub CPUContextMIPS64 mips64; #elif defined(ARCH_CPU_RISCV64) @@ -679,10 +679,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/excep #endif } context_union_; CPUContext context_; -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc @@ -325,7 +325,28 @@ void ExpectContext(const CPUContext& act sizeof(actual.riscv64->fpregs)), 0); @@ -712,10 +712,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/excep #else #error Port. #endif -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc @@ -129,6 +129,8 @@ void ProcessReaderLinux::Thread::Initial : thread_info.thread_context.t32.regs[29]; #elif defined(ARCH_CPU_RISCV64) @@ -725,10 +725,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/proce #else #error Port. #endif -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/signal_context.h +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/signal_context.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/linux/signal_context.h -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/linux/signal_context.h +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/signal_context.h ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/signal_context.h @@ -456,6 +456,89 @@ static_assert(offsetof(UContextfcsr = value++; } @@ -937,10 +937,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/test/test_c + } // namespace test } // namespace crashpad -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h @@ -64,6 +64,7 @@ void InitializeCPUContextARM64(CPUContex void InitializeCPUContextMIPS(CPUContext* context, uint32_t seed); void InitializeCPUContextMIPS64(CPUContext* context, uint32_t seed); @@ -949,10 +949,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/snapshot/test/test_c //! \} } // namespace test -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/test/linux/get_tls.cc +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/test/linux/get_tls.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/test/linux/get_tls.cc -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/test/linux/get_tls.cc +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/test/linux/get_tls.cc ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/test/linux/get_tls.cc @@ -51,6 +51,8 @@ LinuxVMAddress GetTLS() { : "$3"); #elif defined(ARCH_CPU_RISCV64) @@ -962,10 +962,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/test/linux/get_tls.c #else #error Port. #endif // ARCH_CPU_ARMEL -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/test/multiprocess_posix.cc +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/test/multiprocess_posix.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/test/multiprocess_posix.cc -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/test/multiprocess_posix.cc +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/test/multiprocess_posix.cc ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/test/multiprocess_posix.cc @@ -162,7 +162,8 @@ void Multiprocess::SetExpectedChildTermi } @@ -976,10 +976,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/test/multiprocess_po SetExpectedChildTermination(kTerminationSignal, SIGTRAP); #else SetExpectedChildTermination(kTerminationSignal, SIGILL); -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc @@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect if (type == AT_IGNORE) { continue; @@ -992,10 +992,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/auxiliary if (!MapInsertOrReplace(&values_, type, value, nullptr)) { LOG(ERROR) << "duplicate auxv entry"; return false; -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/ptracer.cc +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/linux/ptracer.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/linux/ptracer.cc -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/ptracer.cc +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/linux/ptracer.cc ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/linux/ptracer.cc @@ -430,6 +430,64 @@ bool GetThreadArea64(pid_t tid, return true; } @@ -1071,10 +1071,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/ptracer.c GetThreadArea64(tid, info->thread_context, &info->thread_specific_data_address, -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/thread_info.h +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/linux/thread_info.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/linux/thread_info.h -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/thread_info.h +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/linux/thread_info.h ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/linux/thread_info.h @@ -34,6 +34,10 @@ #include #endif @@ -1193,10 +1193,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/linux/thread_in //! \brief The thread-local storage address for the thread. LinuxVMAddress thread_specific_data_address; }; -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context.h +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/misc/capture_context.h -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context.h +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/misc/capture_context.h ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context.h @@ -70,6 +70,7 @@ using NativeCPUContext = ucontext_t; //! Linux | ARM/ARM64 | `r0`/`x0` //! Linux | MIPS/MIPS64 | `$a0` @@ -1205,10 +1205,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_co //! //! Additionally, the value `LR` on ARM/ARM64 will be the return address of //! this function. -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context_linux.S +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context_linux.S =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/misc/capture_context_linux.S -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context_linux.S +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/misc/capture_context_linux.S ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context_linux.S @@ -30,7 +30,7 @@ .globl CAPTURECONTEXT_SYMBOL2 #if defined(__i386__) || defined(__x86_64__) @@ -1435,10 +1435,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_co #elif defined(__riscv) #define MCONTEXT_GREGS_OFFSET 176 -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context_test.cc +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context_test.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/misc/capture_context_test.cc -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context_test.cc +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/misc/capture_context_test.cc ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context_test.cc @@ -48,7 +48,7 @@ void TestCaptureContext() { uintptr_t pc = ProgramCounterFromContext(context_1); @@ -1448,10 +1448,10 @@ Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_co // Sanitizers can cause enough code bloat that the “nearby” check would // likely fail. const uintptr_t kReferencePC = -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc @@ -38,6 +38,8 @@ void SanityCheckContext(const NativeCPUC #elif defined(ARCH_CPU_RISCV64) EXPECT_EQ(context.uc_mcontext.__gregs[10], diff --git a/0001-Implement-support-for-ppc64-on-Linux.patch b/0001-Implement-support-for-ppc64-on-Linux.patch index 5923874..fa7ef9f 100644 --- a/0001-Implement-support-for-ppc64-on-Linux.patch +++ b/0001-Implement-support-for-ppc64-on-Linux.patch @@ -54,10 +54,10 @@ https://wiki.raptorcs.com/wiki/Porting/Chromium src/tools/linux/md2core/minidump-2-core.cc | 45 +++++++++++++++ 25 files changed, 281 insertions(+), 35 deletions(-) -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h @@ -51,6 +51,8 @@ typedef MDRawContextRISCV64 RawContextCP # else # error "Unexpected __riscv_xlen" @@ -67,10 +67,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dum #else #error "This code has not been ported to your platform yet." #endif -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc @@ -336,7 +336,42 @@ void ThreadInfo::FillCPUContext(RawConte #error "Unexpected __riscv_xlen" #endif @@ -153,10 +153,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dum +#endif + } // namespace google_breakpad -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h @@ -67,6 +67,10 @@ struct ThreadInfo { // Use the structures defined in struct user_regs_struct regs; @@ -180,10 +180,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dum }; } // namespace google_breakpad -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc @@ -324,6 +324,48 @@ void UContextReader::FillCPUContext(RawC #error "Unexpected __riscv_xlen" #endif @@ -233,10 +233,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dum #endif } // namespace google_breakpad -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h @@ -54,6 +54,9 @@ struct UContextReader { #elif defined(__aarch64__) static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc, @@ -247,10 +247,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/dum #else static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc); #endif -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc @@ -466,6 +466,13 @@ bool ExceptionHandler::HandleSignal(int memcpy(&g_crash_context_.float_state, fp_ptr, sizeof(g_crash_context_.float_state)); @@ -295,10 +295,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/han #elif defined(__riscv) context.siginfo.si_addr = reinterpret_cast(context.context.uc_mcontext.__gregs[REG_PC]); -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h @@ -197,7 +197,11 @@ class ExceptionHandler { siginfo_t siginfo; pid_t tid; // the crashing thread. @@ -312,10 +312,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/han fpstate_t float_state; #endif }; -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc @@ -325,7 +325,7 @@ TEST(ExceptionHandlerTest, ParallelChild ASSERT_EQ(SIGSEGV, WTERMSIG(status)); return; @@ -347,10 +347,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/han const int kOffset = kMemorySize - sizeof(kIllegalInstruction); const pid_t child = fork(); -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc @@ -143,7 +143,9 @@ class MicrodumpWriter { const MicrodumpExtraInfo& microdump_extra_info, LinuxDumper* dumper) @@ -393,10 +393,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/mic const google_breakpad::fpstate_t* const float_state_; #endif LinuxDumper* dumper_; -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc @@ -281,10 +281,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf); ASSERT_TRUE(ContainsMicrodump(buf)); @@ -420,10 +420,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/mic #else ASSERT_NE(std::string::npos, buf.find("M 00001000 0000002A 00001000 " -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc @@ -118,6 +118,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd #elif defined(__riscv) stack_pointer = reinterpret_cast( @@ -446,10 +446,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/min # if defined(__ANDROID__) for (int i = EF_R0; i <= EF_R31; i++) info.mcontext.gregs[i - EF_R0] = status->pr_reg[i]; -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc @@ -789,7 +789,9 @@ bool LinuxDumper::GetStackInfo(const voi reinterpret_cast(int_stack_pointer & ~(page_size - 1)); @@ -461,10 +461,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/min const MappingInfo* mapping = FindMapping(stack_pointer); if (!mapping) -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h @@ -64,7 +64,8 @@ namespace google_breakpad { typedef Elf32_auxv_t elf_aux_entry; #elif defined(__x86_64) || defined(__aarch64__) || \ @@ -475,10 +475,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/min typedef Elf64_auxv_t elf_aux_entry; #endif -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc @@ -57,6 +57,8 @@ #define TID_PTR_REGISTER "$1" #elif defined(__riscv) @@ -488,10 +488,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/min #else #error This test has not been ported to this platform. #endif -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc @@ -208,12 +208,12 @@ bool LinuxPtraceDumper::ReadRegisterSet( #ifdef PTRACE_GETREGSET struct iovec io; @@ -533,10 +533,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/min #else # error "This code hasn't been ported to your platform yet." #endif -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc @@ -469,6 +469,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR #elif defined(__riscv) pid_t* process_tid_location = @@ -556,10 +556,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/min #else #error This test has not been ported to this platform. #endif -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc @@ -145,7 +145,9 @@ class MinidumpWriter { : fd_(minidump_fd), path_(minidump_path), @@ -613,10 +613,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/min const google_breakpad::fpstate_t* const float_state_; // ditto #endif LinuxDumper* dumper_; -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h @@ -47,6 +47,8 @@ class ExceptionHandler; #if defined(__aarch64__) @@ -626,10 +626,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/min #elif !defined(__ARM_EABI__) && !defined(__mips__) typedef std::remove_pointer::type fpstate_t; #endif -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc @@ -723,6 +723,9 @@ TEST(MinidumpWriterTest, InvalidStackPoi #elif defined(__riscv) context.context.uc_mcontext.__gregs[MD_CONTEXT_RISCV_REG_SP] = @@ -640,10 +640,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/client/linux/min #else # error "This code has not been ported to your platform yet." #endif -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc @@ -72,8 +72,7 @@ bool MemoryMappedFile::Map(const char* p #if defined(__x86_64__) || defined(__aarch64__) || \ @@ -654,10 +654,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/linux/mem struct kernel_stat st; if (sys_fstat(fd, &st) == -1 || st.st_size < 0) { #else -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc @@ -178,9 +178,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM TEST_F(MemoryMappedFileTest, MapWithOffset) { // Put more data in the test file this time. Offsets can only be @@ -672,10 +672,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/linux/mem for (size_t i = 0; i < data1_size; ++i) { data1[i] = i & 0x7f; } -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc @@ -64,8 +64,9 @@ TEST(PageAllocatorTest, LargeObject) { EXPECT_EQ(0U, allocator.pages_allocated()); @@ -687,10 +687,10 @@ Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/common/memory_al for (unsigned i = 1; i < 10; ++i) { uint8_t* p = reinterpret_cast(allocator.Alloc(i)); ASSERT_FALSE(p == nullptr); -Index: chromium-143.0.7499.40/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc +Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc -+++ chromium-143.0.7499.40/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc +--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc ++++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc @@ -82,6 +82,8 @@ #define ELF_ARCH EM_AARCH64 #elif defined(__riscv) diff --git a/0001-add-xnn-ppc64el-support.patch b/0001-add-xnn-ppc64el-support.patch index 9fd2f46..f8415ac 100644 --- a/0001-add-xnn-ppc64el-support.patch +++ b/0001-add-xnn-ppc64el-support.patch @@ -1,7 +1,7 @@ -Index: chromium-143.0.7499.40/third_party/xnnpack/generate_build_gn.py +Index: chromium-144.0.7559.59/third_party/xnnpack/generate_build_gn.py =================================================================== ---- chromium-143.0.7499.40.orig/third_party/xnnpack/generate_build_gn.py -+++ chromium-143.0.7499.40/third_party/xnnpack/generate_build_gn.py +--- chromium-144.0.7559.59.orig/third_party/xnnpack/generate_build_gn.py ++++ chromium-144.0.7559.59/third_party/xnnpack/generate_build_gn.py @@ -239,7 +239,10 @@ _PLATFORMS = [ bazel_platform='//:linux_aarch64'), _Platform(gn_cpu='riscv64', @@ -14,10 +14,10 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/generate_build_gn.py ] -Index: chromium-143.0.7499.40/third_party/xnnpack/bazelroot/BUILD +Index: chromium-144.0.7559.59/third_party/xnnpack/bazelroot/BUILD =================================================================== ---- chromium-143.0.7499.40.orig/third_party/xnnpack/bazelroot/BUILD -+++ chromium-143.0.7499.40/third_party/xnnpack/bazelroot/BUILD +--- chromium-144.0.7559.59.orig/third_party/xnnpack/bazelroot/BUILD ++++ chromium-144.0.7559.59/third_party/xnnpack/bazelroot/BUILD @@ -29,6 +29,14 @@ platform( ], ) diff --git a/0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch b/0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch index 2e4cbc3..29ab492 100644 --- a/0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch +++ b/0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch @@ -1,8 +1,8 @@ -Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf/trap.cc +Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf/trap.cc =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf/trap.cc -+++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf/trap.cc -@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo* +--- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf/trap.cc ++++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf/trap.cc +@@ -231,6 +231,20 @@ void Trap::SigSys(int nr, LinuxSigInfo* SetIsInSigHandler(); } @@ -23,10 +23,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf/trap.cc // Copy the seccomp-specific data into a arch_seccomp_data structure. This // is what we are showing to TrapFnc callbacks that the system call // evaluator registered with the sandbox. -Index: chromium-143.0.7499.40/sandbox/features.gni +Index: chromium-144.0.7559.59/sandbox/features.gni =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/features.gni -+++ chromium-143.0.7499.40/sandbox/features.gni +--- chromium-144.0.7559.59.orig/sandbox/features.gni ++++ chromium-144.0.7559.59/sandbox/features.gni @@ -9,4 +9,5 @@ use_seccomp_bpf = (is_linux || is_chromeos || is_android) && (current_cpu == "x86" || current_cpu == "x64" || @@ -34,10 +34,10 @@ Index: chromium-143.0.7499.40/sandbox/features.gni - current_cpu == "mipsel" || current_cpu == "mips64el") + current_cpu == "mipsel" || current_cpu == "mips64el" || + current_cpu == "ppc64") -Index: chromium-143.0.7499.40/sandbox/policy/linux/bpf_renderer_policy_linux.cc +Index: chromium-144.0.7559.59/sandbox/policy/linux/bpf_renderer_policy_linux.cc =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/policy/linux/bpf_renderer_policy_linux.cc -+++ chromium-143.0.7499.40/sandbox/policy/linux/bpf_renderer_policy_linux.cc +--- chromium-144.0.7559.59.orig/sandbox/policy/linux/bpf_renderer_policy_linux.cc ++++ chromium-144.0.7559.59/sandbox/policy/linux/bpf_renderer_policy_linux.cc @@ -17,6 +17,11 @@ #include "sandbox/linux/system_headers/linux_syscalls.h" #include "sandbox/policy/linux/sandbox_linux.h" @@ -59,10 +59,10 @@ Index: chromium-143.0.7499.40/sandbox/policy/linux/bpf_renderer_policy_linux.cc case __NR_getrlimit: case __NR_setrlimit: // We allow setrlimit to dynamically adjust the address space limit as -Index: chromium-143.0.7499.40/sandbox/linux/bpf_dsl/linux_syscall_ranges.h +Index: chromium-144.0.7559.59/sandbox/linux/bpf_dsl/linux_syscall_ranges.h =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/linux/bpf_dsl/linux_syscall_ranges.h -+++ chromium-143.0.7499.40/sandbox/linux/bpf_dsl/linux_syscall_ranges.h +--- chromium-144.0.7559.59.orig/sandbox/linux/bpf_dsl/linux_syscall_ranges.h ++++ chromium-144.0.7559.59/sandbox/linux/bpf_dsl/linux_syscall_ranges.h @@ -56,6 +56,13 @@ #define MAX_PUBLIC_SYSCALL __NR_syscalls #define MAX_SYSCALL MAX_PUBLIC_SYSCALL @@ -77,10 +77,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/bpf_dsl/linux_syscall_ranges.h #else #error "Unsupported architecture" #endif -Index: chromium-143.0.7499.40/sandbox/linux/BUILD.gn +Index: chromium-144.0.7559.59/sandbox/linux/BUILD.gn =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/linux/BUILD.gn -+++ chromium-143.0.7499.40/sandbox/linux/BUILD.gn +--- chromium-144.0.7559.59.orig/sandbox/linux/BUILD.gn ++++ chromium-144.0.7559.59/sandbox/linux/BUILD.gn @@ -376,6 +376,8 @@ component("sandbox_services") { source_set("sandbox_services_headers") { @@ -90,10 +90,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/BUILD.gn "system_headers/arm64_linux_syscalls.h", "system_headers/arm_linux_syscalls.h", "system_headers/arm_linux_ucontext.h", -Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_syscalls.h +Index: chromium-144.0.7559.59/sandbox/linux/system_headers/linux_syscalls.h =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/linux/system_headers/linux_syscalls.h -+++ chromium-143.0.7499.40/sandbox/linux/system_headers/linux_syscalls.h +--- chromium-144.0.7559.59.orig/sandbox/linux/system_headers/linux_syscalls.h ++++ chromium-144.0.7559.59/sandbox/linux/system_headers/linux_syscalls.h @@ -44,4 +44,8 @@ #include "sandbox/linux/system_headers/arm64_linux_syscalls.h" #endif @@ -103,10 +103,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_syscalls.h +#endif + #endif // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_ -Index: chromium-143.0.7499.40/sandbox/linux/system_headers/ppc64_linux_syscalls.h +Index: chromium-144.0.7559.59/sandbox/linux/system_headers/ppc64_linux_syscalls.h =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/sandbox/linux/system_headers/ppc64_linux_syscalls.h ++++ chromium-144.0.7559.59/sandbox/linux/system_headers/ppc64_linux_syscalls.h @@ -0,0 +1,25 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -133,10 +133,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/system_headers/ppc64_linux_syscalls. +#endif + +#endif // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_ -Index: chromium-143.0.7499.40/sandbox/linux/system_headers/ppc64_linux_ucontext.h +Index: chromium-144.0.7559.59/sandbox/linux/system_headers/ppc64_linux_ucontext.h =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/sandbox/linux/system_headers/ppc64_linux_ucontext.h ++++ chromium-144.0.7559.59/sandbox/linux/system_headers/ppc64_linux_ucontext.h @@ -0,0 +1,12 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -150,11 +150,11 @@ Index: chromium-143.0.7499.40/sandbox/linux/system_headers/ppc64_linux_ucontext. +//TODO: is it necessary to redefine ucontext on PPC64? + +#endif // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_ -Index: chromium-143.0.7499.40/sandbox/linux/syscall_broker/broker_process.cc +Index: chromium-144.0.7559.59/sandbox/linux/syscall_broker/broker_process.cc =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/linux/syscall_broker/broker_process.cc -+++ chromium-143.0.7499.40/sandbox/linux/syscall_broker/broker_process.cc -@@ -167,7 +167,7 @@ bool BrokerProcess::IsSyscallBrokerable( +--- chromium-144.0.7559.59.orig/sandbox/linux/syscall_broker/broker_process.cc ++++ chromium-144.0.7559.59/sandbox/linux/syscall_broker/broker_process.cc +@@ -166,7 +166,7 @@ bool BrokerProcess::IsSyscallBrokerable( #if defined(__NR_fstatat64) case __NR_fstatat64: #endif @@ -163,10 +163,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/syscall_broker/broker_process.cc case __NR_newfstatat: #endif return !fast_check || policy_->allowed_command_set.test(COMMAND_STAT); -Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc +Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc -+++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc +--- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc ++++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc @@ -90,7 +90,8 @@ bool IsBaselinePolicyWatched(int sysno) SyscallSets::IsPrctl(sysno) || SyscallSets::IsProcessGroupOrSession(sysno) || @@ -196,11 +196,11 @@ Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/baseline_policy. if (SyscallSets::IsSocketCall(sysno)) return RestrictSocketcallCommand(); #endif -Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc +Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc -+++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc -@@ -44,7 +44,7 @@ +--- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc ++++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc +@@ -43,7 +43,7 @@ #define MAP_DROPPABLE 0x08 // Zero memory under memory pressure. #endif @@ -209,7 +209,7 @@ Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_paramete !defined(PTRACE_GET_THREAD_AREA) // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA. -@@ -53,6 +53,11 @@ +@@ -52,6 +52,11 @@ #include #endif @@ -219,8 +219,8 @@ Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_paramete +#endif + #if BUILDFLAG(IS_ANDROID) + #include "base/android/background_thread_pool_field_trial.h" - #if !defined(F_DUPFD_CLOEXEC) @@ -110,6 +115,15 @@ inline bool IsArchitectureMips() { #endif } @@ -305,10 +305,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_paramete case __NR_sendto: // Could specify destination. argIndex = 3; break; -Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h +Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h -+++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h +--- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h ++++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h @@ -56,7 +56,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME. SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands(); @@ -318,10 +318,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_paramete // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2), // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2). SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand(); -Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc -+++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +--- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ++++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc @@ -29,7 +29,8 @@ bool SyscallSets::IsAllowedGettime(int s switch (sysno) { case __NR_gettimeofday: @@ -781,10 +781,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc case __NR_vserver: #endif return true; -Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h +Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h -+++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h +--- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h ++++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h @@ -46,13 +46,14 @@ class SANDBOX_EXPORT SyscallSets { static bool IsDeniedGetOrModifySocket(int sysno); @@ -834,11 +834,11 @@ Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h // Big system V multiplexing system call. static bool IsSystemVIpc(int sysno); #endif -Index: chromium-143.0.7499.40/sandbox/linux/services/syscall_wrappers.cc +Index: chromium-144.0.7559.59/sandbox/linux/services/syscall_wrappers.cc =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/linux/services/syscall_wrappers.cc -+++ chromium-143.0.7499.40/sandbox/linux/services/syscall_wrappers.cc -@@ -68,7 +68,7 @@ long sys_clone(unsigned long flags, +--- chromium-144.0.7559.59.orig/sandbox/linux/services/syscall_wrappers.cc ++++ chromium-144.0.7559.59/sandbox/linux/services/syscall_wrappers.cc +@@ -63,7 +63,7 @@ long sys_clone(unsigned long flags, #if defined(ARCH_CPU_X86_64) return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls); #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \ @@ -847,10 +847,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/services/syscall_wrappers.cc // CONFIG_CLONE_BACKWARDS defined. return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid); #endif -Index: chromium-143.0.7499.40/sandbox/linux/bpf_dsl/seccomp_macros.h +Index: chromium-144.0.7559.59/sandbox/linux/bpf_dsl/seccomp_macros.h =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/linux/bpf_dsl/seccomp_macros.h -+++ chromium-143.0.7499.40/sandbox/linux/bpf_dsl/seccomp_macros.h +--- chromium-144.0.7559.59.orig/sandbox/linux/bpf_dsl/seccomp_macros.h ++++ chromium-144.0.7559.59/sandbox/linux/bpf_dsl/seccomp_macros.h @@ -14,6 +14,9 @@ #if defined(__mips__) // sys/user.h in eglibc misses size_t definition @@ -913,10 +913,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/bpf_dsl/seccomp_macros.h #else #error Unsupported target platform -Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_seccomp.h +Index: chromium-144.0.7559.59/sandbox/linux/system_headers/linux_seccomp.h =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/linux/system_headers/linux_seccomp.h -+++ chromium-143.0.7499.40/sandbox/linux/system_headers/linux_seccomp.h +--- chromium-144.0.7559.59.orig/sandbox/linux/system_headers/linux_seccomp.h ++++ chromium-144.0.7559.59/sandbox/linux/system_headers/linux_seccomp.h @@ -38,6 +38,9 @@ #ifndef EM_AARCH64 #define EM_AARCH64 183 @@ -940,10 +940,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_seccomp.h // For prctl.h #ifndef PR_SET_SECCOMP -Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_signal.h +Index: chromium-144.0.7559.59/sandbox/linux/system_headers/linux_signal.h =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/linux/system_headers/linux_signal.h -+++ chromium-143.0.7499.40/sandbox/linux/system_headers/linux_signal.h +--- chromium-144.0.7559.59.orig/sandbox/linux/system_headers/linux_signal.h ++++ chromium-144.0.7559.59/sandbox/linux/system_headers/linux_signal.h @@ -13,7 +13,7 @@ // (not undefined, but defined different values and in different memory // layouts). So, fill the gap here. @@ -953,10 +953,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_signal.h #define LINUX_SIGHUP 1 #define LINUX_SIGINT 2 -Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf/syscall.cc +Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf/syscall.cc =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf/syscall.cc -+++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf/syscall.cc +--- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf/syscall.cc ++++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf/syscall.cc @@ -19,7 +19,7 @@ namespace sandbox { namespace { @@ -1051,11 +1051,11 @@ Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf/syscall.cc #endif SECCOMP_RESULT(ctx) = static_cast(ret_val); } -Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc +Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc -+++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc -@@ -350,8 +350,10 @@ TEST_BASELINE_SIGSYS(__NR_timer_create) +--- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc ++++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc +@@ -354,8 +354,10 @@ TEST_BASELINE_SIGSYS(__NR_timer_create) #if !defined(__aarch64__) TEST_BASELINE_SIGSYS(__NR_inotify_init) @@ -1066,10 +1066,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/baseline_policy_ #if defined(LIBC_GLIBC) && !BUILDFLAG(IS_CHROMEOS) BPF_TEST_C(BaselinePolicy, FutexEINVAL, BaselinePolicy) { -Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_stat.h +Index: chromium-144.0.7559.59/sandbox/linux/system_headers/linux_stat.h =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/linux/system_headers/linux_stat.h -+++ chromium-143.0.7499.40/sandbox/linux/system_headers/linux_stat.h +--- chromium-144.0.7559.59.orig/sandbox/linux/system_headers/linux_stat.h ++++ chromium-144.0.7559.59/sandbox/linux/system_headers/linux_stat.h @@ -173,6 +173,28 @@ struct kernel_stat { unsigned int __unused4; unsigned int __unused5; @@ -1086,12 +1086,12 @@ Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_stat.h + long st_size; + unsigned long st_blksize; + unsigned long st_blocks; -+ // unsigned long st_atime; -+ unsigned long st_atime_nsec; -+ //unsigned long st_mtime; -+ unsigned long st_mtime_nsec; -+ //unsigned long st_ctime; -+ unsigned long st_ctime_nsec; ++ unsigned long st_atime_; ++ unsigned long st_atime_nsec_; ++ unsigned long st_mtime_; ++ unsigned long st_mtime_nsec_; ++ unsigned long st_ctime_; ++ unsigned long st_ctime_nsec_; + unsigned long __unused4; + unsigned long __unused5; + unsigned long __unused6; @@ -1099,10 +1099,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/system_headers/linux_stat.h #endif #if !defined(AT_EMPTY_PATH) -Index: chromium-143.0.7499.40/sandbox/linux/services/credentials.cc +Index: chromium-144.0.7559.59/sandbox/linux/services/credentials.cc =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/linux/services/credentials.cc -+++ chromium-143.0.7499.40/sandbox/linux/services/credentials.cc +--- chromium-144.0.7559.59.orig/sandbox/linux/services/credentials.cc ++++ chromium-144.0.7559.59/sandbox/linux/services/credentials.cc @@ -85,7 +85,7 @@ bool ChrootToSafeEmptyDir() { alignas(16) std::array stack_buf; @@ -1134,10 +1134,10 @@ Index: chromium-143.0.7499.40/sandbox/linux/services/credentials.cc clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS; char tls_buf[PTHREAD_STACK_MIN_CONST] = {}; -Index: chromium-143.0.7499.40/sandbox/policy/linux/bpf_utility_policy_linux.cc +Index: chromium-144.0.7559.59/sandbox/policy/linux/bpf_utility_policy_linux.cc =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/policy/linux/bpf_utility_policy_linux.cc -+++ chromium-143.0.7499.40/sandbox/policy/linux/bpf_utility_policy_linux.cc +--- chromium-144.0.7559.59.orig/sandbox/policy/linux/bpf_utility_policy_linux.cc ++++ chromium-144.0.7559.59/sandbox/policy/linux/bpf_utility_policy_linux.cc @@ -34,7 +34,7 @@ ResultExpr UtilityProcessPolicy::Evaluat case __NR_fdatasync: case __NR_fsync: @@ -1147,11 +1147,11 @@ Index: chromium-143.0.7499.40/sandbox/policy/linux/bpf_utility_policy_linux.cc case __NR_getrlimit: #endif #if defined(__i386__) || defined(__arm__) -Index: chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc +Index: chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc =================================================================== ---- chromium-143.0.7499.40.orig/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc -+++ chromium-143.0.7499.40/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc -@@ -389,7 +389,16 @@ intptr_t SIGSYSFstatatHandler(const stru +--- chromium-144.0.7559.59.orig/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc ++++ chromium-144.0.7559.59/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc +@@ -384,7 +384,16 @@ intptr_t SIGSYSFstatatHandler(const stru if (args.nr == __NR_fstatat_default) { if (*reinterpret_cast(args.args[1]) == '\0' && args.args[3] == static_cast(AT_EMPTY_PATH)) { diff --git a/0001-swiftshader-fix-build.patch b/0001-swiftshader-fix-build.patch index c3f8771..efd12dc 100644 --- a/0001-swiftshader-fix-build.patch +++ b/0001-swiftshader-fix-build.patch @@ -1,6 +1,13 @@ -diff -up chromium-140.0.7339.80/third_party/swiftshader/third_party/llvm-16.0/BUILD.gn.me chromium-140.0.7339.80/third_party/swiftshader/third_party/llvm-16.0/BUILD.gn ---- chromium-140.0.7339.80/third_party/swiftshader/third_party/llvm-16.0/BUILD.gn.me 2025-09-04 06:45:21.570780130 +0200 -+++ chromium-140.0.7339.80/third_party/swiftshader/third_party/llvm-16.0/BUILD.gn 2025-09-04 06:55:56.278501043 +0200 +Description: fix swiftshader build issue on ppc64el +Origin: vendor, https://gitlab.raptorengineering.com/raptor-engineering-public/chromium/openpower-patches/-/blob/chromium-131/patches/ppc64le/third_party/0001-swiftshader-fix-build.patch +Bug: https://buildd.debian.org/status/fetch.php?pkg=chromium&arch=ppc64el&ver=131.0.6778.204-1&stamp=1734633529&raw=0 +Last-Update: 2024-12-20 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: chromium-144.0.7559.59/third_party/swiftshader/third_party/llvm-16.0/BUILD.gn +=================================================================== +--- chromium-144.0.7559.59.orig/third_party/swiftshader/third_party/llvm-16.0/BUILD.gn ++++ chromium-144.0.7559.59/third_party/swiftshader/third_party/llvm-16.0/BUILD.gn @@ -1599,6 +1599,9 @@ swiftshader_llvm_source_set("swiftshader "llvm/lib/Target/PowerPC/PPCVSXFMAMutate.cpp", "llvm/lib/Target/PowerPC/PPCVSXSwapRemoval.cpp", diff --git a/0001-third_party-angle-Include-missing-header-cstddef-in-.patch b/0001-third_party-angle-Include-missing-header-cstddef-in-.patch index 0377a9b..72b1e2a 100644 --- a/0001-third_party-angle-Include-missing-header-cstddef-in-.patch +++ b/0001-third_party-angle-Include-missing-header-cstddef-in-.patch @@ -1,7 +1,7 @@ -Index: chromium-143.0.7499.40/third_party/angle/src/libANGLE/Constants.h +Index: chromium-144.0.7559.59/third_party/angle/src/libANGLE/Constants.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/angle/src/libANGLE/Constants.h -+++ chromium-143.0.7499.40/third_party/angle/src/libANGLE/Constants.h +--- chromium-144.0.7559.59.orig/third_party/angle/src/libANGLE/Constants.h ++++ chromium-144.0.7559.59/third_party/angle/src/libANGLE/Constants.h @@ -9,6 +9,7 @@ #ifndef LIBANGLE_CONSTANTS_H_ #define LIBANGLE_CONSTANTS_H_ diff --git a/0001-third_party-libvpx-Properly-generate-gni-on-ppc64.patch b/0001-third_party-libvpx-Properly-generate-gni-on-ppc64.patch index 8f06a2d..358582b 100644 --- a/0001-third_party-libvpx-Properly-generate-gni-on-ppc64.patch +++ b/0001-third_party-libvpx-Properly-generate-gni-on-ppc64.patch @@ -8,10 +8,10 @@ Subject: [PATCH] third_party/libvpx: Properly generate gni on ppc64 third_party/libvpx/generate_gni.sh | 10 ++++++++++ 2 files changed, 12 insertions(+) -Index: chromium-143.0.7499.40/third_party/libvpx/BUILD.gn +Index: chromium-144.0.7559.59/third_party/libvpx/BUILD.gn =================================================================== ---- chromium-143.0.7499.40.orig/third_party/libvpx/BUILD.gn -+++ chromium-143.0.7499.40/third_party/libvpx/BUILD.gn +--- chromium-144.0.7559.59.orig/third_party/libvpx/BUILD.gn ++++ chromium-144.0.7559.59/third_party/libvpx/BUILD.gn @@ -297,6 +297,8 @@ if (current_cpu == "x86" || (current_cpu } else if (current_cpu == "x64") { deps = [ ":libvpx_x86_64_headers" ] diff --git a/0001-third_party-pffft-Include-altivec.h-on-ppc64-with-SI.patch b/0001-third_party-pffft-Include-altivec.h-on-ppc64-with-SI.patch index 2ba1e48..06a8f9e 100644 --- a/0001-third_party-pffft-Include-altivec.h-on-ppc64-with-SI.patch +++ b/0001-third_party-pffft-Include-altivec.h-on-ppc64-with-SI.patch @@ -8,10 +8,10 @@ Subject: [PATCH] third_party/pffft: Include altivec.h on ppc64 with SIMD third_party/pffft/src/pffft.c | 1 + 1 file changed, 1 insertion(+) -Index: chromium-143.0.7499.40/third_party/pffft/src/pffft.c +Index: chromium-144.0.7559.59/third_party/pffft/src/pffft.c =================================================================== ---- chromium-143.0.7499.40.orig/third_party/pffft/src/pffft.c -+++ chromium-143.0.7499.40/third_party/pffft/src/pffft.c +--- chromium-144.0.7559.59.orig/third_party/pffft/src/pffft.c ++++ chromium-144.0.7559.59/third_party/pffft/src/pffft.c @@ -100,6 +100,7 @@ Altivec support macros */ diff --git a/0002-Add-PPC64-generated-files-for-boringssl.patch b/0002-Add-PPC64-generated-files-for-boringssl.patch index 12d7619..79e72c5 100644 --- a/0002-Add-PPC64-generated-files-for-boringssl.patch +++ b/0002-Add-PPC64-generated-files-for-boringssl.patch @@ -1,7 +1,7 @@ -Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/bcm/aesp8-ppc-linux.S +Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/bcm/aesp8-ppc-linux.S =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/boringssl/src/gen/bcm/aesp8-ppc-linux.S ++++ chromium-144.0.7559.59/third_party/boringssl/src/gen/bcm/aesp8-ppc-linux.S @@ -0,0 +1,3673 @@ +// This file is generated from a similarly-named Perl script in the BoringSSL +// source tree. Do not edit by hand. @@ -3676,10 +3676,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/bcm/aesp8-ppc-linux. +// See https://www.airs.ccom/blog/archives/518. +.section .note.GNU-stack,"",%progbits +#endif -Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/bcm/ghashp8-ppc-linux.S +Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/bcm/ghashp8-ppc-linux.S =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/boringssl/src/gen/bcm/ghashp8-ppc-linux.S ++++ chromium-144.0.7559.59/third_party/boringssl/src/gen/bcm/ghashp8-ppc-linux.S @@ -0,0 +1,590 @@ +// This file is generated from a similarly-named Perl script in the BoringSSL +// source tree. Do not edit by hand. @@ -4271,10 +4271,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/bcm/ghashp8-ppc-linu +// See https://www.airs.ccom/blog/archives/518. +.section .note.GNU-stack,"",%progbits +#endif -Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.cmake +Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.cmake =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/gen/sources.cmake -+++ chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.cmake +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/gen/sources.cmake ++++ chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.cmake @@ -122,6 +122,7 @@ set( gen/bcm/aesni-x86-linux.S gen/bcm/aesni-x86_64-apple.S @@ -4299,7 +4299,7 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.cmake crypto/crypto.cc crypto/curve25519/curve25519.cc crypto/curve25519/curve25519_64_adx.cc -@@ -2971,6 +2974,7 @@ set( +@@ -2980,6 +2983,7 @@ set( gen/test_support/trampoline-armv8-apple.S gen/test_support/trampoline-armv8-linux.S gen/test_support/trampoline-armv8-win.S @@ -4307,10 +4307,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.cmake gen/test_support/trampoline-x86-apple.S gen/test_support/trampoline-x86-linux.S gen/test_support/trampoline-x86_64-apple.S -Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.json +Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.json =================================================================== ---- chromium-143.0.7499.40.orig/third_party/boringssl/src/gen/sources.json -+++ chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.json +--- chromium-144.0.7559.59.orig/third_party/boringssl/src/gen/sources.json ++++ chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.json @@ -100,6 +100,7 @@ "gen/bcm/aesni-x86-linux.S", "gen/bcm/aesni-x86_64-apple.S", @@ -4335,7 +4335,7 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.json "crypto/crypto.cc", "crypto/curve25519/curve25519.cc", "crypto/curve25519/curve25519_64_adx.cc", -@@ -2883,6 +2886,7 @@ +@@ -2892,6 +2895,7 @@ "gen/test_support/trampoline-armv8-apple.S", "gen/test_support/trampoline-armv8-linux.S", "gen/test_support/trampoline-armv8-win.S", @@ -4343,10 +4343,10 @@ Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/sources.json "gen/test_support/trampoline-x86-apple.S", "gen/test_support/trampoline-x86-linux.S", "gen/test_support/trampoline-x86_64-apple.S", -Index: chromium-143.0.7499.40/third_party/boringssl/src/gen/test_support/trampoline-ppc-linux.S +Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/test_support/trampoline-ppc-linux.S =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/boringssl/src/gen/test_support/trampoline-ppc-linux.S ++++ chromium-144.0.7559.59/third_party/boringssl/src/gen/test_support/trampoline-ppc-linux.S @@ -0,0 +1,1413 @@ +// This file is generated from a similarly-named Perl script in the BoringSSL +// source tree. Do not edit by hand. diff --git a/0002-Add-ppc64-trap-instructions.patch b/0002-Add-ppc64-trap-instructions.patch index 61e9992..9559580 100644 --- a/0002-Add-ppc64-trap-instructions.patch +++ b/0002-Add-ppc64-trap-instructions.patch @@ -1,7 +1,7 @@ -Index: chromium-143.0.7499.40/v8/src/base/immediate-crash.h +Index: chromium-144.0.7559.59/v8/src/base/immediate-crash.h =================================================================== ---- chromium-143.0.7499.40.orig/v8/src/base/immediate-crash.h -+++ chromium-143.0.7499.40/v8/src/base/immediate-crash.h +--- chromium-144.0.7559.59.orig/v8/src/base/immediate-crash.h ++++ chromium-144.0.7559.59/v8/src/base/immediate-crash.h @@ -98,6 +98,13 @@ #define TRAP_SEQUENCE1_() asm volatile(".2byte 0x0001"); #define TRAP_SEQUENCE2_() asm volatile("") diff --git a/0002-regenerate-xnn-buildgn.patch b/0002-regenerate-xnn-buildgn.patch index 09eb811..21211da 100644 --- a/0002-regenerate-xnn-buildgn.patch +++ b/0002-regenerate-xnn-buildgn.patch @@ -1,10 +1,10 @@ File regenerated by running 'python3 generate_build_gn.py' Requires Bazel 8 or higher to regenerate -Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn +Index: chromium-144.0.7559.59/third_party/xnnpack/BUILD.gn =================================================================== ---- chromium-143.0.7499.40.orig/third_party/xnnpack/BUILD.gn -+++ chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn +--- chromium-144.0.7559.59.orig/third_party/xnnpack/BUILD.gn ++++ chromium-144.0.7559.59/third_party/xnnpack/BUILD.gn @@ -35,10 +35,10 @@ config("xnnpack_public_config") { } @@ -20,7 +20,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn } config("xnnpack_private_config") { -@@ -48,1840 +48,2104 @@ config("xnnpack_private_config") { +@@ -48,1844 +48,2108 @@ config("xnnpack_private_config") { ] } @@ -1687,6 +1687,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ":f32-vtanh_arm64", + ":f32-vunary_arm64", + ":operators_arm64", ++ ":pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2", + ":pf16-gemm_arch=armv8.2-a+sve+sve2", + ":pf32-gemm_arch=armv8.2-a+sve+sve2", + ":pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2", @@ -1709,6 +1710,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ":qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod", + ":qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16", + ":qd8-f32-qb4w-gemm_arm64", ++ ":qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod", + ":qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod", + ":qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16", + ":qd8-f32-qc4w-gemm_arm64", @@ -2425,6 +2427,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ":f32-vtanh_arm64_standalone", + ":f32-vunary_arm64_standalone", + ":operators_arm64_standalone", ++ ":pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2_standalone", + ":pf16-gemm_arch=armv8.2-a+sve+sve2_standalone", + ":pf32-gemm_arch=armv8.2-a+sve+sve2_standalone", + ":pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2_standalone", @@ -2447,6 +2450,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ":qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone", + ":qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", + ":qd8-f32-qb4w-gemm_arm64_standalone", ++ ":qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod_standalone", + ":qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone", + ":qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", + ":qd8-f32-qc4w-gemm_arm64_standalone", @@ -2650,6 +2654,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ":f32-vtanh_arm64", - ":f32-vunary_arm64", - ":operators_arm64", +- ":pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2", - ":pf16-gemm_arch=armv8.2-a+sve+sve2", - ":pf32-gemm_arch=armv8.2-a+sve+sve2", - ":pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2", @@ -2672,6 +2677,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ":qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod", - ":qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16", - ":qd8-f32-qb4w-gemm_arm64", +- ":qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod", - ":qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod", - ":qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16", - ":qd8-f32-qc4w-gemm_arm64", @@ -3042,6 +3048,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ":f32-vtanh_arm64_standalone", - ":f32-vunary_arm64_standalone", - ":operators_arm64_standalone", +- ":pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2_standalone", - ":pf16-gemm_arch=armv8.2-a+sve+sve2_standalone", - ":pf32-gemm_arch=armv8.2-a+sve+sve2_standalone", - ":pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2_standalone", @@ -3064,6 +3071,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ":qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone", - ":qd8-f32-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", - ":qd8-f32-qb4w-gemm_arm64_standalone", +- ":qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod_standalone", - ":qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone", - ":qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone", - ":qd8-f32-qc4w-gemm_arm64_standalone", @@ -3933,7 +3941,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn ] } } else { -@@ -1891,6 +2155,7 @@ if (current_cpu == "x64" || current_cpu +@@ -1895,6 +2159,7 @@ if (current_cpu == "x64" || current_cpu } } @@ -3941,7 +3949,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn if (build_with_chromium) { source_set("xnnpack") { public = [ "src/include/xnnpack.h" ] -@@ -1901,37 +2166,37 @@ if (build_with_chromium) { +@@ -1905,38 +2170,38 @@ if (build_with_chromium) { configs += [ ":xnnpack_private_config" ] sources = [ @@ -3970,6 +3978,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/sanitizers.c", - "src/src/subgraph.c", - "src/src/tensor.c", +- "src/src/xnnpack/fingerprint_check.c", + "src/src/cache.c", + "src/src/datatype.c", + "src/src/indirection.c", @@ -3989,7 +3998,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/runtime.c", + "src/src/sanitizers.c", + "src/src/subgraph.c", -+ "src/src/tensor.c" ++ "src/src/tensor.c", ++ "src/src/xnnpack/fingerprint_check.c" ] deps = xnnpack_deps + [ @@ -4006,7 +4016,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn public_configs = [ ":xnnpack_public_config" ] } -@@ -1948,37 +2213,37 @@ if (build_with_internal_optimization_gui +@@ -1953,38 +2218,38 @@ if (build_with_internal_optimization_gui configs += [ ":xnnpack_private_config" ] sources = [ @@ -4035,6 +4045,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/sanitizers.c", - "src/src/subgraph.c", - "src/src/tensor.c", +- "src/src/xnnpack/fingerprint_check.c", + "src/src/cache.c", + "src/src/datatype.c", + "src/src/indirection.c", @@ -4054,7 +4065,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/runtime.c", + "src/src/sanitizers.c", + "src/src/subgraph.c", -+ "src/src/tensor.c" ++ "src/src/tensor.c", ++ "src/src/xnnpack/fingerprint_check.c" ] deps = xnnpack_standalone_deps + [ @@ -4071,7 +4083,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn public_configs = [ ":xnnpack_public_config" ] -@@ -1989,56289 +2254,65801 @@ if (build_with_internal_optimization_gui +@@ -1995,56421 +2260,65945 @@ if (build_with_internal_optimization_gui } if (current_cpu == "x64" || current_cpu == "x86") { @@ -5368,7 +5380,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - - sources = [ - "src/include/xnnpack.h", -- "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-avx512skx-u64.c", +- "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -5424,7 +5436,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - - sources = [ - "src/include/xnnpack.h", -- "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-avx512skx-u64.c", +- "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -5463,7 +5475,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - - sources = [ - "src/include/xnnpack.h", -- "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-f16c-u32.c", +- "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -5497,7 +5509,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - - sources = [ - "src/include/xnnpack.h", -- "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-f16c-u32.c", +- "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -7213,7 +7225,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-avx512skx-u64.c" ++ "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -7285,7 +7297,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-avx512skx-u64.c" ++ "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-avx512skx-u64.c" + ] - sources = [ @@ -7362,7 +7374,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-f16c-u32.c" ++ "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c" + ] - if (build_with_chromium) { @@ -7454,7 +7466,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-f16c-u32.c" ++ "src/src/f16-f32acc-rdsum/gen/f16-f32acc-rdsum-7p7x-minmax-f16c-u32.c" + ] - sources = [ @@ -24962,6 +24974,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/operators/convolution-nhwc.c", - "src/src/operators/deconvolution-nhwc.c", - "src/src/operators/dynamic-fully-connected-nc.c", +- "src/src/operators/fingerprint_cache.c", +- "src/src/operators/fingerprint_id.c", - "src/src/operators/fully-connected-nc.c", - "src/src/operators/max-pooling-nhwc.c", - "src/src/operators/pack-lh.c", @@ -25035,6 +25049,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/operators/convolution-nhwc.c", - "src/src/operators/deconvolution-nhwc.c", - "src/src/operators/dynamic-fully-connected-nc.c", +- "src/src/operators/fingerprint_cache.c", +- "src/src/operators/fingerprint_id.c", - "src/src/operators/fully-connected-nc.c", - "src/src/operators/max-pooling-nhwc.c", - "src/src/operators/pack-lh.c", @@ -30881,6 +30897,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } +- } +if (build_with_chromium) { + source_set("f32-vcmul_sse-no-sse2") { + cflags = [ @@ -30906,39 +30923,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ] + + public_configs = [ ":xnnpack_public_config" ] -+ } -+} -+ -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("f32-vcmul_sse-no-sse2_standalone") { -+ cflags = [ -+ "-mno-sse2", -+ "-msse" -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-vcmul/gen/f32-vcmul-sse-u8.c" -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] -+ -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] -+ -+ public_configs = [ ":xnnpack_public_config" ] -+ -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } } +} @@ -30966,43 +30950,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+if (build_with_chromium) { -+ source_set("f32-vcmul_x64") { -+ cflags = [ -+ -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c" -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] -+ -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] -+ -+ public_configs = [ ":xnnpack_public_config" ] -+ } -+} -+ +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vcmul_x64_standalone") { ++ source_set("f32-vcmul_sse-no-sse2_standalone") { + cflags = [ -+ ++ "-mno-sse2", ++ "-msse" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c" ++ "src/src/f32-vcmul/gen/f32-vcmul-sse-u8.c" + ] + + configs -= [ "//build/config/compiler:chromium_code" ] @@ -31016,10 +30974,10 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] -+ -+ public_configs = [ ":xnnpack_public_config" ] - public_configs = [ ":xnnpack_public_config" ] ++ public_configs = [ ":xnnpack_public_config" ] ++ + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } @@ -31057,20 +31015,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } +- } +if (build_with_chromium) { -+ source_set("f32-vcopysign_avx-no-avx2-no-f16c-no-fma") { ++ source_set("f32-vcmul_x64") { + cflags = [ -+ "-mavx", -+ "-mno-avx2", -+ "-mno-f16c", -+ "-mno-fma" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vcopysign/gen/f32-vcopysign-avx.c", -+ "src/src/f32-vcopysign/gen/f32-vcopysignc-avx.c", -+ "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx.c" ++ "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c" + ] + + configs -= [ "//build/config/compiler:chromium_code" ] @@ -31086,77 +31040,23 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ] + + public_configs = [ ":xnnpack_public_config" ] -+ } -+} -+ -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("f32-vcopysign_avx-no-avx2-no-f16c-no-fma_standalone") { -+ cflags = [ -+ "-mavx", -+ "-mno-avx2", -+ "-mno-f16c", -+ "-mno-fma" -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-vcopysign/gen/f32-vcopysign-avx.c", -+ "src/src/f32-vcopysign/gen/f32-vcopysignc-avx.c", -+ "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx.c" -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] -+ -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] -+ -+ public_configs = [ ":xnnpack_public_config" ] -+ -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } } +} - if (build_with_chromium) { - source_set("qd8-f32-qc8w-igemm_x64") { - cflags = [] -+if (build_with_chromium) { -+ source_set("f32-vcopysign_avx512f") { ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("f32-vcmul_x64_standalone") { + cflags = [ -+ "-mavx512f" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vcopysign/gen/f32-vcopysign-avx512f.c", -+ "src/src/f32-vcopysign/gen/f32-vcopysignc-avx512f.c", -+ "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx512f.c" ++ "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c" + ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] -+ -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] -+ -+ public_configs = [ ":xnnpack_public_config" ] -+ } -+} - sources = [ - "src/include/xnnpack.h", @@ -31164,20 +31064,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-1x4-minmax-scalar.c", - "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c", - ] -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("f32-vcopysign_avx512f_standalone") { -+ cflags = [ -+ "-mavx512f" -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-vcopysign/gen/f32-vcopysign-avx512f.c", -+ "src/src/f32-vcopysign/gen/f32-vcopysignc-avx512f.c", -+ "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx512f.c" -+ ] -+ + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] @@ -31208,69 +31094,26 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn } } +} -+ -+if (build_with_chromium) { -+ source_set("f32-vcopysign_sse2-no-sse3") { -+ cflags = [ -+ "-mno-sse3", -+ "-msse2" -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-vcopysign/gen/f32-vcopysign-sse2.c", -+ "src/src/f32-vcopysign/gen/f32-vcopysignc-sse2.c", -+ "src/src/f32-vcopysign/gen/f32-vrcopysignc-sse2.c" -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] -+ -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] -+ -+ public_configs = [ ":xnnpack_public_config" ] -+ } -+} - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { - source_set("qd8-f32-qc8w-igemm_x64_standalone") { - cflags = [] -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("f32-vcopysign_sse2-no-sse3_standalone") { ++if (build_with_chromium) { ++ source_set("f32-vcopysign_avx-no-avx2-no-f16c-no-fma") { + cflags = [ -+ "-mno-sse3", -+ "-msse2" ++ "-mavx", ++ "-mno-avx2", ++ "-mno-f16c", ++ "-mno-fma" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vcopysign/gen/f32-vcopysign-sse2.c", -+ "src/src/f32-vcopysign/gen/f32-vcopysignc-sse2.c", -+ "src/src/f32-vcopysign/gen/f32-vrcopysignc-sse2.c" ++ "src/src/f32-vcopysign/gen/f32-vcopysign-avx.c", ++ "src/src/f32-vcopysign/gen/f32-vcopysignc-avx.c", ++ "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx.c" + ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] -+ -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] -+ -+ public_configs = [ ":xnnpack_public_config" ] - sources = [ - "src/include/xnnpack.h", @@ -31296,9 +31139,20 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } +- } ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] } +} @@ -31328,6 +31182,263 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("f32-vcopysign_avx-no-avx2-no-f16c-no-fma_standalone") { ++ cflags = [ ++ "-mavx", ++ "-mno-avx2", ++ "-mno-f16c", ++ "-mno-fma" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-vcopysign/gen/f32-vcopysign-avx.c", ++ "src/src/f32-vcopysign/gen/f32-vcopysignc-avx.c", ++ "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] + +- public_configs = [ ":xnnpack_public_config" ] ++ public_configs = [ ":xnnpack_public_config" ] ++ ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") { +- cflags = [ +- "-mavx", +- "-mno-avx2", +- "-mno-f16c", +- "-mno-fma", +- ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c", +- "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool:pthreadpool_standalone", +- ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } ++if (build_with_chromium) { ++ source_set("f32-vcopysign_avx512f") { ++ cflags = [ ++ "-mavx512f" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-vcopysign/gen/f32-vcopysign-avx512f.c", ++ "src/src/f32-vcopysign/gen/f32-vcopysignc-avx512f.c", ++ "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx512f.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] ++ } ++} ++ ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("f32-vcopysign_avx512f_standalone") { ++ cflags = [ ++ "-mavx512f" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-vcopysign/gen/f32-vcopysign-avx512f.c", ++ "src/src/f32-vcopysign/gen/f32-vcopysignc-avx512f.c", ++ "src/src/f32-vcopysign/gen/f32-vrcopysignc-avx512f.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] ++ ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- if (build_with_chromium) { +- source_set("qs8-dwconv_f16c-fma-avx2") { +- cflags = [ +- "-mavx2", +- "-mf16c", +- "-mfma", +- ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx2-mul32.c", +- "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx2-mul32.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] ++if (build_with_chromium) { ++ source_set("f32-vcopysign_sse2-no-sse3") { ++ cflags = [ ++ "-mno-sse3", ++ "-msse2" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-vcopysign/gen/f32-vcopysign-sse2.c", ++ "src/src/f32-vcopysign/gen/f32-vcopysignc-sse2.c", ++ "src/src/f32-vcopysign/gen/f32-vrcopysignc-sse2.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] ++ } ++} ++ ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("f32-vcopysign_sse2-no-sse3_standalone") { ++ cflags = [ ++ "-mno-sse3", ++ "-msse2" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-vcopysign/gen/f32-vcopysign-sse2.c", ++ "src/src/f32-vcopysign/gen/f32-vcopysignc-sse2.c", ++ "src/src/f32-vcopysign/gen/f32-vrcopysignc-sse2.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] + +- public_configs = [ ":xnnpack_public_config" ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-dwconv_f16c-fma-avx2_standalone") { +- cflags = [ +- "-mavx2", +- "-mf16c", +- "-mfma", +- ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx2-mul32.c", +- "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx2-mul32.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool:pthreadpool_standalone", +- ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +if (build_with_chromium) { + source_set("f32-vcopysign_x64") { + cflags = [ @@ -31384,28 +31495,30 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ] + + public_configs = [ ":xnnpack_public_config" ] - -- public_configs = [ ":xnnpack_public_config" ] ++ + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } } +} -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") { +- if (build_with_chromium) { +- source_set( +- "qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") { - cflags = [ -- "-mavx", -- "-mno-avx2", -- "-mno-f16c", -- "-mno-fma", +- "-mavx512bw", +- "-mavx512cd", +- "-mavx512dq", +- "-mavx512f", +- "-mavx512vl", +- "-mf16c", +- "-mfma", - ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c", -- "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c", +- "src/src/qs8-dwconv/gen/qs8-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c", +- "src/src/qs8-dwconv/gen/qs8-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -31417,14 +31530,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", +- "//third_party/pthreadpool", - ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } +if (build_with_chromium) { + source_set("f32-vcos_avx-no-avx2-no-f16c-no-fma") { + cflags = [ @@ -31483,279 +31590,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ] + + public_configs = [ ":xnnpack_public_config" ] -+ -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} - -- if (build_with_chromium) { -- source_set("qs8-dwconv_f16c-fma-avx2") { -- cflags = [ -- "-mavx2", -- "-mf16c", -- "-mfma", -- ] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx2-mul32.c", -- "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx2-mul32.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool", -- ] -+if (build_with_chromium) { -+ source_set("f32-vcos_avx512f") { -+ cflags = [ -+ "-mavx512f" -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-vcos/gen/f32-vcos-avx512f-rational-5-4-div.c" -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] -+ -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] -+ -+ public_configs = [ ":xnnpack_public_config" ] -+ } -+} -+ -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("f32-vcos_avx512f_standalone") { -+ cflags = [ -+ "-mavx512f" -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-vcos/gen/f32-vcos-avx512f-rational-5-4-div.c" -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] -+ -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] - -- public_configs = [ ":xnnpack_public_config" ] -+ public_configs = [ ":xnnpack_public_config" ] -+ -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} - -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-dwconv_f16c-fma-avx2_standalone") { -- cflags = [ -- "-mavx2", -- "-mf16c", -- "-mfma", -- ] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-dwconv/gen/qs8-dwconv-25p16c-minmax-fp32-avx2-mul32.c", -- "src/src/qs8-dwconv/gen/qs8-dwconv-9p16c-minmax-fp32-avx2-mul32.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", -- ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } -+if (build_with_chromium) { -+ source_set("f32-vcos_f16c-fma-no-avx2") { -+ cflags = [ -+ "-mf16c", -+ "-mfma", -+ "-mno-avx2" -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-vcos/gen/f32-vcos-fma3-rational-5-4-div.c" -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] -+ -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] -+ -+ public_configs = [ ":xnnpack_public_config" ] -+ } -+} -+ -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("f32-vcos_f16c-fma-no-avx2_standalone") { -+ cflags = [ -+ "-mf16c", -+ "-mfma", -+ "-mno-avx2" -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-vcos/gen/f32-vcos-fma3-rational-5-4-div.c" -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] -+ -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] -+ -+ public_configs = [ ":xnnpack_public_config" ] -+ -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} - -- if (build_with_chromium) { -- source_set( -- "qs8-dwconv_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") { -- cflags = [ -- "-mavx512bw", -- "-mavx512cd", -- "-mavx512dq", -- "-mavx512f", -- "-mavx512vl", -- "-mf16c", -- "-mfma", -- ] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-dwconv/gen/qs8-dwconv-25p32c-minmax-fp32-avx512skx-mul32.c", -- "src/src/qs8-dwconv/gen/qs8-dwconv-9p32c-minmax-fp32-avx512skx-mul32.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool", -- ] -+if (build_with_chromium) { -+ source_set("f32-vcos_sse2-no-sse3") { -+ cflags = [ -+ "-mno-sse3", -+ "-msse2" -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-vcos/gen/f32-vcos-sse2-rational-5-4-div.c", -+ "src/src/f32-vcos/gen/f32-vcos-sse2fma-rational-5-4-div.c" -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] -+ -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] -+ -+ public_configs = [ ":xnnpack_public_config" ] -+ } -+} -+ -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("f32-vcos_sse2-no-sse3_standalone") { -+ cflags = [ -+ "-mno-sse3", -+ "-msse2" -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-vcos/gen/f32-vcos-sse2-rational-5-4-div.c", -+ "src/src/f32-vcos/gen/f32-vcos-sse2fma-rational-5-4-div.c" -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] -+ -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] -+ -+ public_configs = [ ":xnnpack_public_config" ] - public_configs = [ ":xnnpack_public_config" ] + if (!(is_android && use_order_profiling)) { @@ -31802,6 +31636,271 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } +if (build_with_chromium) { ++ source_set("f32-vcos_avx512f") { ++ cflags = [ ++ "-mavx512f" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-vcos/gen/f32-vcos-avx512f-rational-5-4-div.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] ++ } ++} ++ ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("f32-vcos_avx512f_standalone") { ++ cflags = [ ++ "-mavx512f" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-vcos/gen/f32-vcos-avx512f-rational-5-4-div.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] ++ ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- if (build_with_chromium) { +- source_set("qs8-dwconv_sse2-no-sse3") { +- cflags = [ +- "-mno-sse3", +- "-msse2", +- ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse2-mul16-add16.c", +- "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse2-mul16-add16.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] ++if (build_with_chromium) { ++ source_set("f32-vcos_f16c-fma-no-avx2") { ++ cflags = [ ++ "-mf16c", ++ "-mfma", ++ "-mno-avx2" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-vcos/gen/f32-vcos-fma3-rational-5-4-div.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] ++ } ++} ++ ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("f32-vcos_f16c-fma-no-avx2_standalone") { ++ cflags = [ ++ "-mf16c", ++ "-mfma", ++ "-mno-avx2" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-vcos/gen/f32-vcos-fma3-rational-5-4-div.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] + +- public_configs = [ ":xnnpack_public_config" ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-dwconv_sse2-no-sse3_standalone") { +- cflags = [ +- "-mno-sse3", +- "-msse2", +- ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse2-mul16-add16.c", +- "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse2-mul16-add16.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool:pthreadpool_standalone", +- ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } ++if (build_with_chromium) { ++ source_set("f32-vcos_sse2-no-sse3") { ++ cflags = [ ++ "-mno-sse3", ++ "-msse2" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-vcos/gen/f32-vcos-sse2-rational-5-4-div.c", ++ "src/src/f32-vcos/gen/f32-vcos-sse2fma-rational-5-4-div.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] ++ } ++} ++ ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("f32-vcos_sse2-no-sse3_standalone") { ++ cflags = [ ++ "-mno-sse3", ++ "-msse2" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-vcos/gen/f32-vcos-sse2-rational-5-4-div.c", ++ "src/src/f32-vcos/gen/f32-vcos-sse2fma-rational-5-4-div.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] ++ ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- if (build_with_chromium) { +- source_set("qs8-dwconv_sse4.1-no-sse4.2") { +- cflags = [ +- "-mno-sse4.2", +- "-msse4.1", +- ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse41-mul16-add16.c", +- "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse41-mul16-add16.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] ++if (build_with_chromium) { + source_set("f32-vcos_x64") { + cflags = [ + @@ -31851,7 +31950,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] -+ + +- public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] + + if (!(is_android && use_order_profiling)) { @@ -31860,17 +31960,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn } +} -- if (build_with_chromium) { -- source_set("qs8-dwconv_sse2-no-sse3") { +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-dwconv_sse4.1-no-sse4.2_standalone") { - cflags = [ -- "-mno-sse3", -- "-msse2", +- "-mno-sse4.2", +- "-msse4.1", - ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse2-mul16-add16.c", -- "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse2-mul16-add16.c", +- "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse41-mul16-add16.c", +- "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse41-mul16-add16.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -31882,8 +31983,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool", +- "//third_party/pthreadpool:pthreadpool_standalone", - ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +if (build_with_chromium) { + source_set("f32-velu_avx-no-avx2-no-f16c-no-fma") { + cflags = [ @@ -31942,45 +32049,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ] + + public_configs = [ ":xnnpack_public_config" ] - -- public_configs = [ ":xnnpack_public_config" ] ++ + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } } +} -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-dwconv_sse2-no-sse3_standalone") { -- cflags = [ -- "-mno-sse3", -- "-msse2", -- ] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse2-mul16-add16.c", -- "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse2-mul16-add16.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", -- ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } +- if (build_with_chromium) { +- source_set("qs8-dwconv_x64") { +- cflags = [] +if (build_with_chromium) { + source_set("f32-velu_avx512f") { + cflags = [ @@ -32031,26 +32109,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] -+ -+ public_configs = [ ":xnnpack_public_config" ] -+ -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} -- if (build_with_chromium) { -- source_set("qs8-dwconv_sse4.1-no-sse4.2") { -- cflags = [ -- "-mno-sse4.2", -- "-msse4.1", -- ] -- - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse41-mul16-add16.c", -- "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse41-mul16-add16.c", +- "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", +- "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", +- "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", +- "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -32064,6 +32129,19 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] ++ public_configs = [ ":xnnpack_public_config" ] + +- public_configs = [ ":xnnpack_public_config" ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-dwconv_x64_standalone") { +- cflags = [] +if (build_with_chromium) { + source_set("f32-velu_f16c-fma-avx2") { + cflags = [ @@ -32106,8 +32184,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/include/xnnpack.h", + "src/src/f32-velu/gen/f32-velu-avx2-rr1-lut4-p4-perm-u32.c" + ] - -- public_configs = [ ":xnnpack_public_config" ] ++ + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] @@ -32119,27 +32196,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] -+ -+ public_configs = [ ":xnnpack_public_config" ] -+ -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-dwconv_sse4.1-no-sse4.2_standalone") { -- cflags = [ -- "-mno-sse4.2", -- "-msse4.1", -- ] -- - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-dwconv/gen/qs8-dwconv-25p8c-minmax-fp32-sse41-mul16-add16.c", -- "src/src/qs8-dwconv/gen/qs8-dwconv-9p8c-minmax-fp32-sse41-mul16-add16.c", +- "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", +- "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", +- "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", +- "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -32159,6 +32222,38 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } ++ public_configs = [ ":xnnpack_public_config" ] ++ ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- if (build_with_chromium) { +- source_set("qs8-f16-vcvt_f16c-fma-avx2") { +- cflags = [ +- "-mavx2", +- "-mf16c", +- "-mfma", +- ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] +if (build_with_chromium) { + source_set("f32-velu_sse2-no-sse3") { + cflags = [ @@ -32211,7 +32306,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] -+ + +- public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] + + if (!(is_android && use_order_profiling)) { @@ -32220,9 +32316,37 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn } +} -- if (build_with_chromium) { -- source_set("qs8-dwconv_x64") { -- cflags = [] +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-f16-vcvt_f16c-fma-avx2_standalone") { +- cflags = [ +- "-mavx2", +- "-mf16c", +- "-mfma", +- ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool:pthreadpool_standalone", +- ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +if (build_with_chromium) { + source_set("f32-velu_x64") { + cflags = [ @@ -32273,13 +32397,27 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] ++ ++ public_configs = [ ":xnnpack_public_config" ] ++ ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} +- if (build_with_chromium) { +- source_set("qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma") { +- cflags = [ +- "-mavx", +- "-mno-avx2", +- "-mno-f16c", +- "-mno-fma", +- ] +- - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", -- "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", -- "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", -- "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", +- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -32293,19 +32431,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ public_configs = [ ":xnnpack_public_config" ] - -- public_configs = [ ":xnnpack_public_config" ] -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} - -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-dwconv_x64_standalone") { -- cflags = [] +if (build_with_chromium) { + source_set("f32-vexp_avx-no-avx2-no-f16c-no-fma") { + cflags = [ @@ -32365,12 +32490,26 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + + public_configs = [ ":xnnpack_public_config" ] +- public_configs = [ ":xnnpack_public_config" ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") { +- cflags = [ +- "-mavx", +- "-mno-avx2", +- "-mno-f16c", +- "-mno-fma", +- ] +- - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-dwconv/gen/qs8-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", -- "src/src/qs8-dwconv/gen/qs8-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", -- "src/src/qs8-dwconv/gen/qs8-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", -- "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", +- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -32390,36 +32529,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} - -- if (build_with_chromium) { -- source_set("qs8-f16-vcvt_f16c-fma-avx2") { -- cflags = [ -- "-mavx2", -- "-mf16c", -- "-mfma", -- ] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool", -- ] +if (build_with_chromium) { + source_set("f32-vexp_avx512f") { + cflags = [ @@ -32458,8 +32567,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/include/xnnpack.h", + "src/src/f32-vexp/gen/f32-vexp-avx512f-rational-3-2-div.c" + ] - -- public_configs = [ ":xnnpack_public_config" ] ++ + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] @@ -32480,9 +32588,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn } +} -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-f16-vcvt_f16c-fma-avx2_standalone") { +- if (build_with_chromium) { +- source_set("qs8-f32-vcvt_f16c-fma-avx2") { - cflags = [ - "-mavx2", - "-mf16c", @@ -32491,7 +32598,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-f16-vcvt/gen/qs8-f16-vcvt-avx2-u16.c", +- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -32503,14 +32610,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", +- "//third_party/pthreadpool", - ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } +if (build_with_chromium) { + source_set("f32-vexp_f16c-fma-no-avx2") { + cflags = [ @@ -32558,7 +32659,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] -+ + +- public_configs = [ ":xnnpack_public_config" ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", @@ -32574,18 +32676,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn } +} -- if (build_with_chromium) { -- source_set("qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma") { +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-f32-vcvt_f16c-fma-avx2_standalone") { - cflags = [ -- "-mavx", -- "-mno-avx2", -- "-mno-f16c", -- "-mno-fma", +- "-mavx2", +- "-mf16c", +- "-mfma", - ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.c", +- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -32597,8 +32699,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool", +- "//third_party/pthreadpool:pthreadpool_standalone", - ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +if (build_with_chromium) { + source_set("f32-vexp_sse2-no-sse3") { + cflags = [ @@ -32653,8 +32761,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - -- public_configs = [ ":xnnpack_public_config" ] ++ + public_configs = [ ":xnnpack_public_config" ] + + if (!(is_android && use_order_profiling)) { @@ -32663,19 +32770,22 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn } +} -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-f32-vcvt_avx-no-avx2-no-f16c-no-fma_standalone") { +- if (build_with_chromium) { +- source_set( +- "qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") { - cflags = [ -- "-mavx", -- "-mno-avx2", -- "-mno-f16c", -- "-mno-fma", +- "-mavx512bw", +- "-mavx512cd", +- "-mavx512dq", +- "-mavx512f", +- "-mavx512vl", +- "-mf16c", +- "-mfma", - ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx-u32.c", +- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-u32.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -32687,14 +32797,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", +- "//third_party/pthreadpool", - ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } +if (build_with_chromium) { + source_set("f32-vexp_x64") { + cflags = [ @@ -32747,24 +32851,31 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ] + + public_configs = [ ":xnnpack_public_config" ] -+ + +- public_configs = [ ":xnnpack_public_config" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } } +} -- if (build_with_chromium) { -- source_set("qs8-f32-vcvt_f16c-fma-avx2") { +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set( +- "qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ -- "-mavx2", +- "-mavx512bw", +- "-mavx512cd", +- "-mavx512dq", +- "-mavx512f", +- "-mavx512vl", - "-mf16c", - "-mfma", - ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.c", +- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-u32.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -32776,8 +32887,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool", +- "//third_party/pthreadpool:pthreadpool_standalone", - ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +if (build_with_chromium) { + source_set("f32-vgelu_avx-no-avx2-no-f16c-no-fma") { + cflags = [ @@ -32836,26 +32953,23 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ] + + public_configs = [ ":xnnpack_public_config" ] - -- public_configs = [ ":xnnpack_public_config" ] ++ + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } } +} -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-f32-vcvt_f16c-fma-avx2_standalone") { +- if (build_with_chromium) { +- source_set("qs8-f32-vcvt_sse2-no-sse3") { - cflags = [ -- "-mavx2", -- "-mf16c", -- "-mfma", +- "-mno-sse3", +- "-msse2", - ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx2-u16.c", +- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse2-u32.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -32867,14 +32981,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", +- "//third_party/pthreadpool", - ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } +if (build_with_chromium) { + source_set("f32-vgelu_avx512f") { + cflags = [ @@ -32925,7 +33033,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] -+ + +- public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] + + if (!(is_android && use_order_profiling)) { @@ -32934,22 +33043,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn } +} -- if (build_with_chromium) { -- source_set( -- "qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") { +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-f32-vcvt_sse2-no-sse3_standalone") { - cflags = [ -- "-mavx512bw", -- "-mavx512cd", -- "-mavx512dq", -- "-mavx512f", -- "-mavx512vl", -- "-mf16c", -- "-mfma", +- "-mno-sse3", +- "-msse2", - ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-u32.c", +- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse2-u32.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -32961,8 +33065,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool", +- "//third_party/pthreadpool:pthreadpool_standalone", - ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +if (build_with_chromium) { + source_set("f32-vgelu_f16c-fma-no-avx2") { + cflags = [ @@ -32987,8 +33097,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool", + ] - -- public_configs = [ ":xnnpack_public_config" ] ++ + public_configs = [ ":xnnpack_public_config" ] + } +} @@ -33027,23 +33136,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn } +} -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set( -- "qs8-f32-vcvt_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { +- if (build_with_chromium) { +- source_set("qs8-f32-vcvt_sse4.1-no-sse4.2") { - cflags = [ -- "-mavx512bw", -- "-mavx512cd", -- "-mavx512dq", -- "-mavx512f", -- "-mavx512vl", -- "-mf16c", -- "-mfma", +- "-mno-sse4.2", +- "-msse4.1", - ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-avx512skx-u32.c", +- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -33055,14 +33157,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", +- "//third_party/pthreadpool", - ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } +if (build_with_chromium) { + source_set("f32-vgelu_sse2-no-sse3") { + cflags = [ @@ -33119,23 +33215,25 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ] + + public_configs = [ ":xnnpack_public_config" ] -+ + +- public_configs = [ ":xnnpack_public_config" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } } +} -- if (build_with_chromium) { -- source_set("qs8-f32-vcvt_sse2-no-sse3") { +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-f32-vcvt_sse4.1-no-sse4.2_standalone") { - cflags = [ -- "-mno-sse3", -- "-msse2", +- "-mno-sse4.2", +- "-msse4.1", - ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse2-u32.c", +- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -33147,8 +33245,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool", +- "//third_party/pthreadpool:pthreadpool_standalone", - ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +if (build_with_chromium) { + source_set("f32-vgelu_x64") { + cflags = [ @@ -33201,14 +33305,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ] + + public_configs = [ ":xnnpack_public_config" ] - -- public_configs = [ ":xnnpack_public_config" ] ++ + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } } +} -+ + +- if (build_with_chromium) { +- source_set("qs8-f32-vcvt_x64") { +- cflags = [] +if (build_with_chromium) { + source_set("f32-vhswish_avx-no-avx2-no-f16c-no-fma") { + cflags = [ @@ -33239,36 +33345,10 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + } +} -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-f32-vcvt_sse2-no-sse3_standalone") { -- cflags = [ -- "-mno-sse3", -- "-msse2", -- ] -- - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse2-u32.c", +- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c", - ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", -- ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { + source_set("f32-vhswish_avx-no-avx2-no-f16c-no-fma_standalone") { @@ -33288,45 +33368,33 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] -+ + +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] -+ -+ public_configs = [ ":xnnpack_public_config" ] -+ -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} -- if (build_with_chromium) { -- source_set("qs8-f32-vcvt_sse4.1-no-sse4.2") { -- cflags = [ -- "-mno-sse4.2", -- "-msse4.1", -- ] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] ++ public_configs = [ ":xnnpack_public_config" ] + +- public_configs = [ ":xnnpack_public_config" ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} ++ +if (build_with_chromium) { + source_set("f32-vhswish_avx512f") { + cflags = [ @@ -33353,7 +33421,11 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + public_configs = [ ":xnnpack_public_config" ] + } +} -+ + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-f32-vcvt_x64_standalone") { +- cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { + source_set("f32-vhswish_avx512f_standalone") { @@ -33377,27 +33449,12 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - -- public_configs = [ ":xnnpack_public_config" ] -+ public_configs = [ ":xnnpack_public_config" ] + -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} ++ public_configs = [ ":xnnpack_public_config" ] -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-f32-vcvt_sse4.1-no-sse4.2_standalone") { -- cflags = [ -- "-mno-sse4.2", -- "-msse4.1", -- ] -- - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-sse41-u16.c", +- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -33417,6 +33474,39 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- if (build_with_chromium) { +- source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni") { +- cflags = [ +- "-mavx2", +- "-mavxvnni", +- "-mf16c", +- "-mfma", +- "-mgfni", +- ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni-prfm.c", +- "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] +if (build_with_chromium) { + source_set("f32-vhswish_f16c-fma-no-avx2") { + cflags = [ @@ -33473,16 +33563,48 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ] + + public_configs = [ ":xnnpack_public_config" ] -+ + +- public_configs = [ ":xnnpack_public_config" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } } +} -- if (build_with_chromium) { -- source_set("qs8-f32-vcvt_x64") { -- cflags = [] +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni_standalone") { +- cflags = [ +- "-mavx2", +- "-mavxvnni", +- "-mf16c", +- "-mfma", +- "-mgfni", +- ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni-prfm.c", +- "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool:pthreadpool_standalone", +- ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +if (build_with_chromium) { + source_set("f32-vhswish_sse2-no-sse3") { + cflags = [ @@ -33525,46 +33647,51 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/f32-vhswish/gen/f32-vhswish-sse2.c", + "src/src/f32-vhswish/gen/f32-vhswish-sse2fma.c" + ] - -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c", -- ] ++ + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] ++ + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool", -- ] ++ + public_configs = [ ":xnnpack_public_config" ] - -- public_configs = [ ":xnnpack_public_config" ] ++ + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } } +} -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-f32-vcvt_x64_standalone") { -- cflags = [] +- if (build_with_chromium) { +- source_set("qs8-packw_f16c-fma-avx2") { +- cflags = [ +- "-mavx2", +- "-mf16c", +- "-mfma", +- ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx2-madd.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] +if (build_with_chromium) { + source_set("f32-vhswish_x64") { + cflags = [ @@ -33591,29 +33718,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + public_configs = [ ":xnnpack_public_config" ] + } +} - -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", -- ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } ++ +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { + source_set("f32-vhswish_x64_standalone") { @@ -33637,7 +33742,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] -+ + +- public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] + + if (!(is_android && use_order_profiling)) { @@ -33646,20 +33752,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn } +} -- if (build_with_chromium) { -- source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni") { +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-packw_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", -- "-mavxvnni", - "-mf16c", - "-mfma", -- "-mgfni", - ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni-prfm.c", -- "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni.c", +- "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx2-madd.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -33671,8 +33775,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool", +- "//third_party/pthreadpool:pthreadpool_standalone", - ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +if (build_with_chromium) { + source_set("f32-vlog_avx512f") { + cflags = [ @@ -33695,8 +33805,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool", + ] - -- public_configs = [ ":xnnpack_public_config" ] ++ + public_configs = [ ":xnnpack_public_config" ] + } +} @@ -33733,21 +33842,25 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn } +} -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-packw_avx2-avxvnni-f16c-fma-gfni_standalone") { +- if (build_with_chromium) { +- source_set( +- "qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") { - cflags = [ -- "-mavx2", -- "-mavxvnni", +- "-mavx512bw", +- "-mavx512cd", +- "-mavx512dq", +- "-mavx512f", +- "-mavx512vl", +- "-mavx512vnni", - "-mf16c", - "-mfma", -- "-mgfni", - ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni-prfm.c", -- "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avxvnni.c", +- "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-avx256vnni-prfm.c", +- "src/src/qs8-packw/gen/qs8-packw-x64c4-gemm-goi-avx256vnni-prfm.c", +- "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx256vnni-prfm.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -33759,14 +33872,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", +- "//third_party/pthreadpool", - ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } +if (build_with_chromium) { + source_set("f32-vlog_f16c-fma-avx2") { + cflags = [ @@ -33823,24 +33930,34 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ] + + public_configs = [ ":xnnpack_public_config" ] -+ + +- public_configs = [ ":xnnpack_public_config" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } } +} -- if (build_with_chromium) { -- source_set("qs8-packw_f16c-fma-avx2") { +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set( +- "qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { - cflags = [ -- "-mavx2", +- "-mavx512bw", +- "-mavx512cd", +- "-mavx512dq", +- "-mavx512f", +- "-mavx512vl", +- "-mavx512vnni", - "-mf16c", - "-mfma", - ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx2-madd.c", +- "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-avx256vnni-prfm.c", +- "src/src/qs8-packw/gen/qs8-packw-x64c4-gemm-goi-avx256vnni-prfm.c", +- "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx256vnni-prfm.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -33852,8 +33969,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool", +- "//third_party/pthreadpool:pthreadpool_standalone", - ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +if (build_with_chromium) { + source_set("f32-vlog_f16c-fma-no-avx2") { + cflags = [ @@ -33910,14 +34033,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ] + + public_configs = [ ":xnnpack_public_config" ] - -- public_configs = [ ":xnnpack_public_config" ] ++ + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } } +} -+ + +- if (build_with_chromium) { +- source_set("qs8-packw_x64") { +- cflags = [] +if (build_with_chromium) { + source_set("f32-vlog_sse2-no-sse3") { + cflags = [ @@ -33947,18 +34072,12 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + } +} -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-packw_f16c-fma-avx2_standalone") { -- cflags = [ -- "-mavx2", -- "-mf16c", -- "-mfma", -- ] -- - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx2-madd.c", +- "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c", +- "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c", +- "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c", +- "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -33970,14 +34089,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", +- "//third_party/pthreadpool", - ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { + source_set("f32-vlog_sse2-no-sse3_standalone") { @@ -34005,45 +34118,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ] + + public_configs = [ ":xnnpack_public_config" ] -+ + +- public_configs = [ ":xnnpack_public_config" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } } +} -- if (build_with_chromium) { -- source_set( -- "qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") { -- cflags = [ -- "-mavx512bw", -- "-mavx512cd", -- "-mavx512dq", -- "-mavx512f", -- "-mavx512vl", -- "-mavx512vnni", -- "-mf16c", -- "-mfma", -- ] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-avx256vnni-prfm.c", -- "src/src/qs8-packw/gen/qs8-packw-x64c4-gemm-goi-avx256vnni-prfm.c", -- "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx256vnni-prfm.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool", -- ] +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-packw_x64_standalone") { +- cflags = [] +if (build_with_chromium) { + source_set("f32-vlog_x64") { + cflags = [ @@ -34094,36 +34180,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - -- public_configs = [ ":xnnpack_public_config" ] -+ public_configs = [ ":xnnpack_public_config" ] + -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} ++ public_configs = [ ":xnnpack_public_config" ] -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set( -- "qs8-packw_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { -- cflags = [ -- "-mavx512bw", -- "-mavx512cd", -- "-mavx512dq", -- "-mavx512f", -- "-mavx512vl", -- "-mavx512vnni", -- "-mf16c", -- "-mfma", -- ] -- - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-avx256vnni-prfm.c", -- "src/src/qs8-packw/gen/qs8-packw-x64c4-gemm-goi-avx256vnni-prfm.c", -- "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-goi-avx256vnni-prfm.c", +- "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c", +- "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c", +- "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c", +- "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -34143,6 +34208,38 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- if (build_with_chromium) { +- source_set("qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma") { +- cflags = [ +- "-mavx", +- "-mno-avx2", +- "-mno-f16c", +- "-mno-fma", +- ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-avx-madd-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-avx-madd-prfm.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] +if (build_with_chromium) { + source_set("f32-vlrelu_avx-no-avx2-no-f16c-no-fma") { + cflags = [ @@ -34201,16 +34298,47 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ] + + public_configs = [ ":xnnpack_public_config" ] -+ + +- public_configs = [ ":xnnpack_public_config" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } } +} -- if (build_with_chromium) { -- source_set("qs8-packw_x64") { -- cflags = [] +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") { +- cflags = [ +- "-mavx", +- "-mno-avx2", +- "-mno-f16c", +- "-mno-fma", +- ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-avx-madd-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-avx-madd-prfm.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool:pthreadpool_standalone", +- ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +if (build_with_chromium) { + source_set("f32-vlrelu_avx512f") { + cflags = [ @@ -34261,13 +34389,29 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] ++ ++ public_configs = [ ":xnnpack_public_config" ] ++ ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} +- if (build_with_chromium) { +- source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") { +- cflags = [ +- "-mavx2", +- "-mavxvnni", +- "-mf16c", +- "-mfma", +- "-mgfni", +- ] +- - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c", -- "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c", -- "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c", -- "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x8c8-minmax-avxvnni-prfm.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -34281,19 +34425,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ public_configs = [ ":xnnpack_public_config" ] - -- public_configs = [ ":xnnpack_public_config" ] -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} - -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-packw_x64_standalone") { -- cflags = [] +if (build_with_chromium) { + source_set("f32-vlrelu_sse-no-sse2") { + cflags = [ @@ -34321,7 +34452,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + public_configs = [ ":xnnpack_public_config" ] + } +} -+ + +- public_configs = [ ":xnnpack_public_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { + source_set("f32-vlrelu_sse-no-sse2_standalone") { @@ -34346,13 +34478,30 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] ++ ++ public_configs = [ ":xnnpack_public_config" ] ++ ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") { +- cflags = [ +- "-mavx2", +- "-mavxvnni", +- "-mf16c", +- "-mfma", +- "-mgfni", +- ] +- - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c", -- "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c", -- "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c", -- "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x8c8-minmax-avxvnni-prfm.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -34372,40 +34521,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } -+ public_configs = [ ":xnnpack_public_config" ] -+ -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} - -- if (build_with_chromium) { -- source_set("qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma") { -- cflags = [ -- "-mavx", -- "-mno-avx2", -- "-mno-f16c", -- "-mno-fma", -- ] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-avx-madd-prfm.c", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-avx-madd-prfm.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool", -- ] +if (build_with_chromium) { + source_set("f32-vlrelu_sse4.1-no-sse4.2") { + cflags = [ @@ -34422,8 +34537,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - -- public_configs = [ ":xnnpack_public_config" ] ++ + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", @@ -34468,20 +34582,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn } +} -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-qc4w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") { +- if (build_with_chromium) { +- source_set("qs8-qc4w-gemm_f16c-fma-avx2") { - cflags = [ -- "-mavx", -- "-mno-avx2", -- "-mno-f16c", -- "-mno-fma", +- "-mavx2", +- "-mf16c", +- "-mfma", - ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-avx-madd-prfm.c", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-avx-madd-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-avx2-madd-prfm.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -34493,14 +34605,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", +- "//third_party/pthreadpool", - ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } +if (build_with_chromium) { + source_set("f32-vlrelu_x64") { + cflags = [ @@ -34539,7 +34645,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/include/xnnpack.h", + "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c" + ] -+ + +- public_configs = [ ":xnnpack_public_config" ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] @@ -34560,20 +34667,19 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn } +} -- if (build_with_chromium) { -- source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni") { +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-qc4w-gemm_f16c-fma-avx2_standalone") { - cflags = [ - "-mavx2", -- "-mavxvnni", - "-mf16c", - "-mfma", -- "-mgfni", - ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x8c8-minmax-avxvnni-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-avx2-madd-prfm.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -34585,8 +34691,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool", +- "//third_party/pthreadpool:pthreadpool_standalone", - ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +if (build_with_chromium) { + source_set("f32-vmulcaddc_sse-no-sse2") { + cflags = [ @@ -34641,29 +34753,32 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ] + + public_configs = [ ":xnnpack_public_config" ] - -- public_configs = [ ":xnnpack_public_config" ] ++ + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } } +} -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-qc4w-gemm_avx2-avxvnni-f16c-fma-gfni_standalone") { +- if (build_with_chromium) { +- source_set( +- "qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") { - cflags = [ -- "-mavx2", -- "-mavxvnni", +- "-mavx512bw", +- "-mavx512cd", +- "-mavx512dq", +- "-mavx512f", +- "-mavx512vl", - "-mf16c", - "-mfma", -- "-mgfni", - ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avxvnni-prfm.c", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x8c8-minmax-avxvnni-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16c8-minmax-fp32-avx512skx-madd-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-fp32-avx256skx-madd-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x16c8-minmax-fp32-avx512skx-madd-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-fp32-avx256skx-madd-prfm.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -34675,14 +34790,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", +- "//third_party/pthreadpool", - ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } +if (build_with_chromium) { + source_set("f32-vmulcaddc_x64") { + cflags = [ @@ -34733,7 +34842,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] -+ + +- public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] + + if (!(is_android && use_order_profiling)) { @@ -34742,18 +34852,26 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn } +} -- if (build_with_chromium) { -- source_set("qs8-qc4w-gemm_f16c-fma-avx2") { +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set( +- "qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { - cflags = [ -- "-mavx2", +- "-mavx512bw", +- "-mavx512cd", +- "-mavx512dq", +- "-mavx512f", +- "-mavx512vl", - "-mf16c", - "-mfma", - ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-avx2-madd-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16c8-minmax-fp32-avx512skx-madd-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-fp32-avx256skx-madd-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x16c8-minmax-fp32-avx512skx-madd-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-fp32-avx256skx-madd-prfm.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -34765,8 +34883,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool", +- "//third_party/pthreadpool:pthreadpool_standalone", - ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +if (build_with_chromium) { + source_set("f32-vrnd_avx-no-avx2-no-f16c-no-fma") { + cflags = [ @@ -34831,27 +34955,31 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ] + + public_configs = [ ":xnnpack_public_config" ] - -- public_configs = [ ":xnnpack_public_config" ] ++ + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } } +} -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-qc4w-gemm_f16c-fma-avx2_standalone") { +- if (build_with_chromium) { +- source_set( +- "qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") { - cflags = [ -- "-mavx2", +- "-mavx512bw", +- "-mavx512cd", +- "-mavx512dq", +- "-mavx512f", +- "-mavx512vl", +- "-mavx512vnni", - "-mf16c", - "-mfma", - ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-avx2-madd-prfm.c", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-avx2-madd-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-fp32-avx256vnni-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-fp32-avx256vnni-prfm.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -34863,14 +34991,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", +- "//third_party/pthreadpool", - ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } +if (build_with_chromium) { + source_set("f32-vrnd_avx512f") { + cflags = [ @@ -34929,32 +35051,33 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ] + + public_configs = [ ":xnnpack_public_config" ] -+ + +- public_configs = [ ":xnnpack_public_config" ] + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } } +} -- if (build_with_chromium) { +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { - source_set( -- "qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl") { +- "qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { - cflags = [ - "-mavx512bw", - "-mavx512cd", - "-mavx512dq", - "-mavx512f", - "-mavx512vl", +- "-mavx512vnni", - "-mf16c", - "-mfma", - ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16c8-minmax-fp32-avx512skx-madd-prfm.c", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-fp32-avx256skx-madd-prfm.c", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x16c8-minmax-fp32-avx512skx-madd-prfm.c", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-fp32-avx256skx-madd-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-fp32-avx256vnni-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-fp32-avx256vnni-prfm.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -34966,8 +35089,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool", +- "//third_party/pthreadpool:pthreadpool_standalone", - ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +if (build_with_chromium) { + source_set("f32-vrnd_sse2-no-sse3") { + cflags = [ @@ -35028,34 +35157,24 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ] + + public_configs = [ ":xnnpack_public_config" ] - -- public_configs = [ ":xnnpack_public_config" ] ++ + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } } +} -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set( -- "qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl_standalone") { +- if (build_with_chromium) { +- source_set("qs8-qc4w-gemm_ssse3-no-sse4.1") { - cflags = [ -- "-mavx512bw", -- "-mavx512cd", -- "-mavx512dq", -- "-mavx512f", -- "-mavx512vl", -- "-mf16c", -- "-mfma", +- "-mno-sse4.1", +- "-mssse3", - ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x16c8-minmax-fp32-avx512skx-madd-prfm.c", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-fp32-avx256skx-madd-prfm.c", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x16c8-minmax-fp32-avx512skx-madd-prfm.c", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-fp32-avx256skx-madd-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-ssse3-madd-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-ssse3-madd-prfm.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -35067,14 +35186,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", +- "//third_party/pthreadpool", - ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } +if (build_with_chromium) { + source_set("f32-vrnd_sse4.1-no-sse4.2") { + cflags = [ @@ -35101,7 +35214,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool", + ] -+ + +- public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] + } +} @@ -35142,24 +35256,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn } +} -- if (build_with_chromium) { -- source_set( -- "qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni") { +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-qc4w-gemm_ssse3-no-sse4.1_standalone") { - cflags = [ -- "-mavx512bw", -- "-mavx512cd", -- "-mavx512dq", -- "-mavx512f", -- "-mavx512vl", -- "-mavx512vnni", -- "-mf16c", -- "-mfma", +- "-mno-sse4.1", +- "-mssse3", - ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-fp32-avx256vnni-prfm.c", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-fp32-avx256vnni-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-ssse3-madd-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-ssse3-madd-prfm.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -35171,8 +35279,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool", +- "//third_party/pthreadpool:pthreadpool_standalone", - ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +if (build_with_chromium) { + source_set("f32-vrnd_x64") { + cflags = [ @@ -35229,8 +35343,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - -- public_configs = [ ":xnnpack_public_config" ] ++ + public_configs = [ ":xnnpack_public_config" ] + + if (!(is_android && use_order_profiling)) { @@ -35239,44 +35352,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn } +} -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set( -- "qs8-qc4w-gemm_f16c-fma-avx512f-avx512cd-avx512bw-avx512dq-avx512vl-avx512vnni_standalone") { -- cflags = [ -- "-mavx512bw", -- "-mavx512cd", -- "-mavx512dq", -- "-mavx512f", -- "-mavx512vl", -- "-mavx512vnni", -- "-mf16c", -- "-mfma", -- ] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x8c8-minmax-fp32-avx256vnni-prfm.c", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-7x8c8-minmax-fp32-avx256vnni-prfm.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", -- ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } +- if (build_with_chromium) { +- source_set("qs8-qc4w-gemm_x64") { +- cflags = [] +if (build_with_chromium) { + source_set("f32-vrsqrt_avx-no-avx2-no-f16c-no-fma") { + cflags = [ @@ -35323,51 +35401,47 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-rsqrt.c", + "src/src/f32-vrsqrt/gen/f32-vrsqrt-avx-sqrt.c" + ] -+ + +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c", +- ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] -+ + +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] -+ -+ public_configs = [ ":xnnpack_public_config" ] -+ -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} -- if (build_with_chromium) { -- source_set("qs8-qc4w-gemm_ssse3-no-sse4.1") { -- cflags = [ -- "-mno-sse4.1", -- "-mssse3", -- ] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-ssse3-madd-prfm.c", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-ssse3-madd-prfm.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] ++ public_configs = [ ":xnnpack_public_config" ] + +- public_configs = [ ":xnnpack_public_config" ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-qc4w-gemm_x64_standalone") { +- cflags = [] +if (build_with_chromium) { + source_set("f32-vrsqrt_avx512f") { + cflags = [ @@ -35420,28 +35494,11 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] -+ -+ public_configs = [ ":xnnpack_public_config" ] -- public_configs = [ ":xnnpack_public_config" ] -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} - -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-qc4w-gemm_ssse3-no-sse4.1_standalone") { -- cflags = [ -- "-mno-sse4.1", -- "-mssse3", -- ] -- - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4c8-minmax-ssse3-madd-prfm.c", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-5x4c8-minmax-ssse3-madd-prfm.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c", +- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -35461,6 +35518,41 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } ++ public_configs = [ ":xnnpack_public_config" ] ++ ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- if (build_with_chromium) { +- source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma") { +- cflags = [ +- "-mavx", +- "-mno-avx2", +- "-mno-f16c", +- "-mno-fma", +- ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx-mul16-add16.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] +if (build_with_chromium) { + source_set("f32-vrsqrt_sse2-no-sse3") { + cflags = [ @@ -35515,7 +35607,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] -+ + +- public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] + + if (!(is_android && use_order_profiling)) { @@ -35524,9 +35617,40 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn } +} -- if (build_with_chromium) { -- source_set("qs8-qc4w-gemm_x64") { -- cflags = [] +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") { +- cflags = [ +- "-mavx", +- "-mno-avx2", +- "-mno-f16c", +- "-mno-fma", +- ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx-mul16-add16.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool:pthreadpool_standalone", +- ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +if (build_with_chromium) { + source_set("f32-vrsqrt_x64") { + cflags = [ @@ -35567,47 +35691,53 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c", + "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c" + ] - -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c", -- ] ++ + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] ++ + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] - -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool", -- ] ++ + public_configs = [ ":xnnpack_public_config" ] - -- public_configs = [ ":xnnpack_public_config" ] ++ + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } } +} -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-qc4w-gemm_x64_standalone") { -- cflags = [] +- if (build_with_chromium) { +- source_set("qs8-qc8w-dwconv_f16c-fma-avx2") { +- cflags = [ +- "-mavx2", +- "-mf16c", +- "-mfma", +- ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx2-mul32.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx2-mul32.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx2-mul32.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] +if (build_with_chromium) { + source_set("f32-vsigmoid_avx-no-avx2-no-f16c-no-fma") { + cflags = [ @@ -35667,301 +35797,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + + public_configs = [ ":xnnpack_public_config" ] -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c", -- "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", -- ] -- - public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} - -- if (build_with_chromium) { -- source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma") { -- cflags = [ -- "-mavx", -- "-mno-avx2", -- "-mno-f16c", -- "-mno-fma", -- ] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx-mul16-add16.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool", -- ] -+if (build_with_chromium) { -+ source_set("f32-vsigmoid_avx512f") { -+ cflags = [ -+ "-mavx512f" -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c" -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] -+ -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] -+ -+ public_configs = [ ":xnnpack_public_config" ] -+ } -+} -+ -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("f32-vsigmoid_avx512f_standalone") { -+ cflags = [ -+ "-mavx512f" -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c" -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] -+ -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] -+ -+ public_configs = [ ":xnnpack_public_config" ] - -- public_configs = [ ":xnnpack_public_config" ] -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} - -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-qc8w-dwconv_avx-no-avx2-no-f16c-no-fma_standalone") { -- cflags = [ -- "-mavx", -- "-mno-avx2", -- "-mno-f16c", -- "-mno-fma", -- ] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx-mul16-add16.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx-mul16-add16.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx-mul16-add16.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", -- ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } -+if (build_with_chromium) { -+ source_set("f32-vsigmoid_f16c-fma-avx2") { -+ cflags = [ -+ "-mavx2", -+ "-mf16c", -+ "-mfma" -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-u16.c" -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] -+ -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] -+ -+ public_configs = [ ":xnnpack_public_config" ] -+ } -+} -+ -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("f32-vsigmoid_f16c-fma-avx2_standalone") { -+ cflags = [ -+ "-mavx2", -+ "-mf16c", -+ "-mfma" -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-u16.c" -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] -+ -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] -+ -+ public_configs = [ ":xnnpack_public_config" ] -+ -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} - -- if (build_with_chromium) { -- source_set("qs8-qc8w-dwconv_f16c-fma-avx2") { -- cflags = [ -- "-mavx2", -- "-mf16c", -- "-mfma", -- ] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p16c-minmax-fp32-avx2-mul32.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p16c-minmax-fp32-avx2-mul32.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p16c-minmax-fp32-avx2-mul32.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool", -- ] -+if (build_with_chromium) { -+ source_set("f32-vsigmoid_sse2-no-sse3") { -+ cflags = [ -+ "-mno-sse3", -+ "-msse2" -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse2-rr2-lut64-p2-div-u8.c" -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] -+ -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] -+ -+ public_configs = [ ":xnnpack_public_config" ] -+ } -+} -+ -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("f32-vsigmoid_sse2-no-sse3_standalone") { -+ cflags = [ -+ "-mno-sse3", -+ "-msse2" -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse2-rr2-lut64-p2-div-u8.c" -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] -+ -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] - -- public_configs = [ ":xnnpack_public_config" ] -+ public_configs = [ ":xnnpack_public_config" ] -+ + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } @@ -36002,15 +35838,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } +if (build_with_chromium) { -+ source_set("f32-vsigmoid_sse4.1-no-sse4.2") { ++ source_set("f32-vsigmoid_avx512f") { + cflags = [ -+ "-mno-sse4.2", -+ "-msse4.1" ++ "-mavx512f" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse41-rr2-lut64-p2-div-u8.c" ++ "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c" + ] + + configs -= [ "//build/config/compiler:chromium_code" ] @@ -36031,15 +35866,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vsigmoid_sse4.1-no-sse4.2_standalone") { ++ source_set("f32-vsigmoid_avx512f_standalone") { + cflags = [ -+ "-mno-sse4.2", -+ "-msse4.1" ++ "-mavx512f" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse41-rr2-lut64-p2-div-u8.c" ++ "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx512f-rr2-lut32-p2-perm2-scalef-div-u64.c" + ] + + configs -= [ "//build/config/compiler:chromium_code" ] @@ -36094,14 +35928,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("f32-vsigmoid_x64") { ++ source_set("f32-vsigmoid_f16c-fma-avx2") { + cflags = [ -+ ++ "-mavx2", ++ "-mf16c", ++ "-mfma" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c" ++ "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-u16.c" + ] + + configs -= [ "//build/config/compiler:chromium_code" ] @@ -36115,21 +35951,24 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool", + ] -+ + +- public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] + } +} + +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vsigmoid_x64_standalone") { ++ source_set("f32-vsigmoid_f16c-fma-avx2_standalone") { + cflags = [ -+ ++ "-mavx2", ++ "-mf16c", ++ "-mfma" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c" ++ "src/src/f32-vsigmoid/gen/f32-vsigmoid-avx2-rr1-p5-div-u16.c" + ] + + configs -= [ "//build/config/compiler:chromium_code" ] @@ -36145,8 +35984,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + ] + + public_configs = [ ":xnnpack_public_config" ] - -- public_configs = [ ":xnnpack_public_config" ] ++ + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } @@ -36192,6 +36030,270 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } +if (build_with_chromium) { ++ source_set("f32-vsigmoid_sse2-no-sse3") { ++ cflags = [ ++ "-mno-sse3", ++ "-msse2" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse2-rr2-lut64-p2-div-u8.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] ++ } ++} ++ ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("f32-vsigmoid_sse2-no-sse3_standalone") { ++ cflags = [ ++ "-mno-sse3", ++ "-msse2" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse2-rr2-lut64-p2-div-u8.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] ++ ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- if (build_with_chromium) { +- source_set("qs8-qc8w-dwconv_sse2-no-sse3") { +- cflags = [ +- "-mno-sse3", +- "-msse2", +- ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse2-mul16.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse2-mul16.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse2-mul16.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] ++if (build_with_chromium) { ++ source_set("f32-vsigmoid_sse4.1-no-sse4.2") { ++ cflags = [ ++ "-mno-sse4.2", ++ "-msse4.1" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse41-rr2-lut64-p2-div-u8.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] ++ } ++} ++ ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("f32-vsigmoid_sse4.1-no-sse4.2_standalone") { ++ cflags = [ ++ "-mno-sse4.2", ++ "-msse4.1" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-vsigmoid/gen/f32-vsigmoid-sse41-rr2-lut64-p2-div-u8.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] + +- public_configs = [ ":xnnpack_public_config" ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} ++ ++if (build_with_chromium) { ++ source_set("f32-vsigmoid_x64") { ++ cflags = [ ++ ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] ++ } ++} + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-qc8w-dwconv_sse2-no-sse3_standalone") { +- cflags = [ +- "-mno-sse3", +- "-msse2", +- ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse2-mul16.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse2-mul16.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse2-mul16.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool:pthreadpool_standalone", +- ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("f32-vsigmoid_x64_standalone") { ++ cflags = [ ++ ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] ++ ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- if (build_with_chromium) { +- source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2") { +- cflags = [ +- "-mno-sse4.2", +- "-msse4.1", +- ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse41-mul16.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse41-mul16.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse41-mul16.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] ++if (build_with_chromium) { + source_set("f32-vsin_avx-no-avx2-no-f16c-no-fma") { + cflags = [ + "-mavx", @@ -36247,7 +36349,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] -+ + +- public_configs = [ ":xnnpack_public_config" ] + public_configs = [ ":xnnpack_public_config" ] + + if (!(is_android && use_order_profiling)) { @@ -36256,18 +36359,19 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn } +} -- if (build_with_chromium) { -- source_set("qs8-qc8w-dwconv_sse2-no-sse3") { +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2_standalone") { - cflags = [ -- "-mno-sse3", -- "-msse2", +- "-mno-sse4.2", +- "-msse4.1", - ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse2-mul16.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse2-mul16.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse2-mul16.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse41-mul16.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse41-mul16.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse41-mul16.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -36279,8 +36383,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool", +- "//third_party/pthreadpool:pthreadpool_standalone", - ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +if (build_with_chromium) { + source_set("f32-vsin_avx512f") { + cflags = [ @@ -36324,8 +36434,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - -- public_configs = [ ":xnnpack_public_config" ] ++ + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", @@ -36341,38 +36450,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn } +} -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-qc8w-dwconv_sse2-no-sse3_standalone") { -- cflags = [ -- "-mno-sse3", -- "-msse2", -- ] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse2-mul16.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse2-mul16.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse2-mul16.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", -- ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } +- if (build_with_chromium) { +- source_set("qs8-qc8w-dwconv_x64") { +- cflags = [] +if (build_with_chromium) { + source_set("f32-vsin_f16c-fma-no-avx2") { + cflags = [ @@ -36427,27 +36507,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] -+ -+ public_configs = [ ":xnnpack_public_config" ] -+ -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} -- if (build_with_chromium) { -- source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2") { -- cflags = [ -- "-mno-sse4.2", -- "-msse4.1", -- ] -- - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse41-mul16.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse41-mul16.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse41-mul16.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -36461,6 +36529,19 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] ++ public_configs = [ ":xnnpack_public_config" ] + +- public_configs = [ ":xnnpack_public_config" ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-qc8w-dwconv_x64_standalone") { +- cflags = [] +if (build_with_chromium) { + source_set("f32-vsin_sse2-no-sse3") { + cflags = [ @@ -36515,29 +36596,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] -+ -+ public_configs = [ ":xnnpack_public_config" ] -- public_configs = [ ":xnnpack_public_config" ] -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} - -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-qc8w-dwconv_sse4.1-no-sse4.2_standalone") { -- cflags = [ -- "-mno-sse4.2", -- "-msse4.1", -- ] -- - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8c-minmax-fp32-sse41-mul16.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8c-minmax-fp32-sse41-mul16.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8c-minmax-fp32-sse41-mul16.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", +- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -36557,6 +36624,40 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } ++ public_configs = [ ":xnnpack_public_config" ] ++ ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- if (build_with_chromium) { +- source_set("qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma") { +- cflags = [ +- "-mavx", +- "-mno-avx2", +- "-mno-f16c", +- "-mno-fma", +- ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-avx-ld128.c", +- "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x4c8-minmax-fp32-avx-ld128.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] +if (build_with_chromium) { + source_set("f32-vsin_x64") { + cflags = [ @@ -36572,7 +36673,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] -+ + +- public_configs = [ ":xnnpack_public_config" ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", @@ -36616,9 +36718,39 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn } +} -- if (build_with_chromium) { -- source_set("qs8-qc8w-dwconv_x64") { -- cflags = [] +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") { +- cflags = [ +- "-mavx", +- "-mno-avx2", +- "-mno-f16c", +- "-mno-fma", +- ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-avx-ld128.c", +- "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x4c8-minmax-fp32-avx-ld128.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool:pthreadpool_standalone", +- ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +if (build_with_chromium) { + source_set("f32-vsqrt_avx-no-avx2-no-f16c-no-fma") { + cflags = [ @@ -36677,15 +36809,29 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/fxdiv", + "//third_party/pthreadpool:pthreadpool_standalone", + ] ++ ++ public_configs = [ ":xnnpack_public_config" ] ++ ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} +- if (build_with_chromium) { +- source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") { +- cflags = [ +- "-mavx2", +- "-mavxvnni", +- "-mf16c", +- "-mfma", +- "-mgfni", +- ] +- - sources = [ - "src/include/xnnpack.h", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", +- "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avxvnni-prfm.c", +- "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-5x8c8-minmax-fp32-avxvnni-prfm.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -36699,15 +36845,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ public_configs = [ ":xnnpack_public_config" ] - -- public_configs = [ ":xnnpack_public_config" ] -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} -+ +if (build_with_chromium) { + source_set("f32-vsqrt_avx512f") { + cflags = [ @@ -37475,6 +37612,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/operators/convolution-nhwc.c", + "src/src/operators/deconvolution-nhwc.c", + "src/src/operators/dynamic-fully-connected-nc.c", ++ "src/src/operators/fingerprint_cache.c", ++ "src/src/operators/fingerprint_id.c", + "src/src/operators/fully-connected-nc.c", + "src/src/operators/max-pooling-nhwc.c", + "src/src/operators/pack-lh.c", @@ -37523,6 +37662,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/operators/convolution-nhwc.c", + "src/src/operators/deconvolution-nhwc.c", + "src/src/operators/dynamic-fully-connected-nc.c", ++ "src/src/operators/fingerprint_cache.c", ++ "src/src/operators/fingerprint_id.c", + "src/src/operators/fully-connected-nc.c", + "src/src/operators/max-pooling-nhwc.c", + "src/src/operators/pack-lh.c", @@ -62239,6 +62380,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/operators/convolution-nhwc.c", + "src/src/operators/deconvolution-nhwc.c", + "src/src/operators/dynamic-fully-connected-nc.c", ++ "src/src/operators/fingerprint_cache.c", ++ "src/src/operators/fingerprint_id.c", + "src/src/operators/fully-connected-nc.c", + "src/src/operators/max-pooling-nhwc.c", + "src/src/operators/pack-lh.c", @@ -62287,6 +62430,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/operators/convolution-nhwc.c", + "src/src/operators/deconvolution-nhwc.c", + "src/src/operators/dynamic-fully-connected-nc.c", ++ "src/src/operators/fingerprint_cache.c", ++ "src/src/operators/fingerprint_id.c", + "src/src/operators/fully-connected-nc.c", + "src/src/operators/max-pooling-nhwc.c", + "src/src/operators/pack-lh.c", @@ -62322,6 +62467,65 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn +} + +if (build_with_chromium) { ++ source_set("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2") { ++ cflags = [ ++ "-march=armv8.2-a+sve+sve2" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/pf16-f16-f16-igemm/pf16-f16-f16-igemm-32x32c2-minmax-neonsme2.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] ++ } ++} ++ ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2_standalone") { ++ cflags = [ ++ "-march=armv8.2-a+sve+sve2" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/pf16-f16-f16-igemm/pf16-f16-f16-igemm-32x32c2-minmax-neonsme2.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] ++ ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] ++ } ++ } ++} ++ ++if (build_with_chromium) { + source_set("pf16-gemm_arch=armv8.2-a+sve+sve2") { + cflags = [ + "-march=armv8.2-a+sve+sve2" @@ -63686,6 +63890,67 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn +} + +if (build_with_chromium) { ++ source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod") { ++ cflags = [ ++ "-march=armv8.2-a+dotprod" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/qd8-f32-qc2w-gemm/qd8-f32-qc2w-gemm-1x16c4-minmax-neondot.c", ++ "src/src/qd8-f32-qc2w-gemm/qd8-f32-qc2w-gemm-4x16c4-minmax-neondot.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] ++ } ++} ++ ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod_standalone") { ++ cflags = [ ++ "-march=armv8.2-a+dotprod" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/qd8-f32-qc2w-gemm/qd8-f32-qc2w-gemm-1x16c4-minmax-neondot.c", ++ "src/src/qd8-f32-qc2w-gemm/qd8-f32-qc2w-gemm-4x16c4-minmax-neondot.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] ++ ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] ++ } ++ } ++} ++ ++if (build_with_chromium) { + source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod") { + cflags = [ + "-march=armv8.2-a+dotprod" @@ -66824,169 +67089,10 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/pthreadpool:pthreadpool_standalone", + ] -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-qc8w-dwconv_x64_standalone") { -- cflags = [] -+ public_configs = [ ":xnnpack_public_config" ] - -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", -- "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", -- ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} - -- if (build_with_chromium) { -- source_set("qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma") { -- cflags = [ -- "-mavx", -- "-mno-avx2", -- "-mno-f16c", -- "-mno-fma", -- ] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-avx-ld128.c", -- "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x4c8-minmax-fp32-avx-ld128.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool", -- ] -+if (build_with_chromium) { -+ source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod") { -+ cflags = [ -+ "-march=armv8.2-a+fp16+dotprod" -+ ] -+ -+ asmflags = cflags - - public_configs = [ ":xnnpack_public_config" ] - } - } -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S", -+ "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S", -+ "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S", -+ "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S" -+ ] - -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qs8-qc8w-gemm_avx-no-avx2-no-f16c-no-fma_standalone") { -- cflags = [ -- "-mavx", -- "-mno-avx2", -- "-mno-f16c", -- "-mno-fma", -- ] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4c8-minmax-fp32-avx-ld128.c", -- "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-2x4c8-minmax-fp32-avx-ld128.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", -- ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } -- } -- } -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] - -- if (build_with_chromium) { -- source_set("qs8-qc8w-gemm_avx2-avxvnni-f16c-fma-gfni") { -- cflags = [ -- "-mavx2", -- "-mavxvnni", -- "-mf16c", -- "-mfma", -- "-mgfni", -- ] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x8c8-minmax-fp32-avxvnni-prfm.c", -- "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-5x8c8-minmax-fp32-avxvnni-prfm.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool", -- ] -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] - -- public_configs = [ ":xnnpack_public_config" ] -- } + public_configs = [ ":xnnpack_public_config" ] - } -+} - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { @@ -67022,16 +67128,11 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } -- } -- } -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod_standalone") { -+ cflags = [ -+ "-march=armv8.2-a+fp16+dotprod" -+ ] -+ -+ asmflags = cflags ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} - if (build_with_chromium) { - source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni") { @@ -67060,6 +67161,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] ++if (build_with_chromium) { ++ source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod") { ++ cflags = [ ++ "-march=armv8.2-a+fp16+dotprod" ++ ] ++ ++ asmflags = cflags + +- public_configs = [ ":xnnpack_public_config" ] +- } +- } + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S", @@ -67068,14 +67180,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S" + ] -- public_configs = [ ":xnnpack_public_config" ] -- } -- } -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] - - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { - source_set("qs8-qc8w-gemm_avx2-avxvnniint8-f16c-fma-gfni_standalone") { @@ -67112,12 +67216,10 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } - } -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] - if (build_with_chromium) { - source_set("qs8-qc8w-gemm_f16c-fma-avx2") { @@ -67144,12 +67246,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ public_configs = [ ":xnnpack_public_config" ] ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] - public_configs = [ ":xnnpack_public_config" ] -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } +- } ++ public_configs = [ ":xnnpack_public_config" ] } +} @@ -67187,22 +67293,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } - } -+if (build_with_chromium) { -+ source_set("qu8-gemm_arm64") { ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("qu8-gemm_arch=armv8.2-a+fp16+dotprod_standalone") { + cflags = [ -+ ++ "-march=armv8.2-a+fp16+dotprod" + ] + -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu-neon-mlal-lane.c", -+ "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu16-neon-mlal-lane.c", -+ "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c", -+ "src/src/qu8-gemm/gen/qu8-gemm-1x8-minmax-rndnu-neon-mlal-lane.c", -+ "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c", -+ "src/src/qu8-gemm/gen/qu8-gemm-3x8-minmax-rndnu-neon-mlal-lane.c", -+ "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-neon-mlal-lane.c" -+ ] ++ asmflags = cflags - if (build_with_chromium) { - source_set( @@ -67236,20 +67334,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S", ++ "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S", ++ "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S", ++ "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S" ++ ] - public_configs = [ ":xnnpack_public_config" ] - } - } -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { @@ -67291,9 +67390,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } - } -+ public_configs = [ ":xnnpack_public_config" ] - } -+} +- } ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] - if (build_with_chromium) { - source_set( @@ -67326,27 +67429,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -- ++ public_configs = [ ":xnnpack_public_config" ] + - public_configs = [ ":xnnpack_public_config" ] -- } -- } -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("qu8-gemm_arm64_standalone") { -+ cflags = [ -+ -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu-neon-mlal-lane.c", -+ "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu16-neon-mlal-lane.c", -+ "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c", -+ "src/src/qu8-gemm/gen/qu8-gemm-1x8-minmax-rndnu-neon-mlal-lane.c", -+ "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c", -+ "src/src/qu8-gemm/gen/qu8-gemm-3x8-minmax-rndnu-neon-mlal-lane.c", -+ "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-neon-mlal-lane.c" -+ ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { @@ -67388,10 +67478,22 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } - } -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] ++if (build_with_chromium) { ++ source_set("qu8-gemm_arm64") { ++ cflags = [ ++ ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu-neon-mlal-lane.c", ++ "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu16-neon-mlal-lane.c", ++ "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c", ++ "src/src/qu8-gemm/gen/qu8-gemm-1x8-minmax-rndnu-neon-mlal-lane.c", ++ "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c", ++ "src/src/qu8-gemm/gen/qu8-gemm-3x8-minmax-rndnu-neon-mlal-lane.c", ++ "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-neon-mlal-lane.c" ++ ] - if (build_with_chromium) { - source_set( @@ -67427,17 +67529,20 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] - public_configs = [ ":xnnpack_public_config" ] - } - } -+ public_configs = [ ":xnnpack_public_config" ] ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { @@ -67480,9 +67585,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } +- } ++ public_configs = [ ":xnnpack_public_config" ] } +} @@ -67510,23 +67614,26 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+if (build_with_chromium) { -+ source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod") { -+ cflags = [ -+ "-march=armv8.2-a+fp16+dotprod" -+ ] -+ -+ asmflags = cflags - +- - public_configs = [ ":xnnpack_public_config" ] - } - } ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("qu8-gemm_arm64_standalone") { ++ cflags = [ ++ ++ ] ++ + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S", -+ "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S", -+ "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S", -+ "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S" ++ "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu-neon-mlal-lane.c", ++ "src/src/qu8-gemm/gen/qu8-gemm-1x16-minmax-rndnu16-neon-mlal-lane.c", ++ "src/src/qu8-gemm/gen/qu8-gemm-1x4-minmax-fp32-scalar-lrintf.c", ++ "src/src/qu8-gemm/gen/qu8-gemm-1x8-minmax-rndnu-neon-mlal-lane.c", ++ "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c", ++ "src/src/qu8-gemm/gen/qu8-gemm-3x8-minmax-rndnu-neon-mlal-lane.c", ++ "src/src/qu8-gemm/gen/qu8-gemm-4x16-minmax-rndnu-neon-mlal-lane.c" + ] - # This is a target that cannot depend on //base. @@ -67595,14 +67702,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", -+ "//third_party/pthreadpool", ++ "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] - } +- } + public_configs = [ ":xnnpack_public_config" ] - } -+} - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { @@ -67635,20 +67741,28 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } -- } -- } -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod_standalone") { ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- if (build_with_chromium) { +- source_set("qs8-qc8w-gemm_x64") { +- cflags = [] ++if (build_with_chromium) { ++ source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod") { + cflags = [ + "-march=armv8.2-a+fp16+dotprod" + ] + + asmflags = cflags -- if (build_with_chromium) { -- source_set("qs8-qc8w-gemm_x64") { -- cflags = [] +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c", +- "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c", +- ] + sources = [ + "src/include/xnnpack.h", + "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S", @@ -67657,26 +67771,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S" + ] -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c", -- "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c", -- ] -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] - - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", @@ -67684,12 +67786,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ public_configs = [ ":xnnpack_public_config" ] ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] - public_configs = [ ":xnnpack_public_config" ] -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } +- } ++ public_configs = [ ":xnnpack_public_config" ] } +} @@ -67697,23 +67803,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (build_with_internal_optimization_guide) { - source_set("qs8-qc8w-gemm_x64_standalone") { - cflags = [] -+if (build_with_chromium) { -+ source_set("qu8-igemm_arm64") { -+ cflags = [ -+ -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu-neon-mlal-lane.c", -+ "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu16-neon-mlal-lane.c", -+ "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c", -+ "src/src/qu8-igemm/gen/qu8-igemm-1x8-minmax-rndnu-neon-mlal-lane.c", -+ "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c", -+ "src/src/qu8-igemm/gen/qu8-igemm-3x8-minmax-rndnu-neon-mlal-lane.c", -+ "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-neon-mlal-lane.c" -+ ] - +- - sources = [ - "src/include/xnnpack.h", - "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c", @@ -67739,10 +67829,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } - } -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("qu8-igemm_arch=armv8.2-a+fp16+dotprod_standalone") { ++ cflags = [ ++ "-march=armv8.2-a+fp16+dotprod" ++ ] ++ ++ asmflags = cflags - if (build_with_chromium) { - source_set("qs8-qc8w-igemm_avx-no-avx2-no-f16c-no-fma") { @@ -67770,18 +67864,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S", ++ "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75-prfm.S", ++ "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-asm-aarch64-neon-mlal-lane-cortex-a75.S", ++ "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu16-asm-aarch64-neon-mlal-lane-cortex-a53-prfm.S" + ] - public_configs = [ ":xnnpack_public_config" ] - } -+ public_configs = [ ":xnnpack_public_config" ] - } -+} +- } ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { @@ -67818,22 +67915,11 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } - } -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("qu8-igemm_arm64_standalone") { -+ cflags = [ -+ -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu-neon-mlal-lane.c", -+ "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu16-neon-mlal-lane.c", -+ "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c", -+ "src/src/qu8-igemm/gen/qu8-igemm-1x8-minmax-rndnu-neon-mlal-lane.c", -+ "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c", -+ "src/src/qu8-igemm/gen/qu8-igemm-3x8-minmax-rndnu-neon-mlal-lane.c", -+ "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-neon-mlal-lane.c" ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", + ] - if (build_with_chromium) { @@ -67863,20 +67949,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] ++ public_configs = [ ":xnnpack_public_config" ] - public_configs = [ ":xnnpack_public_config" ] -- } -- } -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { @@ -67912,13 +67992,24 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } -+ public_configs = [ ":xnnpack_public_config" ] -+ -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} +- } +- } ++if (build_with_chromium) { ++ source_set("qu8-igemm_arm64") { ++ cflags = [ ++ ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu-neon-mlal-lane.c", ++ "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu16-neon-mlal-lane.c", ++ "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c", ++ "src/src/qu8-igemm/gen/qu8-igemm-1x8-minmax-rndnu-neon-mlal-lane.c", ++ "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c", ++ "src/src/qu8-igemm/gen/qu8-igemm-3x8-minmax-rndnu-neon-mlal-lane.c", ++ "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-neon-mlal-lane.c" ++ ] - if (build_with_chromium) { - source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni") { @@ -67947,27 +68038,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+if (build_with_chromium) { -+ source_set("qu8-rdsum_arm64") { -+ cflags = [ -+ -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u16.c", -+ "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u32.c", -+ "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c" -+ ] - -- public_configs = [ ":xnnpack_public_config" ] -- } -- } + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] +- public_configs = [ ":xnnpack_public_config" ] +- } +- } ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] + - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { - source_set("qs8-qc8w-igemm_avx2-avxvnniint8-f16c-fma-gfni_standalone") { @@ -68003,13 +68088,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } - } -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] -+ + public_configs = [ ":xnnpack_public_config" ] } +} @@ -68041,16 +68119,20 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qu8-rdsum_arm64_standalone") { ++ source_set("qu8-igemm_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u16.c", -+ "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u32.c", -+ "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c" ++ "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu-neon-mlal-lane.c", ++ "src/src/qu8-igemm/gen/qu8-igemm-1x16-minmax-rndnu16-neon-mlal-lane.c", ++ "src/src/qu8-igemm/gen/qu8-igemm-1x4-minmax-fp32-scalar-lrintf.c", ++ "src/src/qu8-igemm/gen/qu8-igemm-1x8-minmax-rndnu-neon-mlal-lane.c", ++ "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c", ++ "src/src/qu8-igemm/gen/qu8-igemm-3x8-minmax-rndnu-neon-mlal-lane.c", ++ "src/src/qu8-igemm/gen/qu8-igemm-4x16-minmax-rndnu-neon-mlal-lane.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -68185,15 +68267,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("qu8-rsum_arm64") { ++ source_set("qu8-rdsum_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-rsum/gen/qu8-rsum-neon-u32-acc2.c", -+ "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c" ++ "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u16.c", ++ "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u32.c", ++ "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c" + ] - if (build_with_chromium) { @@ -68321,15 +68404,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qu8-rsum_arm64_standalone") { ++ source_set("qu8-rdsum_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-rsum/gen/qu8-rsum-neon-u32-acc2.c", -+ "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c" ++ "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u16.c", ++ "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-neon-u32.c", ++ "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -68457,17 +68541,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("qu8-vadd_arm64") { ++ source_set("qu8-rsum_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u16.c", -+ "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u32.c", -+ "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c", -+ "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c" ++ "src/src/qu8-rsum/gen/qu8-rsum-neon-u32-acc2.c", ++ "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c" + ] - if (build_with_chromium) { @@ -68550,17 +68632,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qu8-vadd_arm64_standalone") { ++ source_set("qu8-rsum_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u16.c", -+ "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u32.c", -+ "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c", -+ "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c" ++ "src/src/qu8-rsum/gen/qu8-rsum-neon-u32-acc2.c", ++ "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c" + ] - sources = [ @@ -68604,17 +68684,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("qs8-qc8w-igemm_x64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("qu8-vaddc_arm64") { ++ source_set("qu8-vadd_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u16.c", -+ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u32.c", -+ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c", -+ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c" ++ "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u16.c", ++ "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u32.c", ++ "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c", ++ "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c" + ] - sources = [ @@ -68723,17 +68803,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qu8-vaddc_arm64_standalone") { ++ source_set("qu8-vadd_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u16.c", -+ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u32.c", -+ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c", -+ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c" ++ "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u16.c", ++ "src/src/qu8-vadd/gen/qu8-vadd-minmax-neon-ld64-u32.c", ++ "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c", ++ "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c" + ] - if (build_with_chromium) { @@ -68835,15 +68915,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c", - ] +if (build_with_chromium) { -+ source_set("qu8-vcvt_arm64") { ++ source_set("qu8-vaddc_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vcvt/gen/qu8-vcvt-neon-u32.c", -+ "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c" ++ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u16.c", ++ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u32.c", ++ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c", ++ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c" + ] - configs -= [ "//build/config/compiler:chromium_code" ] @@ -68880,15 +68962,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qu8-vcvt_arm64_standalone") { ++ source_set("qu8-vaddc_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vcvt/gen/qu8-vcvt-neon-u32.c", -+ "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c" ++ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u16.c", ++ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-neon-ld64-u32.c", ++ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c", ++ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c" + ] - sources = [ @@ -69023,15 +69107,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("qu8-vlrelu_arm64") { ++ source_set("qu8-vcvt_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vlrelu/gen/qu8-vlrelu-neon-u32.c", -+ "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c" ++ "src/src/qu8-vcvt/gen/qu8-vcvt-neon-u32.c", ++ "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -69115,15 +69199,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qu8-vlrelu_arm64_standalone") { ++ source_set("qu8-vcvt_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vlrelu/gen/qu8-vlrelu-neon-u32.c", -+ "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c" ++ "src/src/qu8-vcvt/gen/qu8-vcvt-neon-u32.c", ++ "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -69188,15 +69272,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c", - ] +if (build_with_chromium) { -+ source_set("qu8-vmul_arm64") { ++ source_set("qu8-vlrelu_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c", -+ "src/src/qu8-vmul/gen/qu8-vmul-minmax-rndnu-neon-ld64-u16.c" ++ "src/src/qu8-vlrelu/gen/qu8-vlrelu-neon-u32.c", ++ "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c" + ] - configs -= [ "//build/config/compiler:chromium_code" ] @@ -69233,15 +69317,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qu8-vmul_arm64_standalone") { ++ source_set("qu8-vlrelu_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c", -+ "src/src/qu8-vmul/gen/qu8-vmul-minmax-rndnu-neon-ld64-u16.c" ++ "src/src/qu8-vlrelu/gen/qu8-vlrelu-neon-u32.c", ++ "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c" + ] - sources = [ @@ -69375,15 +69459,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("qu8-vmulc_arm64") { ++ source_set("qu8-vmul_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c", -+ "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-rndnu-neon-ld64-u16.c" ++ "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c", ++ "src/src/qu8-vmul/gen/qu8-vmul-minmax-rndnu-neon-ld64-u16.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -69469,15 +69553,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qu8-vmulc_arm64_standalone") { ++ source_set("qu8-vmul_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c", -+ "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-rndnu-neon-ld64-u16.c" ++ "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c", ++ "src/src/qu8-vmul/gen/qu8-vmul-minmax-rndnu-neon-ld64-u16.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -69613,14 +69697,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("qu8-vprelu_arm64") { ++ source_set("qu8-vmulc_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c" ++ "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c", ++ "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-rndnu-neon-ld64-u16.c" + ] - if (build_with_chromium) { @@ -69701,14 +69786,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qu8-vprelu_arm64_standalone") { ++ source_set("qu8-vmulc_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c" ++ "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-fp32-scalar-u4.c", ++ "src/src/qu8-vmulc/gen/qu8-vmulc-minmax-rndnu-neon-ld64-u16.c" + ] - sources = [ @@ -69776,14 +69862,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("qu8-vpreluc_arm64") { ++ source_set("qu8-vprelu_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c" ++ "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c" + ] - if (build_with_chromium) { @@ -69889,14 +69975,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qu8-vpreluc_arm64_standalone") { ++ source_set("qu8-vprelu_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c" ++ "src/src/qu8-vprelu/gen/qu8-vprelu-scalar-u8.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -70024,14 +70110,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("qu8-vrpreluc_arm64") { ++ source_set("qu8-vpreluc_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c" ++ "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c" + ] - if (build_with_chromium) { @@ -70132,14 +70218,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qu8-vrpreluc_arm64_standalone") { ++ source_set("qu8-vpreluc_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c" ++ "src/src/qu8-vpreluc/gen/qu8-vpreluc-scalar-u8.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -70205,16 +70291,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c", - ] +if (build_with_chromium) { -+ source_set("reference_arm64") { ++ source_set("qu8-vrpreluc_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/reference/binary-elementwise.cc", -+ "src/src/reference/packing.cc", -+ "src/src/reference/unary-elementwise.cc" ++ "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c" + ] - configs -= [ "//build/config/compiler:chromium_code" ] @@ -70251,16 +70335,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("reference_arm64_standalone") { ++ source_set("qu8-vrpreluc_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/reference/binary-elementwise.cc", -+ "src/src/reference/packing.cc", -+ "src/src/reference/unary-elementwise.cc" ++ "src/src/qu8-vrpreluc/gen/qu8-vrpreluc-scalar-u8.c" + ] - sources = [ @@ -70393,16 +70475,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("s8-ibilinear_arm64") { ++ source_set("reference_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u16.c", -+ "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u8.c", -+ "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c" ++ "src/src/reference/binary-elementwise.cc", ++ "src/src/reference/packing.cc", ++ "src/src/reference/unary-elementwise.cc" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -70487,16 +70569,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("s8-ibilinear_arm64_standalone") { ++ source_set("reference_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u16.c", -+ "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u8.c", -+ "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c" ++ "src/src/reference/binary-elementwise.cc", ++ "src/src/reference/packing.cc", ++ "src/src/reference/unary-elementwise.cc" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -70617,15 +70699,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("s8-maxpool_arm64") { ++ source_set("s8-ibilinear_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-neon-u16.c", -+ "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c" ++ "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u16.c", ++ "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u8.c", ++ "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c" + ] - if (build_with_chromium) { @@ -70706,15 +70789,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("s8-maxpool_arm64_standalone") { ++ source_set("s8-ibilinear_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-neon-u16.c", -+ "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c" ++ "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u16.c", ++ "src/src/s8-ibilinear/gen/s8-ibilinear-neon-u8.c", ++ "src/src/s8-ibilinear/gen/s8-ibilinear-scalar-u1.c" + ] - sources = [ @@ -70784,17 +70868,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("s8-rdminmax_arm64") { ++ source_set("s8-maxpool_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-neon-u32.c", -+ "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c", -+ "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-neon-u32.c", -+ "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c" ++ "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-neon-u16.c", ++ "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c" + ] - if (build_with_chromium) { @@ -70900,17 +70982,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("s8-rdminmax_arm64_standalone") { ++ source_set("s8-maxpool_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-neon-u32.c", -+ "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c", -+ "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-neon-u32.c", -+ "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c" ++ "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-neon-u16.c", ++ "src/src/s8-maxpool/gen/s8-maxpool-9p-minmax-scalar-u1.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -71026,19 +71106,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("s8-rminmax_arm64") { ++ source_set("s8-rdminmax_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/s8-rminmax/gen/s8-rmax-neon-u32-acc2.c", -+ "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c", -+ "src/src/s8-rminmax/gen/s8-rmin-neon-u32-acc2.c", -+ "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c", -+ "src/src/s8-rminmax/gen/s8-rminmax-neon-u32-acc2.c", -+ "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c" ++ "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-neon-u32.c", ++ "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c", ++ "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-neon-u32.c", ++ "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c" + ] - if (build_with_chromium) { @@ -71139,19 +71217,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("s8-rminmax_arm64_standalone") { ++ source_set("s8-rdminmax_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/s8-rminmax/gen/s8-rmax-neon-u32-acc2.c", -+ "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c", -+ "src/src/s8-rminmax/gen/s8-rmin-neon-u32-acc2.c", -+ "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c", -+ "src/src/s8-rminmax/gen/s8-rminmax-neon-u32-acc2.c", -+ "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c" ++ "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-neon-u32.c", ++ "src/src/s8-rdminmax/gen/s8-rdmax-2p2x-scalar-u2.c", ++ "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-neon-u32.c", ++ "src/src/s8-rdminmax/gen/s8-rdmin-2p2x-scalar-u2.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -71216,15 +71292,19 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c", - ] +if (build_with_chromium) { -+ source_set("s8-vclamp_arm64") { ++ source_set("s8-rminmax_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/s8-vclamp/s8-vclamp-neon-u64.c", -+ "src/src/s8-vclamp/s8-vclamp-scalar-u4.c" ++ "src/src/s8-rminmax/gen/s8-rmax-neon-u32-acc2.c", ++ "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c", ++ "src/src/s8-rminmax/gen/s8-rmin-neon-u32-acc2.c", ++ "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c", ++ "src/src/s8-rminmax/gen/s8-rminmax-neon-u32-acc2.c", ++ "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c" + ] - configs -= [ "//build/config/compiler:chromium_code" ] @@ -71261,15 +71341,19 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("s8-vclamp_arm64_standalone") { ++ source_set("s8-rminmax_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/s8-vclamp/s8-vclamp-neon-u64.c", -+ "src/src/s8-vclamp/s8-vclamp-scalar-u4.c" ++ "src/src/s8-rminmax/gen/s8-rmax-neon-u32-acc2.c", ++ "src/src/s8-rminmax/gen/s8-rmax-scalar-u2-acc2.c", ++ "src/src/s8-rminmax/gen/s8-rmin-neon-u32-acc2.c", ++ "src/src/s8-rminmax/gen/s8-rmin-scalar-u2-acc2.c", ++ "src/src/s8-rminmax/gen/s8-rminmax-neon-u32-acc2.c", ++ "src/src/s8-rminmax/gen/s8-rminmax-scalar-u2-acc2.c" + ] - sources = [ @@ -71401,42 +71485,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("subgraph_arm64") { ++ source_set("s8-vclamp_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/subgraph/argmax-pooling-2d.c", -+ "src/src/subgraph/average-pooling-2d.c", -+ "src/src/subgraph/batch-matrix-multiply.c", -+ "src/src/subgraph/binary.c", -+ "src/src/subgraph/concatenate.c", -+ "src/src/subgraph/convolution-2d.c", -+ "src/src/subgraph/copy.c", -+ "src/src/subgraph/deconvolution-2d.c", -+ "src/src/subgraph/deprecated.c", -+ "src/src/subgraph/depth-to-space-2d.c", -+ "src/src/subgraph/depthwise-convolution-2d.c", -+ "src/src/subgraph/even-split.c", -+ "src/src/subgraph/fully-connected-sparse.c", -+ "src/src/subgraph/fully-connected.c", -+ "src/src/subgraph/max-pooling-2d.c", -+ "src/src/subgraph/pack-lh.c", -+ "src/src/subgraph/reshape-helpers.c", -+ "src/src/subgraph/rope.c", -+ "src/src/subgraph/softmax.c", -+ "src/src/subgraph/space-to-depth-2d.c", -+ "src/src/subgraph/static-constant-pad.c", -+ "src/src/subgraph/static-reduce.c", -+ "src/src/subgraph/static-resize-bilinear-2d.c", -+ "src/src/subgraph/static-slice.c", -+ "src/src/subgraph/static-transpose.c", -+ "src/src/subgraph/subgraph-utils.c", -+ "src/src/subgraph/unary.c", -+ "src/src/subgraph/unpooling-2d.c", -+ "src/src/subgraph/validation.c" ++ "src/src/s8-vclamp/s8-vclamp-neon-u64.c", ++ "src/src/s8-vclamp/s8-vclamp-scalar-u4.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -71515,42 +71572,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("subgraph_arm64_standalone") { ++ source_set("s8-vclamp_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/subgraph/argmax-pooling-2d.c", -+ "src/src/subgraph/average-pooling-2d.c", -+ "src/src/subgraph/batch-matrix-multiply.c", -+ "src/src/subgraph/binary.c", -+ "src/src/subgraph/concatenate.c", -+ "src/src/subgraph/convolution-2d.c", -+ "src/src/subgraph/copy.c", -+ "src/src/subgraph/deconvolution-2d.c", -+ "src/src/subgraph/deprecated.c", -+ "src/src/subgraph/depth-to-space-2d.c", -+ "src/src/subgraph/depthwise-convolution-2d.c", -+ "src/src/subgraph/even-split.c", -+ "src/src/subgraph/fully-connected-sparse.c", -+ "src/src/subgraph/fully-connected.c", -+ "src/src/subgraph/max-pooling-2d.c", -+ "src/src/subgraph/pack-lh.c", -+ "src/src/subgraph/reshape-helpers.c", -+ "src/src/subgraph/rope.c", -+ "src/src/subgraph/softmax.c", -+ "src/src/subgraph/space-to-depth-2d.c", -+ "src/src/subgraph/static-constant-pad.c", -+ "src/src/subgraph/static-reduce.c", -+ "src/src/subgraph/static-resize-bilinear-2d.c", -+ "src/src/subgraph/static-slice.c", -+ "src/src/subgraph/static-transpose.c", -+ "src/src/subgraph/subgraph-utils.c", -+ "src/src/subgraph/unary.c", -+ "src/src/subgraph/unpooling-2d.c", -+ "src/src/subgraph/validation.c" ++ "src/src/s8-vclamp/s8-vclamp-neon-u64.c", ++ "src/src/s8-vclamp/s8-vclamp-scalar-u4.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -71665,22 +71695,42 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("tables_arm64") { ++ source_set("subgraph_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/tables/exp2-k-over-2048.c", -+ "src/src/tables/exp2-k-over-64.c", -+ "src/src/tables/exp2minus-k-over-16.c", -+ "src/src/tables/exp2minus-k-over-2048.c", -+ "src/src/tables/exp2minus-k-over-32.c", -+ "src/src/tables/exp2minus-k-over-4.c", -+ "src/src/tables/exp2minus-k-over-64.c", -+ "src/src/tables/exp2minus-k-over-8.c", -+ "src/src/tables/vlog.c" ++ "src/src/subgraph/argmax-pooling-2d.c", ++ "src/src/subgraph/average-pooling-2d.c", ++ "src/src/subgraph/batch-matrix-multiply.c", ++ "src/src/subgraph/binary.c", ++ "src/src/subgraph/concatenate.c", ++ "src/src/subgraph/convolution-2d.c", ++ "src/src/subgraph/copy.c", ++ "src/src/subgraph/deconvolution-2d.c", ++ "src/src/subgraph/deprecated.c", ++ "src/src/subgraph/depth-to-space-2d.c", ++ "src/src/subgraph/depthwise-convolution-2d.c", ++ "src/src/subgraph/even-split.c", ++ "src/src/subgraph/fully-connected-sparse.c", ++ "src/src/subgraph/fully-connected.c", ++ "src/src/subgraph/max-pooling-2d.c", ++ "src/src/subgraph/pack-lh.c", ++ "src/src/subgraph/reshape-helpers.c", ++ "src/src/subgraph/rope.c", ++ "src/src/subgraph/softmax.c", ++ "src/src/subgraph/space-to-depth-2d.c", ++ "src/src/subgraph/static-constant-pad.c", ++ "src/src/subgraph/static-reduce.c", ++ "src/src/subgraph/static-resize-bilinear-2d.c", ++ "src/src/subgraph/static-slice.c", ++ "src/src/subgraph/static-transpose.c", ++ "src/src/subgraph/subgraph-utils.c", ++ "src/src/subgraph/unary.c", ++ "src/src/subgraph/unpooling-2d.c", ++ "src/src/subgraph/validation.c" + ] - if (build_with_chromium) { @@ -71761,22 +71811,42 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("tables_arm64_standalone") { ++ source_set("subgraph_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/tables/exp2-k-over-2048.c", -+ "src/src/tables/exp2-k-over-64.c", -+ "src/src/tables/exp2minus-k-over-16.c", -+ "src/src/tables/exp2minus-k-over-2048.c", -+ "src/src/tables/exp2minus-k-over-32.c", -+ "src/src/tables/exp2minus-k-over-4.c", -+ "src/src/tables/exp2minus-k-over-64.c", -+ "src/src/tables/exp2minus-k-over-8.c", -+ "src/src/tables/vlog.c" ++ "src/src/subgraph/argmax-pooling-2d.c", ++ "src/src/subgraph/average-pooling-2d.c", ++ "src/src/subgraph/batch-matrix-multiply.c", ++ "src/src/subgraph/binary.c", ++ "src/src/subgraph/concatenate.c", ++ "src/src/subgraph/convolution-2d.c", ++ "src/src/subgraph/copy.c", ++ "src/src/subgraph/deconvolution-2d.c", ++ "src/src/subgraph/deprecated.c", ++ "src/src/subgraph/depth-to-space-2d.c", ++ "src/src/subgraph/depthwise-convolution-2d.c", ++ "src/src/subgraph/even-split.c", ++ "src/src/subgraph/fully-connected-sparse.c", ++ "src/src/subgraph/fully-connected.c", ++ "src/src/subgraph/max-pooling-2d.c", ++ "src/src/subgraph/pack-lh.c", ++ "src/src/subgraph/reshape-helpers.c", ++ "src/src/subgraph/rope.c", ++ "src/src/subgraph/softmax.c", ++ "src/src/subgraph/space-to-depth-2d.c", ++ "src/src/subgraph/static-constant-pad.c", ++ "src/src/subgraph/static-reduce.c", ++ "src/src/subgraph/static-resize-bilinear-2d.c", ++ "src/src/subgraph/static-slice.c", ++ "src/src/subgraph/static-transpose.c", ++ "src/src/subgraph/subgraph-utils.c", ++ "src/src/subgraph/unary.c", ++ "src/src/subgraph/unpooling-2d.c", ++ "src/src/subgraph/validation.c" + ] - sources = [ @@ -71819,16 +71889,22 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("qs8-vlrelu_x64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("u8-ibilinear_arm64") { ++ source_set("tables_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u16.c", -+ "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u8.c", -+ "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c" ++ "src/src/tables/exp2-k-over-2048.c", ++ "src/src/tables/exp2-k-over-64.c", ++ "src/src/tables/exp2minus-k-over-16.c", ++ "src/src/tables/exp2minus-k-over-2048.c", ++ "src/src/tables/exp2minus-k-over-32.c", ++ "src/src/tables/exp2minus-k-over-4.c", ++ "src/src/tables/exp2minus-k-over-64.c", ++ "src/src/tables/exp2minus-k-over-8.c", ++ "src/src/tables/vlog.c" + ] - sources = [ @@ -71934,16 +72010,22 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("u8-ibilinear_arm64_standalone") { ++ source_set("tables_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u16.c", -+ "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u8.c", -+ "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c" ++ "src/src/tables/exp2-k-over-2048.c", ++ "src/src/tables/exp2-k-over-64.c", ++ "src/src/tables/exp2minus-k-over-16.c", ++ "src/src/tables/exp2minus-k-over-2048.c", ++ "src/src/tables/exp2minus-k-over-32.c", ++ "src/src/tables/exp2minus-k-over-4.c", ++ "src/src/tables/exp2minus-k-over-64.c", ++ "src/src/tables/exp2minus-k-over-8.c", ++ "src/src/tables/vlog.c" + ] - if (build_with_chromium) { @@ -72046,14 +72128,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("u8-lut32norm_arm64") { ++ source_set("u8-ibilinear_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/u8-lut32norm/u8-lut32norm-scalar.c" ++ "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u16.c", ++ "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u8.c", ++ "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -72111,14 +72195,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("u8-lut32norm_arm64_standalone") { ++ source_set("u8-ibilinear_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/u8-lut32norm/u8-lut32norm-scalar.c" ++ "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u16.c", ++ "src/src/u8-ibilinear/gen/u8-ibilinear-neon-u8.c", ++ "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c" + ] - sources = [ @@ -72161,15 +72247,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("qs8-vmul_x64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("u8-maxpool_arm64") { ++ source_set("u8-lut32norm_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-neon-u16.c", -+ "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c" ++ "src/src/u8-lut32norm/u8-lut32norm-scalar.c" + ] - sources = [ @@ -72275,15 +72360,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("u8-maxpool_arm64_standalone") { ++ source_set("u8-lut32norm_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-neon-u16.c", -+ "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c" ++ "src/src/u8-lut32norm/u8-lut32norm-scalar.c" + ] - if (build_with_chromium) { @@ -72386,17 +72470,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("u8-rdminmax_arm64") { ++ source_set("u8-maxpool_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-neon-u32.c", -+ "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c", -+ "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-neon-u32.c", -+ "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c" ++ "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-neon-u16.c", ++ "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -72454,17 +72536,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("u8-rdminmax_arm64_standalone") { ++ source_set("u8-maxpool_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-neon-u32.c", -+ "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c", -+ "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-neon-u32.c", -+ "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c" ++ "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-neon-u16.c", ++ "src/src/u8-maxpool/gen/u8-maxpool-9p-minmax-scalar-u1.c" + ] - sources = [ @@ -72532,19 +72612,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("u8-rminmax_arm64") { ++ source_set("u8-rdminmax_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/u8-rminmax/gen/u8-rmax-neon-u32-acc2.c", -+ "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c", -+ "src/src/u8-rminmax/gen/u8-rmin-neon-u32-acc2.c", -+ "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c", -+ "src/src/u8-rminmax/gen/u8-rminmax-neon-u32-acc2.c", -+ "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c" ++ "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-neon-u32.c", ++ "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c", ++ "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-neon-u32.c", ++ "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c" + ] - if (build_with_chromium) { @@ -72627,19 +72705,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("u8-rminmax_arm64_standalone") { ++ source_set("u8-rdminmax_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/u8-rminmax/gen/u8-rmax-neon-u32-acc2.c", -+ "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c", -+ "src/src/u8-rminmax/gen/u8-rmin-neon-u32-acc2.c", -+ "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c", -+ "src/src/u8-rminmax/gen/u8-rminmax-neon-u32-acc2.c", -+ "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c" ++ "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-neon-u32.c", ++ "src/src/u8-rdminmax/gen/u8-rdmax-2p2x-scalar-u2.c", ++ "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-neon-u32.c", ++ "src/src/u8-rdminmax/gen/u8-rdmin-2p2x-scalar-u2.c" + ] - sources = [ @@ -72707,15 +72783,19 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("u8-vclamp_arm64") { ++ source_set("u8-rminmax_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/u8-vclamp/u8-vclamp-neon-u64.c", -+ "src/src/u8-vclamp/u8-vclamp-scalar-u4.c" ++ "src/src/u8-rminmax/gen/u8-rmax-neon-u32-acc2.c", ++ "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c", ++ "src/src/u8-rminmax/gen/u8-rmin-neon-u32-acc2.c", ++ "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c", ++ "src/src/u8-rminmax/gen/u8-rminmax-neon-u32-acc2.c", ++ "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c" + ] - if (build_with_chromium) { @@ -72798,15 +72878,19 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("u8-vclamp_arm64_standalone") { ++ source_set("u8-rminmax_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/u8-vclamp/u8-vclamp-neon-u64.c", -+ "src/src/u8-vclamp/u8-vclamp-scalar-u4.c" ++ "src/src/u8-rminmax/gen/u8-rmax-neon-u32-acc2.c", ++ "src/src/u8-rminmax/gen/u8-rmax-scalar-u2-acc2.c", ++ "src/src/u8-rminmax/gen/u8-rmin-neon-u32-acc2.c", ++ "src/src/u8-rminmax/gen/u8-rmin-scalar-u2-acc2.c", ++ "src/src/u8-rminmax/gen/u8-rminmax-neon-u32-acc2.c", ++ "src/src/u8-rminmax/gen/u8-rminmax-scalar-u2-acc2.c" + ] - sources = [ @@ -72874,14 +72958,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2") { ++ source_set("u8-vclamp_arm64") { + cflags = [ -+ "-march=armv8.2-a+sve+sve2" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x16-pack-lh/x16-packlh-neonsme2.c" ++ "src/src/u8-vclamp/u8-vclamp-neon-u64.c", ++ "src/src/u8-vclamp/u8-vclamp-scalar-u4.c" + ] - if (build_with_chromium) { @@ -72964,14 +73049,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2_standalone") { ++ source_set("u8-vclamp_arm64_standalone") { + cflags = [ -+ "-march=armv8.2-a+sve+sve2" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x16-pack-lh/x16-packlh-neonsme2.c" ++ "src/src/u8-vclamp/u8-vclamp-neon-u64.c", ++ "src/src/u8-vclamp/u8-vclamp-scalar-u4.c" + ] - sources = [ @@ -73014,15 +73100,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("qs8-vrpreluc_x64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("x16-packw_arm64") { ++ source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2") { + cflags = [ -+ ++ "-march=armv8.2-a+sve+sve2" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-neon-ld4lane-u8-prfm.c", -+ "src/src/x16-packw/gen/x16-packw-x8-gemm-goi-neon-ld4lane-u8-prfm.c" ++ "src/src/x16-pack-lh/x16-packlh-igemm-neonsme.c", ++ "src/src/x16-pack-lh/x16-packlh-igemm-neonsme2.c", ++ "src/src/x16-pack-lh/x16-packlh-neonsme.c", ++ "src/src/x16-pack-lh/x16-packlh-neonsme2.c" + ] - sources = [ @@ -73130,15 +73218,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("x16-packw_arm64_standalone") { ++ source_set("x16-pack-lh_arch=armv8.2-a+sve+sve2_standalone") { + cflags = [ -+ ++ "-march=armv8.2-a+sve+sve2" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-neon-ld4lane-u8-prfm.c", -+ "src/src/x16-packw/gen/x16-packw-x8-gemm-goi-neon-ld4lane-u8-prfm.c" ++ "src/src/x16-pack-lh/x16-packlh-igemm-neonsme.c", ++ "src/src/x16-pack-lh/x16-packlh-igemm-neonsme2.c", ++ "src/src/x16-pack-lh/x16-packlh-neonsme.c", ++ "src/src/x16-pack-lh/x16-packlh-neonsme2.c" + ] - if (build_with_chromium) { @@ -73252,15 +73342,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("x16-transposec_arm64") { ++ source_set("x16-packw_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c", -+ "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-dec-zip-neon.c" ++ "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-neon-ld4lane-u8-prfm.c", ++ "src/src/x16-packw/gen/x16-packw-x8-gemm-goi-neon-ld4lane-u8-prfm.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -73346,15 +73436,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("x16-transposec_arm64_standalone") { ++ source_set("x16-packw_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c", -+ "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-dec-zip-neon.c" ++ "src/src/x16-packw/gen/x16-packw-x16-gemm-goi-neon-ld4lane-u8-prfm.c", ++ "src/src/x16-packw/gen/x16-packw-x8-gemm-goi-neon-ld4lane-u8-prfm.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -73472,15 +73562,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("x16-x32-packw_arm64") { ++ source_set("x16-transposec_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c", -+ "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c" ++ "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c", ++ "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-dec-zip-neon.c" + ] - if (build_with_chromium) { @@ -73529,15 +73619,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("x16-x32-packw_arm64_standalone") { ++ source_set("x16-transposec_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c", -+ "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c" ++ "src/src/x16-transposec/gen/x16-transposec-2x4-scalar-int.c", ++ "src/src/x16-transposec/gen/x16-transposec-8x8-reuse-dec-zip-neon.c" + ] - sources = [ @@ -73672,16 +73762,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("x24-transposec_arm64") { ++ source_set("x16-x32-packw_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c", -+ "src/src/x24-transposec/x24-transposec-2x2-neon-tbl64.c", -+ "src/src/x24-transposec/x24-transposec-4x4-aarch64-neon-tbl128.c" ++ "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c", ++ "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -73766,16 +73855,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("x24-transposec_arm64_standalone") { ++ source_set("x16-x32-packw_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c", -+ "src/src/x24-transposec/x24-transposec-2x2-neon-tbl64.c", -+ "src/src/x24-transposec/x24-transposec-4x4-aarch64-neon-tbl128.c" ++ "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-gio-scalar.c", ++ "src/src/x16-x32-packw/gen/x16-x32-packw-x32c2-gemm-goi-scalar.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -73896,14 +73984,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2") { ++ source_set("x24-transposec_arm64") { + cflags = [ -+ "-march=armv8.2-a+sve+sve2" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x32-pack-lh/x32-packlh-neonsme.c" ++ "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c", ++ "src/src/x24-transposec/x24-transposec-2x2-neon-tbl64.c", ++ "src/src/x24-transposec/x24-transposec-4x4-aarch64-neon-tbl128.c" + ] - if (build_with_chromium) { @@ -73984,14 +74074,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2_standalone") { ++ source_set("x24-transposec_arm64_standalone") { + cflags = [ -+ "-march=armv8.2-a+sve+sve2" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x32-pack-lh/x32-packlh-neonsme.c" ++ "src/src/x24-transposec/gen/x24-transposec-1x2-scalar.c", ++ "src/src/x24-transposec/x24-transposec-2x2-neon-tbl64.c", ++ "src/src/x24-transposec/x24-transposec-4x4-aarch64-neon-tbl128.c" + ] - sources = [ @@ -74059,24 +74151,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("x32-packw_arm64") { ++ source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2") { + cflags = [ -+ ++ "-march=armv8.2-a+sve+sve2" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x32-packw/gen/x32-packw-gio-neon-u2.c", -+ "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-neon-ld4lane-u4-prfm.c", -+ "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c", -+ "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-neon-ld2lane-u2-prfm.c", -+ "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c", -+ "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c", -+ "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c", -+ "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c", -+ "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c", -+ "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-neon-ld4lane-u4-prfm.c", -+ "src/src/x32-packw/gen/x32-packw-x8s4-gemm-goi-neon-ld4lane-u4-prfm.c" ++ "src/src/x32-pack-lh/x32-packlh-neonsme.c", ++ "src/src/x32-pack-lh/x32-packlh-neonsme2.c" + ] - if (build_with_chromium) { @@ -74185,24 +74268,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("x32-packw_arm64_standalone") { ++ source_set("x32-pack-lh_arch=armv8.2-a+sve+sve2_standalone") { + cflags = [ -+ ++ "-march=armv8.2-a+sve+sve2" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x32-packw/gen/x32-packw-gio-neon-u2.c", -+ "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-neon-ld4lane-u4-prfm.c", -+ "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c", -+ "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-neon-ld2lane-u2-prfm.c", -+ "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c", -+ "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c", -+ "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c", -+ "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c", -+ "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c", -+ "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-neon-ld4lane-u4-prfm.c", -+ "src/src/x32-packw/gen/x32-packw-x8s4-gemm-goi-neon-ld4lane-u4-prfm.c" ++ "src/src/x32-pack-lh/x32-packlh-neonsme.c", ++ "src/src/x32-pack-lh/x32-packlh-neonsme2.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -74333,16 +74407,24 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("x32-transposec_arm64") { ++ source_set("x32-packw_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c", -+ "src/src/x32-transposec/gen/x32-transposec-4x4-reuse-dec-zip-neon.c", -+ "src/src/x32-transposec/x32-transposec-4x4-aarch64-neon-tbl128.c" ++ "src/src/x32-packw/gen/x32-packw-gio-neon-u2.c", ++ "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-neon-ld4lane-u4-prfm.c", ++ "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c", ++ "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-neon-ld2lane-u2-prfm.c", ++ "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c", ++ "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c", ++ "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c", ++ "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c", ++ "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c", ++ "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-neon-ld4lane-u4-prfm.c", ++ "src/src/x32-packw/gen/x32-packw-x8s4-gemm-goi-neon-ld4lane-u4-prfm.c" + ] - if (build_with_chromium) { @@ -74446,16 +74528,24 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("x32-transposec_arm64_standalone") { ++ source_set("x32-packw_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c", -+ "src/src/x32-transposec/gen/x32-transposec-4x4-reuse-dec-zip-neon.c", -+ "src/src/x32-transposec/x32-transposec-4x4-aarch64-neon-tbl128.c" ++ "src/src/x32-packw/gen/x32-packw-gio-neon-u2.c", ++ "src/src/x32-packw/gen/x32-packw-x16-gemm-goi-neon-ld4lane-u4-prfm.c", ++ "src/src/x32-packw/gen/x32-packw-x2-gemm-gio-scalar.c", ++ "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-neon-ld2lane-u2-prfm.c", ++ "src/src/x32-packw/gen/x32-packw-x2-gemm-goi-scalar-float-u4.c", ++ "src/src/x32-packw/gen/x32-packw-x32-gemm-goi-scalar-int-u2.c", ++ "src/src/x32-packw/gen/x32-packw-x4-gemm-gio-scalar.c", ++ "src/src/x32-packw/gen/x32-packw-x4-gemm-goi-scalar-float-u4.c", ++ "src/src/x32-packw/gen/x32-packw-x64-gemm-goi-scalar-int-u2.c", ++ "src/src/x32-packw/gen/x32-packw-x8-gemm-goi-neon-ld4lane-u4-prfm.c", ++ "src/src/x32-packw/gen/x32-packw-x8s4-gemm-goi-neon-ld4lane-u4-prfm.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -74522,15 +74612,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/qu8-gemm/gen/qu8-gemm-3x4-minmax-fp32-scalar-lrintf.c", - ] +if (build_with_chromium) { -+ source_set("x32-unpool_arm64") { ++ source_set("x32-transposec_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x32-unpool/x32-unpool-neon.c", -+ "src/src/x32-unpool/x32-unpool-scalar.c" ++ "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c", ++ "src/src/x32-transposec/gen/x32-transposec-4x4-reuse-dec-zip-neon.c", ++ "src/src/x32-transposec/x32-transposec-4x4-aarch64-neon-tbl128.c" + ] - configs -= [ "//build/config/compiler:chromium_code" ] @@ -74567,15 +74658,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("x32-unpool_arm64_standalone") { ++ source_set("x32-transposec_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x32-unpool/x32-unpool-neon.c", -+ "src/src/x32-unpool/x32-unpool-scalar.c" ++ "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c", ++ "src/src/x32-transposec/gen/x32-transposec-4x4-reuse-dec-zip-neon.c", ++ "src/src/x32-transposec/x32-transposec-4x4-aarch64-neon-tbl128.c" + ] - sources = [ @@ -74711,16 +74803,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("x64-transposec_arm64") { ++ source_set("x32-unpool_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x64-transposec/gen/x64-transposec-2x2-multi-dec-zip-neon.c", -+ "src/src/x64-transposec/gen/x64-transposec-2x2-reuse-dec-zip-neon.c", -+ "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c" ++ "src/src/x32-unpool/x32-unpool-neon.c", ++ "src/src/x32-unpool/x32-unpool-scalar.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -74807,16 +74898,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("x64-transposec_arm64_standalone") { ++ source_set("x32-unpool_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x64-transposec/gen/x64-transposec-2x2-multi-dec-zip-neon.c", -+ "src/src/x64-transposec/gen/x64-transposec-2x2-reuse-dec-zip-neon.c", -+ "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c" ++ "src/src/x32-unpool/x32-unpool-neon.c", ++ "src/src/x32-unpool/x32-unpool-scalar.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -74940,15 +75030,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("x8-lut_arm64") { ++ source_set("x64-transposec_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x8-lut/gen/x8-lut-aarch64-neon-tbx128x4-u64.c", -+ "src/src/x8-lut/gen/x8-lut-scalar-u4.c" ++ "src/src/x64-transposec/gen/x64-transposec-2x2-multi-dec-zip-neon.c", ++ "src/src/x64-transposec/gen/x64-transposec-2x2-reuse-dec-zip-neon.c", ++ "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c" + ] - if (build_with_chromium) { @@ -75031,15 +75122,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("x8-lut_arm64_standalone") { ++ source_set("x64-transposec_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x8-lut/gen/x8-lut-aarch64-neon-tbx128x4-u64.c", -+ "src/src/x8-lut/gen/x8-lut-scalar-u4.c" ++ "src/src/x64-transposec/gen/x64-transposec-2x2-multi-dec-zip-neon.c", ++ "src/src/x64-transposec/gen/x64-transposec-2x2-reuse-dec-zip-neon.c", ++ "src/src/x64-transposec/gen/x64-transposec-4x2-scalar-int.c" + ] - sources = [ @@ -75109,15 +75201,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2") { ++ source_set("x8-lut_arm64") { + cflags = [ -+ "-march=armv8.2-a+sve+sve2" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x8-pack-lh/x8-packlh-igemm-neonsme2.c", -+ "src/src/x8-pack-lh/x8-packlh-neonsme2.c" ++ "src/src/x8-lut/gen/x8-lut-aarch64-neon-tbx128x4-u64.c", ++ "src/src/x8-lut/gen/x8-lut-scalar-u4.c" + ] - if (build_with_chromium) { @@ -75198,15 +75290,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2_standalone") { ++ source_set("x8-lut_arm64_standalone") { + cflags = [ -+ "-march=armv8.2-a+sve+sve2" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x8-pack-lh/x8-packlh-igemm-neonsme2.c", -+ "src/src/x8-pack-lh/x8-packlh-neonsme2.c" ++ "src/src/x8-lut/gen/x8-lut-aarch64-neon-tbx128x4-u64.c", ++ "src/src/x8-lut/gen/x8-lut-scalar-u4.c" + ] - sources = [ @@ -75249,15 +75341,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("qu8-rdsum_x64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("x8-packq_arm64") { ++ source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2") { + cflags = [ -+ ++ "-march=armv8.2-a+sve+sve2" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c", -+ "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c" ++ "src/src/x8-pack-lh/x8-packlh-igemm-neonsme2.c", ++ "src/src/x8-pack-lh/x8-packlh-neonsme2.c" + ] - sources = [ @@ -75361,15 +75453,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("x8-packq_arm64_standalone") { ++ source_set("x8-pack-lh_arch=armv8.2-a+sve+sve2_standalone") { + cflags = [ -+ ++ "-march=armv8.2-a+sve+sve2" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c", -+ "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c" ++ "src/src/x8-pack-lh/x8-packlh-igemm-neonsme2.c", ++ "src/src/x8-pack-lh/x8-packlh-neonsme2.c" + ] - if (build_with_chromium) { @@ -75456,65 +75548,47 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/include/xnnpack.h", - "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c", - ] -+if (build_with_chromium) { -+ source_set("x8-packw_arm64") { -+ cflags = [ -+ -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c", -+ "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c", -+ "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c", -+ "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c" -+ ] - +- - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] - +- - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] - -- public_configs = [ ":xnnpack_public_config" ] -- } -+ public_configs = [ ":xnnpack_public_config" ] - } -+} - -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qu8-rsum_x64_standalone") { -- cflags = [] -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("x8-packw_arm64_standalone") { ++if (build_with_chromium) { ++ source_set("x8-packq_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c", -+ "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c", -+ "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c", -+ "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c" ++ "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c", ++ "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c" ++ ] + +- public_configs = [ ":xnnpack_public_config" ] +- } +- } ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qu8-rsum_x64_standalone") { +- cflags = [] ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", + ] - sources = [ @@ -75540,11 +75614,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } - } -- } -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] ++ public_configs = [ ":xnnpack_public_config" ] + } ++} - if (build_with_chromium) { - source_set("qu8-vadd_avx-no-avx2-no-f16c-no-fma") { @@ -75571,17 +75643,26 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("x8-packq_arm64_standalone") { ++ cflags = [ ++ ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/x8-packq/x8-packq-aarch64-neon-f32qp8-u2.c", ++ "src/src/x8-packq/x8-packq-scalar-f32qp8-u1.c" + ] - public_configs = [ ":xnnpack_public_config" ] - } - } -+ public_configs = [ ":xnnpack_public_config" ] ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { @@ -75615,11 +75696,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} +- } +- } ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] - if (build_with_chromium) { - source_set("qu8-vadd_f16c-fma-avx2") { @@ -75645,25 +75729,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+if (build_with_chromium) { -+ source_set("x8-transposec_arm64") { -+ cflags = [ -+ -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-dec-zip-neon.c", -+ "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c" -+ ] ++ public_configs = [ ":xnnpack_public_config" ] - public_configs = [ ":xnnpack_public_config" ] -- } -- } -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { @@ -75697,16 +75770,20 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } - } -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", +- } ++if (build_with_chromium) { ++ source_set("x8-packw_arm64") { ++ cflags = [ ++ ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c", ++ "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c", ++ "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c", ++ "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c" + ] -+ -+ public_configs = [ ":xnnpack_public_config" ] - } -+} - if (build_with_chromium) { - source_set( @@ -75737,27 +75814,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("x8-transposec_arm64_standalone") { -+ cflags = [ -+ -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-dec-zip-neon.c", -+ "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c" -+ ] - -- public_configs = [ ":xnnpack_public_config" ] -- } -- } + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] +- public_configs = [ ":xnnpack_public_config" ] +- } +- } ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] + - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { - source_set( @@ -75795,13 +75866,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } - } -- } -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] ++ public_configs = [ ":xnnpack_public_config" ] + } ++} - if (build_with_chromium) { - source_set("qu8-vadd_sse2-no-sse3") { @@ -75826,14 +75893,24 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ public_configs = [ ":xnnpack_public_config" ] - +- - public_configs = [ ":xnnpack_public_config" ] -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} +- } +- } ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("x8-packw_arm64_standalone") { ++ cflags = [ ++ ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/x8-packw/gen/x8-packw-x16-gemm-goi-scalar-u2.c", ++ "src/src/x8-packw/gen/x8-packw-x32-gemm-goi-scalar-u2.c", ++ "src/src/x8-packw/gen/x8-packw-x4-gemm-goi-scalar-u2.c", ++ "src/src/x8-packw/gen/x8-packw-x8-gemm-goi-scalar-u2.c" ++ ] - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { @@ -75867,16 +75944,10 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } - } -+if (build_with_chromium) { -+ source_set("xx-copy_arm64") { -+ cflags = [ -+ -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/xx-copy/xx-copy-scalar-memcpy.c" -+ ] ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] - if (build_with_chromium) { - source_set("qu8-vadd_sse4.1-no-sse4.2") { @@ -75901,21 +75972,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] - -- public_configs = [ ":xnnpack_public_config" ] -- } -- } + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", -+ "//third_party/pthreadpool", ++ "//third_party/pthreadpool:pthreadpool_standalone", + ] +- public_configs = [ ":xnnpack_public_config" ] +- } +- } ++ public_configs = [ ":xnnpack_public_config" ] + - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { - source_set("qu8-vadd_sse4.1-no-sse4.2_standalone") { @@ -75946,46 +76014,41 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } -- } -+ public_configs = [ ":xnnpack_public_config" ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } } +} - if (build_with_chromium) { - source_set("qu8-vadd_x64") { - cflags = [] -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("xx-copy_arm64_standalone") { +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c", +- "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c", +- ] ++if (build_with_chromium) { ++ source_set("x8-transposec_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/xx-copy/xx-copy-scalar-memcpy.c" ++ "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-dec-zip-neon.c", ++ "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c" + ] -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c", -- "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c", -- ] -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] - - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] - deps = [ - "//third_party/cpuinfo", @@ -75993,12 +76056,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ public_configs = [ ":xnnpack_public_config" ] ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] - public_configs = [ ":xnnpack_public_config" ] -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } +- } ++ public_configs = [ ":xnnpack_public_config" ] } +} @@ -76006,16 +76073,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (build_with_internal_optimization_guide) { - source_set("qu8-vadd_x64_standalone") { - cflags = [] -+if (build_with_chromium) { -+ source_set("xx-fill_arm64") { ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("x8-transposec_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/xx-fill/xx-fill-neon-u64.c", -+ "src/src/xx-fill/xx-fill-scalar-u16.c" ++ "src/src/x8-transposec/gen/x8-transposec-16x16-reuse-dec-zip-neon.c", ++ "src/src/x8-transposec/gen/x8-transposec-2x4-scalar-int.c" + ] - sources = [ @@ -76077,14 +76145,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", -+ "//third_party/pthreadpool", ++ "//third_party/pthreadpool:pthreadpool_standalone", + ] - public_configs = [ ":xnnpack_public_config" ] - } +- } + public_configs = [ ":xnnpack_public_config" ] - } -+} - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { @@ -76118,20 +76185,11 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } -- } -- } -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("xx-fill_arm64_standalone") { -+ cflags = [ -+ -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/xx-fill/xx-fill-neon-u64.c", -+ "src/src/xx-fill/xx-fill-scalar-u16.c" -+ ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} - if (build_with_chromium) { - source_set("qu8-vaddc_f16c-fma-avx2") { @@ -76157,20 +76215,24 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] ++if (build_with_chromium) { ++ source_set("xx-copy_arm64") { ++ cflags = [ ++ ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/xx-copy/xx-copy-scalar-memcpy.c" ++ ] - public_configs = [ ":xnnpack_public_config" ] - } - } -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { @@ -76203,11 +76265,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } -+ public_configs = [ ":xnnpack_public_config" ] +- } ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] + -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } ++ public_configs = [ ":xnnpack_public_config" ] } +} @@ -76240,16 +76306,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+if (build_with_chromium) { -+ source_set("xx-pad_arm64") { ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("xx-copy_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/xx-pad/xx-pad-p16-neon-u16.c", -+ "src/src/xx-pad/xx-pad-p4-scalar-u16.c" ++ "src/src/xx-copy/xx-copy-scalar-memcpy.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -76297,16 +76363,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } - } +- } + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", -+ "//third_party/pthreadpool", ++ "//third_party/pthreadpool:pthreadpool_standalone", + ] -+ -+ public_configs = [ ":xnnpack_public_config" ] - } -+} - if (build_with_chromium) { - source_set("qu8-vaddc_sse2-no-sse3") { @@ -76331,26 +76394,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("xx-pad_arm64_standalone") { -+ cflags = [ -+ -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/xx-pad/xx-pad-p16-neon-u16.c", -+ "src/src/xx-pad/xx-pad-p4-scalar-u16.c" -+ ] ++ public_configs = [ ":xnnpack_public_config" ] - public_configs = [ ":xnnpack_public_config" ] -- } -- } -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { @@ -76384,11 +76435,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } - } -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", ++if (build_with_chromium) { ++ source_set("xx-fill_arm64") { ++ cflags = [ ++ ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/xx-fill/xx-fill-neon-u64.c", ++ "src/src/xx-fill/xx-fill-scalar-u16.c" + ] - if (build_with_chromium) { @@ -76414,14 +76470,20 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ public_configs = [ ":xnnpack_public_config" ] ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] - public_configs = [ ":xnnpack_public_config" ] -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} +- } +- } ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { @@ -76454,29 +76516,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } - } -+if (build_with_chromium) { -+ source_set("xx-transposev_arm64") { -+ cflags = [ -+ -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c" -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] -+ -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] -+ + public_configs = [ ":xnnpack_public_config" ] } +} @@ -76486,14 +76525,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("xx-transposev_arm64_standalone") { ++ source_set("xx-fill_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c" ++ "src/src/xx-fill/xx-fill-neon-u64.c", ++ "src/src/xx-fill/xx-fill-scalar-u16.c" + ] - sources = [ @@ -76536,8 +76576,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (build_with_internal_optimization_guide) { - source_set("qu8-vaddc_x64_standalone") { - cflags = [] -+} - +- - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c", @@ -76563,39 +76602,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } - } -+if (current_cpu == "riscv64") { +if (build_with_chromium) { -+ source_set("configs_riscv64") { ++ source_set("xx-pad_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/configs/argmaxpool-config.c", -+ "src/src/configs/avgpool-config.c", -+ "src/src/configs/binary-elementwise-config.c", -+ "src/src/configs/cmul-config.c", -+ "src/src/configs/conv-hwc2chw-config.c", -+ "src/src/configs/dwconv-config.c", -+ "src/src/configs/dwconv2d-chw-config.c", -+ "src/src/configs/gemm-config.c", -+ "src/src/configs/hardware-config.c", -+ "src/src/configs/ibilinear-chw-config.c", -+ "src/src/configs/ibilinear-config.c", -+ "src/src/configs/lut32norm-config.c", -+ "src/src/configs/maxpool-config.c", -+ "src/src/configs/pack-lh-config.c", -+ "src/src/configs/raddstoreexpminusmax-config.c", -+ "src/src/configs/reduce-config.c", -+ "src/src/configs/spmm-config.c", -+ "src/src/configs/transpose-config.c", -+ "src/src/configs/unary-elementwise-config.c", -+ "src/src/configs/unpool-config.c", -+ "src/src/configs/vmulcaddc-config.c", -+ "src/src/configs/x8-lut-config.c", -+ "src/src/configs/xx-fill-config.c", -+ "src/src/configs/xx-pad-config.c" ++ "src/src/xx-pad/xx-pad-p16-neon-u16.c", ++ "src/src/xx-pad/xx-pad-p4-scalar-u16.c" + ] - if (build_with_chromium) { @@ -76701,37 +76717,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("configs_riscv64_standalone") { ++ source_set("xx-pad_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/configs/argmaxpool-config.c", -+ "src/src/configs/avgpool-config.c", -+ "src/src/configs/binary-elementwise-config.c", -+ "src/src/configs/cmul-config.c", -+ "src/src/configs/conv-hwc2chw-config.c", -+ "src/src/configs/dwconv-config.c", -+ "src/src/configs/dwconv2d-chw-config.c", -+ "src/src/configs/gemm-config.c", -+ "src/src/configs/hardware-config.c", -+ "src/src/configs/ibilinear-chw-config.c", -+ "src/src/configs/ibilinear-config.c", -+ "src/src/configs/lut32norm-config.c", -+ "src/src/configs/maxpool-config.c", -+ "src/src/configs/pack-lh-config.c", -+ "src/src/configs/raddstoreexpminusmax-config.c", -+ "src/src/configs/reduce-config.c", -+ "src/src/configs/spmm-config.c", -+ "src/src/configs/transpose-config.c", -+ "src/src/configs/unary-elementwise-config.c", -+ "src/src/configs/unpool-config.c", -+ "src/src/configs/vmulcaddc-config.c", -+ "src/src/configs/x8-lut-config.c", -+ "src/src/configs/xx-fill-config.c", -+ "src/src/configs/xx-pad-config.c" ++ "src/src/xx-pad/xx-pad-p16-neon-u16.c", ++ "src/src/xx-pad/xx-pad-p4-scalar-u16.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -76847,18 +76841,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("enums_riscv64") { ++ source_set("xx-transposev_arm64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/enums/allocation-type.c", -+ "src/src/enums/datatype-strings.c", -+ "src/src/enums/microkernel-type.c", -+ "src/src/enums/node-type.c", -+ "src/src/enums/operator-type.c" ++ "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c" + ] - if (build_with_chromium) { @@ -76959,18 +76949,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("enums_riscv64_standalone") { ++ source_set("xx-transposev_arm64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/enums/allocation-type.c", -+ "src/src/enums/datatype-strings.c", -+ "src/src/enums/microkernel-type.c", -+ "src/src/enums/node-type.c", -+ "src/src/enums/operator-type.c" ++ "src/src/xx-transposev/xx-transposev-1x1-scalar-memcpy.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -77029,20 +77015,45 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (build_with_chromium) { - source_set("qu8-vcvt_x64") { - cflags = [] -- ++} + - sources = [ - "src/include/xnnpack.h", - "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c", - ] ++if (current_cpu == "riscv64") { +if (build_with_chromium) { -+ source_set("f16-f32-vcvt_riscv64") { ++ source_set("configs_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c" ++ "src/src/configs/argmaxpool-config.c", ++ "src/src/configs/avgpool-config.c", ++ "src/src/configs/binary-elementwise-config.c", ++ "src/src/configs/cmul-config.c", ++ "src/src/configs/conv-hwc2chw-config.c", ++ "src/src/configs/dwconv-config.c", ++ "src/src/configs/dwconv2d-chw-config.c", ++ "src/src/configs/gemm-config.c", ++ "src/src/configs/hardware-config.c", ++ "src/src/configs/ibilinear-chw-config.c", ++ "src/src/configs/ibilinear-config.c", ++ "src/src/configs/lut32norm-config.c", ++ "src/src/configs/maxpool-config.c", ++ "src/src/configs/pack-lh-config.c", ++ "src/src/configs/raddstoreexpminusmax-config.c", ++ "src/src/configs/reduce-config.c", ++ "src/src/configs/spmm-config.c", ++ "src/src/configs/transpose-config.c", ++ "src/src/configs/unary-elementwise-config.c", ++ "src/src/configs/unpool-config.c", ++ "src/src/configs/vmulcaddc-config.c", ++ "src/src/configs/x8-lut-config.c", ++ "src/src/configs/xx-fill-config.c", ++ "src/src/configs/xx-pad-config.c" + ] - configs -= [ "//build/config/compiler:chromium_code" ] @@ -77079,14 +77090,37 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f16-f32-vcvt_riscv64_standalone") { ++ source_set("configs_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c" ++ "src/src/configs/argmaxpool-config.c", ++ "src/src/configs/avgpool-config.c", ++ "src/src/configs/binary-elementwise-config.c", ++ "src/src/configs/cmul-config.c", ++ "src/src/configs/conv-hwc2chw-config.c", ++ "src/src/configs/dwconv-config.c", ++ "src/src/configs/dwconv2d-chw-config.c", ++ "src/src/configs/gemm-config.c", ++ "src/src/configs/hardware-config.c", ++ "src/src/configs/ibilinear-chw-config.c", ++ "src/src/configs/ibilinear-config.c", ++ "src/src/configs/lut32norm-config.c", ++ "src/src/configs/maxpool-config.c", ++ "src/src/configs/pack-lh-config.c", ++ "src/src/configs/raddstoreexpminusmax-config.c", ++ "src/src/configs/reduce-config.c", ++ "src/src/configs/spmm-config.c", ++ "src/src/configs/transpose-config.c", ++ "src/src/configs/unary-elementwise-config.c", ++ "src/src/configs/unpool-config.c", ++ "src/src/configs/vmulcaddc-config.c", ++ "src/src/configs/x8-lut-config.c", ++ "src/src/configs/xx-fill-config.c", ++ "src/src/configs/xx-pad-config.c" + ] - sources = [ @@ -77218,14 +77252,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("f16-qs8-vcvt_riscv64") { ++ source_set("enums_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c" ++ "src/src/enums/allocation-type.c", ++ "src/src/enums/datatype-strings.c", ++ "src/src/enums/microkernel-type.c", ++ "src/src/enums/node-type.c", ++ "src/src/enums/operator-type.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -77304,14 +77342,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f16-qs8-vcvt_riscv64_standalone") { ++ source_set("enums_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c" ++ "src/src/enums/allocation-type.c", ++ "src/src/enums/datatype-strings.c", ++ "src/src/enums/microkernel-type.c", ++ "src/src/enums/node-type.c", ++ "src/src/enums/operator-type.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -77426,14 +77468,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("f16-qu8-vcvt_riscv64") { ++ source_set("f16-f32-vcvt_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c" ++ "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c" + ] - if (build_with_chromium) { @@ -77514,14 +77556,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f16-qu8-vcvt_riscv64_standalone") { ++ source_set("f16-f32-vcvt_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c" ++ "src/src/f16-f32-vcvt/gen/f16-f32-vcvt-scalar-u4.c" + ] - sources = [ @@ -77564,15 +77606,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("qu8-vlrelu_x64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("f16-rdminmax_riscv64") { ++ source_set("f16-qs8-vcvt_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c", -+ "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c" ++ "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c" + ] - sources = [ @@ -77678,15 +77719,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f16-rdminmax_riscv64_standalone") { ++ source_set("f16-qs8-vcvt_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c", -+ "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c" ++ "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c" + ] - if (build_with_chromium) { @@ -77789,16 +77829,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("f16-rminmax_riscv64") { ++ source_set("f16-qu8-vcvt_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c", -+ "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c", -+ "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c" ++ "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -77856,16 +77894,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f16-rminmax_riscv64_standalone") { ++ source_set("f16-qu8-vcvt_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c", -+ "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c", -+ "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c" ++ "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c" + ] - sources = [ @@ -77908,14 +77944,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("qu8-vmul_x64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("f16-vapproxgelu_riscv64") { ++ source_set("f16-rdminmax_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c" ++ "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c", ++ "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c" + ] - sources = [ @@ -78021,14 +78058,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f16-vapproxgelu_riscv64_standalone") { ++ source_set("f16-rdminmax_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c" ++ "src/src/f16-rdminmax/gen/f16-rdmax-2p2x-scalar-u2.c", ++ "src/src/f16-rdminmax/gen/f16-rdmin-2p2x-scalar-u2.c" + ] - if (build_with_chromium) { @@ -78131,14 +78169,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("f16-vcos_riscv64") { ++ source_set("f16-rminmax_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c" ++ "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c", ++ "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c", ++ "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -78196,14 +78236,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f16-vcos_riscv64_standalone") { ++ source_set("f16-rminmax_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c" ++ "src/src/f16-rminmax/gen/f16-rmax-scalar-u2-acc2.c", ++ "src/src/f16-rminmax/gen/f16-rmin-scalar-u2-acc2.c", ++ "src/src/f16-rminmax/gen/f16-rminmax-scalar-u2-acc2.c" + ] - sources = [ @@ -78271,14 +78313,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("f16-vexp_riscv64") { ++ source_set("f16-vapproxgelu_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c" ++ "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c" + ] - if (build_with_chromium) { @@ -78361,14 +78403,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f16-vexp_riscv64_standalone") { ++ source_set("f16-vapproxgelu_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c" ++ "src/src/f16-vapproxgelu/gen/f16-vapproxgelu-scalar-rational-6-4-div.c" + ] - sources = [ @@ -78436,14 +78478,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("f16-vgelu_riscv64") { ++ source_set("f16-vcos_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c" ++ "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c" + ] - if (build_with_chromium) { @@ -78526,14 +78568,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f16-vgelu_riscv64_standalone") { ++ source_set("f16-vcos_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c" ++ "src/src/f16-vcos/gen/f16-vcos-scalar-rational-3-2-div.c" + ] - sources = [ @@ -78601,14 +78643,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("f16-vsin_riscv64") { ++ source_set("f16-vexp_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c" ++ "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c" + ] - if (build_with_chromium) { @@ -78701,14 +78743,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f16-vsin_riscv64_standalone") { ++ source_set("f16-vexp_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c" ++ "src/src/f16-vexp/gen/f16-vexp-scalar-poly-3.c" + ] - deps = [ @@ -78777,15 +78819,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/reference/unary-elementwise.cc", - ] +if (build_with_chromium) { -+ source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d") { ++ source_set("f16-vgelu_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c" ++ "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c" + ] - configs -= [ "//build/config/compiler:chromium_code" ] @@ -78822,15 +78863,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("f16-vgelu_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c" ++ "src/src/f16-vgelu/gen/f16-vgelu-scalar-rational-6-4-div.c" + ] - sources = [ @@ -78959,14 +78999,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("f32-argmaxpool_riscv64") { ++ source_set("f16-vsin_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c" ++ "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -79024,14 +79064,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-argmaxpool_riscv64_standalone") { ++ source_set("f16-vsin_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c" ++ "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c" + ] - sources = [ @@ -79099,14 +79139,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("f32-avgpool_riscv64") { ++ source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c" ++ "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c" + ] - if (build_with_chromium) { @@ -79187,14 +79228,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-avgpool_riscv64_standalone") { ++ source_set("f32-argmaxpool_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c" ++ "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-rvv-u1v.c" + ] - sources = [ @@ -79262,15 +79304,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d") { ++ source_set("f32-argmaxpool_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c" ++ "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c" + ] - if (build_with_chromium) { @@ -79353,15 +79394,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("f32-argmaxpool_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c" ++ "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c" + ] - sources = [ @@ -79431,14 +79471,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("f32-conv-hwc2chw_riscv64") { ++ source_set("f32-avgpool_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c" ++ "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c" + ] - if (build_with_chromium) { @@ -79523,14 +79563,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-conv-hwc2chw_riscv64_standalone") { ++ source_set("f32-avgpool_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c" ++ "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c" + ] - sources = [ @@ -79602,7 +79642,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d") { ++ source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv" @@ -79610,8 +79650,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c", -+ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c" ++ "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c" + ] - if (build_with_chromium) { @@ -79720,7 +79759,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("f32-conv-hwc2chw_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv" @@ -79728,8 +79767,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c", -+ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c" ++ "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-2x2.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -79850,21 +79888,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("f32-dwconv2d-chw_riscv64") { ++ source_set("f32-conv-hwc2chw_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c", -+ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c", -+ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c", -+ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c", -+ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c", -+ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c", -+ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c", -+ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c" ++ "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c" + ] - if (build_with_chromium) { @@ -79945,21 +79976,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-dwconv2d-chw_riscv64_standalone") { ++ source_set("f32-conv-hwc2chw_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c", -+ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c", -+ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c", -+ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c", -+ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c", -+ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c", -+ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c", -+ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c" ++ "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c" + ] - sources = [ @@ -80001,25 +80025,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (build_with_internal_optimization_guide) { - source_set("s8-vclamp_x64_standalone") { - cflags = [] -+if (build_with_chromium) { -+ source_set("f32-dwconv_arch=rv64gcv-abi=lp64d") { -+ cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-minmax-rvv.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-rvv.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-minmax-rvv.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-rvv.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-minmax-rvv.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-rvv.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-minmax-rvv.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-rvv.c" -+ ] - +- - sources = [ - "src/include/xnnpack.h", - "src/src/s8-vclamp/s8-vclamp-scalar-u4.c", @@ -80043,28 +80049,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } - } -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] -+ -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] -+ -+ public_configs = [ ":xnnpack_public_config" ] - } -+} - -- if (build_with_chromium) { -- source_set("subgraph_x64") { -- cflags = [] -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("f32-dwconv_arch=rv64gcv-abi=lp64d_standalone") { +- } ++if (build_with_chromium) { ++ source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv" @@ -80072,16 +80059,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-minmax-rvv.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-rvv.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-minmax-rvv.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-rvv.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-minmax-rvv.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-rvv.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-minmax-rvv.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-rvv.c" ++ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c", ++ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c" + ] +- if (build_with_chromium) { +- source_set("subgraph_x64") { +- cflags = [] ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] + - sources = [ - "src/include/xnnpack.h", - "src/src/subgraph/argmax-pooling-2d.c", @@ -80126,26 +80115,36 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] - -- public_configs = [ ":xnnpack_public_config" ] -- } -- } + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", ++ "//third_party/pthreadpool", + ] +- public_configs = [ ":xnnpack_public_config" ] +- } ++ public_configs = [ ":xnnpack_public_config" ] + } ++} + - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { - source_set("subgraph_x64_standalone") { - cflags = [] -+ public_configs = [ ":xnnpack_public_config" ] ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("f32-dwconv2d-chw_arch=rv64gcv-abi=lp64d_standalone") { ++ cflags = [ ++ "-mabi=lp64d", ++ "-march=rv64gcv" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-rvv-7x1v.c", ++ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-rvv-2x2v.c" ++ ] - sources = [ - "src/include/xnnpack.h", @@ -80197,33 +80196,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} +- } +- } ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] - if (build_with_chromium) { - source_set("tables_x64") { - cflags = [] -+if (build_with_chromium) { -+ source_set("f32-dwconv_riscv64") { -+ cflags = [ -+ -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c" ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", + ] - sources = [ @@ -80250,21 +80237,12 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] ++ public_configs = [ ":xnnpack_public_config" ] - public_configs = [ ":xnnpack_public_config" ] -- } -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] -+ -+ public_configs = [ ":xnnpack_public_config" ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } } +} @@ -80272,25 +80250,22 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (build_with_internal_optimization_guide) { - source_set("tables_x64_standalone") { - cflags = [] -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("f32-dwconv_riscv64_standalone") { ++if (build_with_chromium) { ++ source_set("f32-dwconv2d-chw_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c", -+ "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c" ++ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c", ++ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c", ++ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c", ++ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c", ++ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c", ++ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c", ++ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c", ++ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c" + ] - sources = [ @@ -80357,13 +80332,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", ++ "//third_party/pthreadpool", + ] - public_configs = [ ":xnnpack_public_config" ] - } -- } + public_configs = [ ":xnnpack_public_config" ] + } ++} - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { @@ -80395,11 +80371,26 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} +- } +- } ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("f32-dwconv2d-chw_riscv64_standalone") { ++ cflags = [ ++ ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-2x1-acc2.c", ++ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-scalar-4x1.c", ++ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-1x1-acc2.c", ++ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3s2p1-minmax-scalar-2x1-acc2.c", ++ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-1x1-acc5.c", ++ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5p2-minmax-scalar-2x1-acc2.c", ++ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-1x1-acc5.c", ++ "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-5x5s2p2-minmax-scalar-2x1-acc2.c" ++ ] - if (build_with_chromium) { - source_set("u8-ibilinear_sse4.1-no-sse4.2") { @@ -80424,25 +80415,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+if (build_with_chromium) { -+ source_set("f32-f16-vcvt_riscv64") { -+ cflags = [ -+ -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c" -+ ] - -- public_configs = [ ":xnnpack_public_config" ] -- } -- } + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] +- public_configs = [ ":xnnpack_public_config" ] +- } +- } ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] + - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { - source_set("u8-ibilinear_sse4.1-no-sse4.2_standalone") { @@ -80473,74 +80460,36 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } -- } -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] -+ + public_configs = [ ":xnnpack_public_config" ] ++ ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } } +} - if (build_with_chromium) { - source_set("u8-ibilinear_x64") { - cflags = [] -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("f32-f16-vcvt_riscv64_standalone") { -+ cflags = [ -+ -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c" -+ ] - +- - sources = [ - "src/include/xnnpack.h", - "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c", - ] -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] - +- - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] - +- - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ public_configs = [ ":xnnpack_public_config" ] - -- public_configs = [ ":xnnpack_public_config" ] -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} - -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("u8-ibilinear_x64_standalone") { -- cflags = [] +if (build_with_chromium) { -+ source_set("f32-gemm_arch=rv64gcv-abi=lp64d") { ++ source_set("f32-dwconv_arch=rv64gcv-abi=lp64d") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv" @@ -80548,32 +80497,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c", -+ "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c" ++ "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-minmax-rvv.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-rvv.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-minmax-rvv.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-rvv.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-minmax-rvv.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-rvv.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-minmax-rvv.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-rvv.c" + ] -- sources = [ -- "src/include/xnnpack.h", -- "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", -- ] -- - public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } - } - } + configs -= [ "//build/config/compiler:chromium_code" ] @@ -80581,8 +80515,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] -- if (build_with_chromium) { -- source_set("u8-lut32norm_x64") { +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("u8-ibilinear_x64_standalone") { - cflags = [] + deps = [ + "//third_party/cpuinfo", @@ -80593,19 +80528,37 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - sources = [ - "src/include/xnnpack.h", -- "src/src/u8-lut32norm/u8-lut32norm-scalar.c", +- "src/src/u8-ibilinear/gen/u8-ibilinear-scalar-u1.c", - ] -+ public_configs = [ ":xnnpack_public_config" ] -+ } -+} - +- - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool:pthreadpool_standalone", +- ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +- } ++ public_configs = [ ":xnnpack_public_config" ] + } ++} + +- if (build_with_chromium) { +- source_set("u8-lut32norm_x64") { +- cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-gemm_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("f32-dwconv_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv" @@ -80613,8 +80566,34 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c", -+ "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c" ++ "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-minmax-rvv.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-25p8vc-rvv.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-minmax-rvv.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-3p8vc-rvv.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-minmax-rvv.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-4p8vc-rvv.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-minmax-rvv.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-9p8vc-rvv.c" ++ ] + +- sources = [ +- "src/include/xnnpack.h", +- "src/src/u8-lut32norm/u8-lut32norm-scalar.c", +- ] ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] + +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", + ] - deps = [ @@ -80623,27 +80602,20 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] ++ public_configs = [ ":xnnpack_public_config" ] - public_configs = [ ":xnnpack_public_config" ] -- } -- } -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { - source_set("u8-lut32norm_x64_standalone") { - cflags = [] -+ public_configs = [ ":xnnpack_public_config" ] - +- - sources = [ - "src/include/xnnpack.h", - "src/src/u8-lut32norm/u8-lut32norm-scalar.c", @@ -80666,11 +80638,27 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} +- } +- } ++if (build_with_chromium) { ++ source_set("f32-dwconv_riscv64") { ++ cflags = [ ++ ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c" ++ ] - if (build_with_chromium) { - source_set("u8-maxpool_sse2-no-sse3") { @@ -80695,32 +80683,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+if (build_with_chromium) { -+ source_set("f32-gemm_riscv64") { -+ cflags = [ -+ -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c", -+ "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c", -+ "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c", -+ "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c", -+ "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c", -+ "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c", -+ "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c", -+ "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c" -+ ] - -- public_configs = [ ":xnnpack_public_config" ] -- } -- } + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] +- public_configs = [ ":xnnpack_public_config" ] +- } +- } ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] + - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { - source_set("u8-maxpool_sse2-no-sse3_standalone") { @@ -80752,13 +80729,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } - } -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] -+ + public_configs = [ ":xnnpack_public_config" ] } +} @@ -80768,21 +80738,23 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-gemm_riscv64_standalone") { ++ source_set("f32-dwconv_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c", -+ "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c", -+ "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c", -+ "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c", -+ "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c", -+ "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c", -+ "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c", -+ "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c" ++ "src/src/f32-dwconv/gen/f32-dwconv-25p1c-minmax-scalar-acc2.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-25p1c-scalar-acc2.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-25p2c-minmax-scalar-acc2.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-25p2c-scalar-acc2.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-3p1c-minmax-scalar-acc2.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-3p1c-scalar-acc2.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-4p1c-minmax-scalar-acc2.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-4p1c-scalar-acc2.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-9p1c-minmax-scalar-acc2.c", ++ "src/src/f32-dwconv/gen/f32-dwconv-9p1c-scalar-acc2.c" + ] - sources = [ @@ -80850,14 +80822,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("f32-ibilinear-chw_riscv64") { ++ source_set("f32-f16-vcvt_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c" ++ "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c" + ] - if (build_with_chromium) { @@ -80940,14 +80912,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-ibilinear-chw_riscv64_standalone") { ++ source_set("f32-f16-vcvt_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c" ++ "src/src/f32-f16-vcvt/gen/f32-f16-vcvt-scalar-fabsf-u2.c" + ] - sources = [ @@ -81017,14 +80989,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("f32-ibilinear_riscv64") { ++ source_set("f32-gemm_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c" ++ "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c", ++ "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c" + ] - if (build_with_chromium) { @@ -81109,14 +81083,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-ibilinear_riscv64_standalone") { ++ source_set("f32-gemm_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c" ++ "src/src/f32-gemm/gen/f32-gemm-1x4v-minmax-rvv.c", ++ "src/src/f32-gemm/gen/f32-gemm-7x4v-minmax-rvv.c" + ] - sources = [ @@ -81161,16 +81137,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("u8-rminmax_x64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("f32-igemm_arch=rv64gcv-abi=lp64d") { ++ source_set("f32-gemm_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-igemm/gen/f32-igemm-1x4v-minmax-rvv.c", -+ "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c" ++ "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c", ++ "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c", ++ "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c", ++ "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c", ++ "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c", ++ "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c", ++ "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c", ++ "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c" + ] - sources = [ @@ -81276,16 +81257,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-igemm_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("f32-gemm_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-igemm/gen/f32-igemm-1x4v-minmax-rvv.c", -+ "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c" ++ "src/src/f32-gemm/gen/f32-gemm-1x4-minmax-scalar.c", ++ "src/src/f32-gemm/gen/f32-gemm-1x4-relu-scalar.c", ++ "src/src/f32-gemm/gen/f32-gemm-1x4-scalar.c", ++ "src/src/f32-gemm/gen/f32-gemm-4x2-minmax-scalar.c", ++ "src/src/f32-gemm/gen/f32-gemm-4x2-scalar.c", ++ "src/src/f32-gemm/gen/f32-gemm-4x4-minmax-scalar.c", ++ "src/src/f32-gemm/gen/f32-gemm-4x4-relu-scalar.c", ++ "src/src/f32-gemm/gen/f32-gemm-4x4-scalar.c" + ] - if (build_with_chromium) { @@ -81400,21 +81386,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("f32-igemm_riscv64") { ++ source_set("f32-ibilinear-chw_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c", -+ "src/src/f32-igemm/gen/f32-igemm-1x4-relu-scalar.c", -+ "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c", -+ "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c", -+ "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c", -+ "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c", -+ "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c", -+ "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c" ++ "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -81472,21 +81451,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-igemm_riscv64_standalone") { ++ source_set("f32-ibilinear-chw_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c", -+ "src/src/f32-igemm/gen/f32-igemm-1x4-relu-scalar.c", -+ "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c", -+ "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c", -+ "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c", -+ "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c", -+ "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c", -+ "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c" ++ "src/src/f32-ibilinear-chw/gen/f32-ibilinear-chw-scalar-p4.c" + ] - sources = [ @@ -81529,15 +81501,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("u8-vclamp_x64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("f32-maxpool_arch=rv64gcv-abi=lp64d") { ++ source_set("f32-ibilinear_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c" ++ "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c" + ] - sources = [ @@ -81641,15 +81612,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-maxpool_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("f32-ibilinear_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c" ++ "src/src/f32-ibilinear/gen/f32-ibilinear-scalar-u2.c" + ] - if (build_with_chromium) { @@ -81754,14 +81724,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("f32-maxpool_riscv64") { ++ source_set("f32-igemm_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c" ++ "src/src/f32-igemm/gen/f32-igemm-1x4v-minmax-rvv.c", ++ "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -81819,14 +81791,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-maxpool_riscv64_standalone") { ++ source_set("f32-igemm_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c" ++ "src/src/f32-igemm/gen/f32-igemm-1x4v-minmax-rvv.c", ++ "src/src/f32-igemm/gen/f32-igemm-7x4v-minmax-rvv.c" + ] - sources = [ @@ -81869,15 +81843,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("x16-transposec_x64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("f32-qc4w-gemm_riscv64") { ++ source_set("f32-igemm_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c", -+ "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c" ++ "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c", ++ "src/src/f32-igemm/gen/f32-igemm-1x4-relu-scalar.c", ++ "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c", ++ "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c", ++ "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c", ++ "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c", ++ "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c", ++ "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c" + ] - sources = [ @@ -81934,15 +81914,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-qc4w-gemm_riscv64_standalone") { ++ source_set("f32-igemm_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c", -+ "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c" ++ "src/src/f32-igemm/gen/f32-igemm-1x4-minmax-scalar.c", ++ "src/src/f32-igemm/gen/f32-igemm-1x4-relu-scalar.c", ++ "src/src/f32-igemm/gen/f32-igemm-1x4-scalar.c", ++ "src/src/f32-igemm/gen/f32-igemm-4x2-minmax-scalar.c", ++ "src/src/f32-igemm/gen/f32-igemm-4x2-scalar.c", ++ "src/src/f32-igemm/gen/f32-igemm-4x4-minmax-scalar.c", ++ "src/src/f32-igemm/gen/f32-igemm-4x4-relu-scalar.c", ++ "src/src/f32-igemm/gen/f32-igemm-4x4-scalar.c" + ] - deps = [ @@ -82025,15 +82011,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("f32-qc8w-gemm_riscv64") { ++ source_set("f32-maxpool_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c", -+ "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c" ++ "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -82091,15 +82077,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-qc8w-gemm_riscv64_standalone") { ++ source_set("f32-maxpool_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c", -+ "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c" ++ "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-rvv-u2v.c" + ] - sources = [ @@ -82142,15 +82128,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("x24-transposec_x64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d") { ++ source_set("f32-maxpool_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c" ++ "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c" + ] - sources = [ @@ -82264,15 +82249,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("f32-maxpool_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c" ++ "src/src/f32-maxpool/gen/f32-maxpool-9p-minmax-scalar-u1.c" + ] - if (build_with_chromium) { @@ -82324,15 +82308,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("x32-packw_avx512f_standalone") { - cflags = [ "-mavx512f" ] +if (build_with_chromium) { -+ source_set("f32-qs8-vcvt_riscv64") { ++ source_set("f32-qc4w-gemm_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c", -+ "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c" ++ "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c", ++ "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c" + ] - sources = [ @@ -82440,15 +82424,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-qs8-vcvt_riscv64_standalone") { ++ source_set("f32-qc4w-gemm_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c", -+ "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c" ++ "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-1x4-minmax-scalar.c", ++ "src/src/f32-qc4w-gemm/gen/f32-qc4w-gemm-4x4-minmax-scalar.c" + ] - if (build_with_chromium) { @@ -82458,6 +82442,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] - sources = [ - "src/include/xnnpack.h", @@ -82480,13 +82471,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] -+ + public_configs = [ ":xnnpack_public_config" ] - public_configs = [ ":xnnpack_public_config" ] @@ -82501,15 +82485,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("x32-packw_x64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d") { ++ source_set("f32-qc8w-gemm_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c" ++ "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c", ++ "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c" + ] - sources = [ @@ -82620,15 +82604,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("f32-qc8w-gemm_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c" ++ "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-1x4-minmax-scalar.c", ++ "src/src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x4-minmax-scalar.c" + ] - if (build_with_chromium) { @@ -82716,15 +82700,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/x32-transposec/gen/x32-transposec-2x4-scalar-int.c", - ] +if (build_with_chromium) { -+ source_set("f32-qu8-vcvt_riscv64") { ++ source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c", -+ "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c" ++ "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c" + ] - configs -= [ "//build/config/compiler:chromium_code" ] @@ -82761,15 +82745,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-qu8-vcvt_riscv64_standalone") { ++ source_set("f32-qs8-vcvt_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c", -+ "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c" ++ "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-rvv-u2v.c" + ] - sources = [ @@ -82881,15 +82865,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/x32-unpool/x32-unpool-scalar.c", - ] +if (build_with_chromium) { -+ source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d") { ++ source_set("f32-qs8-vcvt_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c" ++ "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c", ++ "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c" + ] - configs -= [ "//build/config/compiler:chromium_code" ] @@ -82926,15 +82910,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("f32-qs8-vcvt_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c" ++ "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-imagic-u4.c", ++ "src/src/f32-qs8-vcvt/gen/f32-qs8-vcvt-scalar-lrintf-u4.c" + ] - sources = [ @@ -83065,14 +83049,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("f32-raddstoreexpminusmax_riscv64") { ++ source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c" ++ "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -83130,14 +83115,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-raddstoreexpminusmax_riscv64_standalone") { ++ source_set("f32-qu8-vcvt_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c" ++ "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-rvv-u2v.c" + ] - sources = [ @@ -83205,15 +83191,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("f32-rdminmax_riscv64") { ++ source_set("f32-qu8-vcvt_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c", -+ "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c" ++ "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c", ++ "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c" + ] - if (build_with_chromium) { @@ -83319,15 +83305,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-rdminmax_riscv64_standalone") { ++ source_set("f32-qu8-vcvt_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c", -+ "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c" ++ "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-imagic-u4.c", ++ "src/src/f32-qu8-vcvt/gen/f32-qu8-vcvt-scalar-lrintf-u4.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -83454,14 +83440,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("f32-rdsum2_riscv64") { ++ source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c" ++ "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c" + ] - if (build_with_chromium) { @@ -83556,14 +83543,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-rdsum2_riscv64_standalone") { ++ source_set("f32-raddstoreexpminusmax_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c" ++ "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-rvv-rr2-p6-u4v.c" + ] - sources = [ @@ -83606,15 +83594,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("x8-lut_x64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("f32-rdsum_arch=rv64gcv-abi=lp64d") { ++ source_set("f32-raddstoreexpminusmax_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c" ++ "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c" + ] - sources = [ @@ -83670,15 +83657,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-rdsum_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("f32-raddstoreexpminusmax_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c" ++ "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c" + ] - deps = [ @@ -83740,15 +83726,21 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("x8-packw_x64") { - cflags = [] +if (build_with_chromium) { -+ source_set("f32-rdsum_riscv64") { ++ source_set("f32-rdminmax_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c" ++ "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c", ++ "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c" + ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] - sources = [ - "src/include/xnnpack.h", @@ -83769,20 +83761,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] - -- public_configs = [ ":xnnpack_public_config" ] -- } + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool", + ] -+ + +- public_configs = [ ":xnnpack_public_config" ] +- } + public_configs = [ ":xnnpack_public_config" ] } +} @@ -83793,14 +83780,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-rdsum_riscv64_standalone") { ++ source_set("f32-rdminmax_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c" ++ "src/src/f32-rdminmax/gen/f32-rdmax-2p2x-scalar-u2.c", ++ "src/src/f32-rdminmax/gen/f32-rdmin-2p2x-scalar-u2.c" + ] - sources = [ @@ -83932,17 +83920,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("f32-rminmax_arch=rv64gcv-abi=lp64d") { ++ source_set("f32-rdsum2_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-rminmax/gen/f32-rmax-rvv-u8v.c", -+ "src/src/f32-rminmax/gen/f32-rmin-rvv-u8v.c", -+ "src/src/f32-rminmax/gen/f32-rminmax-rvv-u8v.c" ++ "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -84000,17 +83985,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-rminmax_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("f32-rdsum2_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-rminmax/gen/f32-rmax-rvv-u8v.c", -+ "src/src/f32-rminmax/gen/f32-rmin-rvv-u8v.c", -+ "src/src/f32-rminmax/gen/f32-rminmax-rvv-u8v.c" ++ "src/src/f32-rdsum2/gen/f32-rdsum2-7p7x-minmax-scalar.c" + ] - sources = [ @@ -84053,16 +84035,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("x8-transposec_x64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("f32-rminmax_riscv64") { ++ source_set("f32-rdsum_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c", -+ "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c", -+ "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c" ++ "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c" + ] - sources = [ @@ -84118,16 +84099,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-rminmax_riscv64_standalone") { ++ source_set("f32-rdsum_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c", -+ "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c", -+ "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c" ++ "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-rvv-u4v.c" + ] - deps = [ @@ -84209,14 +84189,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("f32-rsum2_riscv64") { ++ source_set("f32-rdsum_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c" ++ "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -84274,14 +84254,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-rsum2_riscv64_standalone") { ++ source_set("f32-rdsum_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c" ++ "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c" + ] - sources = [ @@ -84349,14 +84329,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - } - } +if (build_with_chromium) { -+ source_set("f32-rsum_riscv64") { ++ source_set("f32-rminmax_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c" ++ "src/src/f32-rminmax/gen/f32-rmax-rvv-u8v.c", ++ "src/src/f32-rminmax/gen/f32-rmin-rvv-u8v.c", ++ "src/src/f32-rminmax/gen/f32-rminmax-rvv-u8v.c" + ] - if (build_with_chromium) { @@ -84437,14 +84420,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-rsum_riscv64_standalone") { ++ source_set("f32-rminmax_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c" ++ "src/src/f32-rminmax/gen/f32-rmax-rvv-u8v.c", ++ "src/src/f32-rminmax/gen/f32-rmin-rvv-u8v.c", ++ "src/src/f32-rminmax/gen/f32-rminmax-rvv-u8v.c" + ] - sources = [ @@ -84487,17 +84473,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("xx-pad_x64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("f32-spmm_arch=rv64gcv-abi=lp64d") { ++ source_set("f32-rminmax_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-spmm/gen/f32-spmm-4vx4-minmax-rvv.c", -+ "src/src/f32-spmm/gen/f32-spmm-8vx1-minmax-rvv.c", -+ "src/src/f32-spmm/gen/f32-spmm-8vx2-minmax-rvv.c" ++ "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c", ++ "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c", ++ "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c" + ] - sources = [ @@ -84553,17 +84538,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-spmm_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("f32-rminmax_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-spmm/gen/f32-spmm-4vx4-minmax-rvv.c", -+ "src/src/f32-spmm/gen/f32-spmm-8vx1-minmax-rvv.c", -+ "src/src/f32-spmm/gen/f32-spmm-8vx2-minmax-rvv.c" ++ "src/src/f32-rminmax/gen/f32-rmax-scalar-u4-acc4.c", ++ "src/src/f32-rminmax/gen/f32-rmin-scalar-u4-acc4.c", ++ "src/src/f32-rminmax/gen/f32-rminmax-scalar-u4-acc4.c" + ] - deps = [ @@ -84626,16 +84610,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("configs_arm64") { - cflags = [] +if (build_with_chromium) { -+ source_set("f32-spmm_riscv64") { ++ source_set("f32-rsum2_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c", -+ "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c", -+ "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c" ++ "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c" + ] + + configs -= [ "//build/config/compiler:chromium_code" ] @@ -84701,16 +84683,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-spmm_riscv64_standalone") { ++ source_set("f32-rsum2_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c", -+ "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c", -+ "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c" ++ "src/src/f32-rsum2/gen/f32-rsum2-scalar-u1.c" + ] - sources = [ @@ -84809,14 +84789,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("enums_arm64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("f32-vapproxgelu_riscv64") { ++ source_set("f32-rsum_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c" ++ "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c" + ] - sources = [ @@ -84867,14 +84847,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [ "-march=armv8.2-a+fp16" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vapproxgelu_riscv64_standalone") { ++ source_set("f32-rsum_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c" ++ "src/src/f32-rsum/gen/f32-rsum-scalar-u4-acc4.c" + ] - sources = [ @@ -84917,7 +84897,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f16-avgpool_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] +if (build_with_chromium) { -+ source_set("f32-vbinary_arch=rv64gcv-abi=lp64d") { ++ source_set("f32-spmm_arch=rv64gcv-abi=lp64d") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv" @@ -84925,22 +84905,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vbinary/gen/f32-vadd-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vaddc-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vdiv-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vdivc-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vmax-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vmaxc-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vmin-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vminc-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vmul-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vmulc-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vrdivc-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vrsubc-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vsqrdiff-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vsqrdiffc-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vsub-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vsubc-rvv-u8v.c" ++ "src/src/f32-spmm/gen/f32-spmm-4vx4-minmax-rvv.c", ++ "src/src/f32-spmm/gen/f32-spmm-8vx1-minmax-rvv.c", ++ "src/src/f32-spmm/gen/f32-spmm-8vx2-minmax-rvv.c" + ] - sources = [ @@ -84996,7 +84963,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vbinary_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("f32-spmm_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv" @@ -85004,22 +84971,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vbinary/gen/f32-vadd-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vaddc-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vdiv-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vdivc-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vmax-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vmaxc-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vmin-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vminc-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vmul-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vmulc-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vrdivc-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vrsubc-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vsqrdiff-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vsqrdiffc-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vsub-rvv-u8v.c", -+ "src/src/f32-vbinary/gen/f32-vsubc-rvv-u8v.c" ++ "src/src/f32-spmm/gen/f32-spmm-4vx4-minmax-rvv.c", ++ "src/src/f32-spmm/gen/f32-spmm-8vx1-minmax-rvv.c", ++ "src/src/f32-spmm/gen/f32-spmm-8vx2-minmax-rvv.c" + ] - deps = [ @@ -85081,33 +85035,22 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f16-dwconv2d-chw_arch=armv8.2-a+fp16") { - cflags = [ "-march=armv8.2-a+fp16" ] +if (build_with_chromium) { -+ source_set("f32-vbinary_riscv64") { ++ source_set("f32-spmm_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c", -+ "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c", -+ "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c", -+ "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c" ++ "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c", ++ "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c", ++ "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c" + ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] - sources = [ - "src/include/xnnpack.h", @@ -85128,20 +85071,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] - -- public_configs = [ ":xnnpack_public_config" ] -- } + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool", + ] -+ + +- public_configs = [ ":xnnpack_public_config" ] +- } + public_configs = [ ":xnnpack_public_config" ] } +} @@ -85152,32 +85090,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [ "-march=armv8.2-a+fp16" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vbinary_riscv64_standalone") { ++ source_set("f32-spmm_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c", -+ "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c", -+ "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c", -+ "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c", -+ "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c" ++ "src/src/f32-spmm/gen/f32-spmm-8x1-minmax-scalar.c", ++ "src/src/f32-spmm/gen/f32-spmm-8x2-minmax-scalar.c", ++ "src/src/f32-spmm/gen/f32-spmm-8x4-minmax-scalar.c" + ] - sources = [ @@ -85256,14 +85178,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f16-dwconv_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] +if (build_with_chromium) { -+ source_set("f32-vclamp_riscv64") { ++ source_set("f32-vapproxgelu_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vclamp/gen/f32-vclamp-scalar.c" ++ "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c" + ] - sources = [ @@ -85314,14 +85236,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vclamp_riscv64_standalone") { ++ source_set("f32-vapproxgelu_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vclamp/gen/f32-vclamp-scalar.c" ++ "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c" + ] - sources = [ @@ -85366,7 +85288,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f16-f32-vcvt_arm64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("f32-vcmul_arch=rv64gcv-abi=lp64d") { ++ source_set("f32-vbinary_arch=rv64gcv-abi=lp64d") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv" @@ -85374,7 +85296,22 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c" ++ "src/src/f32-vbinary/gen/f32-vadd-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vaddc-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vdiv-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vdivc-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vmax-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vmaxc-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vmin-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vminc-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vmul-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vmulc-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vrdivc-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vrsubc-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vsqrdiff-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vsqrdiffc-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vsub-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vsubc-rvv-u8v.c" + ] - sources = [ @@ -85423,7 +85360,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [ "-march=armv8.2-a+fp16" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vcmul_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("f32-vbinary_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv" @@ -85431,7 +85368,22 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c" ++ "src/src/f32-vbinary/gen/f32-vadd-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vaddc-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vdiv-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vdivc-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vmax-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vmaxc-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vmin-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vminc-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vmul-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vmulc-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vrdivc-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vrsubc-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vsqrdiff-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vsqrdiffc-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vsub-rvv-u8v.c", ++ "src/src/f32-vbinary/gen/f32-vsubc-rvv-u8v.c" + ] - sources = [ @@ -85474,14 +85426,32 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f16-f32acc-rdsum2_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] +if (build_with_chromium) { -+ source_set("f32-vcmul_riscv64") { ++ source_set("f32-vbinary_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c" ++ "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c", ++ "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c", ++ "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c", ++ "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c" + ] - sources = [ @@ -85528,14 +85498,32 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [ "-march=armv8.2-a+fp16" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vcmul_riscv64_standalone") { ++ source_set("f32-vbinary_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c" ++ "src/src/f32-vbinary/gen/f32-vadd-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vaddc-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vdiv-scalar-u2.c", ++ "src/src/f32-vbinary/gen/f32-vdivc-scalar-u2.c", ++ "src/src/f32-vbinary/gen/f32-vmax-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vmaxc-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vmin-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vminc-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vmul-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vmulc-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vprelu-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vpreluc-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vrdivc-scalar-u2.c", ++ "src/src/f32-vbinary/gen/f32-vrpreluc-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vrsubc-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vsqrdiff-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vsqrdiffc-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vsub-scalar-u8.c", ++ "src/src/f32-vbinary/gen/f32-vsubc-scalar-u8.c" + ] - sources = [ @@ -85578,16 +85566,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f16-f32acc-rdsum_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] +if (build_with_chromium) { -+ source_set("f32-vcopysign_riscv64") { ++ source_set("f32-vclamp_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c", -+ "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c", -+ "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c" ++ "src/src/f32-vclamp/gen/f32-vclamp-scalar.c" + ] - sources = [ @@ -85643,16 +85629,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vcopysign_riscv64_standalone") { ++ source_set("f32-vclamp_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c", -+ "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c", -+ "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c" ++ "src/src/f32-vclamp/gen/f32-vclamp-scalar.c" + ] - deps = [ @@ -85719,14 +85703,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/f16-f32acc-rsum/gen/f16-f32acc-rsum-neonfp16arith-u32-acc4.c", - ] +if (build_with_chromium) { -+ source_set("f32-vcos_riscv64") { ++ source_set("f32-vcmul_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c" ++ "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c" + ] - configs -= [ "//build/config/compiler:chromium_code" ] @@ -85763,14 +85748,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [ "-march=armv8.2-a+fp16" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vcos_riscv64_standalone") { ++ source_set("f32-vcmul_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c" ++ "src/src/f32-vcmul/gen/f32-vcmul-rvv-u2v.c" + ] - sources = [ @@ -85845,14 +85831,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f16-gemm_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] +if (build_with_chromium) { -+ source_set("f32-velu_riscv64") { ++ source_set("f32-vcmul_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c" ++ "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c" + ] - sources = [ @@ -85902,14 +85888,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-velu_riscv64_standalone") { ++ source_set("f32-vcmul_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c" ++ "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c" + ] + + configs -= [ "//build/config/compiler:chromium_code" ] @@ -85960,22 +85946,31 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f16-gemm_arch=armv8.2-a+fp16+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] +if (build_with_chromium) { -+ source_set("f32-vexp_riscv64") { ++ source_set("f32-vcopysign_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c" ++ "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c", ++ "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c", ++ "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c" + ] - -- asmflags = cflags ++ + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] +- asmflags = cflags ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] + - sources = [ - "src/include/xnnpack.h", - "src/src/f16-gemm/gen/f16-gemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S", @@ -86004,13 +85999,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } - } -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] -+ + public_configs = [ ":xnnpack_public_config" ] } +} @@ -86020,14 +86008,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [ "-march=armv8.2-a+fp16" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vexp_riscv64_standalone") { ++ source_set("f32-vcopysign_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c" ++ "src/src/f32-vcopysign/gen/f32-vcopysign-scalar.c", ++ "src/src/f32-vcopysign/gen/f32-vcopysignc-scalar.c", ++ "src/src/f32-vcopysign/gen/f32-vrcopysignc-scalar.c" + ] - sources = [ @@ -86070,14 +86060,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f16-ibilinear-chw_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] +if (build_with_chromium) { -+ source_set("f32-vgelu_riscv64") { ++ source_set("f32-vcos_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c" ++ "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c" + ] - sources = [ @@ -86133,14 +86123,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vgelu_riscv64_standalone") { ++ source_set("f32-vcos_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c" ++ "src/src/f32-vcos/gen/f32-vcos-scalar-rational-5-4-div.c" + ] - deps = [ @@ -86222,15 +86212,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("f32-vhswish_arch=rv64gcv-abi=lp64d") { ++ source_set("f32-velu_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c" ++ "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -86287,23 +86276,29 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vhswish_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("f32-velu_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c" ++ "src/src/f32-velu/gen/f32-velu-scalar-rr2-lut16-p3-u4.c" + ] - -- asmflags = cflags ++ + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] +- asmflags = cflags ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] + - sources = [ - "src/include/xnnpack.h", - "src/src/f16-igemm/f16-igemm-1x16-minmax-asm-aarch64-neonfp16arith-ld64.S", @@ -86325,13 +86320,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] -+ + public_configs = [ ":xnnpack_public_config" ] - public_configs = [ ":xnnpack_public_config" ] @@ -86346,14 +86334,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f16-igemm_arch=armv8.2-a+fp16+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] +if (build_with_chromium) { -+ source_set("f32-vhswish_riscv64") { ++ source_set("f32-vexp_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vhswish/gen/f32-vhswish-scalar.c" ++ "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c" + ] - asmflags = cflags @@ -86406,14 +86394,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [ "-march=armv8.2-a+fp16" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vhswish_riscv64_standalone") { ++ source_set("f32-vexp_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vhswish/gen/f32-vhswish-scalar.c" ++ "src/src/f32-vexp/gen/f32-vexp-scalar-rational-3-2-div.c" + ] - sources = [ @@ -86456,14 +86444,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f16-maxpool_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] +if (build_with_chromium) { -+ source_set("f32-vlog_riscv64") { ++ source_set("f32-vgelu_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c" ++ "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c" + ] - sources = [ @@ -86510,14 +86498,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [ "-march=armv8.2-a+fp16" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vlog_riscv64_standalone") { ++ source_set("f32-vgelu_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c" ++ "src/src/f32-vgelu/gen/f32-vgelu-scalar-rational-12-10-div.c" + ] - sources = [ @@ -86560,7 +86548,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f16-qs8-vcvt_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] +if (build_with_chromium) { -+ source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d") { ++ source_set("f32-vhswish_arch=rv64gcv-abi=lp64d") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv" @@ -86568,7 +86556,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c" ++ "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c" + ] - sources = [ @@ -86594,37 +86582,28 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } - } -- } + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - -- if (build_with_chromium) { -- source_set("f16-qs8-vcvt_arm64") { -- cflags = [] ++ + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool", + ] - -- sources = [ -- "src/include/xnnpack.h", -- "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c", -- ] ++ + public_configs = [ ":xnnpack_public_config" ] -+ } + } +} -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] +- if (build_with_chromium) { +- source_set("f16-qs8-vcvt_arm64") { +- cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("f32-vhswish_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv" @@ -86632,7 +86611,27 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c" ++ "src/src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c" ++ ] + +- sources = [ +- "src/include/xnnpack.h", +- "src/src/f16-qs8-vcvt/gen/f16-qs8-vcvt-scalar-imagic-u4.c", +- ] ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] + +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", + ] - deps = [ @@ -86641,26 +86640,29 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] ++ public_configs = [ ":xnnpack_public_config" ] - public_configs = [ ":xnnpack_public_config" ] -- } -- } -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { - source_set("f16-qs8-vcvt_arm64_standalone") { - cflags = [] -+ public_configs = [ ":xnnpack_public_config" ] ++if (build_with_chromium) { ++ source_set("f32-vhswish_riscv64") { ++ cflags = [ ++ ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-vhswish/gen/f32-vhswish-scalar.c" ++ ] - sources = [ - "src/include/xnnpack.h", @@ -86684,55 +86686,93 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } +- } ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] ++ ++ public_configs = [ ":xnnpack_public_config" ] } +} - if (build_with_chromium) { - source_set("f16-qu8-vcvt_arm64") { - cflags = [] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool", -- ] -+if (build_with_chromium) { -+ source_set("f32-vlrelu_riscv64") { ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("f32-vhswish_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c" ++ "src/src/f32-vhswish/gen/f32-vhswish-scalar.c" + ] -- public_configs = [ ":xnnpack_public_config" ] -- } -- } +- sources = [ +- "src/include/xnnpack.h", +- "src/src/f16-qu8-vcvt/gen/f16-qu8-vcvt-scalar-imagic-u4.c", +- ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] + +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] ++ public_configs = [ ":xnnpack_public_config" ] + +- public_configs = [ ":xnnpack_public_config" ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { - source_set("f16-qu8-vcvt_arm64_standalone") { - cflags = [] ++if (build_with_chromium) { ++ source_set("f32-vlog_riscv64") { ++ cflags = [ ++ ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c" ++ ] ++ ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", @@ -86772,14 +86812,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [ "-march=armv8.2-a+fp16" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vlrelu_riscv64_standalone") { ++ source_set("f32-vlog_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c" ++ "src/src/f32-vlog/gen/f32-vlog-scalar-rational-3-3-div.c" + ] - sources = [ @@ -86822,14 +86862,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f16-raddstoreexpminusmax_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] +if (build_with_chromium) { -+ source_set("f32-vmulcaddc_riscv64") { ++ source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c" ++ "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c" + ] - sources = [ @@ -86886,14 +86927,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vmulcaddc_riscv64_standalone") { ++ source_set("f32-vlrelu_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c" ++ "src/src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c" + ] - deps = [ @@ -86974,18 +87016,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("f32-vrnd_arch=rv64gcv-abi=lp64d") { ++ source_set("f32-vlrelu_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vrnd/gen/f32-vrndd-rvv-u4v.c", -+ "src/src/f32-vrnd/gen/f32-vrndne-rvv-u4v.c", -+ "src/src/f32-vrnd/gen/f32-vrndu-rvv-u4v.c", -+ "src/src/f32-vrnd/gen/f32-vrndz-rvv-u4v.c" ++ "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -87040,18 +87078,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [ "-march=armv8.2-a+fp16" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vrnd_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("f32-vlrelu_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vrnd/gen/f32-vrndd-rvv-u4v.c", -+ "src/src/f32-vrnd/gen/f32-vrndne-rvv-u4v.c", -+ "src/src/f32-vrnd/gen/f32-vrndu-rvv-u4v.c", -+ "src/src/f32-vrnd/gen/f32-vrndz-rvv-u4v.c" ++ "src/src/f32-vlrelu/gen/f32-vlrelu-scalar-u4.c" + ] - sources = [ @@ -87096,17 +87130,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f16-rminmax_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] +if (build_with_chromium) { -+ source_set("f32-vrnd_riscv64") { ++ source_set("f32-vmulcaddc_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c", -+ "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c", -+ "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c", -+ "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c" ++ "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c" + ] - sources = [ @@ -87166,17 +87197,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vrnd_riscv64_standalone") { ++ source_set("f32-vmulcaddc_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c", -+ "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c", -+ "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c", -+ "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c" ++ "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c1-minmax-scalar-2x.c" + ] - deps = [ @@ -87257,7 +87285,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d") { ++ source_set("f32-vrnd_arch=rv64gcv-abi=lp64d") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv" @@ -87265,7 +87293,10 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c" ++ "src/src/f32-vrnd/gen/f32-vrndd-rvv-u4v.c", ++ "src/src/f32-vrnd/gen/f32-vrndne-rvv-u4v.c", ++ "src/src/f32-vrnd/gen/f32-vrndu-rvv-u4v.c", ++ "src/src/f32-vrnd/gen/f32-vrndz-rvv-u4v.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -87319,7 +87350,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [ "-march=armv8.2-a+fp16" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("f32-vrnd_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", + "-march=rv64gcv" @@ -87327,7 +87358,10 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c" ++ "src/src/f32-vrnd/gen/f32-vrndd-rvv-u4v.c", ++ "src/src/f32-vrnd/gen/f32-vrndne-rvv-u4v.c", ++ "src/src/f32-vrnd/gen/f32-vrndu-rvv-u4v.c", ++ "src/src/f32-vrnd/gen/f32-vrndz-rvv-u4v.c" + ] - sources = [ @@ -87370,15 +87404,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f16-vapproxgelu_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] +if (build_with_chromium) { -+ source_set("f32-vrsqrt_riscv64") { ++ source_set("f32-vrnd_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c", -+ "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c" ++ "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c", ++ "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c", ++ "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c", ++ "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c" + ] - sources = [ @@ -87434,15 +87470,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vrsqrt_riscv64_standalone") { ++ source_set("f32-vrnd_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c", -+ "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c" ++ "src/src/f32-vrnd/gen/f32-vrndd-scalar-libm-u1.c", ++ "src/src/f32-vrnd/gen/f32-vrndne-scalar-libm-u1.c", ++ "src/src/f32-vrnd/gen/f32-vrndu-scalar-libm-u1.c", ++ "src/src/f32-vrnd/gen/f32-vrndz-scalar-libm-u1.c" + ] - deps = [ @@ -87542,14 +87580,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("f32-vsigmoid_riscv64") { ++ source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c" ++ "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -87624,14 +87663,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [ "-march=armv8.2-a+fp16" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vsigmoid_riscv64_standalone") { ++ source_set("f32-vrsqrt_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c" ++ "src/src/f32-vrsqrt/gen/f32-vrsqrt-rvv-rsqrt-u4v.c" + ] - sources = [ @@ -87674,14 +87714,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f16-vclamp_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] +if (build_with_chromium) { -+ source_set("f32-vsin_riscv64") { ++ source_set("f32-vrsqrt_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c" ++ "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c", ++ "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c" + ] - sources = [ @@ -87737,14 +87778,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vsin_riscv64_standalone") { ++ source_set("f32-vrsqrt_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c" ++ "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-rsqrt-u1.c", ++ "src/src/f32-vrsqrt/gen/f32-vrsqrt-scalar-sqrt.c" + ] - deps = [ @@ -87823,14 +87865,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("f32-vsqrt_riscv64") { ++ source_set("f32-vsigmoid_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c" ++ "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -87884,14 +87926,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vsqrt_riscv64_standalone") { ++ source_set("f32-vsigmoid_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c" ++ "src/src/f32-vsigmoid/gen/f32-vsigmoid-scalar-rr2-lut64-p2-div-u2.c" + ] - sources = [ @@ -87934,14 +87976,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f16-vcos_arm64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("f32-vtanh_riscv64") { ++ source_set("f32-vsin_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c" ++ "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c" + ] - sources = [ @@ -87997,14 +88039,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vtanh_riscv64_standalone") { ++ source_set("f32-vsin_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c" ++ "src/src/f32-vsin/gen/f32-vsin-scalar-rational-5-4-div.c" + ] - deps = [ @@ -88083,16 +88125,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("f32-vunary_riscv64") { ++ source_set("f32-vsqrt_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vunary/gen/f32-vabs-scalar.c", -+ "src/src/f32-vunary/gen/f32-vneg-scalar.c", -+ "src/src/f32-vunary/gen/f32-vsqr-scalar.c" ++ "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -88146,16 +88186,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("f32-vunary_riscv64_standalone") { ++ source_set("f32-vsqrt_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/f32-vunary/gen/f32-vabs-scalar.c", -+ "src/src/f32-vunary/gen/f32-vneg-scalar.c", -+ "src/src/f32-vunary/gen/f32-vsqr-scalar.c" ++ "src/src/f32-vsqrt/gen/f32-vsqrt-scalar-sqrt.c" + ] - sources = [ @@ -88198,34 +88236,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f16-vexp_arm64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("operators_riscv64") { ++ source_set("f32-vtanh_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/operators/argmax-pooling-nhwc.c", -+ "src/src/operators/average-pooling-nhwc.c", -+ "src/src/operators/batch-matrix-multiply-nc.c", -+ "src/src/operators/binary-elementwise-nd.c", -+ "src/src/operators/constant-pad-nd.c", -+ "src/src/operators/convolution-nchw.c", -+ "src/src/operators/convolution-nhwc.c", -+ "src/src/operators/deconvolution-nhwc.c", -+ "src/src/operators/dynamic-fully-connected-nc.c", -+ "src/src/operators/fully-connected-nc.c", -+ "src/src/operators/max-pooling-nhwc.c", -+ "src/src/operators/pack-lh.c", -+ "src/src/operators/reduce-nd.c", -+ "src/src/operators/resize-bilinear-nchw.c", -+ "src/src/operators/resize-bilinear-nhwc.c", -+ "src/src/operators/rope-nthc.c", -+ "src/src/operators/slice-nd.c", -+ "src/src/operators/softmax-nc.c", -+ "src/src/operators/transpose-nd.c", -+ "src/src/operators/unary-elementwise-nc.c", -+ "src/src/operators/unpooling-nhwc.c" ++ "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c" + ] - sources = [ @@ -88281,34 +88299,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("operators_riscv64_standalone") { ++ source_set("f32-vtanh_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/operators/argmax-pooling-nhwc.c", -+ "src/src/operators/average-pooling-nhwc.c", -+ "src/src/operators/batch-matrix-multiply-nc.c", -+ "src/src/operators/binary-elementwise-nd.c", -+ "src/src/operators/constant-pad-nd.c", -+ "src/src/operators/convolution-nchw.c", -+ "src/src/operators/convolution-nhwc.c", -+ "src/src/operators/deconvolution-nhwc.c", -+ "src/src/operators/dynamic-fully-connected-nc.c", -+ "src/src/operators/fully-connected-nc.c", -+ "src/src/operators/max-pooling-nhwc.c", -+ "src/src/operators/pack-lh.c", -+ "src/src/operators/reduce-nd.c", -+ "src/src/operators/resize-bilinear-nchw.c", -+ "src/src/operators/resize-bilinear-nhwc.c", -+ "src/src/operators/rope-nthc.c", -+ "src/src/operators/slice-nd.c", -+ "src/src/operators/softmax-nc.c", -+ "src/src/operators/transpose-nd.c", -+ "src/src/operators/unary-elementwise-nc.c", -+ "src/src/operators/unpooling-nhwc.c" ++ "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c" + ] - deps = [ @@ -88387,15 +88385,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("qd8-f32-qb4w-gemm_riscv64") { ++ source_set("f32-vunary_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c", -+ "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c" ++ "src/src/f32-vunary/gen/f32-vabs-scalar.c", ++ "src/src/f32-vunary/gen/f32-vneg-scalar.c", ++ "src/src/f32-vunary/gen/f32-vsqr-scalar.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -88449,15 +88448,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [ "-march=armv8.2-a+fp16" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qd8-f32-qb4w-gemm_riscv64_standalone") { ++ source_set("f32-vunary_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c", -+ "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c" ++ "src/src/f32-vunary/gen/f32-vabs-scalar.c", ++ "src/src/f32-vunary/gen/f32-vneg-scalar.c", ++ "src/src/f32-vunary/gen/f32-vsqr-scalar.c" + ] - sources = [ @@ -88500,16 +88500,36 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f16-vhswish_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] +if (build_with_chromium) { -+ source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d") { ++ source_set("operators_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4v-minmax-rvv.c", -+ "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4v-minmax-rvv.c" ++ "src/src/operators/argmax-pooling-nhwc.c", ++ "src/src/operators/average-pooling-nhwc.c", ++ "src/src/operators/batch-matrix-multiply-nc.c", ++ "src/src/operators/binary-elementwise-nd.c", ++ "src/src/operators/constant-pad-nd.c", ++ "src/src/operators/convolution-nchw.c", ++ "src/src/operators/convolution-nhwc.c", ++ "src/src/operators/deconvolution-nhwc.c", ++ "src/src/operators/dynamic-fully-connected-nc.c", ++ "src/src/operators/fingerprint_cache.c", ++ "src/src/operators/fingerprint_id.c", ++ "src/src/operators/fully-connected-nc.c", ++ "src/src/operators/max-pooling-nhwc.c", ++ "src/src/operators/pack-lh.c", ++ "src/src/operators/reduce-nd.c", ++ "src/src/operators/resize-bilinear-nchw.c", ++ "src/src/operators/resize-bilinear-nhwc.c", ++ "src/src/operators/rope-nthc.c", ++ "src/src/operators/slice-nd.c", ++ "src/src/operators/softmax-nc.c", ++ "src/src/operators/transpose-nd.c", ++ "src/src/operators/unary-elementwise-nc.c", ++ "src/src/operators/unpooling-nhwc.c" + ] - sources = [ @@ -88565,16 +88585,36 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("operators_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4v-minmax-rvv.c", -+ "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4v-minmax-rvv.c" ++ "src/src/operators/argmax-pooling-nhwc.c", ++ "src/src/operators/average-pooling-nhwc.c", ++ "src/src/operators/batch-matrix-multiply-nc.c", ++ "src/src/operators/binary-elementwise-nd.c", ++ "src/src/operators/constant-pad-nd.c", ++ "src/src/operators/convolution-nchw.c", ++ "src/src/operators/convolution-nhwc.c", ++ "src/src/operators/deconvolution-nhwc.c", ++ "src/src/operators/dynamic-fully-connected-nc.c", ++ "src/src/operators/fingerprint_cache.c", ++ "src/src/operators/fingerprint_id.c", ++ "src/src/operators/fully-connected-nc.c", ++ "src/src/operators/max-pooling-nhwc.c", ++ "src/src/operators/pack-lh.c", ++ "src/src/operators/reduce-nd.c", ++ "src/src/operators/resize-bilinear-nchw.c", ++ "src/src/operators/resize-bilinear-nhwc.c", ++ "src/src/operators/rope-nthc.c", ++ "src/src/operators/slice-nd.c", ++ "src/src/operators/softmax-nc.c", ++ "src/src/operators/transpose-nd.c", ++ "src/src/operators/unary-elementwise-nc.c", ++ "src/src/operators/unpooling-nhwc.c" + ] - deps = [ @@ -88640,6 +88680,279 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/include/xnnpack.h", - "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c", - ] ++if (build_with_chromium) { ++ source_set("qd8-f32-qb4w-gemm_riscv64") { ++ cflags = [ ++ ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c", ++ "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c" ++ ] + +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] + +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] + +- public_configs = [ ":xnnpack_public_config" ] +- } ++ public_configs = [ ":xnnpack_public_config" ] + } ++} + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("f16-vmulcaddc_arch=armv8.2-a+fp16_standalone") { +- cflags = [ "-march=armv8.2-a+fp16" ] ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("qd8-f32-qb4w-gemm_riscv64_standalone") { ++ cflags = [ ++ ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-1x4-minmax-scalar.c", ++ "src/src/qd8-f32-qb4w-gemm/gen/qd8-f32-qb4w-gemm-4x4-minmax-scalar.c" ++ ] + +- sources = [ +- "src/include/xnnpack.h", +- "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool:pthreadpool_standalone", +- ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +- } +- } ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] + +- if (build_with_chromium) { +- source_set("f16-vrnd_arch=armv8.2-a+fp16") { +- cflags = [ "-march=armv8.2-a+fp16" ] ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] + +- sources = [ +- "src/include/xnnpack.h", +- "src/src/f16-vrnd/gen/f16-vrndd-neonfp16arith-u16.c", +- "src/src/f16-vrnd/gen/f16-vrndne-neonfp16arith-u16.c", +- "src/src/f16-vrnd/gen/f16-vrndu-neonfp16arith-u16.c", +- "src/src/f16-vrnd/gen/f16-vrndz-neonfp16arith-u16.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] ++ public_configs = [ ":xnnpack_public_config" ] + +- public_configs = [ ":xnnpack_public_config" ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("f16-vrnd_arch=armv8.2-a+fp16_standalone") { +- cflags = [ "-march=armv8.2-a+fp16" ] ++if (build_with_chromium) { ++ source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d") { ++ cflags = [ ++ "-mabi=lp64d", ++ "-march=rv64gcv" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4v-minmax-rvv.c", ++ "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4v-minmax-rvv.c" ++ ] + +- sources = [ +- "src/include/xnnpack.h", +- "src/src/f16-vrnd/gen/f16-vrndd-neonfp16arith-u16.c", +- "src/src/f16-vrnd/gen/f16-vrndne-neonfp16arith-u16.c", +- "src/src/f16-vrnd/gen/f16-vrndu-neonfp16arith-u16.c", +- "src/src/f16-vrnd/gen/f16-vrndz-neonfp16arith-u16.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool:pthreadpool_standalone", +- ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +- } +- } ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] + +- if (build_with_chromium) { +- source_set("f16-vrsqrt_arch=armv8.2-a+fp16") { +- cflags = [ "-march=armv8.2-a+fp16" ] ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] + +- sources = [ +- "src/include/xnnpack.h", +- "src/src/f16-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c", +- ] ++ public_configs = [ ":xnnpack_public_config" ] ++ } ++} + +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("qd8-f32-qc4w-gemm_arch=rv64gcv-abi=lp64d_standalone") { ++ cflags = [ ++ "-mabi=lp64d", ++ "-march=rv64gcv" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x4v-minmax-rvv.c", ++ "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x4v-minmax-rvv.c" ++ ] + +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] + +- public_configs = [ ":xnnpack_public_config" ] +- } +- } ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("f16-vrsqrt_arch=armv8.2-a+fp16_standalone") { +- cflags = [ "-march=armv8.2-a+fp16" ] ++ public_configs = [ ":xnnpack_public_config" ] + +- sources = [ +- "src/include/xnnpack.h", +- "src/src/f16-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool:pthreadpool_standalone", +- ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- if (build_with_chromium) { +- source_set("f16-vsigmoid_arch=armv8.2-a+fp16") { +- cflags = [ "-march=armv8.2-a+fp16" ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1fma-u32.c", +- "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1recps-u16.c", +- ] - - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] @@ -88674,7 +88987,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("f16-vmulcaddc_arch=armv8.2-a+fp16_standalone") { +- source_set("f16-vsigmoid_arch=armv8.2-a+fp16_standalone") { - cflags = [ "-march=armv8.2-a+fp16" ] + deps = [ + "//third_party/cpuinfo", @@ -88685,7 +88998,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - sources = [ - "src/include/xnnpack.h", -- "src/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c", +- "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1fma-u32.c", +- "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1recps-u16.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -88711,7 +89025,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn +} - if (build_with_chromium) { -- source_set("f16-vrnd_arch=armv8.2-a+fp16") { +- source_set("f16-vsin_arch=armv8.2-a+fp16") { - cflags = [ "-march=armv8.2-a+fp16" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { @@ -88728,31 +89042,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - sources = [ - "src/include/xnnpack.h", -- "src/src/f16-vrnd/gen/f16-vrndd-neonfp16arith-u16.c", -- "src/src/f16-vrnd/gen/f16-vrndne-neonfp16arith-u16.c", -- "src/src/f16-vrnd/gen/f16-vrndu-neonfp16arith-u16.c", -- "src/src/f16-vrnd/gen/f16-vrndz-neonfp16arith-u16.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool", +- "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c", - ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] -- public_configs = [ ":xnnpack_public_config" ] -- } -- } +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", @@ -88760,63 +89060,25 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/pthreadpool:pthreadpool_standalone", + ] -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("f16-vrnd_arch=armv8.2-a+fp16_standalone") { -- cflags = [ "-march=armv8.2-a+fp16" ] -+ public_configs = [ ":xnnpack_public_config" ] - -- sources = [ -- "src/include/xnnpack.h", -- "src/src/f16-vrnd/gen/f16-vrndd-neonfp16arith-u16.c", -- "src/src/f16-vrnd/gen/f16-vrndne-neonfp16arith-u16.c", -- "src/src/f16-vrnd/gen/f16-vrndu-neonfp16arith-u16.c", -- "src/src/f16-vrnd/gen/f16-vrndz-neonfp16arith-u16.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", -- ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} - -- if (build_with_chromium) { -- source_set("f16-vrsqrt_arch=armv8.2-a+fp16") { -- cflags = [ "-march=armv8.2-a+fp16" ] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/f16-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] ++ public_configs = [ ":xnnpack_public_config" ] + +- public_configs = [ ":xnnpack_public_config" ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("f16-vsin_arch=armv8.2-a+fp16_standalone") { +- cflags = [ "-march=armv8.2-a+fp16" ] +if (build_with_chromium) { + source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d") { + cflags = [ @@ -88830,28 +89092,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4v-minmax-rvv.c" + ] -- public_configs = [ ":xnnpack_public_config" ] -- } -- } -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] - -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("f16-vrsqrt_arch=armv8.2-a+fp16_standalone") { -- cflags = [ "-march=armv8.2-a+fp16" ] -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/f16-vrsqrt/gen/f16-vrsqrt-neonfp16arith-rsqrt-u16.c", +- "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -88872,13 +89115,34 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } - } -+ public_configs = [ ":xnnpack_public_config" ] - } -+} +- } ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] - if (build_with_chromium) { -- source_set("f16-vsigmoid_arch=armv8.2-a+fp16") { -- cflags = [ "-march=armv8.2-a+fp16" ] +- source_set("f16-vsin_arm64") { +- cflags = [] ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] + +- sources = [ +- "src/include/xnnpack.h", +- "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c", +- ] ++ public_configs = [ ":xnnpack_public_config" ] ++ } ++} + +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") { @@ -88893,20 +89157,20 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4v-minmax-rvv.c" + ] -- sources = [ -- "src/include/xnnpack.h", -- "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1fma-u32.c", -- "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1recps-u16.c", +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", - ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] +- public_configs = [ ":xnnpack_public_config" ] +- } +- } + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", @@ -88914,25 +89178,61 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/pthreadpool:pthreadpool_standalone", + ] +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("f16-vsin_arm64_standalone") { +- cflags = [] ++ public_configs = [ ":xnnpack_public_config" ] + +- sources = [ +- "src/include/xnnpack.h", +- "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool", +- "//third_party/pthreadpool:pthreadpool_standalone", - ] -+ public_configs = [ ":xnnpack_public_config" ] - +- - public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } } +} -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("f16-vsigmoid_arch=armv8.2-a+fp16_standalone") { +- if (build_with_chromium) { +- source_set("f16-vsqrt_arch=armv8.2-a+fp16") { - cflags = [ "-march=armv8.2-a+fp16" ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/f16-vsqrt/gen/f16-vsqrt-aarch64-neonfp16arith-sqrt-u8.c", +- "src/src/f16-vsqrt/gen/f16-vsqrt-neonfp16arith-nr1fma1adj-u8.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] +if (build_with_chromium) { + source_set("qd8-f32-qc8w-gemm_riscv64") { + cflags = [ @@ -88946,10 +89246,29 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c" + ] +- public_configs = [ ":xnnpack_public_config" ] +- } +- } ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("f16-vsqrt_arch=armv8.2-a+fp16_standalone") { +- cflags = [ "-march=armv8.2-a+fp16" ] ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] + - sources = [ - "src/include/xnnpack.h", -- "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1fma-u32.c", -- "src/src/f16-vsigmoid/gen/f16-vsigmoid-neonfp16arith-rr2-p2-nr1recps-u16.c", +- "src/src/f16-vsqrt/gen/f16-vsqrt-aarch64-neonfp16arith-sqrt-u8.c", +- "src/src/f16-vsqrt/gen/f16-vsqrt-neonfp16arith-nr1fma1adj-u8.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -88970,34 +89289,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } - } -- } -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] - -- if (build_with_chromium) { -- source_set("f16-vsin_arch=armv8.2-a+fp16") { -- cflags = [ "-march=armv8.2-a+fp16" ] -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] - -- sources = [ -- "src/include/xnnpack.h", -- "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c", -- ] + public_configs = [ ":xnnpack_public_config" ] -+ } + } +} -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] +- if (build_with_chromium) { +- source_set("f16-vtanh_arch=armv8.2-a+fp16") { +- cflags = [ "-march=armv8.2-a+fp16" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-gemm_riscv64_standalone") { @@ -89012,20 +89310,20 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/qd8-f32-qc8w-gemm/gen/qd8-f32-qc8w-gemm-4x4-minmax-scalar.c" + ] -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool", +- sources = [ +- "src/include/xnnpack.h", +- "src/src/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c", +- "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c", - ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] -- public_configs = [ ":xnnpack_public_config" ] -- } -- } +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", @@ -89033,60 +89331,25 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/pthreadpool:pthreadpool_standalone", + ] -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("f16-vsin_arch=armv8.2-a+fp16_standalone") { -- cflags = [ "-march=armv8.2-a+fp16" ] -+ public_configs = [ ":xnnpack_public_config" ] - -- sources = [ -- "src/include/xnnpack.h", -- "src/src/f16-vsin/gen/f16-vsin-neonfp16arith-rational-3-2-div.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", -- ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} - -- if (build_with_chromium) { -- source_set("f16-vsin_arm64") { -- cflags = [] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] ++ public_configs = [ ":xnnpack_public_config" ] + +- public_configs = [ ":xnnpack_public_config" ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("f16-vtanh_arch=armv8.2-a+fp16_standalone") { +- cflags = [ "-march=armv8.2-a+fp16" ] +if (build_with_chromium) { + source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d") { + cflags = [ @@ -89100,28 +89363,10 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4v-minmax-rvv.c" + ] -- public_configs = [ ":xnnpack_public_config" ] -- } -- } -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] - -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("f16-vsin_arm64_standalone") { -- cflags = [] -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/f16-vsin/gen/f16-vsin-scalar-rational-3-2-div.c", +- "src/src/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c", +- "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -89142,13 +89387,36 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } - } -+ public_configs = [ ":xnnpack_public_config" ] - } -+} +- } ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] - if (build_with_chromium) { -- source_set("f16-vsqrt_arch=armv8.2-a+fp16") { +- source_set("f16-vunary_arch=armv8.2-a+fp16") { - cflags = [ "-march=armv8.2-a+fp16" ] ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] + +- sources = [ +- "src/include/xnnpack.h", +- "src/src/f16-vunary/gen/f16-vabs-neonfp16arith-u16.c", +- "src/src/f16-vunary/gen/f16-vneg-neonfp16arith-u16.c", +- "src/src/f16-vunary/gen/f16-vsqr-neonfp16arith-u16.c", +- ] ++ public_configs = [ ":xnnpack_public_config" ] ++ } ++} + +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") { @@ -89163,20 +89431,20 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4v-minmax-rvv.c" + ] -- sources = [ -- "src/include/xnnpack.h", -- "src/src/f16-vsqrt/gen/f16-vsqrt-aarch64-neonfp16arith-sqrt-u8.c", -- "src/src/f16-vsqrt/gen/f16-vsqrt-neonfp16arith-nr1fma1adj-u8.c", +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", - ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] +- public_configs = [ ":xnnpack_public_config" ] +- } +- } + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", @@ -89184,25 +89452,63 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/pthreadpool:pthreadpool_standalone", + ] +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("f16-vunary_arch=armv8.2-a+fp16_standalone") { +- cflags = [ "-march=armv8.2-a+fp16" ] ++ public_configs = [ ":xnnpack_public_config" ] + +- sources = [ +- "src/include/xnnpack.h", +- "src/src/f16-vunary/gen/f16-vabs-neonfp16arith-u16.c", +- "src/src/f16-vunary/gen/f16-vneg-neonfp16arith-u16.c", +- "src/src/f16-vunary/gen/f16-vsqr-neonfp16arith-u16.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", -- "//third_party/pthreadpool", +- "//third_party/pthreadpool:pthreadpool_standalone", - ] -+ public_configs = [ ":xnnpack_public_config" ] - +- - public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } + if (!(is_android && use_order_profiling)) { + assert_no_deps = [ "//base" ] } } +} -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("f16-vsqrt_arch=armv8.2-a+fp16_standalone") { -- cflags = [ "-march=armv8.2-a+fp16" ] +- if (build_with_chromium) { +- source_set("f32-argmaxpool_arm64") { +- cflags = [] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c", +- "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] +if (build_with_chromium) { + source_set("qd8-f32-qc8w-igemm_riscv64") { + cflags = [ @@ -89216,10 +89522,29 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c" + ] +- public_configs = [ ":xnnpack_public_config" ] +- } +- } ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("f32-argmaxpool_arm64_standalone") { +- cflags = [] ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] + - sources = [ - "src/include/xnnpack.h", -- "src/src/f16-vsqrt/gen/f16-vsqrt-aarch64-neonfp16arith-sqrt-u8.c", -- "src/src/f16-vsqrt/gen/f16-vsqrt-neonfp16arith-nr1fma1adj-u8.c", +- "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c", +- "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -89240,35 +89565,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } - } -- } -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] - -- if (build_with_chromium) { -- source_set("f16-vtanh_arch=armv8.2-a+fp16") { -- cflags = [ "-march=armv8.2-a+fp16" ] -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] - -- sources = [ -- "src/include/xnnpack.h", -- "src/src/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c", -- "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c", -- ] + public_configs = [ ":xnnpack_public_config" ] -+ } + } +} -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] +- if (build_with_chromium) { +- source_set("f32-avgpool_arm64") { +- cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { + source_set("qd8-f32-qc8w-igemm_riscv64_standalone") { @@ -89283,20 +89586,20 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/qd8-f32-qc8w-igemm/gen/qd8-f32-qc8w-igemm-4x4-minmax-scalar.c" + ] -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool", +- sources = [ +- "src/include/xnnpack.h", +- "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-neon-u4.c", +- "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c", - ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] -- public_configs = [ ":xnnpack_public_config" ] -- } -- } +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", @@ -89304,63 +89607,25 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/pthreadpool:pthreadpool_standalone", + ] -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("f16-vtanh_arch=armv8.2-a+fp16_standalone") { -- cflags = [ "-march=armv8.2-a+fp16" ] -+ public_configs = [ ":xnnpack_public_config" ] - -- sources = [ -- "src/include/xnnpack.h", -- "src/src/f16-vtanh/gen/f16-vtanh-aarch64-neonfp16arith-expm1minus-rr1-p3h2ts-div-u32.c", -- "src/src/f16-vtanh/gen/f16-vtanh-neonfp16arith-expm1minus-rr1-p3h2ts-nr1fma-u32.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", -- ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} - -- if (build_with_chromium) { -- source_set("f16-vunary_arch=armv8.2-a+fp16") { -- cflags = [ "-march=armv8.2-a+fp16" ] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/f16-vunary/gen/f16-vabs-neonfp16arith-u16.c", -- "src/src/f16-vunary/gen/f16-vneg-neonfp16arith-u16.c", -- "src/src/f16-vunary/gen/f16-vsqr-neonfp16arith-u16.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] ++ public_configs = [ ":xnnpack_public_config" ] + +- public_configs = [ ":xnnpack_public_config" ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("f32-avgpool_arm64_standalone") { +- cflags = [] +if (build_with_chromium) { + source_set("qs8-dwconv_arch=rv64gcv-abi=lp64d") { + cflags = [ @@ -89374,30 +89639,10 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/qs8-dwconv/gen/qs8-dwconv-9p8vc-minmax-fp32-rvv.c" + ] -- public_configs = [ ":xnnpack_public_config" ] -- } -- } -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] - -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("f16-vunary_arch=armv8.2-a+fp16_standalone") { -- cflags = [ "-march=armv8.2-a+fp16" ] -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/f16-vunary/gen/f16-vabs-neonfp16arith-u16.c", -- "src/src/f16-vunary/gen/f16-vneg-neonfp16arith-u16.c", -- "src/src/f16-vunary/gen/f16-vsqr-neonfp16arith-u16.c", +- "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-neon-u4.c", +- "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -89418,12 +89663,24 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } - } ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] ++ + public_configs = [ ":xnnpack_public_config" ] } +} - if (build_with_chromium) { -- source_set("f32-argmaxpool_arm64") { +- source_set("f32-conv-hwc2chw_arm64") { - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { @@ -89441,8 +89698,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - sources = [ - "src/include/xnnpack.h", -- "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c", -- "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c", +- "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-aarch64-neonfma-2x2.c", +- "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-neon-2x2.c", +- "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c", - ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] @@ -89477,7 +89735,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("f32-argmaxpool_arm64_standalone") { +- source_set("f32-conv-hwc2chw_arm64_standalone") { - cflags = [] +if (build_with_chromium) { + source_set("qs8-dwconv_riscv64") { @@ -89495,8 +89753,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - sources = [ - "src/include/xnnpack.h", -- "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-neon-c4.c", -- "src/src/f32-argmaxpool/f32-argmaxpool-9p8x-scalar-c1.c", +- "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-aarch64-neonfma-2x2.c", +- "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-neon-2x2.c", +- "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -89517,35 +89776,25 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } - } -- } + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] - -- if (build_with_chromium) { -- source_set("f32-avgpool_arm64") { -- cflags = [] ++ + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool", + ] - -- sources = [ -- "src/include/xnnpack.h", -- "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-neon-u4.c", -- "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c", -- ] ++ + public_configs = [ ":xnnpack_public_config" ] -+ } + } +} -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] +- if (build_with_chromium) { +- source_set("f32-dwconv2d-chw_arm64") { +- cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { + source_set("qs8-dwconv_riscv64_standalone") { @@ -89561,160 +89810,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/qs8-dwconv/gen/qs8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c" + ] -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool", -- ] -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] - -- public_configs = [ ":xnnpack_public_config" ] -- } -- } -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] - -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("f32-avgpool_arm64_standalone") { -- cflags = [] -+ public_configs = [ ":xnnpack_public_config" ] - -- sources = [ -- "src/include/xnnpack.h", -- "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-neon-u4.c", -- "src/src/f32-avgpool/gen/f32-avgpool-9p-minmax-scalar-u1.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", -- ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} - -- if (build_with_chromium) { -- source_set("f32-conv-hwc2chw_arm64") { -- cflags = [] -- -- sources = [ -- "src/include/xnnpack.h", -- "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-aarch64-neonfma-2x2.c", -- "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-neon-2x2.c", -- "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool", -- ] -+if (build_with_chromium) { -+ source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d") { -+ cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c" -+ ] - -- public_configs = [ ":xnnpack_public_config" ] -- } -- } -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] - -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("f32-conv-hwc2chw_arm64_standalone") { -- cflags = [] -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] - -- sources = [ -- "src/include/xnnpack.h", -- "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-aarch64-neonfma-2x2.c", -- "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-neon-2x2.c", -- "src/src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x4-scalar-1x1.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", -- ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } -- } -+ public_configs = [ ":xnnpack_public_config" ] - } -+} - -- if (build_with_chromium) { -- source_set("f32-dwconv2d-chw_arm64") { -- cflags = [] -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") { -+ cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c" -+ ] - - sources = [ - "src/include/xnnpack.h", - "src/src/f32-dwconv2d-chw/gen/f32-dwconv2d-chw-3x3p1-minmax-aarch64-neonfma-3x4.c", @@ -89814,14 +89909,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f32-dwconv_arch=armv8.2-a+fp16+dotprod") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] +if (build_with_chromium) { -+ source_set("qs8-f32-vcvt_riscv64") { ++ source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c" ++ "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c" + ] - asmflags = cflags @@ -89857,14 +89953,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-f32-vcvt_riscv64_standalone") { ++ source_set("qs8-f32-vcvt_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c" ++ "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-rvv-u2v.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -89955,17 +90052,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("qs8-packw_riscv64") { ++ source_set("qs8-f32-vcvt_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c", -+ "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c", -+ "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c", -+ "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c" ++ "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -90036,17 +90130,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-packw_riscv64_standalone") { ++ source_set("qs8-f32-vcvt_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c", -+ "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c", -+ "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c", -+ "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c" ++ "src/src/qs8-f32-vcvt/gen/qs8-f32-vcvt-scalar-u4.c" + ] - sources = [ @@ -90091,15 +90182,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f32-f16-vcvt_arm64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("qs8-qc4w-gemm_riscv64") { ++ source_set("qs8-packw_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c", -+ "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c" ++ "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c", ++ "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c", ++ "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c", ++ "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c" + ] - sources = [ @@ -90186,15 +90279,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-qc4w-gemm_riscv64_standalone") { ++ source_set("qs8-packw_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c", -+ "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c" ++ "src/src/qs8-packw/gen/qs8-packw-x16c8-gemm-goi-scalar.c", ++ "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-gio-scalar.c", ++ "src/src/qs8-packw/gen/qs8-packw-x4c8-gemm-goi-scalar.c", ++ "src/src/qs8-packw/gen/qs8-packw-x8c8-gemm-gio-scalar.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -90306,17 +90401,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d") { ++ source_set("qs8-qc4w-gemm_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c", -+ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c", -+ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c" ++ "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c", ++ "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -90388,17 +90481,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("qs8-qc4w-gemm_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c", -+ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c", -+ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c" ++ "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-1x4-minmax-fp32-scalar-fmagic.c", ++ "src/src/qs8-qc4w-gemm/gen/qs8-qc4w-gemm-3x4-minmax-fp32-scalar-fmagic.c" + ] - sources = [ @@ -90443,19 +90534,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f32-ibilinear-chw_arm64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("qs8-qc8w-dwconv_riscv64") { ++ source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", -+ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", -+ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c", -+ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c", -+ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", -+ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c" ++ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c", ++ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c", ++ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c" + ] - sources = [ @@ -90515,19 +90604,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-qc8w-dwconv_riscv64_standalone") { ++ source_set("qs8-qc8w-dwconv_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", -+ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", -+ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c", -+ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c", -+ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", -+ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c" ++ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p8vc-minmax-fp32-rvv.c", ++ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p8vc-minmax-fp32-rvv.c", ++ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p8vc-minmax-fp32-rvv.c" + ] - deps = [ @@ -90591,16 +90678,19 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f32-igemm_arch=armv8.2-a+fp16+dotprod") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] +if (build_with_chromium) { -+ source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d") { ++ source_set("qs8-qc8w-dwconv_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4v-minmax-fp32-rvv.c", -+ "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x4v-minmax-fp32-rvv.c" ++ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", ++ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", ++ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c", ++ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c", ++ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", ++ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c" + ] - asmflags = cflags @@ -90663,16 +90753,19 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - asmflags = cflags +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("qs8-qc8w-dwconv_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4v-minmax-fp32-rvv.c", -+ "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x4v-minmax-fp32-rvv.c" ++ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p1c-minmax-fp32-scalar-fmagic.c", ++ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-25p2c-minmax-fp32-scalar-lrintf.c", ++ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p1c-minmax-fp32-scalar-fmagic.c", ++ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-3p2c-minmax-fp32-scalar-lrintf.c", ++ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p1c-minmax-fp32-scalar-fmagic.c", ++ "src/src/qs8-qc8w-dwconv/gen/qs8-qc8w-dwconv-9p2c-minmax-fp32-scalar-lrintf.c" + ] - sources = [ @@ -90779,15 +90872,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f32-igemm_arm64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("qs8-qc8w-gemm_riscv64") { ++ source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c", -+ "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c" ++ "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4v-minmax-fp32-rvv.c", ++ "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x4v-minmax-fp32-rvv.c" + ] - sources = [ @@ -90862,15 +90956,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-qc8w-gemm_riscv64_standalone") { ++ source_set("qs8-qc8w-gemm_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c", -+ "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c" ++ "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4v-minmax-fp32-rvv.c", ++ "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-4x4v-minmax-fp32-rvv.c" + ] - deps = [ @@ -90956,16 +91051,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d") { ++ source_set("qs8-qc8w-gemm_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4v-minmax-fp32-rvv.c", -+ "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x4v-minmax-fp32-rvv.c" ++ "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c", ++ "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -91027,16 +91121,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - asmflags = cflags +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("qs8-qc8w-gemm_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4v-minmax-fp32-rvv.c", -+ "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x4v-minmax-fp32-rvv.c" ++ "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-1x4-minmax-fp32-scalar-lrintf.c", ++ "src/src/qs8-qc8w-gemm/gen/qs8-qc8w-gemm-3x4-minmax-fp32-scalar-lrintf.c" + ] - sources = [ @@ -91081,15 +91174,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f32-qc8w-gemm_arch=armv8.2-a+fp16+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] +if (build_with_chromium) { -+ source_set("qs8-qc8w-igemm_riscv64") { ++ source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c", -+ "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c" ++ "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4v-minmax-fp32-rvv.c", ++ "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x4v-minmax-fp32-rvv.c" + ] + + configs -= [ "//build/config/compiler:chromium_code" ] @@ -91139,15 +91233,16 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-qc8w-igemm_riscv64_standalone") { ++ source_set("qs8-qc8w-igemm_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c", -+ "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c" ++ "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4v-minmax-fp32-rvv.c", ++ "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-4x4v-minmax-fp32-rvv.c" + ] - sources = [ @@ -91249,14 +91344,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("qs8-qu8-packw_riscv64") { ++ source_set("qs8-qc8w-igemm_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c" ++ "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c", ++ "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -91313,14 +91409,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-qu8-packw_riscv64_standalone") { ++ source_set("qs8-qc8w-igemm_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c" ++ "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-1x4-minmax-fp32-scalar-lrintf.c", ++ "src/src/qs8-qc8w-igemm/gen/qs8-qc8w-igemm-3x4-minmax-fp32-scalar-lrintf.c" + ] - sources = [ @@ -91404,15 +91501,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-scalar-rr2-p5-u4-acc2.c", - ] +if (build_with_chromium) { -+ source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d") { ++ source_set("qs8-qu8-packw_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c" ++ "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c" + ] - configs -= [ "//build/config/compiler:chromium_code" ] @@ -91449,15 +91545,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("qs8-qu8-packw_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c" ++ "src/src/qs8-qu8-packw/gen/qs8-qu8-packw-x16c8-gemm-goi-scalar.c" + ] - sources = [ @@ -91533,14 +91628,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f32-rdminmax_arm64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("qs8-rdsum_riscv64") { ++ source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c" ++ "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c" + ] - sources = [ @@ -91600,14 +91696,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-rdsum_riscv64_standalone") { ++ source_set("qs8-rdsum_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c" ++ "src/src/qs8-rdsum/gen/qs8-rdsum-7p7x-rvv-u2v.c" + ] - deps = [ @@ -91676,15 +91773,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c", - ] +if (build_with_chromium) { -+ source_set("qs8-rsum_arch=rv64gcv-abi=lp64d") { ++ source_set("qs8-rdsum_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c" ++ "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c" + ] - configs -= [ "//build/config/compiler:chromium_code" ] @@ -91721,15 +91817,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-rsum_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("qs8-rdsum_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c" ++ "src/src/qs8-rdsum/gen/qs8-rdsum-minmax-fp32-scalar-u1-acc1.c" + ] - sources = [ @@ -91807,14 +91902,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f32-rminmax_arm64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("qs8-rsum_riscv64") { ++ source_set("qs8-rsum_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c" ++ "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c" + ] - sources = [ @@ -91876,14 +91972,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-rsum_riscv64_standalone") { ++ source_set("qs8-rsum_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c" ++ "src/src/qs8-rsum/gen/qs8-rsum-rvv-u2v.c" + ] - deps = [ @@ -91964,15 +92061,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("qs8-vadd_arch=rv64gcv-abi=lp64d") { ++ source_set("qs8-rsum_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c" ++ "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -92027,15 +92123,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-vadd_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("qs8-rsum_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c" ++ "src/src/qs8-rsum/gen/qs8-rsum-scalar-u4.c" + ] - sources = [ @@ -92125,15 +92220,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/f32-vapproxgelu/gen/f32-vapproxgelu-scalar-rational-12-10-div.c", - ] +if (build_with_chromium) { -+ source_set("qs8-vadd_riscv64") { ++ source_set("qs8-vadd_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c", -+ "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c" ++ "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c" + ] - configs -= [ "//build/config/compiler:chromium_code" ] @@ -92170,15 +92265,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-vadd_riscv64_standalone") { ++ source_set("qs8-vadd_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c", -+ "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c" ++ "src/src/qs8-vadd/gen/qs8-vadd-minmax-rvv-u2v.c" + ] - sources = [ @@ -92288,15 +92383,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f32-vbinary_arm64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d") { ++ source_set("qs8-vadd_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c" ++ "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c", ++ "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c" + ] - sources = [ @@ -92390,15 +92485,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("qs8-vadd_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c" ++ "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u1.c", ++ "src/src/qs8-vadd/gen/qs8-vadd-minmax-scalar-u4.c" + ] - deps = [ @@ -92467,15 +92562,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/f32-vcmul/gen/f32-vcmul-scalar-u4.c", - ] +if (build_with_chromium) { -+ source_set("qs8-vaddc_riscv64") { ++ source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c", -+ "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c" ++ "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c" + ] - configs -= [ "//build/config/compiler:chromium_code" ] @@ -92512,15 +92607,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-vaddc_riscv64_standalone") { ++ source_set("qs8-vaddc_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c", -+ "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c" ++ "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-rvv-u2v.c" + ] - sources = [ @@ -92598,14 +92693,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f32-vcopysign_arm64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("qs8-vcvt_riscv64") { ++ source_set("qs8-vaddc_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c" ++ "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c", ++ "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c" + ] - sources = [ @@ -92667,14 +92763,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-vcvt_riscv64_standalone") { ++ source_set("qs8-vaddc_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c" ++ "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u1.c", ++ "src/src/qs8-vaddc/gen/qs8-vaddc-minmax-scalar-u4.c" + ] - deps = [ @@ -92757,15 +92854,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d") { ++ source_set("qs8-vcvt_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c" ++ "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -92822,15 +92918,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("qs8-vcvt_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c" ++ "src/src/qs8-vcvt/gen/qs8-vcvt-scalar-u4.c" + ] - sources = [ @@ -92874,14 +92969,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f32-vexp_arm64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("qs8-vlrelu_riscv64") { ++ source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c" ++ "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c" + ] - sources = [ @@ -92939,14 +93035,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-vlrelu_riscv64_standalone") { ++ source_set("qs8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c" ++ "src/src/qs8-vlrelu/gen/qs8-vlrelu-rvv-u2v.c" + ] - deps = [ @@ -93027,15 +93124,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("qs8-vmul_arch=rv64gcv-abi=lp64d") { ++ source_set("qs8-vlrelu_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c" ++ "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -93090,15 +93186,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-vmul_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("qs8-vlrelu_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c" ++ "src/src/qs8-vlrelu/gen/qs8-vlrelu-scalar-andxor-u4.c" + ] - sources = [ @@ -93142,14 +93237,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f32-vlog_arm64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("qs8-vmul_riscv64") { ++ source_set("qs8-vmul_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c" ++ "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c" + ] - sources = [ @@ -93207,14 +93303,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-vmul_riscv64_standalone") { ++ source_set("qs8-vmul_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c" ++ "src/src/qs8-vmul/gen/qs8-vmul-minmax-f32-rvv-u2v.c" + ] - deps = [ @@ -93284,15 +93381,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/f32-vmulcaddc/gen/f32-vmulcaddc-c4-minmax-neonfma-2x.c", - ] +if (build_with_chromium) { -+ source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d") { ++ source_set("qs8-vmul_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c" ++ "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c" + ] - configs -= [ "//build/config/compiler:chromium_code" ] @@ -93329,15 +93425,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("qs8-vmul_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c" ++ "src/src/qs8-vmul/gen/qs8-vmul-minmax-fp32-scalar-u4.c" + ] - sources = [ @@ -93422,14 +93517,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f32-vrnd_arm64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("qs8-vmulc_riscv64") { ++ source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c" ++ "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c" + ] - sources = [ @@ -93498,14 +93594,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-vmulc_riscv64_standalone") { ++ source_set("qs8-vmulc_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c" ++ "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-f32-rvv-u2v.c" + ] - deps = [ @@ -93588,14 +93685,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("qs8-vprelu_riscv64") { ++ source_set("qs8-vmulc_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c" ++ "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -93651,14 +93748,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-vprelu_riscv64_standalone") { ++ source_set("qs8-vmulc_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c" ++ "src/src/qs8-vmulc/gen/qs8-vmulc-minmax-fp32-scalar-u4.c" + ] - sources = [ @@ -93702,14 +93799,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("f32-vsin_arm64_standalone") { - cflags = [] +if (build_with_chromium) { -+ source_set("qs8-vpreluc_riscv64") { ++ source_set("qs8-vprelu_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c" ++ "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c" + ] - sources = [ @@ -93767,14 +93864,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qs8-vpreluc_riscv64_standalone") { ++ source_set("qs8-vprelu_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c" ++ "src/src/qs8-vprelu/gen/qs8-vprelu-scalar-u8.c" + ] - deps = [ @@ -93842,59 +93939,46 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/f32-vtanh/gen/f32-vtanh-neon-rational-9-8-div.c", - "src/src/f32-vtanh/gen/f32-vtanh-scalar-rational-9-8-div.c", - ] -+if (build_with_chromium) { -+ source_set("qs8-vrpreluc_riscv64") { -+ cflags = [ -+ -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c" -+ ] - +- - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] - +- - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] - -- public_configs = [ ":xnnpack_public_config" ] -- } -+ public_configs = [ ":xnnpack_public_config" ] - } -+} - -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("f32-vtanh_arm64_standalone") { -- cflags = [] -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("qs8-vrpreluc_riscv64_standalone") { ++if (build_with_chromium) { ++ source_set("qs8-vpreluc_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c" ++ "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c" ++ ] + +- public_configs = [ ":xnnpack_public_config" ] +- } +- } ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("f32-vtanh_arm64_standalone") { +- cflags = [] ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", + ] - sources = [ @@ -93921,20 +94005,23 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } - } -- } -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] ++ public_configs = [ ":xnnpack_public_config" ] + } ++} - if (build_with_chromium) { - source_set("f32-vunary_arm64") { - cflags = [] -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("qs8-vpreluc_riscv64_standalone") { ++ cflags = [ ++ ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/qs8-vpreluc/gen/qs8-vpreluc-scalar-u8.c" + ] - sources = [ @@ -93952,6 +94039,222 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] - configs += [ ":xnnpack_private_config" ] - +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] + +- public_configs = [ ":xnnpack_public_config" ] +- } +- } ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("f32-vunary_arm64_standalone") { +- cflags = [] ++ public_configs = [ ":xnnpack_public_config" ] + +- sources = [ +- "src/include/xnnpack.h", +- "src/src/f32-vunary/gen/f32-vabs-neon.c", +- "src/src/f32-vunary/gen/f32-vabs-scalar.c", +- "src/src/f32-vunary/gen/f32-vneg-neon.c", +- "src/src/f32-vunary/gen/f32-vneg-scalar.c", +- "src/src/f32-vunary/gen/f32-vsqr-neon.c", +- "src/src/f32-vunary/gen/f32-vsqr-scalar.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool:pthreadpool_standalone", +- ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- if (build_with_chromium) { +- source_set("operators_arm64") { +- cflags = [] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/operators/argmax-pooling-nhwc.c", +- "src/src/operators/average-pooling-nhwc.c", +- "src/src/operators/batch-matrix-multiply-nc.c", +- "src/src/operators/binary-elementwise-nd.c", +- "src/src/operators/constant-pad-nd.c", +- "src/src/operators/convolution-nchw.c", +- "src/src/operators/convolution-nhwc.c", +- "src/src/operators/deconvolution-nhwc.c", +- "src/src/operators/dynamic-fully-connected-nc.c", +- "src/src/operators/fingerprint_cache.c", +- "src/src/operators/fingerprint_id.c", +- "src/src/operators/fully-connected-nc.c", +- "src/src/operators/max-pooling-nhwc.c", +- "src/src/operators/pack-lh.c", +- "src/src/operators/reduce-nd.c", +- "src/src/operators/resize-bilinear-nchw.c", +- "src/src/operators/resize-bilinear-nhwc.c", +- "src/src/operators/rope-nthc.c", +- "src/src/operators/slice-nd.c", +- "src/src/operators/softmax-nc.c", +- "src/src/operators/transpose-nd.c", +- "src/src/operators/unary-elementwise-nc.c", +- "src/src/operators/unpooling-nhwc.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] ++if (build_with_chromium) { ++ source_set("qs8-vrpreluc_riscv64") { ++ cflags = [ ++ ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c" ++ ] + +- public_configs = [ ":xnnpack_public_config" ] +- } +- } ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("operators_arm64_standalone") { +- cflags = [] ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] + +- sources = [ +- "src/include/xnnpack.h", +- "src/src/operators/argmax-pooling-nhwc.c", +- "src/src/operators/average-pooling-nhwc.c", +- "src/src/operators/batch-matrix-multiply-nc.c", +- "src/src/operators/binary-elementwise-nd.c", +- "src/src/operators/constant-pad-nd.c", +- "src/src/operators/convolution-nchw.c", +- "src/src/operators/convolution-nhwc.c", +- "src/src/operators/deconvolution-nhwc.c", +- "src/src/operators/dynamic-fully-connected-nc.c", +- "src/src/operators/fingerprint_cache.c", +- "src/src/operators/fingerprint_id.c", +- "src/src/operators/fully-connected-nc.c", +- "src/src/operators/max-pooling-nhwc.c", +- "src/src/operators/pack-lh.c", +- "src/src/operators/reduce-nd.c", +- "src/src/operators/resize-bilinear-nchw.c", +- "src/src/operators/resize-bilinear-nhwc.c", +- "src/src/operators/rope-nthc.c", +- "src/src/operators/slice-nd.c", +- "src/src/operators/softmax-nc.c", +- "src/src/operators/transpose-nd.c", +- "src/src/operators/unary-elementwise-nc.c", +- "src/src/operators/unpooling-nhwc.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool:pthreadpool_standalone", +- ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } +- } ++ public_configs = [ ":xnnpack_public_config" ] + } ++} + +- if (build_with_chromium) { +- source_set("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2") { +- cflags = [ "-march=armv8.2-a+sve+sve2" ] ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { ++ source_set("qs8-vrpreluc_riscv64_standalone") { ++ cflags = [ ++ ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/qs8-vrpreluc/gen/qs8-vrpreluc-scalar-u8.c" ++ ] + +- sources = [ +- "src/include/xnnpack.h", +- "src/src/pf16-f16-f16-igemm/pf16-f16-f16-igemm-32x32c2-minmax-neonsme2.c", +- ] ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] + +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] + - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", @@ -93969,8 +94272,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("f32-vunary_arm64_standalone") { -- cflags = [] +- source_set("pf16-f16-f16-igemm_arch=armv8.2-a+sve+sve2_standalone") { +- cflags = [ "-march=armv8.2-a+sve+sve2" ] +if (build_with_chromium) { + source_set("qu8-dwconv_arch=rv64gcv-abi=lp64d") { + cflags = [ @@ -93986,12 +94289,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - sources = [ - "src/include/xnnpack.h", -- "src/src/f32-vunary/gen/f32-vabs-neon.c", -- "src/src/f32-vunary/gen/f32-vabs-scalar.c", -- "src/src/f32-vunary/gen/f32-vneg-neon.c", -- "src/src/f32-vunary/gen/f32-vneg-scalar.c", -- "src/src/f32-vunary/gen/f32-vsqr-neon.c", -- "src/src/f32-vunary/gen/f32-vsqr-scalar.c", +- "src/src/pf16-f16-f16-igemm/pf16-f16-f16-igemm-32x32c2-minmax-neonsme2.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -94012,25 +94310,35 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } - } +- } + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] -+ + +- if (build_with_chromium) { +- source_set("pf16-gemm_arch=armv8.2-a+sve+sve2") { +- cflags = [ "-march=armv8.2-a+sve+sve2" ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", + "//third_party/fxdiv", + "//third_party/pthreadpool", + ] -+ + +- sources = [ +- "src/include/xnnpack.h", +- "src/src/pf16-gemm/pf16-gemm-1x32c2-minmax-neonsme2.c", +- "src/src/pf16-gemm/pf16-gemm-32x32c2-minmax-neonsme2.c", +- ] + public_configs = [ ":xnnpack_public_config" ] - } ++ } +} -- if (build_with_chromium) { -- source_set("operators_arm64") { -- cflags = [] +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { + source_set("qu8-dwconv_arch=rv64gcv-abi=lp64d_standalone") { @@ -94045,36 +94353,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/qu8-dwconv/gen/qu8-dwconv-9p8vc-minmax-fp32-rvv.c" + ] -- sources = [ -- "src/include/xnnpack.h", -- "src/src/operators/argmax-pooling-nhwc.c", -- "src/src/operators/average-pooling-nhwc.c", -- "src/src/operators/batch-matrix-multiply-nc.c", -- "src/src/operators/binary-elementwise-nd.c", -- "src/src/operators/constant-pad-nd.c", -- "src/src/operators/convolution-nchw.c", -- "src/src/operators/convolution-nhwc.c", -- "src/src/operators/deconvolution-nhwc.c", -- "src/src/operators/dynamic-fully-connected-nc.c", -- "src/src/operators/fully-connected-nc.c", -- "src/src/operators/max-pooling-nhwc.c", -- "src/src/operators/pack-lh.c", -- "src/src/operators/reduce-nd.c", -- "src/src/operators/resize-bilinear-nchw.c", -- "src/src/operators/resize-bilinear-nhwc.c", -- "src/src/operators/rope-nthc.c", -- "src/src/operators/slice-nd.c", -- "src/src/operators/softmax-nc.c", -- "src/src/operators/transpose-nd.c", -- "src/src/operators/unary-elementwise-nc.c", -- "src/src/operators/unpooling-nhwc.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", @@ -94098,33 +94376,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("operators_arm64_standalone") { -- cflags = [] +- source_set("pf16-gemm_arch=armv8.2-a+sve+sve2_standalone") { +- cflags = [ "-march=armv8.2-a+sve+sve2" ] + public_configs = [ ":xnnpack_public_config" ] - sources = [ - "src/include/xnnpack.h", -- "src/src/operators/argmax-pooling-nhwc.c", -- "src/src/operators/average-pooling-nhwc.c", -- "src/src/operators/batch-matrix-multiply-nc.c", -- "src/src/operators/binary-elementwise-nd.c", -- "src/src/operators/constant-pad-nd.c", -- "src/src/operators/convolution-nchw.c", -- "src/src/operators/convolution-nhwc.c", -- "src/src/operators/deconvolution-nhwc.c", -- "src/src/operators/dynamic-fully-connected-nc.c", -- "src/src/operators/fully-connected-nc.c", -- "src/src/operators/max-pooling-nhwc.c", -- "src/src/operators/pack-lh.c", -- "src/src/operators/reduce-nd.c", -- "src/src/operators/resize-bilinear-nchw.c", -- "src/src/operators/resize-bilinear-nhwc.c", -- "src/src/operators/rope-nthc.c", -- "src/src/operators/slice-nd.c", -- "src/src/operators/softmax-nc.c", -- "src/src/operators/transpose-nd.c", -- "src/src/operators/unary-elementwise-nc.c", -- "src/src/operators/unpooling-nhwc.c", +- "src/src/pf16-gemm/pf16-gemm-1x32c2-minmax-neonsme2.c", +- "src/src/pf16-gemm/pf16-gemm-32x32c2-minmax-neonsme2.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -94151,13 +94410,27 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn +} - if (build_with_chromium) { -- source_set("pf16-gemm_arch=armv8.2-a+sve+sve2") { +- source_set("pf32-gemm_arch=armv8.2-a+sve+sve2") { - cflags = [ "-march=armv8.2-a+sve+sve2" ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/pf16-gemm/pf16-gemm-1x32c2-minmax-neonsme2.c", -- "src/src/pf16-gemm/pf16-gemm-32x32c2-minmax-neonsme2.c", +- "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme.c", +- "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme2.c", +- "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme.c", +- "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme2.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", - ] +if (build_with_chromium) { + source_set("qu8-dwconv_riscv64") { @@ -94173,21 +94446,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/qu8-dwconv/gen/qu8-dwconv-9p2c-minmax-fp32-scalar-lrintf.c" + ] -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] +- public_configs = [ ":xnnpack_public_config" ] +- } +- } + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool", -- ] +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("pf32-gemm_arch=armv8.2-a+sve+sve2_standalone") { +- cflags = [ "-march=armv8.2-a+sve+sve2" ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", @@ -94195,15 +94465,38 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/pthreadpool", + ] +- sources = [ +- "src/include/xnnpack.h", +- "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme.c", +- "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme2.c", +- "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme.c", +- "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme2.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool:pthreadpool_standalone", +- ] +- - public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } - } + public_configs = [ ":xnnpack_public_config" ] } +} -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("pf16-gemm_arch=armv8.2-a+sve+sve2_standalone") { +- if (build_with_chromium) { +- source_set("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2") { - cflags = [ "-march=armv8.2-a+sve+sve2" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { @@ -94222,37 +94515,17 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - sources = [ - "src/include/xnnpack.h", -- "src/src/pf16-gemm/pf16-gemm-1x32c2-minmax-neonsme2.c", -- "src/src/pf16-gemm/pf16-gemm-32x32c2-minmax-neonsme2.c", +- "src/src/pqs8-f32-qc8w-igemm/pqs8-f32-qc8w-igemm-32x32c4-minmax-neonsme2.c", - ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", -- ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } -- } -- } + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] + configs += [ ":xnnpack_private_config" ] -- if (build_with_chromium) { -- source_set("pf32-gemm_arch=armv8.2-a+sve+sve2") { -- cflags = [ "-march=armv8.2-a+sve+sve2" ] +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", @@ -94260,19 +94533,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "//third_party/pthreadpool:pthreadpool_standalone", + ] -- sources = [ -- "src/include/xnnpack.h", -- "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme.c", -- "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme2.c", -- "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme.c", -- "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme2.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- - deps = [ - "//third_party/cpuinfo", - "//third_party/fp16", @@ -94290,7 +94550,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("pf32-gemm_arch=armv8.2-a+sve+sve2_standalone") { +- source_set("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2_standalone") { - cflags = [ "-march=armv8.2-a+sve+sve2" ] +if (build_with_chromium) { + source_set("qu8-f32-vcvt_arch=rv64gcv-abi=lp64d") { @@ -94306,10 +94566,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - sources = [ - "src/include/xnnpack.h", -- "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme.c", -- "src/src/pf32-gemm/pf32-gemm-1x32-minmax-neonsme2.c", -- "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme.c", -- "src/src/pf32-gemm/pf32-gemm-32x32-minmax-neonsme2.c", +- "src/src/pqs8-f32-qc8w-igemm/pqs8-f32-qc8w-igemm-32x32c4-minmax-neonsme2.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -94337,7 +94594,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + configs += [ ":xnnpack_private_config" ] - if (build_with_chromium) { -- source_set("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2") { +- source_set("pqs8-qc8w-gemm_arch=armv8.2-a+sve+sve2") { - cflags = [ "-march=armv8.2-a+sve+sve2" ] + deps = [ + "//third_party/cpuinfo", @@ -94348,7 +94605,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - sources = [ - "src/include/xnnpack.h", -- "src/src/pqs8-f32-qc8w-igemm/pqs8-f32-qc8w-igemm-32x32c4-minmax-neonsme2.c", +- "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-1x32c4-minmax-neonsme2.c", +- "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-32x32c4-minmax-neonsme2.c", - ] + public_configs = [ ":xnnpack_public_config" ] + } @@ -94394,13 +94652,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("pqs8-f32-qc8w-igemm_arch=armv8.2-a+sve+sve2_standalone") { +- source_set("pqs8-qc8w-gemm_arch=armv8.2-a+sve+sve2_standalone") { - cflags = [ "-march=armv8.2-a+sve+sve2" ] + public_configs = [ ":xnnpack_public_config" ] - sources = [ - "src/include/xnnpack.h", -- "src/src/pqs8-f32-qc8w-igemm/pqs8-f32-qc8w-igemm-32x32c4-minmax-neonsme2.c", +- "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-1x32c4-minmax-neonsme2.c", +- "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-32x32c4-minmax-neonsme2.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -94427,13 +94686,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn +} - if (build_with_chromium) { -- source_set("pqs8-qc8w-gemm_arch=armv8.2-a+sve+sve2") { -- cflags = [ "-march=armv8.2-a+sve+sve2" ] +- source_set("qb4-packw_arch=armv8.2-a+dotprod") { +- cflags = [ "-march=armv8.2-a+dotprod" ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-1x32c4-minmax-neonsme2.c", -- "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-32x32c4-minmax-neonsme2.c", +- "src/src/qb4-packw/gen/qb4-packw-x16c4-gemm-goi-aarch64-neondot.c", +- "src/src/qb4-packw/gen/qb4-packw-x16c8-gemm-goi-aarch64-neondot.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -94468,8 +94727,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("pqs8-qc8w-gemm_arch=armv8.2-a+sve+sve2_standalone") { -- cflags = [ "-march=armv8.2-a+sve+sve2" ] +- source_set("qb4-packw_arch=armv8.2-a+dotprod_standalone") { +- cflags = [ "-march=armv8.2-a+dotprod" ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", @@ -94479,8 +94738,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - sources = [ - "src/include/xnnpack.h", -- "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-1x32c4-minmax-neonsme2.c", -- "src/src/pqs8-qc8w-gemm/pqs8-qc8w-gemm-32x32c4-minmax-neonsme2.c", +- "src/src/qb4-packw/gen/qb4-packw-x16c4-gemm-goi-aarch64-neondot.c", +- "src/src/qb4-packw/gen/qb4-packw-x16c8-gemm-goi-aarch64-neondot.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -94506,8 +94765,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn +} - if (build_with_chromium) { -- source_set("qb4-packw_arch=armv8.2-a+dotprod") { -- cflags = [ "-march=armv8.2-a+dotprod" ] +- source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16") { +- cflags = [ "-march=armv8.2-a+dotprod+fp16" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { + source_set("qu8-f32-vcvt_riscv64_standalone") { @@ -94522,8 +94781,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - sources = [ - "src/include/xnnpack.h", -- "src/src/qb4-packw/gen/qb4-packw-x16c4-gemm-goi-aarch64-neondot.c", -- "src/src/qb4-packw/gen/qb4-packw-x16c8-gemm-goi-aarch64-neondot.c", +- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c4-minmax-neondotfp16arith.c", +- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c4-minmax-neondotfp16arith.c", - ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] @@ -94558,8 +94817,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("qb4-packw_arch=armv8.2-a+dotprod_standalone") { -- cflags = [ "-march=armv8.2-a+dotprod" ] +- source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") { +- cflags = [ "-march=armv8.2-a+dotprod+fp16" ] +if (build_with_chromium) { + source_set("qu8-gemm_riscv64") { + cflags = [ @@ -94574,8 +94833,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - sources = [ - "src/include/xnnpack.h", -- "src/src/qb4-packw/gen/qb4-packw-x16c4-gemm-goi-aarch64-neondot.c", -- "src/src/qb4-packw/gen/qb4-packw-x16c8-gemm-goi-aarch64-neondot.c", +- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c4-minmax-neondotfp16arith.c", +- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c4-minmax-neondotfp16arith.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -94603,8 +94862,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + configs += [ ":xnnpack_private_config" ] - if (build_with_chromium) { -- source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16") { -- cflags = [ "-march=armv8.2-a+dotprod+fp16" ] +- source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16") { +- cflags = [ "-march=armv8.2-a+fp16" ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", @@ -94614,8 +94873,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - sources = [ - "src/include/xnnpack.h", -- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c4-minmax-neondotfp16arith.c", -- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c4-minmax-neondotfp16arith.c", +- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16-minmax-neonfp16arith-mlal-lane.c", +- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-6x16-minmax-neonfp16arith-mlal-lane.c", - ] + public_configs = [ ":xnnpack_public_config" ] + } @@ -94661,14 +94920,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") { -- cflags = [ "-march=armv8.2-a+dotprod+fp16" ] +- source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16_standalone") { +- cflags = [ "-march=armv8.2-a+fp16" ] + public_configs = [ ":xnnpack_public_config" ] - sources = [ - "src/include/xnnpack.h", -- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c4-minmax-neondotfp16arith.c", -- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c4-minmax-neondotfp16arith.c", +- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16-minmax-neonfp16arith-mlal-lane.c", +- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-6x16-minmax-neonfp16arith-mlal-lane.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -94695,13 +94954,13 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn +} - if (build_with_chromium) { -- source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16") { -- cflags = [ "-march=armv8.2-a+fp16" ] +- source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") { +- cflags = [ "-march=armv8.2-a+i8mm+fp16" ] - - sources = [ - "src/include/xnnpack.h", -- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16-minmax-neonfp16arith-mlal-lane.c", -- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-6x16-minmax-neonfp16arith-mlal-lane.c", +- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c8-minmax-neoni8mm.c", +- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c8-minmax-neoni8mm.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -94737,8 +94996,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+fp16_standalone") { -- cflags = [ "-march=armv8.2-a+fp16" ] +- source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { +- cflags = [ "-march=armv8.2-a+i8mm+fp16" ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", @@ -94748,8 +95007,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - sources = [ - "src/include/xnnpack.h", -- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16-minmax-neonfp16arith-mlal-lane.c", -- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-6x16-minmax-neonfp16arith-mlal-lane.c", +- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c8-minmax-neoni8mm.c", +- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c8-minmax-neoni8mm.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -94775,8 +95034,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn +} - if (build_with_chromium) { -- source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16") { -- cflags = [ "-march=armv8.2-a+i8mm+fp16" ] +- source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16") { +- cflags = [ "-march=armv8.2-a+dotprod+fp16" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { + source_set("qu8-igemm_riscv64_standalone") { @@ -94790,114 +95049,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/qu8-igemm/gen/qu8-igemm-3x4-minmax-fp32-scalar-lrintf.c" + ] -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c8-minmax-neoni8mm.c", -- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c8-minmax-neoni8mm.c", -- ] -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] - -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] - -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool", -- ] -+ public_configs = [ ":xnnpack_public_config" ] - -- public_configs = [ ":xnnpack_public_config" ] -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} - -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qd8-f16-qb4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { -- cflags = [ "-march=armv8.2-a+i8mm+fp16" ] -+if (build_with_chromium) { -+ source_set("qu8-rdsum_arch=rv64gcv-abi=lp64d") { -+ cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c" -+ ] - -- sources = [ -- "src/include/xnnpack.h", -- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-1x16c8-minmax-neoni8mm.c", -- "src/src/qd8-f16-qb4w-gemm/gen/qd8-f16-qb4w-gemm-4x16c8-minmax-neoni8mm.c", -- ] -- -- configs -= [ "//build/config/compiler:chromium_code" ] -- configs += [ "//build/config/compiler:no_chromium_code" ] -- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -- configs += [ ":xnnpack_private_config" ] -- -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool:pthreadpool_standalone", -- ] -- -- public_configs = [ ":xnnpack_public_config" ] -- -- if (!(is_android && use_order_profiling)) { -- assert_no_deps = [ "//base" ] -- } -- } -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] -+ -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] -+ -+ public_configs = [ ":xnnpack_public_config" ] - } -+} - -- if (build_with_chromium) { -- source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16") { -- cflags = [ "-march=armv8.2-a+dotprod+fp16" ] -+# This is a target that cannot depend on //base. -+if (build_with_internal_optimization_guide) { -+ source_set("qu8-rdsum_arch=rv64gcv-abi=lp64d_standalone") { -+ cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" -+ ] -+ -+ sources = [ -+ "src/include/xnnpack.h", -+ "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c" -+ ] - - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-1x16c4-minmax-neondotfp16arith.c", @@ -94939,14 +95090,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("qd8-f16-qc4w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") { - cflags = [ "-march=armv8.2-a+dotprod+fp16" ] +if (build_with_chromium) { -+ source_set("qu8-rdsum_riscv64") { ++ source_set("qu8-rdsum_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c" ++ "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c" + ] - sources = [ @@ -95004,14 +95156,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qu8-rdsum_riscv64_standalone") { ++ source_set("qu8-rdsum_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c" ++ "src/src/qu8-rdsum/gen/qu8-rdsum-7p7x-rvv-u2v.c" + ] - deps = [ @@ -95080,15 +95233,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/qd8-f16-qc4w-gemm/gen/qd8-f16-qc4w-gemm-4x16c8-minmax-neoni8mm.c", - ] +if (build_with_chromium) { -+ source_set("qu8-rsum_arch=rv64gcv-abi=lp64d") { ++ source_set("qu8-rdsum_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c" ++ "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c" + ] - configs -= [ "//build/config/compiler:chromium_code" ] @@ -95125,15 +95277,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [ "-march=armv8.2-a+i8mm+fp16" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qu8-rsum_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("qu8-rdsum_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c" ++ "src/src/qu8-rdsum/gen/qu8-rdsum-scalar.c" + ] - sources = [ @@ -95209,14 +95360,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+dotprod+fp16_standalone") { - cflags = [ "-march=armv8.2-a+dotprod+fp16" ] +if (build_with_chromium) { -+ source_set("qu8-rsum_riscv64") { ++ source_set("qu8-rsum_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c" ++ "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c" + ] - sources = [ @@ -95276,14 +95428,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qu8-rsum_riscv64_standalone") { ++ source_set("qu8-rsum_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c" ++ "src/src/qu8-rsum/gen/qu8-rsum-rvv-u2v.c" + ] - deps = [ @@ -95346,15 +95499,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("qd8-f16-qc8w-gemm_arch=armv8.2-a+fp16+dotprod") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] +if (build_with_chromium) { -+ source_set("qu8-vadd_arch=rv64gcv-abi=lp64d") { ++ source_set("qu8-rsum_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c" ++ "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c" + ] - asmflags = cflags @@ -95391,15 +95543,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qu8-vadd_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("qu8-rsum_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c" ++ "src/src/qu8-rsum/gen/qu8-rsum-scalar-u4.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -95463,15 +95614,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/qd8-f16-qc8w-gemm/gen/qd8-f16-qc8w-gemm-4x16c8-minmax-neoni8mm.c", - ] +if (build_with_chromium) { -+ source_set("qu8-vadd_riscv64") { ++ source_set("qu8-vadd_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c", -+ "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c" ++ "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c" + ] - configs -= [ "//build/config/compiler:chromium_code" ] @@ -95508,15 +95659,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [ "-march=armv8.2-a+i8mm+fp16" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qu8-vadd_riscv64_standalone") { ++ source_set("qu8-vadd_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c", -+ "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c" ++ "src/src/qu8-vadd/gen/qu8-vadd-minmax-rvv-u2v.c" + ] - sources = [ @@ -95592,15 +95743,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+dotprod+fp16_standalone") { - cflags = [ "-march=armv8.2-a+dotprod+fp16" ] +if (build_with_chromium) { -+ source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d") { ++ source_set("qu8-vadd_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c" ++ "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c", ++ "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c" + ] - sources = [ @@ -95660,15 +95811,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("qu8-vadd_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c" ++ "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u1.c", ++ "src/src/qu8-vadd/gen/qu8-vadd-minmax-scalar-u4.c" + ] - deps = [ @@ -95731,15 +95882,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("qd8-f16-qc8w-igemm_arch=armv8.2-a+fp16+dotprod") { - cflags = [ "-march=armv8.2-a+fp16+dotprod" ] +if (build_with_chromium) { -+ source_set("qu8-vaddc_riscv64") { ++ source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c", -+ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c" ++ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c" + ] - asmflags = cflags @@ -95776,15 +95927,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qu8-vaddc_riscv64_standalone") { ++ source_set("qu8-vaddc_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c", -+ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c" ++ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-rvv-u2v.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -95860,14 +96011,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("qu8-vcvt_riscv64") { ++ source_set("qu8-vaddc_riscv64") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c" ++ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c", ++ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -95922,14 +96074,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - cflags = [ "-march=armv8.2-a+dotprod" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qu8-vcvt_riscv64_standalone") { ++ source_set("qu8-vaddc_riscv64_standalone") { + cflags = [ + + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c" ++ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u1.c", ++ "src/src/qu8-vaddc/gen/qu8-vaddc-minmax-scalar-u4.c" + ] - sources = [ @@ -95973,15 +96126,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - source_set("qd8-f32-qb4w-gemm_arch=armv8.2-a+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+dotprod" ] +if (build_with_chromium) { -+ source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d") { ++ source_set("qu8-vcvt_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c" ++ "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c" + ] - sources = [ @@ -96039,15 +96191,14 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") { ++ source_set("qu8-vcvt_riscv64_standalone") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c" ++ "src/src/qu8-vcvt/gen/qu8-vcvt-scalar-u4.c" + ] - deps = [ @@ -96130,14 +96281,15 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/pthreadpool", - ] +if (build_with_chromium) { -+ source_set("qu8-vlrelu_riscv64") { ++ source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c" ++ "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c" + ] - public_configs = [ ":xnnpack_public_config" ] @@ -96190,24 +96342,25 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn +} - if (build_with_chromium) { -- source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod") { +- source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod") { - cflags = [ "-march=armv8.2-a+dotprod" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { -+ source_set("qu8-vlrelu_riscv64_standalone") { ++ source_set("qu8-vlrelu_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ -+ ++ "-mabi=lp64d", ++ "-march=rv64gcv" + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c" ++ "src/src/qu8-vlrelu/gen/qu8-vlrelu-rvv-u2v.c" + ] - sources = [ - "src/include/xnnpack.h", -- "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c4-minmax-neondot.c", -- "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c4-minmax-neondot.c", +- "src/src/qd8-f32-qc2w-gemm/qd8-f32-qc2w-gemm-1x16c4-minmax-neondot.c", +- "src/src/qd8-f32-qc2w-gemm/qd8-f32-qc2w-gemm-4x16c4-minmax-neondot.c", - ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] @@ -96242,24 +96395,23 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - # This is a target that cannot depend on //base. - if (build_with_internal_optimization_guide) { -- source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") { +- source_set("qd8-f32-qc2w-gemm_arch=armv8.2-a+dotprod_standalone") { - cflags = [ "-march=armv8.2-a+dotprod" ] +if (build_with_chromium) { -+ source_set("qu8-vmul_arch=rv64gcv-abi=lp64d") { ++ source_set("qu8-vlrelu_riscv64") { + cflags = [ -+ "-mabi=lp64d", -+ "-march=rv64gcv" ++ + ] + + sources = [ + "src/include/xnnpack.h", -+ "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.c" ++ "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c" + ] - sources = [ - "src/include/xnnpack.h", -- "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c4-minmax-neondot.c", -- "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c4-minmax-neondot.c", +- "src/src/qd8-f32-qc2w-gemm/qd8-f32-qc2w-gemm-1x16c4-minmax-neondot.c", +- "src/src/qd8-f32-qc2w-gemm/qd8-f32-qc2w-gemm-4x16c4-minmax-neondot.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -96287,8 +96439,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + configs += [ ":xnnpack_private_config" ] - if (build_with_chromium) { -- source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") { -- cflags = [ "-march=armv8.2-a+i8mm+fp16" ] +- source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod") { +- cflags = [ "-march=armv8.2-a+dotprod" ] + deps = [ + "//third_party/cpuinfo", + "//third_party/fp16", @@ -96298,8 +96450,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - sources = [ - "src/include/xnnpack.h", -- "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-neoni8mm.c", -- "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c8-minmax-neoni8mm.c", +- "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c4-minmax-neondot.c", +- "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c4-minmax-neondot.c", - ] + public_configs = [ ":xnnpack_public_config" ] + } @@ -96311,6 +96463,127 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - configs += [ ":xnnpack_private_config" ] +# This is a target that cannot depend on //base. +if (build_with_internal_optimization_guide) { ++ source_set("qu8-vlrelu_riscv64_standalone") { ++ cflags = [ ++ ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/qu8-vlrelu/gen/qu8-vlrelu-scalar-andxor-u4.c" ++ ] + +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] + +- public_configs = [ ":xnnpack_public_config" ] +- } +- } ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+dotprod_standalone") { +- cflags = [ "-march=armv8.2-a+dotprod" ] ++ public_configs = [ ":xnnpack_public_config" ] + +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c4-minmax-neondot.c", +- "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c4-minmax-neondot.c", +- ] +- +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] +- +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool:pthreadpool_standalone", +- ] +- +- public_configs = [ ":xnnpack_public_config" ] +- +- if (!(is_android && use_order_profiling)) { +- assert_no_deps = [ "//base" ] +- } ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- if (build_with_chromium) { +- source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16") { +- cflags = [ "-march=armv8.2-a+i8mm+fp16" ] +- +- sources = [ +- "src/include/xnnpack.h", +- "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-neoni8mm.c", +- "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-4x16c8-minmax-neoni8mm.c", +- ] ++if (build_with_chromium) { ++ source_set("qu8-vmul_arch=rv64gcv-abi=lp64d") { ++ cflags = [ ++ "-mabi=lp64d", ++ "-march=rv64gcv" ++ ] ++ ++ sources = [ ++ "src/include/xnnpack.h", ++ "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.c" ++ ] + +- configs -= [ "//build/config/compiler:chromium_code" ] +- configs += [ "//build/config/compiler:no_chromium_code" ] +- configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] +- configs += [ ":xnnpack_private_config" ] ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] + +- deps = [ +- "//third_party/cpuinfo", +- "//third_party/fp16", +- "//third_party/fxdiv", +- "//third_party/pthreadpool", +- ] ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] + +- public_configs = [ ":xnnpack_public_config" ] +- } ++ public_configs = [ ":xnnpack_public_config" ] + } ++} + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { +- cflags = [ "-march=armv8.2-a+i8mm+fp16" ] ++# This is a target that cannot depend on //base. ++if (build_with_internal_optimization_guide) { + source_set("qu8-vmul_arch=rv64gcv-abi=lp64d_standalone") { + cflags = [ + "-mabi=lp64d", @@ -96322,33 +96595,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/qu8-vmul/gen/qu8-vmul-minmax-f32-rvv-u2v.c" + ] -- deps = [ -- "//third_party/cpuinfo", -- "//third_party/fp16", -- "//third_party/fxdiv", -- "//third_party/pthreadpool", -- ] -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] - -- public_configs = [ ":xnnpack_public_config" ] -- } -- } -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool:pthreadpool_standalone", -+ ] - -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qd8-f32-qc4w-gemm_arch=armv8.2-a+i8mm+fp16_standalone") { -- cflags = [ "-march=armv8.2-a+i8mm+fp16" ] -+ public_configs = [ ":xnnpack_public_config" ] - - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16c8-minmax-neoni8mm.c", @@ -96372,16 +96618,23 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - if (!(is_android && use_order_profiling)) { - assert_no_deps = [ "//base" ] - } -+ if (!(is_android && use_order_profiling)) { -+ assert_no_deps = [ "//base" ] - } - } -+} +- } +- } ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] - if (build_with_chromium) { - source_set("qd8-f32-qc4w-gemm_arm64") { - cflags = [] -- ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool:pthreadpool_standalone", ++ ] + - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16-minmax-neon-mlal-lane.c", @@ -96401,6 +96654,19 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "//third_party/fxdiv", - "//third_party/pthreadpool", - ] ++ public_configs = [ ":xnnpack_public_config" ] + +- public_configs = [ ":xnnpack_public_config" ] ++ if (!(is_android && use_order_profiling)) { ++ assert_no_deps = [ "//base" ] + } + } ++} + +- # This is a target that cannot depend on //base. +- if (build_with_internal_optimization_guide) { +- source_set("qd8-f32-qc4w-gemm_arm64_standalone") { +- cflags = [] +if (build_with_chromium) { + source_set("qu8-vmul_riscv64") { + cflags = [ @@ -96412,25 +96678,6 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/qu8-vmul/gen/qu8-vmul-minmax-fp32-scalar-u4.c" + ] -- public_configs = [ ":xnnpack_public_config" ] -- } -- } -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ "//build/config/compiler:no_chromium_code" ] -+ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] -+ configs += [ ":xnnpack_private_config" ] - -- # This is a target that cannot depend on //base. -- if (build_with_internal_optimization_guide) { -- source_set("qd8-f32-qc4w-gemm_arm64_standalone") { -- cflags = [] -+ deps = [ -+ "//third_party/cpuinfo", -+ "//third_party/fp16", -+ "//third_party/fxdiv", -+ "//third_party/pthreadpool", -+ ] - - sources = [ - "src/include/xnnpack.h", - "src/src/qd8-f32-qc4w-gemm/gen/qd8-f32-qc4w-gemm-1x16-minmax-neon-mlal-lane.c", @@ -96457,6 +96704,18 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - assert_no_deps = [ "//base" ] - } - } ++ configs -= [ "//build/config/compiler:chromium_code" ] ++ configs += [ "//build/config/compiler:no_chromium_code" ] ++ configs += [ "//build/config/sanitizers:cfi_icall_generalize_pointers" ] ++ configs += [ ":xnnpack_private_config" ] ++ ++ deps = [ ++ "//third_party/cpuinfo", ++ "//third_party/fp16", ++ "//third_party/fxdiv", ++ "//third_party/pthreadpool", ++ ] ++ + public_configs = [ ":xnnpack_public_config" ] } +} @@ -103571,6 +103830,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - - sources = [ - "src/include/xnnpack.h", +- "src/src/x16-pack-lh/x16-packlh-igemm-neonsme.c", +- "src/src/x16-pack-lh/x16-packlh-igemm-neonsme2.c", +- "src/src/x16-pack-lh/x16-packlh-neonsme.c", - "src/src/x16-pack-lh/x16-packlh-neonsme2.c", - ] - @@ -103617,6 +103879,9 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - sources = [ - "src/include/xnnpack.h", +- "src/src/x16-pack-lh/x16-packlh-igemm-neonsme.c", +- "src/src/x16-pack-lh/x16-packlh-igemm-neonsme2.c", +- "src/src/x16-pack-lh/x16-packlh-neonsme.c", - "src/src/x16-pack-lh/x16-packlh-neonsme2.c", - ] - @@ -104019,6 +104284,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - sources = [ - "src/include/xnnpack.h", - "src/src/x32-pack-lh/x32-packlh-neonsme.c", +- "src/src/x32-pack-lh/x32-packlh-neonsme2.c", - ] + public_configs = [ ":xnnpack_public_config" ] + } @@ -104070,6 +104336,7 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - sources = [ - "src/include/xnnpack.h", - "src/src/x32-pack-lh/x32-packlh-neonsme.c", +- "src/src/x32-pack-lh/x32-packlh-neonsme2.c", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] @@ -110226,6 +110493,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/operators/convolution-nhwc.c", + "src/src/operators/deconvolution-nhwc.c", + "src/src/operators/dynamic-fully-connected-nc.c", ++ "src/src/operators/fingerprint_cache.c", ++ "src/src/operators/fingerprint_id.c", + "src/src/operators/fully-connected-nc.c", + "src/src/operators/max-pooling-nhwc.c", + "src/src/operators/pack-lh.c", @@ -110311,6 +110580,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn + "src/src/operators/convolution-nhwc.c", + "src/src/operators/deconvolution-nhwc.c", + "src/src/operators/dynamic-fully-connected-nc.c", ++ "src/src/operators/fingerprint_cache.c", ++ "src/src/operators/fingerprint_id.c", + "src/src/operators/fully-connected-nc.c", + "src/src/operators/max-pooling-nhwc.c", + "src/src/operators/pack-lh.c", @@ -112026,6 +112297,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/operators/convolution-nhwc.c", - "src/src/operators/deconvolution-nhwc.c", - "src/src/operators/dynamic-fully-connected-nc.c", +- "src/src/operators/fingerprint_cache.c", +- "src/src/operators/fingerprint_id.c", - "src/src/operators/fully-connected-nc.c", - "src/src/operators/max-pooling-nhwc.c", - "src/src/operators/pack-lh.c", @@ -112083,6 +112356,8 @@ Index: chromium-143.0.7499.40/third_party/xnnpack/BUILD.gn - "src/src/operators/convolution-nhwc.c", - "src/src/operators/deconvolution-nhwc.c", - "src/src/operators/dynamic-fully-connected-nc.c", +- "src/src/operators/fingerprint_cache.c", +- "src/src/operators/fingerprint_id.c", - "src/src/operators/fully-connected-nc.c", - "src/src/operators/max-pooling-nhwc.c", - "src/src/operators/pack-lh.c", diff --git a/0002-third_party-libvpx-Remove-bad-ppc64-config.patch b/0002-third_party-libvpx-Remove-bad-ppc64-config.patch index c8c0a6e..a6dba00 100644 --- a/0002-third_party-libvpx-Remove-bad-ppc64-config.patch +++ b/0002-third_party-libvpx-Remove-bad-ppc64-config.patch @@ -1,6 +1,6 @@ -Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h +Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h +--- chromium-144.0.7559.59.orig/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h +++ /dev/null @@ -1,186 +0,0 @@ -/* @@ -189,9 +189,9 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp8_r -#endif - -#endif // VP8_RTCD_H_ -Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h +Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h +--- chromium-144.0.7559.59.orig/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h +++ /dev/null @@ -1,119 +0,0 @@ -/* @@ -313,9 +313,9 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp9_r -#endif - -#endif // VP9_RTCD_H_ -Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm +Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm =================================================================== ---- chromium-143.0.7499.40.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm +--- chromium-144.0.7559.59.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm +++ /dev/null @@ -1,107 +0,0 @@ -@ This file was created from a .asm file @@ -425,9 +425,9 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_c -.equ DECODE_WIDTH_LIMIT , 16384 -.equ DECODE_HEIGHT_LIMIT , 16384 - .section .note.GNU-stack,"",%progbits -Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.c +Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.c =================================================================== ---- chromium-143.0.7499.40.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.c +--- chromium-144.0.7559.59.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.c +++ /dev/null @@ -1,10 +0,0 @@ -/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */ @@ -440,9 +440,9 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_c -#include "vpx/vpx_codec.h" -static const char* const cfg = "--target=ppc64le-linux-gcc --enable-external-build --enable-postproc --enable-multi-res-encoding --enable-temporal-denoising --enable-vp9-temporal-denoising --enable-vp9-postproc --size-limit=16384x16384 --enable-realtime-only --disable-install-docs --disable-libyuv --enable-unit-tests"; -const char *vpx_codec_build_config(void) {return cfg;} -Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.h +Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.h +--- chromium-144.0.7559.59.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.h +++ /dev/null @@ -1,116 +0,0 @@ -/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */ @@ -561,9 +561,9 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_c -#define DECODE_WIDTH_LIMIT 16384 -#define DECODE_HEIGHT_LIMIT 16384 -#endif /* VPX_CONFIG_H */ -Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h +Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h +--- chromium-144.0.7559.59.orig/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h +++ /dev/null @@ -1,858 +0,0 @@ -/* @@ -1424,9 +1424,9 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_d -#endif - -#endif // VPX_DSP_RTCD_H_ -Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h +Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h +--- chromium-144.0.7559.59.orig/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h +++ /dev/null @@ -1,83 +0,0 @@ -/* diff --git a/0002-third_party-lss-kernel-structs.patch b/0002-third_party-lss-kernel-structs.patch index 9b2d8e5..a81d439 100644 --- a/0002-third_party-lss-kernel-structs.patch +++ b/0002-third_party-lss-kernel-structs.patch @@ -1,7 +1,7 @@ -Index: chromium-143.0.7499.40/third_party/lss/linux_syscall_support.h +Index: chromium-144.0.7559.59/third_party/lss/linux_syscall_support.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/lss/linux_syscall_support.h -+++ chromium-143.0.7499.40/third_party/lss/linux_syscall_support.h +--- chromium-144.0.7559.59.orig/third_party/lss/linux_syscall_support.h ++++ chromium-144.0.7559.59/third_party/lss/linux_syscall_support.h @@ -86,7 +86,7 @@ * Porting to other related platforms should not be difficult. */ diff --git a/0003-third_party-libvpx-Add-ppc64-generated-config.patch b/0003-third_party-libvpx-Add-ppc64-generated-config.patch index b4d484c..e329359 100644 --- a/0003-third_party-libvpx-Add-ppc64-generated-config.patch +++ b/0003-third_party-libvpx-Add-ppc64-generated-config.patch @@ -1,7 +1,7 @@ -Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h +Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h ++++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h @@ -0,0 +1,316 @@ +// This file is generated. Do not edit. +#ifndef VP8_RTCD_H_ @@ -319,10 +319,10 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp8_r +#endif + +#endif -Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h +Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h ++++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h @@ -0,0 +1,267 @@ +// This file is generated. Do not edit. +#ifndef VP9_RTCD_H_ @@ -591,10 +591,10 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vp9_r +#endif + +#endif -Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm +Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm ++++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm @@ -0,0 +1,107 @@ +@ This file was created from a .asm file +@ using the ads2gas.pl script. @@ -703,10 +703,10 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_c +.equ DECODE_WIDTH_LIMIT , 16384 +.equ DECODE_HEIGHT_LIMIT , 16384 + .section .note.GNU-stack,"",%progbits -Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.c +Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.c =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.c ++++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.c @@ -0,0 +1,10 @@ +/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */ +/* */ @@ -718,10 +718,10 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_c +#include "vpx/vpx_codec.h" +static const char* const cfg = "--target=generic-gnu --enable-vp9-highbitdepth --enable-external-build --enable-postproc --enable-multi-res-encoding --enable-temporal-denoising --enable-vp9-temporal-denoising --enable-vp9-postproc --size-limit=16384x16384 --enable-realtime-only --disable-install-docs --disable-libyuv"; +const char *vpx_codec_build_config(void) {return cfg;} -Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.h +Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.h =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.h ++++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.h @@ -0,0 +1,116 @@ +/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */ +/* */ @@ -839,10 +839,10 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_c +#define DECODE_WIDTH_LIMIT 16384 +#define DECODE_HEIGHT_LIMIT 16384 +#endif /* VPX_CONFIG_H */ -Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h +Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h ++++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h @@ -0,0 +1,4128 @@ +// This file is generated. Do not edit. +#ifndef VPX_DSP_RTCD_H_ @@ -4972,10 +4972,10 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_d +#endif + +#endif -Index: chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h +Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h =================================================================== --- /dev/null -+++ chromium-143.0.7499.40/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h ++++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h @@ -0,0 +1,96 @@ +// This file is generated. Do not edit. +#ifndef VPX_SCALE_RTCD_H_ diff --git a/0004-third_party-crashpad-port-curl-transport-ppc64.patch b/0004-third_party-crashpad-port-curl-transport-ppc64.patch index 550213d..bb55c2e 100644 --- a/0004-third_party-crashpad-port-curl-transport-ppc64.patch +++ b/0004-third_party-crashpad-port-curl-transport-ppc64.patch @@ -1,7 +1,7 @@ -Index: chromium-143.0.7499.40/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc +Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc -+++ chromium-143.0.7499.40/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc +--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc ++++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc @@ -239,6 +239,12 @@ std::string UserAgent() { #endif #elif defined (ARCH_CPU_RISCV64) diff --git a/0004-third_party-libvpx-work-around-ambiguous-vsx.patch b/0004-third_party-libvpx-work-around-ambiguous-vsx.patch index 58aed49..9adceb3 100644 --- a/0004-third_party-libvpx-work-around-ambiguous-vsx.patch +++ b/0004-third_party-libvpx-work-around-ambiguous-vsx.patch @@ -1,7 +1,7 @@ -Index: chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c +Index: chromium-144.0.7559.59/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c =================================================================== ---- chromium-143.0.7499.40.orig/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c -+++ chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c +--- chromium-144.0.7559.59.orig/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c ++++ chromium-144.0.7559.59/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c @@ -38,6 +38,28 @@ static INLINE int16x8_t vec_max_across(i return vec_max(a, vec_perm(a, a, vec_perm16)); } @@ -137,10 +137,10 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vp9/encoder/ppc/v eob = vec_max(eob, vec_or(scan0, zero_coeff0)); eob2 = vec_max(vec_or(scan1, zero_coeff1), vec_or(scan2, zero_coeff2)); -Index: chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c +Index: chromium-144.0.7559.59/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c =================================================================== ---- chromium-143.0.7499.40.orig/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c -+++ chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c +--- chromium-144.0.7559.59.orig/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c ++++ chromium-144.0.7559.59/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c @@ -15,6 +15,28 @@ #include "vpx_dsp/ppc/txfm_common_vsx.h" #include "vpx_dsp/ppc/types_vsx.h" @@ -255,10 +255,10 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct3 } // Returns 1 if negative 0 if positive -Index: chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c +Index: chromium-144.0.7559.59/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c =================================================================== ---- chromium-143.0.7499.40.orig/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c -+++ chromium-143.0.7499.40/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c +--- chromium-144.0.7559.59.orig/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c ++++ chromium-144.0.7559.59/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c @@ -13,6 +13,28 @@ #include "./vpx_dsp_rtcd.h" #include "vpx_dsp/ppc/types_vsx.h" diff --git a/HACK-debian-clang-disable-base-musttail.patch b/HACK-debian-clang-disable-base-musttail.patch index 566c8d9..07e60f7 100644 --- a/HACK-debian-clang-disable-base-musttail.patch +++ b/HACK-debian-clang-disable-base-musttail.patch @@ -1,7 +1,7 @@ -Index: chromium-143.0.7499.40/base/compiler_specific.h +Index: chromium-144.0.7559.59/base/compiler_specific.h =================================================================== ---- chromium-143.0.7499.40.orig/base/compiler_specific.h -+++ chromium-143.0.7499.40/base/compiler_specific.h +--- chromium-144.0.7559.59.orig/base/compiler_specific.h ++++ chromium-144.0.7559.59/base/compiler_specific.h @@ -198,7 +198,7 @@ // MUSTTAIL return Func1(d + 1); // `Func1()` will be tail-called. // } diff --git a/HACK-debian-clang-disable-pa-musttail.patch b/HACK-debian-clang-disable-pa-musttail.patch index f124de4..d06c52e 100644 --- a/HACK-debian-clang-disable-pa-musttail.patch +++ b/HACK-debian-clang-disable-pa-musttail.patch @@ -1,7 +1,7 @@ -Index: chromium-143.0.7499.40/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h +Index: chromium-144.0.7559.59/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h =================================================================== ---- chromium-143.0.7499.40.orig/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h -+++ chromium-143.0.7499.40/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h +--- chromium-144.0.7559.59.orig/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h ++++ chromium-144.0.7559.59/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h @@ -139,7 +139,7 @@ // PA_MUSTTAIL return Func1(d + 1); // `Func1()` will be tail-called. // } diff --git a/HACK-third_party-libvpx-use-generic-gnu.patch b/HACK-third_party-libvpx-use-generic-gnu.patch index 44c118d..215eb0d 100644 --- a/HACK-third_party-libvpx-use-generic-gnu.patch +++ b/HACK-third_party-libvpx-use-generic-gnu.patch @@ -1,7 +1,7 @@ -Index: chromium-143.0.7499.40/third_party/libvpx/generate_gni.sh +Index: chromium-144.0.7559.59/third_party/libvpx/generate_gni.sh =================================================================== ---- chromium-143.0.7499.40.orig/third_party/libvpx/generate_gni.sh -+++ chromium-143.0.7499.40/third_party/libvpx/generate_gni.sh +--- chromium-144.0.7559.59.orig/third_party/libvpx/generate_gni.sh ++++ chromium-144.0.7559.59/third_party/libvpx/generate_gni.sh @@ -429,7 +429,7 @@ gen_config_files linux/mipsel "--target= gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}" gen_config_files linux/loongarch \ @@ -11,10 +11,10 @@ Index: chromium-143.0.7499.40/third_party/libvpx/generate_gni.sh gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}" gen_config_files win/arm64-highbd \ "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD} ${disable_sve}" -Index: chromium-143.0.7499.40/third_party/libvpx/source/libvpx/build/make/rtcd.pl +Index: chromium-144.0.7559.59/third_party/libvpx/source/libvpx/build/make/rtcd.pl =================================================================== ---- chromium-143.0.7499.40.orig/third_party/libvpx/source/libvpx/build/make/rtcd.pl -+++ chromium-143.0.7499.40/third_party/libvpx/source/libvpx/build/make/rtcd.pl +--- chromium-144.0.7559.59.orig/third_party/libvpx/source/libvpx/build/make/rtcd.pl ++++ chromium-144.0.7559.59/third_party/libvpx/source/libvpx/build/make/rtcd.pl @@ -527,8 +527,9 @@ if ($opts{arch} eq 'x86') { } arm; @@ -27,10 +27,10 @@ Index: chromium-143.0.7499.40/third_party/libvpx/source/libvpx/build/make/rtcd.p } elsif ($opts{arch} =~ /loongarch/ ) { @ALL_ARCHS = filter(qw/lsx lasx/); loongarch; -Index: chromium-143.0.7499.40/third_party/libvpx/BUILD.gn +Index: chromium-144.0.7559.59/third_party/libvpx/BUILD.gn =================================================================== ---- chromium-143.0.7499.40.orig/third_party/libvpx/BUILD.gn -+++ chromium-143.0.7499.40/third_party/libvpx/BUILD.gn +--- chromium-144.0.7559.59.orig/third_party/libvpx/BUILD.gn ++++ chromium-144.0.7559.59/third_party/libvpx/BUILD.gn @@ -98,6 +98,14 @@ config("libvpx_config") { "-Wno-sign-compare", ] diff --git a/Rtc_base-system-arch.h-PPC.patch b/Rtc_base-system-arch.h-PPC.patch index 4985a70..b5a4185 100644 --- a/Rtc_base-system-arch.h-PPC.patch +++ b/Rtc_base-system-arch.h-PPC.patch @@ -1,7 +1,7 @@ -Index: chromium-143.0.7499.40/third_party/webrtc/rtc_base/system/arch.h +Index: chromium-144.0.7559.59/third_party/webrtc/rtc_base/system/arch.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/webrtc/rtc_base/system/arch.h -+++ chromium-143.0.7499.40/third_party/webrtc/rtc_base/system/arch.h +--- chromium-144.0.7559.59.orig/third_party/webrtc/rtc_base/system/arch.h ++++ chromium-144.0.7559.59/third_party/webrtc/rtc_base/system/arch.h @@ -46,6 +46,18 @@ #endif #if defined(__MIPSEL__) diff --git a/add-ppc64-architecture-string.patch b/add-ppc64-architecture-string.patch index ab36e41..3983cfa 100644 --- a/add-ppc64-architecture-string.patch +++ b/add-ppc64-architecture-string.patch @@ -1,7 +1,7 @@ -Index: chromium-143.0.7499.40/base/system/sys_info.cc +Index: chromium-144.0.7559.59/base/system/sys_info.cc =================================================================== ---- chromium-143.0.7499.40.orig/base/system/sys_info.cc -+++ chromium-143.0.7499.40/base/system/sys_info.cc +--- chromium-144.0.7559.59.orig/base/system/sys_info.cc ++++ chromium-144.0.7559.59/base/system/sys_info.cc @@ -263,6 +263,8 @@ std::string SysInfo::ProcessCPUArchitect return "ARM"; #elif defined(ARCH_CPU_ARM64) diff --git a/add-ppc64-architecture-to-extensions.diff b/add-ppc64-architecture-to-extensions.diff index 2053505..39e0495 100644 --- a/add-ppc64-architecture-to-extensions.diff +++ b/add-ppc64-architecture-to-extensions.diff @@ -1,7 +1,7 @@ -Index: chromium-143.0.7499.40/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc +Index: chromium-144.0.7559.59/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc =================================================================== ---- chromium-143.0.7499.40.orig/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc -+++ chromium-143.0.7499.40/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc +--- chromium-144.0.7559.59.orig/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc ++++ chromium-144.0.7559.59/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc @@ -383,6 +383,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatfo info->arch = extensions::api::runtime::PlatformArch::kMips64; } else if (arch == "riscv64") { @@ -11,10 +11,10 @@ Index: chromium-143.0.7499.40/chrome/browser/extensions/api/runtime/chrome_runti } else { NOTREACHED(); } -Index: chromium-143.0.7499.40/extensions/common/api/runtime.json +Index: chromium-144.0.7559.59/extensions/common/api/runtime.json =================================================================== ---- chromium-143.0.7499.40.orig/extensions/common/api/runtime.json -+++ chromium-143.0.7499.40/extensions/common/api/runtime.json +--- chromium-144.0.7559.59.orig/extensions/common/api/runtime.json ++++ chromium-144.0.7559.59/extensions/common/api/runtime.json @@ -98,7 +98,8 @@ {"name": "x86-64", "description": "Specifies the processer architecture as x86-64."}, {"name": "mips", "description": "Specifies the processer architecture as mips."}, diff --git a/add-ppc64-pthread-stack-size.patch b/add-ppc64-pthread-stack-size.patch index ceb2849..8f4472b 100644 --- a/add-ppc64-pthread-stack-size.patch +++ b/add-ppc64-pthread-stack-size.patch @@ -1,7 +1,7 @@ -Index: chromium-143.0.7499.40/base/process/launch.h +Index: chromium-144.0.7559.59/base/process/launch.h =================================================================== ---- chromium-143.0.7499.40.orig/base/process/launch.h -+++ chromium-143.0.7499.40/base/process/launch.h +--- chromium-144.0.7559.59.orig/base/process/launch.h ++++ chromium-144.0.7559.59/base/process/launch.h @@ -58,6 +58,9 @@ enum TerminationStatus : int; #if defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_LOONGARCH64) #define PTHREAD_STACK_MIN_CONST \ diff --git a/chromium-141-rust-clanglib.patch b/chromium-141-rust-clanglib.patch deleted file mode 100644 index b9142c8..0000000 --- a/chromium-141-rust-clanglib.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -up chromium-141.0.7390.37/build/config/clang/BUILD.gn.rust-clang_lib chromium-141.0.7390.37/build/config/clang/BUILD.gn ---- chromium-141.0.7390.37/build/config/clang/BUILD.gn.rust-clang_lib 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/build/config/clang/BUILD.gn 2025-09-27 12:15:44.380395911 +0200 -@@ -168,7 +168,21 @@ template("clang_lib") { - } - } else if (is_apple) { - _dir = "darwin" -- } else if (is_linux || is_chromeos) { -+ } else if (is_linux) { -+ if (current_cpu == "x64") { -+ _dir = "x86_64-redhat-linux-gnu" -+ } else if (current_cpu == "x86") { -+ _dir = "i386-redhat-linux-gnu" -+ } else if (current_cpu == "arm64") { -+ _dir = "aarch64-redhat-linux-gnu" -+ } else if (current_cpu == "arm") { -+ _dir = "armhf-redhat-linux-gnu" -+ } else if (current_cpu == "ppc64") { -+ _dir = "ppc64le-redhat-linux-gnu" -+ } else { -+ assert(false) # Unhandled cpu type -+ } -+ } else if (is_chromeos) { - if (current_cpu == "x64") { - _dir = "x86_64-unknown-linux-gnu" - } else if (current_cpu == "x86") { -diff -up chromium-141.0.7390.37/build/rust/rust_bindgen_generator.gni.rust-clang_lib chromium-141.0.7390.37/build/rust/rust_bindgen_generator.gni ---- chromium-141.0.7390.37/build/rust/rust_bindgen_generator.gni.rust-clang_lib 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/build/rust/rust_bindgen_generator.gni 2025-09-27 11:41:29.777786734 +0200 -@@ -18,11 +18,11 @@ if (host_os == "win") { - - # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in - # ../lib. --_libclang_path = rust_bindgen_root -+_libclang_path = clang_base_path - if (host_os == "win") { - _libclang_path += "/bin" - } else { -- _libclang_path += "/lib" -+ _libclang_path += "/lib64" - } - - # Template to build Rust/C bindings with bindgen. -diff -up chromium-141.0.7390.37/build/rust/rust_bindgen.gni.rust-clang_lib chromium-141.0.7390.37/build/rust/rust_bindgen.gni ---- chromium-141.0.7390.37/build/rust/rust_bindgen.gni.rust-clang_lib 2025-09-23 22:21:14.000000000 +0200 -+++ chromium-141.0.7390.37/build/rust/rust_bindgen.gni 2025-09-27 11:41:29.777891843 +0200 -@@ -19,11 +19,11 @@ if (host_os == "win") { - - # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in - # ../lib. --_libclang_path = rust_bindgen_root -+_libclang_path = clang_base_path - if (host_os == "win") { - _libclang_path += "/bin" - } else { -- _libclang_path += "/lib" -+ _libclang_path += "/lib64" - } - - # Template to build Rust/C bindings with bindgen. diff --git a/chromium-142-Add-ExtractData-support-for-text-uri-list.patch b/chromium-142-Add-ExtractData-support-for-text-uri-list.patch deleted file mode 100644 index 71d7e94..0000000 --- a/chromium-142-Add-ExtractData-support-for-text-uri-list.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 3e6fd579fa63e68c9d0092ea56f7a457c03bdb7d Mon Sep 17 00:00:00 2001 -From: LuK1337 -Date: Thu, 20 Nov 2025 14:27:50 -0800 -Subject: [PATCH] [ozone/wayland] Add ExtractData() support for text/uri-list - -When dragging a file from chrome://downloads to KDE Konsole, the -following message shows up in the debug output: "Cannot deliver data of -type text/uri-list and no text representation is available.". - -After making it so text/uri-list is handled the same way as -text/x-moz-url, the log message is gone and path to file is pasted into -terminal as one would expect. - -Bug: 460074619 -Test: ozone_unittests -Change-Id: Iab0144ca7d3d3983d0e61d74f42a53b366f9e830 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7145698 -Auto-Submit: Łukasz Patron -Reviewed-by: Kramer Ge -Reviewed-by: Peter McNeeley -Commit-Queue: Peter McNeeley -Cr-Commit-Position: refs/heads/main@{#1548075} ---- - -diff --git a/AUTHORS b/AUTHORS -index abceab66..98ced4a 100644 ---- a/AUTHORS -+++ b/AUTHORS -@@ -943,6 +943,7 @@ - Luka Dojcilovic - Lukas Lihotzki - Lukasz Krakowiak -+Lukasz Patron - Luke Inman-Semerau - Luke Gu - Luke Warlow -diff --git a/ui/ozone/platform/wayland/host/wayland_exchange_data_provider.cc b/ui/ozone/platform/wayland/host/wayland_exchange_data_provider.cc -index 2d32cc9..da6da7ae 100644 ---- a/ui/ozone/platform/wayland/host/wayland_exchange_data_provider.cc -+++ b/ui/ozone/platform/wayland/host/wayland_exchange_data_provider.cc -@@ -277,7 +277,8 @@ - DCHECK(out_content); - DCHECK(IsMimeTypeSupported(mime_type)); - if (std::optional url_info; -- mime_type == ui::kMimeTypeMozillaUrl && -+ (mime_type == ui::kMimeTypeMozillaUrl || -+ mime_type == ui::kMimeTypeUriList) && - (url_info = GetURLAndTitle(kFilenameToURLPolicy)).has_value()) { - out_content->append(url_info->url.spec()); - return true; -diff --git a/ui/ozone/platform/wayland/host/wayland_exchange_data_provider_unittest.cc b/ui/ozone/platform/wayland/host/wayland_exchange_data_provider_unittest.cc -index 70b6d9d..29a8ad0 100644 ---- a/ui/ozone/platform/wayland/host/wayland_exchange_data_provider_unittest.cc -+++ b/ui/ozone/platform/wayland/host/wayland_exchange_data_provider_unittest.cc -@@ -61,6 +61,17 @@ - EXPECT_EQ("pickled-str", read_pickled_str); - } - -+TEST(WaylandExchangeDataProviderTest, FileNameAsUriList) { -+ WaylandExchangeDataProvider provider; -+ std::string extracted; -+ EXPECT_FALSE(provider.ExtractData(kMimeTypeUriList, &extracted)); -+ -+ extracted.clear(); -+ provider.AddData(ToClipboardData("file:///dev/null"), kMimeTypeUriList); -+ EXPECT_TRUE(provider.ExtractData(kMimeTypeUriList, &extracted)); -+ EXPECT_EQ("file:///dev/null", extracted); -+} -+ - TEST(WaylandExchangeDataProviderTest, FileContents) { - constexpr std::string kName("filename"); - constexpr std::string kContents("contents"); diff --git a/chromium-142-Update-pointer-position-during-draggin.patch b/chromium-142-Update-pointer-position-during-draggin.patch deleted file mode 100644 index eb0e1c8..0000000 --- a/chromium-142-Update-pointer-position-during-draggin.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 4aed3650884fb2eb5605a051e92387204ae88cad Mon Sep 17 00:00:00 2001 -From: LuK1337 -Date: Sun, 30 Nov 2025 20:36:28 -0800 -Subject: [PATCH] [ozone/wayland] Update pointer position during dragging - -Prior to this change, dragging a file from chrome://downloads by its -filename would often open the file after it was dropped somewhere, this -is because the synthetic mouse release has outdated location. - -After ensuring that pointer location is updated during drag motion, -similarly to WaylandWindowDragController::OnDragLeave(), this is no -longer a problem. - -Bug: 462468355 -Test: ozone_unittests -Change-Id: Ib377b7ec04a9f5a02a21e36f7c43871a3e414798 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7182320 -Reviewed-by: Peter McNeeley -Commit-Queue: Peter McNeeley -Auto-Submit: Łukasz Patron -Reviewed-by: Kramer Ge -Cr-Commit-Position: refs/heads/main@{#1551919} ---- - -diff --git a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc -index b557e465..47b0911 100644 ---- a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc -+++ b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc -@@ -486,17 +486,9 @@ - if (drag_source_.has_value()) { - // Update the cursor position only for drag with mouse. - if (*drag_source_ == mojom::DragEventSource::kMouse) { -- auto* cursor_position = connection_->wayland_cursor_position(); -- if (cursor_position) { -- CHECK(window_); -- // TODO(crbug.com/41494257): Once we enable the input region for -- // subsurfaces, we need to update this part since the location will no -- // longer be relative to the window. -- auto location_in_screen = -- gfx::ToRoundedPoint(location) + -- window_->GetBoundsInDIP().origin().OffsetFromOrigin(); -- cursor_position->OnCursorPositionChanged(location_in_screen); -- } -+ pointer_delegate_->OnPointerMotionEvent( -+ location, timestamp, wl::EventDispatchPolicy::kImmediate, -+ /*is_synthesized=*/true); - } - } - -diff --git a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h -index e1239e6b..9a3ea8a2 100644 ---- a/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h -+++ b/ui/ozone/platform/wayland/host/wayland_data_drag_controller.h -@@ -130,6 +130,10 @@ - // TODO(crbug.com/40598679): Remove once focus is fixed during DND sessions. - WaylandWindow* entered_window() const { return window_; } - -+ WaylandPointer::Delegate* pointer_delegate() const { -+ return pointer_delegate_; -+ } -+ - // Returns false iff the data is for a window dragging session. - bool ShouldReleaseCaptureForDrag(ui::OSExchangeData* data) const; - -diff --git a/ui/ozone/platform/wayland/host/wayland_data_drag_controller_unittest.cc b/ui/ozone/platform/wayland/host/wayland_data_drag_controller_unittest.cc -index 4156ce4..d2a867acaf 100644 ---- a/ui/ozone/platform/wayland/host/wayland_data_drag_controller_unittest.cc -+++ b/ui/ozone/platform/wayland/host/wayland_data_drag_controller_unittest.cc -@@ -1441,8 +1441,10 @@ - // Send a drag motion and see if cursor position is updated. - SendDndMotion(gfx::Point(10, 11)); - WaitForDragDropTasks(); -- // Cursor position should be updated. -+ // Cursor and pointer positions should be updated. -+ auto* pointer_delegate = drag_controller()->pointer_delegate(); - EXPECT_EQ(gfx::Point(10, 11), cursor_position->GetCursorSurfacePoint()); -+ EXPECT_EQ(gfx::PointF(10, 11), pointer_delegate->GetPointerLocation()); - - SendDndLeave(); - SendDndCancelled(); diff --git a/chromium-144-rust-clanglib.patch b/chromium-144-rust-clanglib.patch new file mode 100644 index 0000000..981fe52 --- /dev/null +++ b/chromium-144-rust-clanglib.patch @@ -0,0 +1,66 @@ +diff -up chromium-144.0.7559.31/build/config/clang/BUILD.gn.rust-clang_lib chromium-144.0.7559.31/build/config/clang/BUILD.gn +--- chromium-144.0.7559.31/build/config/clang/BUILD.gn.rust-clang_lib 2025-12-17 01:06:32.000000000 +0100 ++++ chromium-144.0.7559.31/build/config/clang/BUILD.gn 2025-12-23 19:01:33.876897379 +0100 +@@ -177,7 +177,21 @@ template("clang_lib") { + } + } else if (is_apple) { + _dir = "darwin" +- } else if (is_linux || is_chromeos) { ++ } else if (is_linux) { ++ if (current_cpu == "x64") { ++ _dir = "x86_64-redhat-linux-gnu" ++ } else if (current_cpu == "x86") { ++ _dir = "i386-redhat-linux-gnu" ++ } else if (current_cpu == "arm64") { ++ _dir = "aarch64-redhat-linux-gnu" ++ } else if (current_cpu == "arm") { ++ _dir = "armhf-redhat-linux-gnu" ++ } else if (current_cpu == "ppc64") { ++ _dir = "ppc64le-redhat-linux-gnu" ++ } else { ++ assert(false) # Unhandled cpu type ++ } ++ } else if (is_chromeos) { + if (current_cpu == "x64") { + _dir = "x86_64-unknown-linux-gnu" + } else if (current_cpu == "x86") { +diff -up chromium-144.0.7559.31/build/rust/rust_bindgen_generator.gni.rust-clang_lib chromium-144.0.7559.31/build/rust/rust_bindgen_generator.gni +--- chromium-144.0.7559.31/build/rust/rust_bindgen_generator.gni.rust-clang_lib 2025-12-17 01:06:32.000000000 +0100 ++++ chromium-144.0.7559.31/build/rust/rust_bindgen_generator.gni 2025-12-23 19:21:34.335924481 +0100 +@@ -26,14 +26,14 @@ if (!use_chromium_rust_toolchain && + + # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in + # ../lib. +-_libclang_path = rust_bindgen_root ++_libclang_path = clang_base_path + if (!use_chromium_rust_toolchain && + (host_cpu == "ppc64" || host_cpu == "s390x")) { + _libclang_path = rust_sysroot_absolute + "/lib64" + } else if (host_os == "win") { + _libclang_path += "/bin" + } else { +- _libclang_path += "/lib" ++ _libclang_path += "/lib64" + } + + # Template to build Rust/C bindings with bindgen. +diff -up chromium-144.0.7559.31/build/rust/rust_bindgen.gni.rust-clang_lib chromium-144.0.7559.31/build/rust/rust_bindgen.gni +--- chromium-144.0.7559.31/build/rust/rust_bindgen.gni.rust-clang_lib 2025-12-17 01:06:32.000000000 +0100 ++++ chromium-144.0.7559.31/build/rust/rust_bindgen.gni 2025-12-23 19:22:12.089755683 +0100 +@@ -19,14 +19,14 @@ if (host_os == "win") { + + # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in + # ../lib. +-_libclang_path = rust_bindgen_root ++_libclang_path = clang_base_path + if (!use_chromium_rust_toolchain && + (current_cpu == "ppc64" || current_cpu == "s390x")) { + _libclang_path = rust_sysroot_absolute + "/lib64" + } else if (host_os == "win") { + _libclang_path += "/bin" + } else { +- _libclang_path += "/lib" ++ _libclang_path += "/lib64" + } + + # Template to build Rust/C bindings with bindgen. diff --git a/chromium-144-rust-libadler2.patch b/chromium-144-rust-libadler2.patch new file mode 100644 index 0000000..631a321 --- /dev/null +++ b/chromium-144-rust-libadler2.patch @@ -0,0 +1,16 @@ +diff -up chromium-144.0.7559.31/build/rust/std/BUILD.gn.than chromium-144.0.7559.31/build/rust/std/BUILD.gn +--- chromium-144.0.7559.31/build/rust/std/BUILD.gn.than 2025-12-26 15:06:36.274081861 +0100 ++++ chromium-144.0.7559.31/build/rust/std/BUILD.gn 2025-12-26 16:11:45.697054423 +0100 +@@ -55,11 +55,7 @@ if (toolchain_has_rust) { + "miniz_oxide", + "object", + ] +- if (rustc_nightly_capability) { +- stdlib_files += [ "adler2" ] +- } else { +- stdlib_files += [ "adler" ] +- } ++ stdlib_files += [ "adler2" ] + } + + if (toolchain_for_rust_host_build_tools) { diff --git a/chromium.spec b/chromium.spec index a65c8b5..735d788 100644 --- a/chromium.spec +++ b/chromium.spec @@ -260,7 +260,7 @@ %endif Name: chromium -Version: 143.0.7499.192 +Version: 144.0.7559.59 Release: 1%{?dist} Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Url: http://www.chromium.org/Home @@ -345,6 +345,9 @@ Patch150: chromium-124-qt6.patch # revert, it causes ramdom crash on aarch64 Patch300: chromium-131-revert-decommit-pooled-pages-by-default.patch +# Disable rust nightly features +Patch301: chromium-144-rust-libadler2.patch + # disable memory tagging (epel8 on aarch64) due to new feature IFUNC-Resolver # it is not supported in old glibc < 2.30, error: fatal error: 'sys/ifunc.h' file not found Patch305: chromium-124-el8-arm64-memory_tagging.patch @@ -408,7 +411,7 @@ Patch356: chromium-141-use_libcxx_modules.patch Patch357: chromium-134-type-mismatch-error.patch # set clang_lib path -Patch358: chromium-141-rust-clanglib.patch +Patch358: chromium-144-rust-clanglib.patch # PowerPC64 LE support # Timothy Pearson's patchset @@ -447,7 +450,6 @@ Patch396: skia-vsx-instructions.patch Patch397: 0001-Implement-support-for-ppc64-on-Linux.patch Patch398: 0001-Implement-support-for-PPC64-on-Linux.patch Patch399: 0001-Force-baseline-POWER8-AltiVec-VSX-CPU-features-when-.patch -Patch400: fix-clang-selection.patch Patch401: fix-rustc.patch Patch402: fix-rust-linking.patch Patch403: fix-breakpad-compile.patch @@ -482,9 +484,6 @@ Patch511: 0002-Fix-Missing-OPENSSL_NO_ENGINE-Guard.patch %endif # upstream patches -# Fix Wayland URI DnD issues -Patch1001: chromium-142-Add-ExtractData-support-for-text-uri-list.patch -Patch1002: chromium-142-Update-pointer-position-during-draggin.patch # Use chromium-latest.py to generate clean tarball from released build tarballs, found here: # http://build.chromium.org/buildbot/official/ @@ -532,6 +531,7 @@ BuildRequires: gcc-toolset-14-libatomic-devel %endif BuildRequires: rustc +BuildRequires: rustfmt BuildRequires: bindgen-cli %if ! %{bundlezstd} @@ -1081,6 +1081,8 @@ Qt6 UI for chromium. %patch -P300 -p1 -R -b .revert-decommit-pooled-pages-by-default %endif +%patch -P301 -p1 -b .rust-libadler2 + %if 0%{?rhel} == 8 %ifarch aarch64 %patch -P305 -p1 -b .el8-memory_tagging @@ -1095,11 +1097,6 @@ Qt6 UI for chromium. %patch -P310 -p1 -b .rust-FTBFS-suppress-warnings %patch -P311 -p1 -b .fstack-protector-strong -%if 0%{?rhel} == 9 || 0%{?rhel_minor_version} == 1 -%patch -P312 -p1 -b .el9-rust-no-alloc-shim-is-unstable -%patch -P313 -p1 -b .el9-rust_alloc_error_handler_should_panic -%endif - %if 0%{?rhel} && 0%{?rhel} < 10 %patch -P354 -p1 -b .split-threshold-for-reg-with-hint %endif @@ -1152,7 +1149,6 @@ Qt6 UI for chromium. %patch -P397 -p1 -b .0001-Implement-support-for-ppc64-on-Linux %patch -P398 -p1 -b .0001-Implement-support-for-PPC64-on-Linux %patch -P399 -p1 -b .0001-Force-baseline-POWER8-AltiVec-VSX-CPU-features-when- -%patch -P400 -p1 -b .fix-clang-selection %patch -P401 -p1 -b .fix-rustc %patch -P402 -p1 -b .fix-rust-linking %patch -P403 -p1 -b .fix-breakpad-compile @@ -1177,8 +1173,6 @@ Qt6 UI for chromium. %endif # Upstream patches -%patch -P1001 -p1 -b .Add-ExtractData-support-for-text-uri-list.patch -%patch -P1002 -p1 -b .Update-pointer-position-during-draggin.patch # Change shebang in all relevant files in this directory and all subdirectories # See `man find` for how the `-exec command {} +` syntax works @@ -1817,8 +1811,21 @@ fi %endif %changelog +* Wed Jan 14 2026 Than Ngo - 144.0.7559.59-1 +- Update to 144.0.7559.59 + * CVE-2026-0899: Out of bounds memory access in V8 + * CVE-2026-0900: Inappropriate implementation in V8 + * CVE-2026-0901: Inappropriate implementation in Blink + * CVE-2026-0902: Inappropriate implementation in V8 + * CVE-2026-0903: Insufficient validation of untrusted input in Downloads + * CVE-2026-0904: Incorrect security UI in Digital Credentials + * CVE-2026-0905: Insufficient policy enforcement in Network + * CVE-2026-0906: Incorrect security UI + * CVE-2026-0907: Incorrect security UI in Split View + * CVE-2026-0908: Use after free in ANGLE + * Wed Jan 07 2026 Than Ngo - 143.0.7499.192-1 -- Update tp 143.0.7499.192 +- Update to 143.0.7499.192 * High CVE-2026-0628: Insufficient policy enforcement in WebView tag - Fix rhbz#2425338, Enable control flow integrity support for x86_64/aarch64 - Enable build for epel10.1 diff --git a/dawn-fix-ppc64le-detection.patch b/dawn-fix-ppc64le-detection.patch index a32fa4e..9eb8581 100644 --- a/dawn-fix-ppc64le-detection.patch +++ b/dawn-fix-ppc64le-detection.patch @@ -1,7 +1,7 @@ -Index: chromium-143.0.7499.40/third_party/dawn/src/dawn/common/Platform.h +Index: chromium-144.0.7559.59/third_party/dawn/src/dawn/common/Platform.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/dawn/src/dawn/common/Platform.h -+++ chromium-143.0.7499.40/third_party/dawn/src/dawn/common/Platform.h +--- chromium-144.0.7559.59.orig/third_party/dawn/src/dawn/common/Platform.h ++++ chromium-144.0.7559.59/third_party/dawn/src/dawn/common/Platform.h @@ -163,10 +163,12 @@ #elif defined(__s390x__) #define DAWN_PLATFORM_IS_S390X 1 diff --git a/fix-breakpad-compile.patch b/fix-breakpad-compile.patch index 1ce2a60..7ad360b 100644 --- a/fix-breakpad-compile.patch +++ b/fix-breakpad-compile.patch @@ -1,7 +1,7 @@ -Index: chromium-143.0.7499.40/third_party/breakpad/BUILD.gn +Index: chromium-144.0.7559.59/third_party/breakpad/BUILD.gn =================================================================== ---- chromium-143.0.7499.40.orig/third_party/breakpad/BUILD.gn -+++ chromium-143.0.7499.40/third_party/breakpad/BUILD.gn +--- chromium-144.0.7559.59.orig/third_party/breakpad/BUILD.gn ++++ chromium-144.0.7559.59/third_party/breakpad/BUILD.gn @@ -804,7 +804,6 @@ if (is_linux || is_chromeos || is_androi "breakpad/src/client/minidump_file_writer.h", "breakpad/src/common/convert_UTF.cc", diff --git a/fix-clang-selection.patch b/fix-clang-selection.patch deleted file mode 100644 index a503030..0000000 --- a/fix-clang-selection.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: chromium-143.0.7499.40/build/config/BUILDCONFIG.gn -=================================================================== ---- chromium-143.0.7499.40.orig/build/config/BUILDCONFIG.gn -+++ chromium-143.0.7499.40/build/config/BUILDCONFIG.gn -@@ -138,7 +138,6 @@ declare_args() { - # Set to true when compiling with the Clang compiler. - is_clang = current_os != "linux" || - (current_cpu != "s390x" && current_cpu != "s390" && -- current_cpu != "ppc64" && current_cpu != "ppc" && - current_cpu != "mips" && current_cpu != "mips64") - - # Allows the path to a custom target toolchain to be injected as a single diff --git a/fix-different-data-layouts.patch b/fix-different-data-layouts.patch index f2e5403..31e5254 100644 --- a/fix-different-data-layouts.patch +++ b/fix-different-data-layouts.patch @@ -24,10 +24,10 @@ inconsistency in data layouts when targeting this particular platform. The error reported by the linker is not technically an error, however, only a warning goosed up by a --fatal-warnings flag. -Index: chromium-143.0.7499.40/build/config/compiler/BUILD.gn +Index: chromium-144.0.7559.59/build/config/compiler/BUILD.gn =================================================================== ---- chromium-143.0.7499.40.orig/build/config/compiler/BUILD.gn -+++ chromium-143.0.7499.40/build/config/compiler/BUILD.gn +--- chromium-144.0.7559.59.orig/build/config/compiler/BUILD.gn ++++ chromium-144.0.7559.59/build/config/compiler/BUILD.gn @@ -470,7 +470,7 @@ config("compiler") { # Linker warnings. diff --git a/fix-page-allocator-overflow.patch b/fix-page-allocator-overflow.patch index dbfc560..0cda503 100644 --- a/fix-page-allocator-overflow.patch +++ b/fix-page-allocator-overflow.patch @@ -1,7 +1,7 @@ -Index: chromium-143.0.7499.40/base/allocator/dispatcher/tls.h +Index: chromium-144.0.7559.59/base/allocator/dispatcher/tls.h =================================================================== ---- chromium-143.0.7499.40.orig/base/allocator/dispatcher/tls.h -+++ chromium-143.0.7499.40/base/allocator/dispatcher/tls.h +--- chromium-144.0.7559.59.orig/base/allocator/dispatcher/tls.h ++++ chromium-144.0.7559.59/base/allocator/dispatcher/tls.h @@ -88,6 +88,8 @@ struct BASE_EXPORT MMapAllocator { constexpr static size_t AllocationChunkSize = 16384; #elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) @@ -11,10 +11,10 @@ Index: chromium-143.0.7499.40/base/allocator/dispatcher/tls.h #else constexpr static size_t AllocationChunkSize = 4096; #endif -Index: chromium-143.0.7499.40/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h +Index: chromium-144.0.7559.59/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h =================================================================== ---- chromium-143.0.7499.40.orig/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h -+++ chromium-143.0.7499.40/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h +--- chromium-144.0.7559.59.orig/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h ++++ chromium-144.0.7559.59/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h @@ -399,7 +399,7 @@ PA_ALWAYS_INLINE constexpr size_t MaxDir // TODO(casey.smalley@arm.com): under 64k pages we can end up in a situation // where a normal slot span will be large enough to contain multiple items, diff --git a/fix-partition-alloc-compile.patch b/fix-partition-alloc-compile.patch index 8721f1b..2fd5cfb 100644 --- a/fix-partition-alloc-compile.patch +++ b/fix-partition-alloc-compile.patch @@ -1,9 +1,9 @@ kIndex: chromium-114.0.5735.45/base/allocator/partition_allocator/partition_alloc.gni =================================================================== -Index: chromium-143.0.7499.40/base/allocator/partition_allocator/partition_alloc.gni +Index: chromium-144.0.7559.59/base/allocator/partition_allocator/partition_alloc.gni =================================================================== ---- chromium-143.0.7499.40.orig/base/allocator/partition_allocator/partition_alloc.gni -+++ chromium-143.0.7499.40/base/allocator/partition_allocator/partition_alloc.gni +--- chromium-144.0.7559.59.orig/base/allocator/partition_allocator/partition_alloc.gni ++++ chromium-144.0.7559.59/base/allocator/partition_allocator/partition_alloc.gni @@ -71,7 +71,7 @@ is_clang_or_gcc = is_clang || !is_win # Whether 64-bit pointers are used. # A static_assert in partition_alloc_config.h verifies that. diff --git a/fix-rust-linking.patch b/fix-rust-linking.patch index 28f2a1f..dca5333 100644 --- a/fix-rust-linking.patch +++ b/fix-rust-linking.patch @@ -1,8 +1,8 @@ -Index: chromium-143.0.7499.40/build/toolchain/gcc_toolchain.gni +Index: chromium-144.0.7559.59/build/toolchain/gcc_toolchain.gni =================================================================== ---- chromium-143.0.7499.40.orig/build/toolchain/gcc_toolchain.gni -+++ chromium-143.0.7499.40/build/toolchain/gcc_toolchain.gni -@@ -422,7 +422,13 @@ template("single_gcc_toolchain") { +--- chromium-144.0.7559.59.orig/build/toolchain/gcc_toolchain.gni ++++ chromium-144.0.7559.59/build/toolchain/gcc_toolchain.gni +@@ -415,7 +415,13 @@ template("single_gcc_toolchain") { # -soname flag is not available on aix ld soname_flag = "-Wl,-soname=\"$soname\"" } @@ -17,7 +17,7 @@ Index: chromium-143.0.7499.40/build/toolchain/gcc_toolchain.gni # Generate a map file to be used for binary size analysis. # Map file adds ~10% to the link time on a z620. -@@ -534,7 +540,13 @@ template("single_gcc_toolchain") { +@@ -527,7 +533,13 @@ template("single_gcc_toolchain") { whole_archive_flag = "-Wl,--whole-archive" no_whole_archive_flag = "-Wl,--no-whole-archive" } diff --git a/fix-rustc.patch b/fix-rustc.patch index 1655042..d5b7a2c 100644 --- a/fix-rustc.patch +++ b/fix-rustc.patch @@ -1,10 +1,10 @@ author: Andres Salomon description: allow ppc64le to build by using proper rustc target -Index: chromium-143.0.7499.40/build/config/rust.gni +Index: chromium-144.0.7559.59/build/config/rust.gni =================================================================== ---- chromium-143.0.7499.40.orig/build/config/rust.gni -+++ chromium-143.0.7499.40/build/config/rust.gni -@@ -176,6 +176,9 @@ rust_abi_target = "" +--- chromium-144.0.7559.59.orig/build/config/rust.gni ++++ chromium-144.0.7559.59/build/config/rust.gni +@@ -186,6 +186,9 @@ rust_abi_target = "" if (is_linux || is_chromeos) { if (current_cpu == "arm64") { rust_abi_target = "aarch64-unknown-linux-gnu" diff --git a/fix-study-crash.patch b/fix-study-crash.patch index 2d1058a..0a0dd1b 100644 --- a/fix-study-crash.patch +++ b/fix-study-crash.patch @@ -1,7 +1,7 @@ -Index: chromium-143.0.7499.40/components/variations/proto/study.proto +Index: chromium-144.0.7559.59/components/variations/proto/study.proto =================================================================== ---- chromium-143.0.7499.40.orig/components/variations/proto/study.proto -+++ chromium-143.0.7499.40/components/variations/proto/study.proto +--- chromium-144.0.7559.59.orig/components/variations/proto/study.proto ++++ chromium-144.0.7559.59/components/variations/proto/study.proto @@ -293,6 +293,9 @@ message Study { // A Mac-only value, indicating an x86-64 binary running on an arm64 host // via "Rosetta 2" binary translation. @@ -12,11 +12,11 @@ Index: chromium-143.0.7499.40/components/variations/proto/study.proto } // Enum to pass as optional bool. -Index: chromium-143.0.7499.40/components/variations/service/variations_field_trial_creator.cc +Index: chromium-144.0.7559.59/components/variations/service/variations_field_trial_creator.cc =================================================================== ---- chromium-143.0.7499.40.orig/components/variations/service/variations_field_trial_creator.cc -+++ chromium-143.0.7499.40/components/variations/service/variations_field_trial_creator.cc -@@ -105,6 +105,9 @@ Study::CpuArchitecture GetCurrentCpuArch +--- chromium-144.0.7559.59.orig/components/variations/service/variations_field_trial_creator.cc ++++ chromium-144.0.7559.59/components/variations/service/variations_field_trial_creator.cc +@@ -108,6 +108,9 @@ Study::CpuArchitecture GetCurrentCpuArch if (process_arch == "x86") { return Study::X86_32; } diff --git a/fix-unknown-warning-option-messages.diff b/fix-unknown-warning-option-messages.diff index 8c767e1..1555a08 100644 --- a/fix-unknown-warning-option-messages.diff +++ b/fix-unknown-warning-option-messages.diff @@ -1,8 +1,8 @@ -Index: chromium-143.0.7499.40/build/config/compiler/BUILD.gn +Index: chromium-144.0.7559.59/build/config/compiler/BUILD.gn =================================================================== ---- chromium-143.0.7499.40.orig/build/config/compiler/BUILD.gn -+++ chromium-143.0.7499.40/build/config/compiler/BUILD.gn -@@ -2134,7 +2134,9 @@ config("default_warnings") { +--- chromium-144.0.7559.59.orig/build/config/compiler/BUILD.gn ++++ chromium-144.0.7559.59/build/config/compiler/BUILD.gn +@@ -2129,7 +2129,9 @@ config("default_warnings") { # Don't warn about "maybe" uninitialized. Clang doesn't include this # in -Wall but gcc does, and it gives false positives. @@ -13,7 +13,7 @@ Index: chromium-143.0.7499.40/build/config/compiler/BUILD.gn cflags += [ "-Wno-deprecated-declarations" ] # -Wcomment gives too many false positives in the case a -@@ -2145,7 +2147,9 @@ config("default_warnings") { +@@ -2140,7 +2142,9 @@ config("default_warnings") { # -Wpacked-not-aligned complains all generated mojom-shared-internal.h # files. diff --git a/skia-vsx-instructions.patch b/skia-vsx-instructions.patch index b84166c..acffaa2 100644 --- a/skia-vsx-instructions.patch +++ b/skia-vsx-instructions.patch @@ -1,8 +1,8 @@ -Index: chromium-143.0.7499.40/third_party/skia/BUILD.gn +Index: chromium-144.0.7559.59/third_party/skia/BUILD.gn =================================================================== ---- chromium-143.0.7499.40.orig/third_party/skia/BUILD.gn -+++ chromium-143.0.7499.40/third_party/skia/BUILD.gn -@@ -192,6 +192,12 @@ opts("lasx") { +--- chromium-144.0.7559.59.orig/third_party/skia/BUILD.gn ++++ chromium-144.0.7559.59/third_party/skia/BUILD.gn +@@ -199,6 +199,12 @@ opts("lasx") { cflags = [ "-mlasx" ] } @@ -15,7 +15,7 @@ Index: chromium-143.0.7499.40/third_party/skia/BUILD.gn # Any feature of Skia that requires third-party code should be optional and use this template. template("optional") { if (invoker.enabled) { -@@ -1686,6 +1692,7 @@ skia_component("skia") { +@@ -1700,6 +1706,7 @@ skia_component("skia") { ":skx", ":typeface_fontations", ":vello", @@ -23,10 +23,10 @@ Index: chromium-143.0.7499.40/third_party/skia/BUILD.gn ":webp_decode", ":wuffs", ":xml", -Index: chromium-143.0.7499.40/third_party/skia/gn/skia/BUILD.gn +Index: chromium-144.0.7559.59/third_party/skia/gn/skia/BUILD.gn =================================================================== ---- chromium-143.0.7499.40.orig/third_party/skia/gn/skia/BUILD.gn -+++ chromium-143.0.7499.40/third_party/skia/gn/skia/BUILD.gn +--- chromium-144.0.7559.59.orig/third_party/skia/gn/skia/BUILD.gn ++++ chromium-144.0.7559.59/third_party/skia/gn/skia/BUILD.gn @@ -142,6 +142,8 @@ config("default") { "-mfpmath=sse", ] @@ -36,10 +36,10 @@ Index: chromium-143.0.7499.40/third_party/skia/gn/skia/BUILD.gn } else if (current_cpu == "loong64") { cflags += [ "-mlsx", -Index: chromium-143.0.7499.40/third_party/skia/include/core/SkTypes.h +Index: chromium-144.0.7559.59/third_party/skia/include/core/SkTypes.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/skia/include/core/SkTypes.h -+++ chromium-143.0.7499.40/third_party/skia/include/core/SkTypes.h +--- chromium-144.0.7559.59.orig/third_party/skia/include/core/SkTypes.h ++++ chromium-144.0.7559.59/third_party/skia/include/core/SkTypes.h @@ -198,4 +198,43 @@ static constexpr uint32_t SK_InvalidGenI */ static constexpr uint32_t SK_InvalidUniqueID = 0; @@ -84,10 +84,10 @@ Index: chromium-143.0.7499.40/third_party/skia/include/core/SkTypes.h +#endif + #endif -Index: chromium-143.0.7499.40/third_party/skia/src/base/SkSpinlock.cpp +Index: chromium-144.0.7559.59/third_party/skia/src/base/SkSpinlock.cpp =================================================================== ---- chromium-143.0.7499.40.orig/third_party/skia/src/base/SkSpinlock.cpp -+++ chromium-143.0.7499.40/third_party/skia/src/base/SkSpinlock.cpp +--- chromium-144.0.7559.59.orig/third_party/skia/src/base/SkSpinlock.cpp ++++ chromium-144.0.7559.59/third_party/skia/src/base/SkSpinlock.cpp @@ -33,7 +33,8 @@ #endif @@ -98,10 +98,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/base/SkSpinlock.cpp #include static void do_pause() { _mm_pause(); } #else -Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkBitmapProcState_opts.h +Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkBitmapProcState_opts.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/skia/src/opts/SkBitmapProcState_opts.h -+++ chromium-143.0.7499.40/third_party/skia/src/opts/SkBitmapProcState_opts.h +--- chromium-144.0.7559.59.orig/third_party/skia/src/opts/SkBitmapProcState_opts.h ++++ chromium-144.0.7559.59/third_party/skia/src/opts/SkBitmapProcState_opts.h @@ -21,7 +21,13 @@ // The rest are scattershot at the moment but I want to get them // all migrated to be normal code inside SkBitmapProcState.cpp. @@ -117,10 +117,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkBitmapProcState_opts.h #include #elif defined(SK_ARM_HAS_NEON) #include -Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkBlitRow_opts.h +Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkBlitRow_opts.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/skia/src/opts/SkBlitRow_opts.h -+++ chromium-143.0.7499.40/third_party/skia/src/opts/SkBlitRow_opts.h +--- chromium-144.0.7559.59.orig/third_party/skia/src/opts/SkBlitRow_opts.h ++++ chromium-144.0.7559.59/third_party/skia/src/opts/SkBlitRow_opts.h @@ -69,7 +69,7 @@ #endif @@ -130,10 +130,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkBlitRow_opts.h static inline __m128i SkPMSrcOver_SSE2(const __m128i& src, const __m128i& dst) { __m128i scale = _mm_sub_epi32(_mm_set1_epi32(256), -Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h +Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkRasterPipeline_opts.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/skia/src/opts/SkRasterPipeline_opts.h -+++ chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h +--- chromium-144.0.7559.59.orig/third_party/skia/src/opts/SkRasterPipeline_opts.h ++++ chromium-144.0.7559.59/third_party/skia/src/opts/SkRasterPipeline_opts.h @@ -1,5 +1,6 @@ /* * Copyright 2018 Google Inc. @@ -394,7 +394,7 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h // These platforms are ideal for wider stages, and their default ABI is ideal. #define ABI #define SKRP_NARROW_STAGES 0 -@@ -5574,6 +5784,10 @@ SI F sqrt_(F x) { +@@ -5600,6 +5810,10 @@ SI F sqrt_(F x) { float32x4_t lo,hi; split(x, &lo,&hi); return join(sqrt(lo), sqrt(hi)); @@ -405,7 +405,7 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h #elif defined(SKRP_CPU_LASX) __m256 lo,hi; split(x, &lo,&hi); -@@ -5605,6 +5819,10 @@ SI F floor_(F x) { +@@ -5631,6 +5845,10 @@ SI F floor_(F x) { __m128 lo,hi; split(x, &lo,&hi); return join(_mm_floor_ps(lo), _mm_floor_ps(hi)); @@ -416,7 +416,7 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h #elif defined(SKRP_CPU_LASX) __m256 lo,hi; split(x, &lo,&hi); -@@ -5624,6 +5842,7 @@ SI F floor_(F x) { +@@ -5650,6 +5868,7 @@ SI F floor_(F x) { // (2 * a * b + (1 << 15)) >> 16 // The result is a number on [-1, 1). // Note: on neon this is a saturating multiply while the others are not. @@ -424,7 +424,7 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h SI I16 scaled_mult(I16 a, I16 b) { #if defined(SKRP_CPU_SKX) return (I16)_mm256_mulhrs_epi16((__m256i)a, (__m256i)b); -@@ -5635,6 +5854,22 @@ SI I16 scaled_mult(I16 a, I16 b) { +@@ -5661,6 +5880,22 @@ SI I16 scaled_mult(I16 a, I16 b) { return vqrdmulhq_s16(a, b); #elif defined(SKRP_CPU_NEON) return vqrdmulhq_s16(a, b); @@ -447,7 +447,7 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h #elif defined(SKRP_CPU_LASX) I16 res = __lasx_xvmuh_h(a, b); return __lasx_xvslli_h(res, 1); -@@ -5662,7 +5897,26 @@ SI U16 constrained_add(I16 a, U16 b) { +@@ -5688,7 +5923,26 @@ SI U16 constrained_add(I16 a, U16 b) { SkASSERT(-ib <= ia && ia <= 65535 - ib); } #endif @@ -474,7 +474,7 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h } SI F fract(F x) { return x - floor_(x); } -@@ -6718,8 +6972,14 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S +@@ -6744,8 +6998,14 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S // 2^-8 * v = 2^-9 * (tx*(R - L) + (R + L)) // v = 1/2 * (tx*(R - L) + (R + L)) auto lerpX = [&](U16 left, U16 right) -> U16 { @@ -489,7 +489,7 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h // The constrained_add is the most subtle part of lerp. The first term is on the interval // [-1, 1), and the second term is on the interval is on the interval [0, 1) because // both terms are too high by a factor of 2 which will be handled below. (Both R and L are -@@ -6731,7 +6991,12 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S +@@ -6757,7 +7017,12 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S U16 v2 = constrained_add(scaled_mult(tx, width), middle) + 1; // Divide by 2 to calculate v and at the same time bring the intermediate value onto the // interval [0, 1/2] to set up for the lerpY. @@ -502,7 +502,7 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h }; const uint32_t* ptr; -@@ -6765,9 +7030,15 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S +@@ -6791,9 +7056,15 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S I16 width = (I16)bottom - (I16)top; U16 middle = bottom + top; // Add + 0x80 for rounding. @@ -519,10 +519,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkRasterPipeline_opts.h }; r = lerpY(topR, bottomR); -Index: chromium-143.0.7499.40/third_party/skia/src/base/SkVx.h +Index: chromium-144.0.7559.59/third_party/skia/src/base/SkVx.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/skia/src/base/SkVx.h -+++ chromium-143.0.7499.40/third_party/skia/src/base/SkVx.h +--- chromium-144.0.7559.59.orig/third_party/skia/src/base/SkVx.h ++++ chromium-144.0.7559.59/third_party/skia/src/base/SkVx.h @@ -41,7 +41,12 @@ #endif @@ -537,10 +537,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/base/SkVx.h #include #elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41 #include -Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp +Index: chromium-144.0.7559.59/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp =================================================================== ---- chromium-143.0.7499.40.orig/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp -+++ chromium-143.0.7499.40/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp +--- chromium-144.0.7559.59.orig/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp ++++ chromium-144.0.7559.59/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp @@ -9,7 +9,7 @@ #include "src/core/SkBlitMask.h" #include "src/core/SkOptsTargets.h" @@ -550,10 +550,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBlitMask_opts_ssse3.cp // The order of these includes is important: // 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget -Index: chromium-143.0.7499.40/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp +Index: chromium-144.0.7559.59/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp =================================================================== ---- chromium-143.0.7499.40.orig/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp -+++ chromium-143.0.7499.40/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp +--- chromium-144.0.7559.59.orig/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp ++++ chromium-144.0.7559.59/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp @@ -10,7 +10,7 @@ #include "src/core/SkOptsTargets.h" #include "src/core/SkSwizzlePriv.h" @@ -563,10 +563,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/core/SkSwizzler_opts_ssse3.cp !defined(SK_ENABLE_OPTIMIZE_SIZE) && \ SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3 -Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBlitMask_opts.cpp +Index: chromium-144.0.7559.59/third_party/skia/src/core/SkBlitMask_opts.cpp =================================================================== ---- chromium-143.0.7499.40.orig/third_party/skia/src/core/SkBlitMask_opts.cpp -+++ chromium-143.0.7499.40/third_party/skia/src/core/SkBlitMask_opts.cpp +--- chromium-144.0.7559.59.orig/third_party/skia/src/core/SkBlitMask_opts.cpp ++++ chromium-144.0.7559.59/third_party/skia/src/core/SkBlitMask_opts.cpp @@ -25,7 +25,7 @@ namespace SkOpts { static bool init() { #if defined(SK_ENABLE_OPTIMIZE_SIZE) @@ -576,10 +576,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBlitMask_opts.cpp #if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3 if (SkCpu::Supports(SkCpu::SSSE3)) { Init_BlitMask_ssse3(); } #endif -Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBitmapProcState_opts.cpp +Index: chromium-144.0.7559.59/third_party/skia/src/core/SkBitmapProcState_opts.cpp =================================================================== ---- chromium-143.0.7499.40.orig/third_party/skia/src/core/SkBitmapProcState_opts.cpp -+++ chromium-143.0.7499.40/third_party/skia/src/core/SkBitmapProcState_opts.cpp +--- chromium-144.0.7559.59.orig/third_party/skia/src/core/SkBitmapProcState_opts.cpp ++++ chromium-144.0.7559.59/third_party/skia/src/core/SkBitmapProcState_opts.cpp @@ -27,7 +27,7 @@ namespace SkOpts { static bool init() { #if defined(SK_ENABLE_OPTIMIZE_SIZE) @@ -589,10 +589,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBitmapProcState_opts.c #if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3 if (SkCpu::Supports(SkCpu::SSSE3)) { Init_BitmapProcState_ssse3(); } #endif -Index: chromium-143.0.7499.40/third_party/skia/src/core/SkCpu.h +Index: chromium-144.0.7559.59/third_party/skia/src/core/SkCpu.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/skia/src/core/SkCpu.h -+++ chromium-143.0.7499.40/third_party/skia/src/core/SkCpu.h +--- chromium-144.0.7559.59.orig/third_party/skia/src/core/SkCpu.h ++++ chromium-144.0.7559.59/third_party/skia/src/core/SkCpu.h @@ -60,7 +60,7 @@ inline bool SkCpu::Supports(uint32_t mas // If we mask in compile-time known lower limits, the compiler can @@ -602,10 +602,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/core/SkCpu.h #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1 features |= SSE1; #endif -Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp +Index: chromium-144.0.7559.59/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp =================================================================== ---- chromium-143.0.7499.40.orig/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp -+++ chromium-143.0.7499.40/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp +--- chromium-144.0.7559.59.orig/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp ++++ chromium-144.0.7559.59/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp @@ -8,7 +8,7 @@ #include "include/private/base/SkFeatures.h" #include "src/core/SkOptsTargets.h" @@ -615,10 +615,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBitmapProcState_opts_s // The order of these includes is important: // 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget -Index: chromium-143.0.7499.40/third_party/skia/include/private/base/SkFeatures.h +Index: chromium-144.0.7559.59/third_party/skia/include/private/base/SkFeatures.h =================================================================== ---- chromium-143.0.7499.40.orig/third_party/skia/include/private/base/SkFeatures.h -+++ chromium-143.0.7499.40/third_party/skia/include/private/base/SkFeatures.h +--- chromium-144.0.7559.59.orig/third_party/skia/include/private/base/SkFeatures.h ++++ chromium-144.0.7559.59/third_party/skia/include/private/base/SkFeatures.h @@ -63,6 +63,8 @@ #if defined(__i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64) @@ -628,10 +628,10 @@ Index: chromium-143.0.7499.40/third_party/skia/include/private/base/SkFeatures.h #endif #if defined(__loongarch__) || defined (__loongarch64) -Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkSwizzler_opts.inc +Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkSwizzler_opts.inc =================================================================== ---- chromium-143.0.7499.40.orig/third_party/skia/src/opts/SkSwizzler_opts.inc -+++ chromium-143.0.7499.40/third_party/skia/src/opts/SkSwizzler_opts.inc +--- chromium-144.0.7559.59.orig/third_party/skia/src/opts/SkSwizzler_opts.inc ++++ chromium-144.0.7559.59/third_party/skia/src/opts/SkSwizzler_opts.inc @@ -14,7 +14,10 @@ #include #include @@ -678,10 +678,10 @@ Index: chromium-143.0.7499.40/third_party/skia/src/opts/SkSwizzler_opts.inc #elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1 && (defined(__clang__) || !defined(_MSC_VER)) // -- SSE -- Harden against timing attacks -- MSVC is not supported. using F4 = __m128; -Index: chromium-143.0.7499.40/third_party/skia/src/core/SkBlitter_ARGB32.cpp +Index: chromium-144.0.7559.59/third_party/skia/src/core/SkBlitter_ARGB32.cpp =================================================================== ---- chromium-143.0.7499.40.orig/third_party/skia/src/core/SkBlitter_ARGB32.cpp -+++ chromium-143.0.7499.40/third_party/skia/src/core/SkBlitter_ARGB32.cpp +--- chromium-144.0.7559.59.orig/third_party/skia/src/core/SkBlitter_ARGB32.cpp ++++ chromium-144.0.7559.59/third_party/skia/src/core/SkBlitter_ARGB32.cpp @@ -129,6 +129,16 @@ static inline SkPMColor blend_lcd16_opaq #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2 #include diff --git a/sources b/sources index fb67321..c0bc4dc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (node-v22.14.0-stripped.tar.gz) = affddb541009c6d378049c2d7845b981335d9e7aa387efcc472e5efb621c345cd58ca69778a394f7e4ebbb5e4b1a115a389838ef1b6458ef5e98f2071b166e15 -SHA512 (chromium-143.0.7499.192-clean.tar.xz) = 252f3feb974a9618f649c3ba6b848f87b747bee173d86c956a3c822305343574cfd369414c94c8e648c3d65d4f4e54c171d364989c0fb937240ed16abe6dda9a +SHA512 (chromium-144.0.7559.59-clean.tar.xz) = 15c866cb35455daac4cbec3dc600966c13f4dff2a1665395fe1f6cc769f614c08cd5ff7819ff0838dcf1201ffc4a04f03ae0c32beed8e44eb8dca24c2fd7e042