From patchwork Sun May 12 10:03:27 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: 48802 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp505463pzb; Sun, 12 May 2024 03:04:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVt1S1NuQ0NLMrTNhmlHXq1mCq22lNcQF+c1SQ0qVUhAlZG1Lbtw8Vj8IH+j9TWHTLDlHNFdk/eH2Tm19SG9zJNS+LmqUurAHfnoQ== X-Google-Smtp-Source: AGHT+IF5HKK9MplWnU9zmzH7RKE++EVMfN4czZfNtOF9UBK03a2hcN1EPko49tZvf2QKqsMIYjPQ X-Received: by 2002:a19:2d01:0:b0:51d:aaf7:a92e with SMTP id 2adb3069b0e04-5221057931fmr5069473e87.47.1715508239882; Sun, 12 May 2024 03:03:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715508239; cv=none; d=google.com; s=arc-20160816; b=cvHFOFV+9I4HEin33K7lMeejYR6+Y0CNAjjwcG3EKlLh1vNHf/k2DBWkTpBrqw4zfr GB8KTT1m7IXivVAmjS7aKPcnHQHhEIVGzGrUfS4w49K4CQ5F66RlVkXFqGGEG8akBY84 2Cu9CA3Sd4rme7eIpzyoHipklspDrcwaU9I3FDerl3AEC96wLGz3LvcouRIG3jJ94Whl 0dloMfgyATy020MpcqjJfHlJBOs56+q686pdSCyUVw+MLSjy+nnpuXCaMx1cVyxh1CjI iamt1hPrPp5QYEUkJAfRTR2Qy3HnGQp/lBGKF1Z493WAG32MhmcV4vjGjwpHhkmmnVXd 0/7w== 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=dVJ4mHXN5hmtTjXwSQwQWGHE0P/rn/8Ee3DZIhAQe1U=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=cIdrzQjkB7j9OxvsIfyNsEBez5JVqYVLQFRFaVTjJ9GB7Z72oF1sU3Yyw7T33epMwS R3i2vBQ4E54g4wqhtZyRlcLeBEt6WG/GPqTGCrcPvsU6iGKLTxotyrUY3LJbyWuitKnA aOGeVjQwDAklAeKsWBowQHcoYRK3xz/HMsepcdfC9fwKmqL3NYLIhzoYzjEN4Gv3CK97 OG1usvlCMRTziNCFG8uxLznzLZEp70G8+9C4jNRqplA2VKW/Kj27Ypw8Q+zx0kA494XJ StqfuhsVqyHQBNO9sswwOQySJJ5f3jENmOaubwjRLvZHG5kN/97UjdB1aqN1lLipzj2C IWUA==; 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=i8DSBj5r; 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-a5a179461a2si395461766b.106.2024.05.12.03.03.59; Sun, 12 May 2024 03:03:59 -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=i8DSBj5r; 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 DFFD568D614; Sun, 12 May 2024 13:03:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-53.mail.qq.com (out203-205-251-53.mail.qq.com [203.205.251.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D59FA68D28C for ; Sun, 12 May 2024 13:03:46 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1715508217; bh=IzPOcBOWNtUKphNWCBJQnWWXajctDFyMkbzGuNG5ubk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=i8DSBj5rHt/ObLe37fqh/mWclRUPwb4pcNEM+Ohflg+ETXb/PzCYT78uq5XFzPE8b 9h6wpj1zcmnhuEl0B0RraVKLwI0Ywm68ks5tBAn0jrbd5E1FNySrhkG8E0qCUAFsov gq5dsqpk9H4UmlT/DYVnox7Mh2DMadX+sysNiUvs= Received: from localhost.localdomain ([42.56.223.122]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id E135E56; Sun, 12 May 2024 18:03:33 +0800 X-QQ-mid: xmsmtpt1715508217t7s78nv3j Message-ID: X-QQ-XMAILINFO: N5sfBKY/oC4kxGsf5WAq3/5DKnhzLxtVmyNjEk9M3+XscvWMyTcwadRTwKsw1g G6D1ej2rfxgCSxG4CZ9eI1CPWQdH61KlriX+u7rHUz9IP5nsaWLHulHY8mwAnOGCNvoZxnGityWe eNxcEztjYrxTrDDw4YU6ryDRntaiDLncWfmHvhfM3dFH+u49J7tPT7ErIzZjoxz7rf+IMLWESh36 vLvB6kJRN86owZxZ4LLVm/dnxI7U604DqhfNDB2zpyt4+4fBRabQHkDnRXnpgxHMrE1nd4rqO+0t qFCIdzW/ISPsx/sy0El4flLGtU7UqQHHolr2Dl6aeDbr+ftHlg0hbq4s6Z2Ul3rLlUyowFPezlrw SmFAg8nnBhQfaQeW2x1yFtfmbUh6NVamUuyl7fajjTk4+K8NPD46HFkyhFjKZtsemIJQ4TjCjAWL G2P6HR7dEeFegDSTsi40BYudbdhAUogSX1/U9IT9Blqh8wDOE4iYm4rIC34wJy454AJ0eAFsWe73 lX0k7I7w6aoSKsMPtE7o8x+dY+y0CY8DumdVsbP0/8ipFEh++wXVkL8BjNFtYAzSuuuGQsbCWRJ1 CAfj46MqGlggq6l81yR6TkdG09syiTg7MMxmHrcoCgOJ8kTNAJP5hAsaG3ekrcZIOSjnvEXWjDO4 7qlvcmCt7A4YjSLgrSMeMYQZYXjvhieO2/XzpwscDnkmW51ML0oGZ9mHA8rh2jQ5+ZEK6wpg2CSL O+fM6N6Jwql3QLE8aBn6U8cgfBvxI42crpT7lARVNjaRbyewY03ahVQGv4tS5r+v2A6W+w1IYjGm AlzVau4L3tJYvGjuHJESfQE3s44JQCJxCGR51aQpLvKv45Za4uSowqKd1mEknRu0l1Nzg0Jkv+aR tuziE3lmHlctHcWIFkjYUUF/baXgO6wCL9VlcFERkrOfBvVgq3D0O3WtNSIx91O1907SgYOYSn X-QQ-XMRINFO: Mp0Kj//9VHAxr69bL5MkOOs= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 May 2024 18:03:27 +0800 X-OQ-MSGID: <20240512100331.995415-5-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240512100331.995415-1-uk7b@foxmail.com> References: <20240512100331.995415-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: k4xTATVmiWO3 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 1f9a3bcd24..832b015166 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_get_rv_vlenb() >= 16) { + +#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 }