From patchwork Fri Sep 29 17:16:39 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: 44031 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:394d:b0:15d:8365:d4b8 with SMTP id r13csp701146pzg; Fri, 29 Sep 2023 10:16:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHgmOdFuu4F2vucUulXltlxgYkzGIUcxY/g271TgLGVYgfaBDrmL7Ik7fjk95DpjDdXUmHZ X-Received: by 2002:a17:906:3ca1:b0:9a5:cf6f:3efc with SMTP id b1-20020a1709063ca100b009a5cf6f3efcmr4054940ejh.77.1696007813051; Fri, 29 Sep 2023 10:16:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696007813; cv=none; d=google.com; s=arc-20160816; b=l1TTmgFC7336l4WaREsG+5uhusYaWwCuMihZl5CCdivkT+eqhR8AXK9kamhH2TdD1b f28csC3Tpyb2qMxDJ6gSFfkDBpCKs3YhUFT+qjGMRJzPvh/cw4zAWdJ8auDNMowgsZzV iCzfTbYQ/bvkUprOaePSQzr5ygt/40td+K9/ModSZnH9XwOgMaGDEVuc5qQYXMMzDRVU JHojRHWU39VabYW8RRkfoWb/3h1erRdbxp7cLlGg0nlwbYddLZUs0KOptTunEmteH3eH 2yusmVcDF9d9l1YXZvvHtsAC7ea7tBRSAIVESIrKBKE6YIlUBnno5vxtIKwkKKtLu38L ND9Q== 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:message-id:date:to:from :delivered-to; bh=7iTxrGrQIRPp1aqup4YB6Jr+uQBvI2+V19sxp2vF/T4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Y2KjKjA8M1mFwcpF8WPukTofnHbvqP8knbGFWZCVNUDEwLf56jN6HRS307Zh+QlTtV rtLp9ZBOPLfBfSFJT18dQcvlRivwuQfdH5KhXupaXeB7e5sUn8Oo6hc3GAYH/5x3NUTd EMN5H7mJWoonKMgCWtoT7ZPkcXWZmwwmOtewTNR2piVczT6PrTww9bZewAGs+SDww1HF WsgVZI25AfkeVKprhgDwIg/mGgFsdjGXirMvRG69isOjXjKLxECoUc85LDrDXPweQ74c ranu0kaAdHQ6b4p13qFXWm4Bt5adyzYcxrgow07fLW97PZ8RGtAjj3GJDcTHFdlw5vmZ 3dWQ== 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 tl4-20020a170907c30400b009b291699dcbsi9421493ejc.237.2023.09.29.10.16.51; Fri, 29 Sep 2023 10:16:53 -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 A73C468CC96; Fri, 29 Sep 2023 20:16:48 +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 C95BF68CC83 for ; Fri, 29 Sep 2023 20:16:41 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 5E533C009A 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:39 +0300 Message-Id: <20230929171641.85165-1-remi@remlab.net> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] riscv: factor out the bswap32 assembler 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: vRFQ2qYNV3Jh --- libavcodec/riscv/bswapdsp_rvb.S | 43 +--------------------- libavutil/riscv/bswap_rvb.S | 65 +++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 41 deletions(-) create mode 100644 libavutil/riscv/bswap_rvb.S diff --git a/libavcodec/riscv/bswapdsp_rvb.S b/libavcodec/riscv/bswapdsp_rvb.S index 91b47bf82d..0786bd3f36 100644 --- a/libavcodec/riscv/bswapdsp_rvb.S +++ b/libavcodec/riscv/bswapdsp_rvb.S @@ -20,49 +20,10 @@ #include "config.h" #include "libavutil/riscv/asm.S" +#include "libavutil/riscv/bswap_rvb.S" #if (__riscv_xlen >= 64) func ff_bswap32_buf_rvb, zbb - andi t0, a1, 4 - beqz t0, 1f - /* Align a1 (input) to 64-bit */ - lwu t0, (a1) - addi a0, a0, 4 - rev8 t0, t0 - addi a2, a2, -1 - srli t0, t0, __riscv_xlen - 32 - addi a1, a1, 4 - sw t0, -4(a0) -1: - andi a3, a2, -2 - sh2add a2, a2, a0 - beqz a3, 3f - sh2add a3, a3, a0 -2: /* 2 elements (64 bits) at a time on a 64-bit boundary */ - ld t0, (a1) - addi a0, a0, 8 - rev8 t0, t0 -#if (__riscv_xlen == 64) - srli t2, t0, 32 - sw t0, -4(a0) -#else - srli t1, t0, __riscv_xlen - 64 - srli t2, t0, __riscv_xlen - 32 - sw t1, -4(a0) -#endif - addi a1, a1, 8 - sw t2, -8(a0) - bne a0, a3, 2b -3: - beq a0, a2, 5f -4: /* Process last element */ - lwu t0, (a1) - addi a0, a0, 4 - rev8 t0, t0 - addi a1, a1, 4 - srli t0, t0, __riscv_xlen - 32 - sw t0, -4(a0) -5: - ret + bswap32_rvb a0, a1, a2 endfunc #endif diff --git a/libavutil/riscv/bswap_rvb.S b/libavutil/riscv/bswap_rvb.S new file mode 100644 index 0000000000..b391e2f9f1 --- /dev/null +++ b/libavutil/riscv/bswap_rvb.S @@ -0,0 +1,65 @@ +/* + * 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 + */ + +#if (__riscv_xlen >= 64) + .macro bswap32_rvb out, in, count + andi t0, \count, 4 + beqz t0, 1f + /* Align input to 64-bit */ + lwu t0, (\in) + addi \out, \out, 4 + rev8 t0, t0 + addi \count, \count, -1 + srli t0, t0, __riscv_xlen - 32 + addi \in, \in, 4 + sw t0, -4(\out) +1: + andi t3, \count, -2 + sh2add \count, \count, \out + beqz t3, 3f + sh2add t3, t3, \out +2: /* 2 elements (64 bits) at a time on a 64-bit boundary */ + ld t0, (\in) + addi \out, \out, 8 + rev8 t0, t0 +#if (__riscv_xlen == 64) + srli t2, t0, 32 + sw t0, -4(\out) +#else + srli t1, t0, __riscv_xlen - 64 + srli t2, t0, __riscv_xlen - 32 + sw t1, -4(\out) +#endif + addi \in, \in, 8 + sw t2, -8(\out) + bne \out, t3, 2b +3: + beq \out, \count, 5f +4: /* Process last element */ + lwu t0, (\in) + addi \out, \out, 4 + rev8 t0, t0 + addi \in, \in, 4 + srli t0, t0, __riscv_xlen - 32 + sw t0, -4(\out) +5: + ret + .endm +#endif 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 From patchwork Fri Sep 29 17:16:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 44033 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:394d:b0:15d:8365:d4b8 with SMTP id r13csp701311pzg; Fri, 29 Sep 2023 10:17:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEYc+hyqOQlasw3nFCqAQ8+VUs6n0OUy0jU3I+PEfXkRuFGymbPH7JyDhBI5nqjEhLSAd9j X-Received: by 2002:a17:906:5198:b0:9ae:6ffd:be12 with SMTP id y24-20020a170906519800b009ae6ffdbe12mr3949363ejk.76.1696007829175; Fri, 29 Sep 2023 10:17:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696007829; cv=none; d=google.com; s=arc-20160816; b=DGaJIC/MpqBR6x9+JwzzyooAvglv9pI9iwi9qnKK49dvIz7Q2IAff8oXac4IwXjhiS 1eaMM1UdQv8Fnf1ddwfr1ij7+N/6M9AMqMXJcz/VpGlMav8PB3B7an/3V2QMmGQas0yG BH6JfmdCDUerjJTrgkpPDQma0AvuHHi50Qy2p3DXgpX6Cbiu7K8TP5zh5lcJwrlFHo8B 9NwoAQ898NM9yl8jE8VPPJAno4DKtANiRpTY2AiMZLtIEA3ls2VvH/iPcaBqpWxCeqAa OS9qgyeUrTI+Pm06ylXjXAXvK3NVT2UCKCGxnGeEOuV06g37S3ZgSMqUW+la7jUhvvad 0y8w== 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=LF6+hsg/tD8HYhwbVQbo4RQJ5zSqXI/YUbJXD2mrK/4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=vzpswaoBj+5Rhdqydmlf8pOruewIMtQpg5G0YUt14NxxYj06OheSmsOAEnlFhO/mrR ntz2tZIrhXilYlGOGHV3LF8QIXJdo55du2vyHloyfIOUTEzHRaNsyukm0o8rvb3gPYiw mQvt9aDCciBCGPIslMKtXakCBInBmJ/r/Y29uYF4Lffl3zMH0DIVP9ALXu6ZUm1Sz+J1 TGhlZ8V/RZUSsB8DuyMgm77EEl2vckj1wMAtB1RuxXcEvfRvo18hmrnHCf71ONGxPJKa 85+9LBpN9UvdvpH0xeOI+spr7sddhzkxuGUW7iJz4+PxUA3JsLKW7sRPFg69L5Ci7p// AY3A== 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 s26-20020a170906c31a00b00991f598188csi15381226ejz.214.2023.09.29.10.17.08; Fri, 29 Sep 2023 10:17:09 -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 89BA268CCA0; Fri, 29 Sep 2023 20:16:50 +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 430E168CC83 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 D3D10C018F 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:41 +0300 Message-Id: <20230929171641.85165-3-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 3/3] swscale/rgb2rgb: remove R-V V shuffle_bytes_3012 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: J3E8q96iD2HC This is slower than the Zbb version on real hardware due to register strides. Proper support for vector byte-swap requires the Zvbb extension, but it's much too early for me to worry about it. --- libswscale/riscv/rgb2rgb.c | 2 -- libswscale/riscv/rgb2rgb_rvv.S | 25 ------------------------- 2 files changed, 27 deletions(-) diff --git a/libswscale/riscv/rgb2rgb.c b/libswscale/riscv/rgb2rgb.c index 21baaa21c5..162a4082b0 100644 --- a/libswscale/riscv/rgb2rgb.c +++ b/libswscale/riscv/rgb2rgb.c @@ -30,7 +30,6 @@ 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, int s2stride, int dstride); @@ -55,7 +54,6 @@ av_cold void rgb2rgb_init_riscv(void) shuffle_bytes_2103 = ff_shuffle_bytes_2103_rvv; shuffle_bytes_1230 = ff_shuffle_bytes_1230_rvv; shuffle_bytes_3012 = ff_shuffle_bytes_3012_rvv; - shuffle_bytes_3210 = ff_shuffle_bytes_3210_rvv; interleaveBytes = ff_interleave_bytes_rvv; #if (__riscv_xlen == 64) uyvytoyuv422 = ff_uyvytoyuv422_rvv; diff --git a/libswscale/riscv/rgb2rgb_rvv.S b/libswscale/riscv/rgb2rgb_rvv.S index 0ac3afff7c..008f098bfe 100644 --- a/libswscale/riscv/rgb2rgb_rvv.S +++ b/libswscale/riscv/rgb2rgb_rvv.S @@ -74,31 +74,6 @@ func ff_shuffle_bytes_3012_rvv, zve32x ret endfunc -func ff_shuffle_bytes_3210_rvv, zve32x - addi t1, a0, 2 - addi t2, a0, 1 - addi t3, a0, 0 - addi a0, a0, 3 - srai a2, a2, 2 - li t4, 4 -1: - vsetvli t0, a2, e8, m1, ta, ma - sub a2, a2, t0 - vlse8.v v8, (a0), t4 - sh2add a0, t0, a0 - vlse8.v v9, (t1), t4 - sh2add t1, t0, t1 - vlse8.v v10, (t2), t4 - sh2add t2, t0, t2 - vlse8.v v11, (t3), t4 - sh2add t3, t0, t3 - vsseg4e8.v v8, (a1) - sh2add a1, t0, a1 - bnez a2, 1b - - ret -endfunc - func ff_interleave_bytes_rvv, zve32x 1: mv t0, a0