From patchwork Wed Sep 28 15:30:00 2022 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: 38440 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp309614pzh; Wed, 28 Sep 2022 08:30:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Diq2IphfhYg2PbHuYq6mZQWH5woe45vaivAjrQ8cSQXpWyaMJoVMpLrpZ7j/JJlzklE93 X-Received: by 2002:a17:906:db0d:b0:77b:a7cd:8396 with SMTP id xj13-20020a170906db0d00b0077ba7cd8396mr28691933ejb.264.1664379018740; Wed, 28 Sep 2022 08:30:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664379018; cv=none; d=google.com; s=arc-20160816; b=bMptF97WWzt2IHS3pf2q12UDogJMC7P0Yr7GLiRU9MBQf/HUjItcmbt4QU7NLk8+s0 Y6vhxwMdk/sKS/js4Wmx/iQdqQN4diHUToE6T2wlhOj+2r8zqIgnfjd4fNk9b2apbp26 ObI2H84tscywlS1C2LPPzV1hKizR/yVptJHL/KwVnGcyUBbJZKq1nzTL/UhVTtzMZESv SrnuPi0qtm38BbECvE8eojZr38OtcPURR8uwFag/Ru69cr/g5DKagXVj1qWbU1b5dRPm as63+M95CZvqUVMoR83IxN/XQQVhNqUWIimvfrGY8BI4Hk53SDCGRpqZdFHVm+OeJ2wj QvXw== 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=oJKDEW9dnrMNq5rhLGDmuXYrgmt+RRxpJpOb6ZJHMMA=; b=hlvadDrXz0+nO5Ict5vDqDI9C5BrhXQf6sjmow+b65xnxG7bdsU1UZTRUHYR9pXM2Q P68Nr8EP4K5vvcRS8Mw1HkGTf4o8ZupHN7ZXhp9bL85mmyqwLq4SJtV8LmhraZiBKobe dP7+bMAyxh6awC74AUkXSTIqzFPArYOue3r/6I9u9MwS93MAAZsaBhsQhFr+mskeby7m 5TD8YrJkpkBjsyfBnac5tAD9fyB9hTkEvX8LZxl92vpVhNA56l08ZjoJhoF8FPOBZfYV HyVKUN4cZA3BZ50jynTRBEE//DFefWGDYQgYp0gvcQHH7DCVUHBN0JSn5aXF6NpFg4oe Jkeg== 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 dn6-20020a17090794c600b00730a20dd838si5008733ejc.84.2022.09.28.08.30.17; Wed, 28 Sep 2022 08:30:18 -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 6FA5768BBB6; Wed, 28 Sep 2022 18:30:09 +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 3BF0168BB66 for ; Wed, 28 Sep 2022 18:30:02 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id EA188C0090 for ; Wed, 28 Sep 2022 18:30:01 +0300 (EEST) From: remi@remlab.net To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Sep 2022 18:30:00 +0300 Message-Id: <20220928153001.30025-2-remi@remlab.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <12088142.O9o76ZdvQC@basile.remlab.net> References: <12088142.O9o76ZdvQC@basile.remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] sws/rgb2rgb: RISC-V V interleaveBytes 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: ko7HdZIrNTOK From: RĂ©mi Denis-Courmont --- libswscale/riscv/rgb2rgb.c | 4 ++++ libswscale/riscv/rgb2rgb_rvv.S | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/libswscale/riscv/rgb2rgb.c b/libswscale/riscv/rgb2rgb.c index 5654154494..32c1546827 100644 --- a/libswscale/riscv/rgb2rgb.c +++ b/libswscale/riscv/rgb2rgb.c @@ -30,6 +30,9 @@ 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_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); av_cold void rgb2rgb_init_riscv(void) { @@ -42,6 +45,7 @@ av_cold void rgb2rgb_init_riscv(void) 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; } #endif } diff --git a/libswscale/riscv/rgb2rgb_rvv.S b/libswscale/riscv/rgb2rgb_rvv.S index 3eb11262c0..7f8c2efd80 100644 --- a/libswscale/riscv/rgb2rgb_rvv.S +++ b/libswscale/riscv/rgb2rgb_rvv.S @@ -76,3 +76,29 @@ func ff_shuffle_bytes_3210_rvv, zve32x addi a0, a0, 3 j 1b endfunc + +func ff_interleave_bytes_rvv, zve32x +1: + mv t0, a0 + mv t1, a1 + mv t2, a2 + mv t3, a3 + addi a4, a4, -1 +2: + vsetvli t4, t3, e8, ta, ma + sub t3, t3, t4 + vle8.v v8, (t0) + add t0, t4, t0 + vle8.v v9, (t1) + add t1, t4, t1 + vsseg2e8.v v8, (t2) + sh1add t2, t4, t2 + bnez t4, 2b + + add a0, a0, a5 + add a1, a1, a6 + add a2, a2, a7 + bnez a4, 1b + + ret +endfunc