From patchwork Mon May 13 16:59:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: uk7b@foxmail.com X-Patchwork-Id: 48857 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp465204pzb; Mon, 13 May 2024 10:00:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWA0ekh0rCol7z/yOq+Dhw/fHQcbf5W9zBTgjAFN5/kioR9686+6WzMRa5NsPj09JbQmMg+Y5tYWnkEjwakjne91f+rpm1uLOe5zg== X-Google-Smtp-Source: AGHT+IHRq2X+mI6bn1GwvSkXhzMANHOBwuQOqA2KcVVuK0vlSomjNSfUlPJilbYfdGlX1yG3bEZd X-Received: by 2002:a50:fb08:0:b0:573:5c17:f6f2 with SMTP id 4fb4d7f45d1cf-5735c17f781mr5542629a12.24.1715619600263; Mon, 13 May 2024 10:00:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715619600; cv=none; d=google.com; s=arc-20160816; b=j2ASIx+DYOrI31fxiepXTb+W3NchmWGBh2EdajPo3W1HC1Izs6OCDA/PnlzaSg9qc5 WGAxC0Yr0EU9nPiTekRDGQR5KBQurc/U6CvgzYDawHDTXyH8zg5yQ8qvRWbs+/tnFtj+ ahjiJPvngzYFLJITSPSOo3h5t3f7ipBPCWHasLxM30wd6NmKRAQewkP9oqrsyM8Mvyix iasVRaLNtHhjrdOxMJWoPNjmNB5vOfh9jIF7kHtj3A3kD4wMS9FwsgcLKX4UX7C4M3ZC bBgsamesKYQ0l4SidjpsPd+uCpwHeV8kn8dwS9z3CJED8mxTnDKo4Aq+mSkfGBi30ZHV t1eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=PPYX8L1ZVcjXHRG8BerPZoSq/Fde9RGU7k2yAmFIXXg=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=IOwBLOU//ru6SdlTpfH9Fa15GSYjbBfn+rnDnmi+zSsjcuQQfEwP+/0cqB5JB70yhz WPmy3yeJ7jX4ME/HTcefgzAYfziXckE13Dhj9AGYXQNqPWqOC7cT5IuVjRDlH2DrvEAn FZBMEfIxqs5P7aSL0ugD/aX8Dg4vg37eF972D+sMTSnIBSodSdieyglV3FyOq2dtoLep 4bsbG2isiqWkiVWZV8oq++kypooy7JTy6izifozSAesCevIswpdBtvUNgdnehIj9hFhJ 5K1fsy916CTenKrNYa2AHpW+BTNeqI/h9lKTRFZUPlfxIIXUxNsN6pcmu5jTxK4T7SkA qCdw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=PwsHNKT9; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5733c37942bsi5089650a12.689.2024.05.13.09.59.59; Mon, 13 May 2024 10:00:00 -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; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=PwsHNKT9; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9F9ED68D649; Mon, 13 May 2024 19:59:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-252.mail.qq.com (out162-62-57-252.mail.qq.com [162.62.57.252]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0320768D319 for ; Mon, 13 May 2024 19:59:46 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1715619578; bh=abQgQOXPqwUttUlYyEXhDPri1dRv4SchjBC6M6aJWZI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PwsHNKT9Pyn4QW+MD4lMKZQ3hFzGcpnpR7C8HA3adCRAj/CigLOfl+yU37a0n/Vco ADL0MIfx7psG4P+4+/K7LKVwNW7bccQn1Vpd+gyYcuckLoLnG76DJhgMfNDBnIPD5y IZw8gy+1igjF+Yz5cg36O3+RjtSA/6G80T5J6DTc= Received: from localhost.localdomain ([42.56.223.122]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id EE3A4485; Tue, 14 May 2024 00:59:35 +0800 X-QQ-mid: xmsmtpt1715619577tsnk7wasq Message-ID: X-QQ-XMAILINFO: MziGzrjZeogZp4LEQbZ5OLnTQaEI2OwcoLO9iOY3RTYExVM6xJgh4iUamX6AoA YSsuumL/tumHwNfnttISJYmkS4uZMXOH2HJGHbFgrzLMcxjRbf21kDQRoCSryJrh30MTzlzwFjDj bdk/rl+6mJWJTFh2iIERRGnCIkjf6bfroshYZLNVSBdi2/ZZ//mEljj2GcWdKVR06Nfaxj+I8GWu KVoe1xLC8pbtZfjDW63UVqlPVzDiUyRr+eZjgzEPt4bEufdXLqY6GgIYhapnbypCOkS8bpeHyFsq 50fxUgY4TeiGFmCTVhZObMwztQBLh3h1hDRsCGlZCB19J7gEfiIeaKGf0/4Di1OIQUHZRL0Bc65+ gImgCILxTm3TKHdMJ7jHwptrnwuO7tdyulhDHBN66P+bPQFeKxQ75X+rEOFVz5FFMIYPcfRUVOR9 dJ0T2pRBpDbnx34sWB4ibS/RPkWCO24YyOXnrRJFrIEV3P+fOgUKfCAdIH+oa2HBx/qtNb+z1969 QQIlOhEXBa24KhXosKMC8B7brEX1M7fiyq9HlEmb3BiZg+J12n7i6on2w7nSeNPnJB3hdFA8NGot NN9IjSFbTnMMMQJK8HWSc4T9JFDu//1iZ2CEtUIOmCRaX528syCPxm5ZNqMcZlp4dT6aAahQWAC0 xcmm2mIUyejhDecaiSqVwEzUWdNK0zMLNB5Pw2mhJvM4jIc5ux4mt3Rx2XfkO3rkGdUYXlrzvvzx 22rMk+ZLr1eS7DXIiMhnfit0cNIMjpWEU/YGZjgRdKlP853fbHwDlODyeiLMYnkowNTMBlzasJWp 3B6xiWA/3qsJKPpAEXGaKuW8hnPuwihbEtUwBcbPZeKAVYkf7GufanKB4TtrxTWwUYon+ZGHlZFO GhvmcDEwI/+iDYxQUb+ce9pe+UehoiaLnXMlGhzEkwL6crzB3SEgInBkl8L2K3cR/ceWwfpmGyW7 wB/a4b7h4= X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 May 2024 00:59:19 +0800 X-OQ-MSGID: <20240513165926.1467967-2-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240513165926.1467967-1-uk7b@foxmail.com> References: <20240513165926.1467967-1-uk7b@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/9] lavc/vp9dsp: R-V mc copy 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 Cc: sunyuechi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rH8wSupvw+xz From: sunyuechi C908: vp9_put4_8bpp_c: 0.7 vp9_put4_8bpp_rvi: 0.5 vp9_put8_8bpp_c: 2.5 vp9_put8_8bpp_rvi: 0.5 vp9_put16_8bpp_c: 16.7 vp9_put16_8bpp_rvi: 1.5 vp9_put32_8bpp_c: 37.2 vp9_put32_8bpp_rvi: 5.7 vp9_put64_8bpp_c: 107.5 vp9_put64_8bpp_rvi: 21.7 --- libavcodec/riscv/Makefile | 3 +- libavcodec/riscv/vp9_mc_rvi.S | 105 +++++++++++++++++++++++++++++++++ libavcodec/riscv/vp9dsp.h | 3 + libavcodec/riscv/vp9dsp_init.c | 28 +++++++++ 4 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 libavcodec/riscv/vp9_mc_rvi.S diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index ccd060c666..0cd900104f 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -62,7 +62,8 @@ OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_init.o RV-OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_rvi.o RVV-OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_rvv.o OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9dsp_init.o -RV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvi.o +RV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvi.o \ + riscv/vp9_mc_rvi.o RVV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvv.o OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_init.o RVV-OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_rvv.o diff --git a/libavcodec/riscv/vp9_mc_rvi.S b/libavcodec/riscv/vp9_mc_rvi.S new file mode 100644 index 0000000000..0db14e83c7 --- /dev/null +++ b/libavcodec/riscv/vp9_mc_rvi.S @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS). + * + * 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 "libavutil/riscv/asm.S" + +#if __riscv_xlen >= 64 +func ff_copy64_rvi +1: + addi a4, a4, -1 + ld t0, (a2) + ld t1, 8(a2) + ld t2, 16(a2) + ld t3, 24(a2) + ld t4, 32(a2) + ld t5, 40(a2) + ld t6, 48(a2) + ld a7, 56(a2) + sd t0, (a0) + sd t1, 8(a0) + sd t2, 16(a0) + sd t3, 24(a0) + sd t4, 32(a0) + sd t5, 40(a0) + sd t6, 48(a0) + sd a7, 56(a0) + add a2, a2, a3 + add a0, a0, a1 + bnez a4, 1b + + ret +endfunc + +func ff_copy32_rvi +1: + addi a4, a4, -1 + ld t0, (a2) + ld t1, 8(a2) + ld t2, 16(a2) + ld t3, 24(a2) + sd t0, (a0) + sd t1, 8(a0) + sd t2, 16(a0) + sd t3, 24(a0) + add a2, a2, a3 + add a0, a0, a1 + bnez a4, 1b + + ret +endfunc + +func ff_copy16_rvi +1: + addi a4, a4, -1 + ld t0, (a2) + ld t1, 8(a2) + sd t0, (a0) + sd t1, 8(a0) + add a2, a2, a3 + add a0, a0, a1 + bnez a4, 1b + + ret +endfunc + +func ff_copy8_rvi +1: + addi a4, a4, -1 + ld t0, (a2) + sd t0, (a0) + add a2, a2, a3 + add a0, a0, a1 + bnez a4, 1b + + ret +endfunc +#endif + +func ff_copy4_rvi +1: + addi a4, a4, -1 + lw t0, (a2) + sw t0, (a0) + add a2, a2, a3 + add a0, a0, a1 + bnez a4, 1b + + ret +endfunc diff --git a/libavcodec/riscv/vp9dsp.h b/libavcodec/riscv/vp9dsp.h index f8bc6563a5..b8ff282f8a 100644 --- a/libavcodec/riscv/vp9dsp.h +++ b/libavcodec/riscv/vp9dsp.h @@ -167,6 +167,9 @@ void ff_copy##SIZE##_rvi(uint8_t *dst, ptrdiff_t dststride, \ const uint8_t *src, ptrdiff_t srcstride, \ int h, int mx, int my); +VP9_COPY_RISCV_RVI_FUNC(64); +VP9_COPY_RISCV_RVI_FUNC(32); +VP9_COPY_RISCV_RVI_FUNC(16); VP9_COPY_RISCV_RVI_FUNC(8); VP9_COPY_RISCV_RVI_FUNC(4); diff --git a/libavcodec/riscv/vp9dsp_init.c b/libavcodec/riscv/vp9dsp_init.c index 0f64afc6d2..dace51cf06 100644 --- a/libavcodec/riscv/vp9dsp_init.c +++ b/libavcodec/riscv/vp9dsp_init.c @@ -24,6 +24,33 @@ #include "libavcodec/vp9dsp.h" #include "vp9dsp.h" +static av_cold void vp9dsp_mc_init_riscv(VP9DSPContext *dsp, int bpp) +{ +#if HAVE_RV + int flags = av_get_cpu_flags(); + +# if __riscv_xlen >= 64 + if (bpp == 8 && (flags & AV_CPU_FLAG_RV_MISALIGNED)) { + +#define init_fpel(idx1, sz) \ + dsp->mc[idx1][FILTER_8TAP_SMOOTH ][0][0][0] = ff_copy##sz##_rvi; \ + dsp->mc[idx1][FILTER_8TAP_REGULAR][0][0][0] = ff_copy##sz##_rvi; \ + dsp->mc[idx1][FILTER_8TAP_SHARP ][0][0][0] = ff_copy##sz##_rvi; \ + dsp->mc[idx1][FILTER_BILINEAR ][0][0][0] = ff_copy##sz##_rvi + + init_fpel(0, 64); + init_fpel(1, 32); + init_fpel(2, 16); + init_fpel(3, 8); + init_fpel(4, 4); + +#undef init_fpel + } +# endif + +#endif +} + static av_cold void vp9dsp_intrapred_init_riscv(VP9DSPContext *dsp, int bpp) { #if HAVE_RV @@ -67,4 +94,5 @@ static av_cold void vp9dsp_intrapred_init_riscv(VP9DSPContext *dsp, int bpp) av_cold void ff_vp9dsp_init_riscv(VP9DSPContext *dsp, int bpp, int bitexact) { vp9dsp_intrapred_init_riscv(dsp, bpp); + vp9dsp_mc_init_riscv(dsp, bpp); }