From patchwork Fri Sep 29 17:16:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 44032 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:394d:b0:15d:8365:d4b8 with SMTP id r13csp701213pzg; Fri, 29 Sep 2023 10:17:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEYoYoei/QOD8LwiV1LrHKKZBlg9TBfTDNyuXDrCbiUV7xOva8U5dtifMQduppjZmSrRRhw X-Received: by 2002:aa7:c1d4:0:b0:532:c72e:26fb with SMTP id d20-20020aa7c1d4000000b00532c72e26fbmr4047154edp.6.1696007821279; Fri, 29 Sep 2023 10:17:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696007821; cv=none; d=google.com; s=arc-20160816; b=VKQMp5l0YPTNarxWUHsW8QUihfHu4ohz7qLYstYre8sg+XwTFBTMI6FxzwUaJPbMYG 2OHf4CphFdnSf39w/EGVDeWpiqekoDeQKcs/DfNC2aDb+bdmavmkCzGXm1o77PY0Nthy 7basfJp/a+x33z1wktO79YL+ZAMUYYmuZh39r/IDQyz1F3AAAEeToDoyvSVdfNT5eXzW 7EXzukkJHO21YX3NAF82yRywycIvL3+XZg7jEulRMNV/Ba/R8PBQDEE798zlhZXWhIn3 vtMZaYZpq2PXUpftQM365Si0LGZob0KMN7R5dkyt6dRMJlGh34PXDHfbPDxPIDoqOiRt uOYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=i2HBmT6q1MPNXR/zqhn4ITDVlkip1Bc46FCuRoyoBTI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=OBWj0gy0lATvQxfSa8R/A5xz6WoTZN4IezZRyhO1/CLEYiUskY0oSPcBONsScf8QHP jAGk7SK1Qv4+oplJdFAjgRO/zpP+3JMuGFpsBDi65UweJhWDATQNF9NOW+jrAuBvHxzE FlJe+wPMWzH6+UKjjHgG60G2o+uckuUpjg4J7SaIqGWGtw8alY4AKSg7Au1yfNIh/ncs tF82VkFkpiijw9XZN3IBbos4YACFcijpDDstRi9nuCIcOEsiHqW9miahkdPacgJtVgJg onpCHvML6u2fKLXeR8u1lH8H+MWnMQAsrpg5f86HUhk5ojKRdbY6DHXTaygRkFFCb9ia 2UlQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c6-20020aa7df06000000b005340f3e0163si9707131edy.544.2023.09.29.10.17.00; Fri, 29 Sep 2023 10:17:01 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 958B868CC93; Fri, 29 Sep 2023 20:16:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ursule.remlab.net (vps-a2bccee9.vps.ovh.net [51.75.19.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0F1E968CC83 for ; Fri, 29 Sep 2023 20:16:42 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 997C5C00A2 for ; Fri, 29 Sep 2023 20:16:41 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Sep 2023 20:16:40 +0300 Message-Id: <20230929171641.85165-2-remi@remlab.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230929171641.85165-1-remi@remlab.net> References: <20230929171641.85165-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] swscale/rgb2rgb: add R-V Zbb shuffle_bytes_3210 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 6cfNApJx37RD --- libswscale/riscv/Makefile | 1 + libswscale/riscv/rgb2rgb.c | 7 ++++++- libswscale/riscv/rgb2rgb_rvb.S | 30 ++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 libswscale/riscv/rgb2rgb_rvb.S diff --git a/libswscale/riscv/Makefile b/libswscale/riscv/Makefile index 214d877b62..7b371d5a86 100644 --- a/libswscale/riscv/Makefile +++ b/libswscale/riscv/Makefile @@ -1,2 +1,3 @@ OBJS += riscv/rgb2rgb.o +OBJS += riscv/rgb2rgb_rvb.o RVV-OBJS += riscv/rgb2rgb_rvv.o diff --git a/libswscale/riscv/rgb2rgb.c b/libswscale/riscv/rgb2rgb.c index 4c2d0f07d2..21baaa21c5 100644 --- a/libswscale/riscv/rgb2rgb.c +++ b/libswscale/riscv/rgb2rgb.c @@ -29,6 +29,7 @@ void ff_shuffle_bytes_0321_rvv(const uint8_t *src, uint8_t *dst, int src_len); void ff_shuffle_bytes_2103_rvv(const uint8_t *src, uint8_t *dst, int src_len); void ff_shuffle_bytes_1230_rvv(const uint8_t *src, uint8_t *dst, int src_len); void ff_shuffle_bytes_3012_rvv(const uint8_t *src, uint8_t *dst, int src_len); +void ff_shuffle_bytes_3210_rvb(const uint8_t *src, uint8_t *dst, int src_len); void ff_shuffle_bytes_3210_rvv(const uint8_t *src, uint8_t *dst, int src_len); void ff_interleave_bytes_rvv(const uint8_t *src1, const uint8_t *src2, uint8_t *dst, int width, int height, int s1stride, @@ -42,9 +43,13 @@ void ff_yuyvtoyuv422_rvv(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, av_cold void rgb2rgb_init_riscv(void) { -#if HAVE_RVV int flags = av_get_cpu_flags(); +#if (__riscv_xlen == 64) + if ((flags & AV_CPU_FLAG_RVB_BASIC) && (flags & AV_CPU_FLAG_RVB_ADDR)) + shuffle_bytes_3210 = ff_shuffle_bytes_3210_rvb; +#endif +#if HAVE_RVV if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR)) { shuffle_bytes_0321 = ff_shuffle_bytes_0321_rvv; shuffle_bytes_2103 = ff_shuffle_bytes_2103_rvv; diff --git a/libswscale/riscv/rgb2rgb_rvb.S b/libswscale/riscv/rgb2rgb_rvb.S new file mode 100644 index 0000000000..af127b32ed --- /dev/null +++ b/libswscale/riscv/rgb2rgb_rvb.S @@ -0,0 +1,30 @@ +/* + * Copyright © 2022 Rémi Denis-Courmont. + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" +#include "libavutil/riscv/asm.S" +#include "libavutil/riscv/bswap_rvb.S" + +#if (__riscv_xlen >= 64) +func ff_shuffle_bytes_3210_rvb, zbb + srli a2, a2, 2 + bswap32_rvb a1, a0, a2 +endfunc +#endif