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