From patchwork Sat Oct 28 12:36:32 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: 44402 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dd83:b0:15d:8365:d4b8 with SMTP id kw3csp435816pzb; Sat, 28 Oct 2023 05:36:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEwfApARu3bDfcxtQmicIhLLAplQnfjWu9mxmDL69iUgodYFwcsPwmAMkSO4sTKUoLsnqHH X-Received: by 2002:a05:6512:3f0f:b0:509:b45:8879 with SMTP id y15-20020a0565123f0f00b005090b458879mr1196048lfa.3.1698496616162; Sat, 28 Oct 2023 05:36:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698496616; cv=none; d=google.com; s=arc-20160816; b=wgLywruLt9zwAT6pMP/q0qnNkHXK5tBmc4KO4qDivlAtLtWgBBNqJtW2oSKSCO1YxH gS6MsSx+6cjxzeZbVwmgkWn3XTbxqpLoqNyoHeetjYJX+Qjr1A2DSQtJcBuUhVWBVwzn w4JX9u/7fFcQcjN3ifVkBnZwn4v/lyFGXi67hnV1mOB2WMs6dl1ibeibAyH7f0LwJV3n xBKM5PjeJ8hjgVQrDW6nbinVdUqJHsQdDWzEKh9Rby9q3n77ZWN5NO1OEdGZyaQnYGJg zNBTQsn1bH8Ep1UvndzMEeO00juJmgdVzLcWPFvj7KyQRNxWqCJDp6b8lHFUhaIhNtnz TKLA== 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=zG6qiZMJT62fkKzb/qaKeZK07gVTqloGGXc3x7Jw84E=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=k7X+QND2qL4vwN12A9qS/EdTPi1Z/6uwY0DEncNWh0PCjkA5IJRes2lAxZeeq6B2RR hSF/e/lVQQDF4asi9ZWEmdtA2YMbY5iSB92AO9h1fqbaHM7sJacQpKSh8Jt31nqhzeF5 TWd1ciAQX5ZELiuyG7e6zb8pKST75MIZ46xrL9V0ouJkiCA58hnzPJUMyLnrD1E7/ElM tSjPi78e7ToIB+w4QPdZffvE2Y3q8iFDxfUw7bfrs5OPzJSfYHXI6C/KI1lJdZFE0o1Y nlCXLhubYaf1ce6LGDnQaiXnW1xilIMdw2LQ5CH5F0O5TFs3Lf2Oa9/+c5PlzqGkHN4e 6WSg== 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 b42-20020a509f2d000000b0053e4bad7577si1577931edf.288.2023.10.28.05.36.55; Sat, 28 Oct 2023 05:36:56 -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 6FC4668CAF5; Sat, 28 Oct 2023 15:36:41 +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 DEC9668C9D1 for ; Sat, 28 Oct 2023 15:36:33 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 73685C006C for ; Sat, 28 Oct 2023 15:36:33 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Oct 2023 15:36:32 +0300 Message-ID: <20231028123633.42264-2-remi@remlab.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231028123633.42264-1-remi@remlab.net> References: <20231028123633.42264-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavc/utvideodsp: R-V V restore_rgb_planes10 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: Z+xmP3rqVNa4 restore_rgb_planes10_c: 185852.2 restore_rgb_planes10_rvv_i32: 90130.5 --- libavcodec/riscv/utvideodsp_init.c | 9 +++++++- libavcodec/riscv/utvideodsp_rvv.S | 35 ++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/libavcodec/riscv/utvideodsp_init.c b/libavcodec/riscv/utvideodsp_init.c index dfaa16692a..f5038c4736 100644 --- a/libavcodec/riscv/utvideodsp_init.c +++ b/libavcodec/riscv/utvideodsp_init.c @@ -26,13 +26,20 @@ void ff_restore_rgb_planes_rvv(uint8_t *r, uint8_t *g, uint8_t *b, ptrdiff_t linesize_r, ptrdiff_t linesize_g, ptrdiff_t linesize_b, int width, int height); +void ff_restore_rgb_planes10_rvv(uint16_t *r, uint16_t *g, uint16_t *b, + ptrdiff_t linesize_r, ptrdiff_t linesize_g, + ptrdiff_t linesize_b, int width, int height); av_cold void ff_utvideodsp_init_riscv(UTVideoDSPContext *c) { #if HAVE_RVV int flags = av_get_cpu_flags(); - if (flags & AV_CPU_FLAG_RVV_I32) + if (flags & AV_CPU_FLAG_RVV_I32) { c->restore_rgb_planes = ff_restore_rgb_planes_rvv; + + if (flags & AV_CPU_FLAG_RVB_ADDR) + c->restore_rgb_planes10 = ff_restore_rgb_planes10_rvv; + } #endif } diff --git a/libavcodec/riscv/utvideodsp_rvv.S b/libavcodec/riscv/utvideodsp_rvv.S index 673e3442ce..fa70d0eb34 100644 --- a/libavcodec/riscv/utvideodsp_rvv.S +++ b/libavcodec/riscv/utvideodsp_rvv.S @@ -51,3 +51,38 @@ func ff_restore_rgb_planes_rvv, zve32x ret endfunc + +func ff_restore_rgb_planes10_rvv, zve32x + li t1, -0x200 + li t2, 0x3FF + sub a3, a3, a6 + sub a4, a4, a6 + sub a5, a5, a6 +1: + mv t6, a6 + addi a7, a7, -1 +2: + vsetvli t0, t6, e16, m8, ta, ma + vle16.v v16, (a1) + sub t6, t6, t0 + vle16.v v8, (a0) + vadd.vx v16, v16, t1 + sh1add a1, t0, a1 + vle16.v v24, (a2) + vadd.vv v8, v8, v16 + vadd.vv v24, v24, v16 + vand.vx v8, v8, t2 + vand.vx v24, v24, t2 + vse16.v v8, (a0) + sh1add a0, t0, a0 + vse16.v v24, (a2) + sh1add a2, t0, a2 + bnez t6, 2b + + sh1add a0, a3, a0 + sh1add a1, a4, a1 + sh1add a2, a5, a2 + bnez a7, 1b + + ret +endfunc