From patchwork Mon Feb 19 11:13:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: flow gg X-Patchwork-Id: 46364 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp1189297pzb; Mon, 19 Feb 2024 03:14:08 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUM12chO4vt7z9955Qxe0/sQF0fVJ2sw0Vps66NQbV1mZG4inGg+k2/I7E1JkmbJyqrZB838/GKHBI5F/bvCBrzg6jBu9n1iImq/g== X-Google-Smtp-Source: AGHT+IG6EgWC0bKtFPP/e2/PCNMVCmRd7LESVxcevomBQk03CXhqYhr/IHScKTP655yM5/SLjzF/ X-Received: by 2002:a05:6512:1306:b0:512:997a:a8c3 with SMTP id x6-20020a056512130600b00512997aa8c3mr5767455lfu.42.1708341247775; Mon, 19 Feb 2024 03:14:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708341247; cv=none; d=google.com; s=arc-20160816; b=vxcqqZLpTDFh/kZj4+FXX9Ojzxqam3IFGLEFOpzoYzeh0DTJmKZ5F8Zz6V9MHNQnPx JBian4uU6cIuERhk/e9RkPpcZmIKh42/aV3iaLisl72e0N+c/ZZw8PEYfjlO962jxHTG 0dVDxDnsj0KPNcnNOCrrFaQXr/5J4tAkPFb1/l3bQevR9eZ4SEkeIFX7N28VW+oUVl8g XGdXpMaLZfoInypImeRt6FryReE1Q4op3n7TcrVWVpk40zG+l7ilVorfUze3KHhPtJW6 LCtkKFrAoMIsPZEEPJwoIBaP1kgJvv/N69spoWvHxzRtmVGvBrBWRq9KH/RSPLhBN44L pfUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=Ni1B+nJ/fBQTh1wNA3pxF7zrwZHgPQOpABtOGNwd6jY=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Z+ToBBlcabv4GN+Ml4LpmddlxsXRLBzQl2Nf3/Dkkp6Mr2FcB8w2VP6YzoUcDs8e87 6eNbA30c8kZNI4Ru7So2/EFFpxKaisnbBCwUtoD10Z94DWP1nW/ylR5VvPPMwFu5FLjt vNIWRvtapVdSNb0AOKA9GJGlLy8XFDy0hLJ0y9uKOk0nnun4Ti4Gm8TKse/A016SDF9k rnXd62UFJzLVGxlhTHSdrAPKz5GSnUMwCj+IpbkDait/ut0OHWh3XZ28/fVebRARWUcr +ohDcXHxQrDvwCJ8ysCN3cH7ns1NDkwIGJq1PT3dPjaGlRo7N4p6OsUCs7xF8Jyq05ha e8kw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=hB1tkFQT; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c19-20020aa7c993000000b00564777049f4si718357edt.305.2024.02.19.03.14.06; Mon, 19 Feb 2024 03:14:07 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=hB1tkFQT; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 692CD68D3ED; Mon, 19 Feb 2024 13:14:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 54BCA68D02A for ; Mon, 19 Feb 2024 13:13:56 +0200 (EET) Received: by mail-qv1-f54.google.com with SMTP id 6a1803df08f44-68f56f26101so6850096d6.1 for ; Mon, 19 Feb 2024 03:13:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708341234; x=1708946034; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=AdPUJDMLXtrdnzKh0YVJfjRTMV4qVMsWa6SsbE9Kd1k=; b=hB1tkFQTv8GAdgCUiXHpvhU8U3lCx908sh5eXy0T8kK8BYM/oZk9O/hIzCyq98SMO3 mlExqYSVFSafxMdLamJ6HJ+kJBdZ4NOWRTF1GCNfCJ9RXtpth0osUoJ5NcRQbg81gLNI dpIgvQq/aL3cNlVLeIAB0g1LuoxpEo7S/CHEl43jmYLzpmV0Nw7qH6dcRlSZmQRTsmNG M2qmcwM83bCtc/cx9ErNKkQmuSGZBSyQDycOJRBmRTOL1kTVA56bBKqIowu4/mM2eDvg CZeJphikROXON9MkG+WXSQKK1o+kpmHR00lkJZi6mp7opdC5f038YXB84qVtT68rGeco zfwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708341234; x=1708946034; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=AdPUJDMLXtrdnzKh0YVJfjRTMV4qVMsWa6SsbE9Kd1k=; b=BVDbr/JTFPafnyc4S9cHO4a8k9TdOMJEOVqmkmA33CVnUqiyV321L8HEFBMctwWbnC ifAXI+j5D1tPvk4L1qkvy7318TWc6lv3iFa58XZ6w/3rqcEsJiJFT2p4rW1ywZL2NxFl IYovPIDZZ1NKfXe0D4I95kwz3hJfO4XRVtrChgNpUjReDtOPSUDiADLDcsrpWOoZATcD qxgk+v3LS+N/EvW+Q/eVtr7uVLt4uPHFpBVa7fsMFD9a0Zn1kZKBb+VgKNMnTlQAwT4Y hjInwMjiXA8I+CYSsorpMDmxkC6KlERTtYMFD26soBkJ7at9dfx8o9Yd0n2Ut8CtGNzv Hg/g== X-Gm-Message-State: AOJu0Yy1Kqy9rE6z4VdOEOM4SO/6i7yeVc+WU0IExXlZxLCDcgv5iHps 3wuv+MTXtdm7KywjImnZI0UQrAY2awDqJ+W/GF17lUpgEa5+qX06SaAumQEDUhHYNs/4PXkXa7/ mRkVAZVHGyg7G4Kfe2dN5OEuXoza4gJaoXfQ= X-Received: by 2002:a0c:dd89:0:b0:68f:5546:c7e8 with SMTP id v9-20020a0cdd89000000b0068f5546c7e8mr4831814qvk.48.1708341234268; Mon, 19 Feb 2024 03:13:54 -0800 (PST) MIME-Version: 1.0 From: flow gg Date: Mon, 19 Feb 2024 19:13:43 +0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] lavc/vp8dsp: R-V V put_vp8_pixels 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: /gXbZhc/1Muc The reason for using m1+le8 instead of stride load + larger group multipliers is the same as in "[FFmpeg-devel] [PATCH 1/7] lavc/me_cmp: R-V V pix_abs." In the test, there is #define src (buf + 2 * SRC_BUF_STRIDE + 2 + 1) Therefore, not using e8 will result : (fatal signal 7: Bus error). From 6daaabd19c26b01b948804e4ec84a6f606746ec7 Mon Sep 17 00:00:00 2001 From: sunyuechi Date: Mon, 19 Feb 2024 18:03:58 +0800 Subject: [PATCH] lavc/vp8dsp: R-V V put_vp8_pixels C908: vp8_put_pixels4_c: 87.5 vp8_put_pixels4_rvv_i32: 42.7 vp8_put_pixels8_c: 284.5 vp8_put_pixels8_rvv_i32: 77.7 vp8_put_pixels16_c: 1087.7 vp8_put_pixels16_rvv_i32: 108.0 --- libavcodec/riscv/vp8dsp.h | 75 ++++++++++++++++++++++++++++++++++ libavcodec/riscv/vp8dsp_init.c | 22 ++++++++++ libavcodec/riscv/vp8dsp_rvv.S | 27 ++++++++++++ libavcodec/vp8dsp.c | 2 + libavcodec/vp8dsp.h | 1 + 5 files changed, 127 insertions(+) create mode 100644 libavcodec/riscv/vp8dsp.h diff --git a/libavcodec/riscv/vp8dsp.h b/libavcodec/riscv/vp8dsp.h new file mode 100644 index 0000000000..971c5c0a96 --- /dev/null +++ b/libavcodec/riscv/vp8dsp.h @@ -0,0 +1,75 @@ +/* + * 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 + */ + +#ifndef AVCODEC_RISCV_VP8DSP_H +#define AVCODEC_RISCV_VP8DSP_H + +#include "libavcodec/vp8dsp.h" + +#define VP8_LF_Y(hv, inner, opt) \ + void ff_vp8_##hv##_loop_filter16##inner##_##opt(uint8_t *dst, \ + ptrdiff_t stride, \ + int flim_E, int flim_I, \ + int hev_thresh) + +#define VP8_LF_UV(hv, inner, opt) \ + void ff_vp8_##hv##_loop_filter8uv##inner##_##opt(uint8_t *dstU, \ + uint8_t *dstV, \ + ptrdiff_t stride, \ + int flim_E, int flim_I, \ + int hev_thresh) + +#define VP8_LF_SIMPLE(hv, opt) \ + void ff_vp8_##hv##_loop_filter16_simple_##opt(uint8_t *dst, \ + ptrdiff_t stride, \ + int flim) + +#define VP8_LF_HV(inner, opt) \ + VP8_LF_Y(h, inner, opt); \ + VP8_LF_Y(v, inner, opt); \ + VP8_LF_UV(h, inner, opt); \ + VP8_LF_UV(v, inner, opt) + +#define VP8_LF(opt) \ + VP8_LF_HV(, opt); \ + VP8_LF_HV(_inner, opt); \ + VP8_LF_SIMPLE(h, opt); \ + VP8_LF_SIMPLE(v, opt) + +#define VP8_MC(n, opt) \ + void ff_put_vp8_##n##_##opt(uint8_t *dst, ptrdiff_t dststride, \ + const uint8_t *src, ptrdiff_t srcstride,\ + int h, int x, int y) + +#define VP8_EPEL(w, opt) \ + VP8_MC(pixels ## w, opt); \ + VP8_MC(epel ## w ## _h4, opt); \ + VP8_MC(epel ## w ## _h6, opt); \ + VP8_MC(epel ## w ## _v4, opt); \ + VP8_MC(epel ## w ## _h4v4, opt); \ + VP8_MC(epel ## w ## _h6v4, opt); \ + VP8_MC(epel ## w ## _v6, opt); \ + VP8_MC(epel ## w ## _h4v6, opt); \ + VP8_MC(epel ## w ## _h6v6, opt) + +#define VP8_BILIN(w, opt) \ + VP8_MC(bilin ## w ## _h, opt); \ + VP8_MC(bilin ## w ## _v, opt); \ + VP8_MC(bilin ## w ## _hv, opt) + +#endif /* AVCODEC_RISCV_VP8DSP_H */ diff --git a/libavcodec/riscv/vp8dsp_init.c b/libavcodec/riscv/vp8dsp_init.c index af57aabb71..c364de3dc9 100644 --- a/libavcodec/riscv/vp8dsp_init.c +++ b/libavcodec/riscv/vp8dsp_init.c @@ -24,11 +24,33 @@ #include "libavutil/cpu.h" #include "libavutil/riscv/cpu.h" #include "libavcodec/vp8dsp.h" +#include "vp8dsp.h" void ff_vp8_idct_dc_add_rvv(uint8_t *dst, int16_t block[16], ptrdiff_t stride); void ff_vp8_idct_dc_add4y_rvv(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride); void ff_vp8_idct_dc_add4uv_rvv(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride); +VP8_EPEL(16, rvv); +VP8_EPEL(8, rvv); +VP8_EPEL(4, rvv); + +av_cold void ff_vp78dsp_init_riscv(VP8DSPContext *c) +{ +#if HAVE_RVV + int flags = av_get_cpu_flags(); + + if (flags & AV_CPU_FLAG_RVV_I32 && ff_get_rv_vlenb() >= 16) { + c->put_vp8_epel_pixels_tab[0][0][0] = ff_put_vp8_pixels16_rvv; + c->put_vp8_epel_pixels_tab[1][0][0] = ff_put_vp8_pixels8_rvv; + c->put_vp8_epel_pixels_tab[2][0][0] = ff_put_vp8_pixels4_rvv; + + c->put_vp8_bilinear_pixels_tab[0][0][0] = ff_put_vp8_pixels16_rvv; + c->put_vp8_bilinear_pixels_tab[1][0][0] = ff_put_vp8_pixels8_rvv; + c->put_vp8_bilinear_pixels_tab[2][0][0] = ff_put_vp8_pixels4_rvv; + } +#endif +} + av_cold void ff_vp8dsp_init_riscv(VP8DSPContext *c) { #if HAVE_RVV diff --git a/libavcodec/riscv/vp8dsp_rvv.S b/libavcodec/riscv/vp8dsp_rvv.S index 8a0773f964..063ab7110c 100644 --- a/libavcodec/riscv/vp8dsp_rvv.S +++ b/libavcodec/riscv/vp8dsp_rvv.S @@ -71,3 +71,30 @@ func ff_vp8_idct_dc_add4uv_rvv, zve32x ret endfunc + +.macro put_vp8_pixels +1: + addi a4, a4, -1 + vle8.v v0, (a2) + vse8.v v0, (a0) + add a2, a2, a3 + add a0, a0, a1 + bnez a4, 1b + + ret +.endm + +func ff_put_vp8_pixels16_rvv, zve32x + vsetivli zero, 16, e8, m1, ta, ma + put_vp8_pixels +endfunc + +func ff_put_vp8_pixels8_rvv, zve32x + vsetivli zero, 8, e8, mf2, ta, ma + put_vp8_pixels +endfunc + +func ff_put_vp8_pixels4_rvv, zve32x + vsetivli zero, 4, e8, mf4, ta, ma + put_vp8_pixels +endfunc diff --git a/libavcodec/vp8dsp.c b/libavcodec/vp8dsp.c index 72d4ea3793..8624c3ae15 100644 --- a/libavcodec/vp8dsp.c +++ b/libavcodec/vp8dsp.c @@ -681,6 +681,8 @@ av_cold void ff_vp78dsp_init(VP8DSPContext *dsp) ff_vp78dsp_init_arm(dsp); #elif ARCH_PPC ff_vp78dsp_init_ppc(dsp); +#elif ARCH_RISCV + ff_vp78dsp_init_riscv(dsp); #elif ARCH_X86 ff_vp78dsp_init_x86(dsp); #endif diff --git a/libavcodec/vp8dsp.h b/libavcodec/vp8dsp.h index 30dc2c6cc1..3bf12b6b45 100644 --- a/libavcodec/vp8dsp.h +++ b/libavcodec/vp8dsp.h @@ -87,6 +87,7 @@ void ff_vp78dsp_init(VP8DSPContext *c); void ff_vp78dsp_init_aarch64(VP8DSPContext *c); void ff_vp78dsp_init_arm(VP8DSPContext *c); void ff_vp78dsp_init_ppc(VP8DSPContext *c); +void ff_vp78dsp_init_riscv(VP8DSPContext *c); void ff_vp78dsp_init_x86(VP8DSPContext *c); void ff_vp8dsp_init(VP8DSPContext *c); -- 2.43.2