From patchwork Mon May 13 16:59:22 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: 48861 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp465812pzb; Mon, 13 May 2024 10:00:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWbRci3I74i4hrgm7BXYUT41HVU+JiOryzdI3rCNs6Bt9teW7Zsj0qun51kTYc0Gs7uGALETWP36l0OvljB4EVYwJnMNwkUMjWcRA== X-Google-Smtp-Source: AGHT+IFqCTqSjDCYoW3vkuuGo8HYH+5A9QMCcCdTJC3AGmF/wf4AC4Q3nKfuV50OcsPpnk7un+VB X-Received: by 2002:a17:907:9705:b0:a5a:7cd3:b2e7 with SMTP id a640c23a62f3a-a5a7cd3b463mr40336866b.11.1715619643846; Mon, 13 May 2024 10:00:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715619643; cv=none; d=google.com; s=arc-20160816; b=aqf14DOqkFhHqG/E25U/x+Nk4hgbBXsGvbg8iWZTiZizoZnMJfidmj8rNG25Nw8cdj YM9gds7T7q1rnfPPPOYE4FQc0QyKnJiTpSeP99DCo/070a+JF0qrsWb7r/tLC+iYbA5W u9a4ryJky2DsPJA7eCgIvF+8Uda0L0QR2hOVYmlsvRKdPS816KcpQPBkv5TmMcnhIZ2G sYM7X+JSjhCRmI2eIzqlPCB0i6kPTxacGZrTeE/PMevniY2Nh3t8ruIPLzMFiSwcbsSb 0Sun3h4u0NDf65i3wb4J6T4qjM9UZ1D+OA4C7mummPvAgDG9snSteQw0yQ++dUm7mEAw vXzQ== 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=+oZ9kuHyjaYhTLuBkmkMAA+sN/6aX9CEyqd/N5hiHEI=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=Zddzem2WgooYYu8U4NeNEWxFNpaeqFOC1QwASWV3dpGEDiOMhUf+ETtDovBVL+HXEG EqJGXUsC+5L997GoH+UndX/WhNUMVMlRhHGjnhTsiymCBy7dSP+DjylJqYndOpoREMaF 1CSsRV8SLCycLhvzMGh0mtTZPcWiZgCIm88e9MQpH/uqIfKO+xsHxmvldcl1Yyux78aw vH8ohr4nAnikynFpDjc8g/BCbQ/OVxWHiA2FuYcQaYAn/8DAVCEfdLuhTQ/yzgohuDab VRAkTcklBeTvvqg7cOxV/ll0AmFKzVD64VaQCzLKRyykxvoWpDQBZajuO8c6SqQvgeRl hFYQ==; 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=NrrsbQdY; 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 a640c23a62f3a-a5a74c3fc3bsi66793666b.522.2024.05.13.10.00.43; Mon, 13 May 2024 10:00:43 -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=NrrsbQdY; 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 5980F68D12C; Mon, 13 May 2024 20:00:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E096C68D56F for ; Mon, 13 May 2024 19:59:48 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1715619580; bh=x0AAXEPcPZHyzlPQVJhf+9bttIi30atQQMSnO3K95vk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NrrsbQdYwBwbYp6lwrQl8GqAd4tBiFLpFb4eCW2Ns7u81IK3EtqlUagG6CnH6h3/w EhMvi3LrtXkUGsknfP2akrTOVgwH9ojiDetMOJZWnWSF5QRoqz/pVqBG7u464CP/bC MMXyJlDQKV4QGtsfUrxyRfw5TwVKE8nCqLILWPqE= 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: xmsmtpt1715619579tabn13nyj Message-ID: X-QQ-XMAILINFO: NY/MPejODIJVOoj5kutKKJ2Y42BKpTVVB/W8jk78AThYmfebmkjreR5Nsb/Smd gLk0NdCpWjH3ievpqaYUDEfEeqGGhmXKbpHCIUsaGaoIf0a+WTWZ85iPp9SkyaJA0f8k30WyGXgP mIcb8ewaBQrnrF1FplcTsan9IcUm6cr8tDGvQ0mI44USRgDoL87i2RL2fEktbESw8ezav8WGcyNf DkZZG2Soe0LHZ3l+3jqs90OleaPyEDyT1lWzoZRBOOJ5gmOJl5SiZKTuHt1SupLqaoYp5a5d11tz 1a0A+JsVg3G1d+UuG8CQH/cDdxaXcBmdy3aQxd4d5kh7YlRs6FQ3ZgT44hiRm5o+iM8NaQ9HAoem SwmH9qbqSmttEgg+EpNYeTIOqGb0en5YGPuAZd973r3zorrCYk2NIx6uoPC3+MSDjAyVxwU/Lv1M MU6M/YOV2mmV28ZIYs0RJwxlJuVQy6oT/KkMM5H+7JyiRbUBWhY5CZAXDmqMO2NmHv+/rgpGsrMI 0v8+TIcLNKGyJspuCdI022LkHNBNlvDpGmO9aY1kgfOVWG21DrLEA+n+ZXMHaGuUh2ihtUJ2kNlo uJTkCfu8ufrc+UDkx4RFBUAwAynOzm8gQv+hnOxqR7IMpBq5bq/IBQVf+TSTFgDhGWxo95NPeY6z K4VphScInJJShGDkCSIUAqJi/SztwX2SKsaNOPyH6n9k3eMqNJ1ljGS9eAEyMBkk/YvMIpxz4+GO T0CfeOKkYrKPyhskgU5XahYImFtp5Ek5xsdrfpbqld9FwRjZOCdo2taDeyC4zzgRkogGpIF2U7+V JH1ss0UrrTaMoC8Qv+dynMsNQHiHeE1NVpf6ZvuKLN26FinDpd/0/LT5liiRo/FU+WBNaUzV/2yx 5vwdgm0aIo1MstFZ2950bzRu+H2AEiCg/xaFdJWSfmTyi6LS89EhEL8Uxp3gC43ZIaj7tE0oUYiB KEjLazjOc= X-QQ-XMRINFO: OD9hHCdaPRBwq3WW+NvGbIU= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 May 2024 00:59:22 +0800 X-OQ-MSGID: <20240513165926.1467967-5-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 5/9] lavc/vp9dsp: R-V V mc avg 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: YXOQ93E/fCZ3 From: sunyuechi C908: vp9_avg4_8bpp_c: 1.2 vp9_avg4_8bpp_rvv_i64: 1.0 vp9_avg8_8bpp_c: 3.7 vp9_avg8_8bpp_rvv_i64: 1.5 vp9_avg16_8bpp_c: 14.7 vp9_avg16_8bpp_rvv_i64: 3.5 vp9_avg32_8bpp_c: 57.7 vp9_avg32_8bpp_rvv_i64: 10.0 vp9_avg64_8bpp_c: 229.0 vp9_avg64_8bpp_rvv_i64: 31.7 --- libavcodec/riscv/Makefile | 3 +- libavcodec/riscv/vp9_mc_rvv.S | 58 ++++++++++++++++++++++++++++++++++ libavcodec/riscv/vp9dsp_init.c | 18 +++++++++++ 3 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 libavcodec/riscv/vp9_mc_rvv.S diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index 0cd900104f..1183357b37 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -64,6 +64,7 @@ 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 \ riscv/vp9_mc_rvi.o -RVV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvv.o +RVV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvv.o \ + riscv/vp9_mc_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_rvv.S b/libavcodec/riscv/vp9_mc_rvv.S new file mode 100644 index 0000000000..5d917e7b98 --- /dev/null +++ b/libavcodec/riscv/vp9_mc_rvv.S @@ -0,0 +1,58 @@ +/* + * 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" + +.macro vsetvlstatic8 len an maxlen mn=m4 +.if \len == 4 + vsetivli zero, \len, e8, mf4, ta, ma +.elseif \len == 8 + vsetivli zero, \len, e8, mf2, ta, ma +.elseif \len == 16 + vsetivli zero, \len, e8, m1, ta, ma +.elseif \len == 32 + li \an, \len + vsetvli zero, \an, e8, m2, ta, ma +.elseif \len == 64 + li \an, \maxlen + vsetvli zero, \an, e8, \mn, ta, ma +.endif +.endm + +.macro copy_avg len +func ff_avg\len\()_rvv, zve32x + csrwi vxrm, 0 + vsetvlstatic8 \len t0 64 +1: + addi a4, a4, -1 + vle8.v v8, (a2) + vle8.v v16, (a0) + vaaddu.vv v8, v8, v16 + vse8.v v8, (a0) + add a2, a2, a3 + add a0, a0, a1 + bnez a4, 1b + ret +endfunc +.endm + +.irp len 64, 32, 16, 8, 4 + copy_avg \len +.endr diff --git a/libavcodec/riscv/vp9dsp_init.c b/libavcodec/riscv/vp9dsp_init.c index 184fadbaf7..1922484a1d 100644 --- a/libavcodec/riscv/vp9dsp_init.c +++ b/libavcodec/riscv/vp9dsp_init.c @@ -48,6 +48,24 @@ static av_cold void vp9dsp_mc_init_riscv(VP9DSPContext *dsp, int bpp) } # endif +#if HAVE_RVV + if (bpp == 8 && (flags & AV_CPU_FLAG_RVV_I32) && ff_rv_vlen_least(128)) { + +#define init_fpel(idx1, sz) \ + dsp->mc[idx1][FILTER_8TAP_SMOOTH ][1][0][0] = ff_avg##sz##_rvv; \ + dsp->mc[idx1][FILTER_8TAP_REGULAR][1][0][0] = ff_avg##sz##_rvv; \ + dsp->mc[idx1][FILTER_8TAP_SHARP ][1][0][0] = ff_avg##sz##_rvv; \ + dsp->mc[idx1][FILTER_BILINEAR ][1][0][0] = ff_avg##sz##_rvv + + 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 }