From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E0CD8158087 for ; Sat, 15 Jan 2022 08:48:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2FFBC2BC008; Sat, 15 Jan 2022 08:48:49 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4B3222BC008 for ; Sat, 15 Jan 2022 08:48:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 647C7343528 for ; Sat, 15 Jan 2022 08:48:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B5C231BD for ; Sat, 15 Jan 2022 08:48:45 +0000 (UTC) From: "Stephan Hartmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Stephan Hartmann" Message-ID: <1642236507.7a60cec57a2fe78292758c678697d0f16819ad90.sultan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/, www-client/chromium/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/chromium/chromium-97.0.4692.71-r1.ebuild www-client/chromium/chromium-98.0.4758.54.ebuild www-client/chromium/chromium-99.0.4818.0.ebuild www-client/chromium/files/chromium-97-arm-tflite-cast.patch X-VCS-Directories: www-client/chromium/files/ www-client/chromium/ X-VCS-Committer: sultan X-VCS-Committer-Name: Stephan Hartmann X-VCS-Revision: 7a60cec57a2fe78292758c678697d0f16819ad90 X-VCS-Branch: master Date: Sat, 15 Jan 2022 08:48:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8acedb95-cc89-4faa-93e3-b757f5d71583 X-Archives-Hash: 2c67022ad5e93c1030535fd007251c38 commit: 7a60cec57a2fe78292758c678697d0f16819ad90 Author: Stephan Hartmann gentoo org> AuthorDate: Sat Jan 15 08:47:52 2022 +0000 Commit: Stephan Hartmann gentoo org> CommitDate: Sat Jan 15 08:48:27 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a60cec5 www-client/chromium: fix building with dotprod extension on arm64 Closes: https://bugs.gentoo.org/831203 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Stephan Hartmann gentoo.org> .../chromium/chromium-97.0.4692.71-r1.ebuild | 1 + www-client/chromium/chromium-98.0.4758.54.ebuild | 1 + www-client/chromium/chromium-99.0.4818.0.ebuild | 1 + .../files/chromium-97-arm-tflite-cast.patch | 26 ++++++++++++++++++++++ 4 files changed, 29 insertions(+) diff --git a/www-client/chromium/chromium-97.0.4692.71-r1.ebuild b/www-client/chromium/chromium-97.0.4692.71-r1.ebuild index 18c2360c6a75..1534ae2ed09e 100644 --- a/www-client/chromium/chromium-97.0.4692.71-r1.ebuild +++ b/www-client/chromium/chromium-97.0.4692.71-r1.ebuild @@ -234,6 +234,7 @@ src_prepare() { "${FILESDIR}/chromium-97-arm64-mte-clang.patch" "${FILESDIR}/chromium-97-fix-tag-dragging.patch" "${FILESDIR}/chromium-97-fix-tag-dragging-i3.patch" + "${FILESDIR}/chromium-97-arm-tflite-cast.patch" "${FILESDIR}/chromium-glibc-2.34.patch" "${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch" "${FILESDIR}/chromium-shim_headers.patch" diff --git a/www-client/chromium/chromium-98.0.4758.54.ebuild b/www-client/chromium/chromium-98.0.4758.54.ebuild index af028da209f3..434c6e1fdf92 100644 --- a/www-client/chromium/chromium-98.0.4758.54.ebuild +++ b/www-client/chromium/chromium-98.0.4758.54.ebuild @@ -231,6 +231,7 @@ src_prepare() { "${WORKDIR}/patches" "${FILESDIR}/chromium-93-InkDropHost-crash.patch" "${FILESDIR}/chromium-97-fix-tag-dragging-i3.patch" + "${FILESDIR}/chromium-97-arm-tflite-cast.patch" "${FILESDIR}/chromium-98-EnumTable-crash.patch" "${FILESDIR}/chromium-98-system-libdrm.patch" "${FILESDIR}/chromium-glibc-2.34.patch" diff --git a/www-client/chromium/chromium-99.0.4818.0.ebuild b/www-client/chromium/chromium-99.0.4818.0.ebuild index 709268237eb6..b2d9fb16d746 100644 --- a/www-client/chromium/chromium-99.0.4818.0.ebuild +++ b/www-client/chromium/chromium-99.0.4818.0.ebuild @@ -231,6 +231,7 @@ src_prepare() { "${WORKDIR}/patches" "${FILESDIR}/chromium-93-InkDropHost-crash.patch" "${FILESDIR}/chromium-97-fix-tag-dragging-i3.patch" + "${FILESDIR}/chromium-97-arm-tflite-cast.patch" "${FILESDIR}/chromium-98-EnumTable-crash.patch" "${FILESDIR}/chromium-98-system-libdrm.patch" "${FILESDIR}/chromium-glibc-2.34-r1.patch" diff --git a/www-client/chromium/files/chromium-97-arm-tflite-cast.patch b/www-client/chromium/files/chromium-97-arm-tflite-cast.patch new file mode 100644 index 000000000000..843a384c76d3 --- /dev/null +++ b/www-client/chromium/files/chromium-97-arm-tflite-cast.patch @@ -0,0 +1,26 @@ +vreinterpret_s32_s8() casts int8x8_t to int32x2_t. However, third argument +of vdotq_lane_s32() is of type int8x8_t. + +--- a/third_party/tflite/src/tensorflow/lite/kernels/internal/optimized/depthwiseconv_3x3_filter_common.h ++++ b/third_party/tflite/src/tensorflow/lite/kernels/internal/optimized/depthwiseconv_3x3_filter_common.h +@@ -129,16 +129,14 @@ inline int32x4_t vdotq_four_lane_s32(int32x4_t acc, int8x16_t lhs, + int8x16_t rhs, const int lane) { + switch (lane) { + case 0: +- return vdotq_lane_s32(acc, lhs, vreinterpret_s32_s8(vget_low_s8(rhs)), 0); ++ return vdotq_lane_s32(acc, lhs, vget_low_s8(rhs), 0); + case 1: +- return vdotq_lane_s32(acc, lhs, vreinterpret_s32_s8(vget_low_s8(rhs)), 1); ++ return vdotq_lane_s32(acc, lhs, vget_low_s8(rhs), 1); + case 2: +- return vdotq_lane_s32(acc, lhs, vreinterpret_s32_s8(vget_high_s8(rhs)), +- 0); ++ return vdotq_lane_s32(acc, lhs, vget_high_s8(rhs), 0); + case 3: + default: +- return vdotq_lane_s32(acc, lhs, vreinterpret_s32_s8(vget_high_s8(rhs)), +- 1); ++ return vdotq_lane_s32(acc, lhs, vget_high_s8(rhs), 1); + } + } +