From patchwork Tue May 7 07:36:06 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: 48609 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6816:b0:1af:836d:81b3 with SMTP id wr22csp208649pzb; Tue, 7 May 2024 00:37:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWVNYnjV0q0BRZnICAaO3yUQqrY3pNW23BwdClE5o/ku6OPre9x2gx0hG1fOq3aEciOqjmd6YCqha5k0ovir+QtXSuHPLXtgfB5FQ== X-Google-Smtp-Source: AGHT+IGSUgPKyjXKsKgvkE8baU3P3EY/BVvg7gBS4yUYF7GhjfSolKV88SOSsiApOr7RRPv3ERvq X-Received: by 2002:ac2:46f9:0:b0:51b:6366:3459 with SMTP id q25-20020ac246f9000000b0051b63663459mr10249000lfo.67.1715067419875; Tue, 07 May 2024 00:36:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715067419; cv=none; d=google.com; s=arc-20160816; b=aI88pIMnRzDwpOahvtp/ixhGz3g9w2Fw4oXakr7BpjLFP4CWhfuOuQ5YIw2VQNQExD jhTP8LlLD5PedwZYHsFL+ciPF1c9DYOY74c0zxzD/x2F46XlO7TcnVEHovcIlF3gPlLV GPTnF9XuRXQCuDMWXifEO71DiFyw+qj6DVRY43taQL1QMGSYLzd/swmOQfC7s9KImPls dk/AHNp6Gb3e9X6pqtb2N2hT0ypOEjM7AeNYhhrdvPBs5HcMUlVTb85c9VHoeBKSYrCL LyHZDrWK+TNrT6MXWIeUxLseXH7Uf8iMCOCS99QXPTmHgGjin6iAyTZ7z44pmk/wpdjd KzqA== 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=M6JP+48VRW18QTkABFaofnps3hoVR+XDohJoZA67UJw=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=R+0tUkHxfkRWV2WnwwOuax81OuONxEcwDujVgxEQRBu9ViNmGjydIg/4SUiiVbb+xv eCbcqlUMvxIlhsTxPglZNpXRWLyAbURzvxAG0UKH8LL+XjU+OcTM6eeGhm/VLE9svPXx kqj7YV2GrfqRgjTbVwArQixxkkLx6MraMKRd2L8Pabs8khh1+Pp3HTotBQ8DHp254R4M R66f6rGE4dURwar55KsToeyeu5X/Ffc4J5C6BAij2XhHipru5X//E7bxWGqDhKdH3A0o +XIkZao05l9camvgnfLwxXScB5vk9khb9L2rLOD70Y9V7OKLLGNxKSxUnFKt3zaNMxUp hhpQ==; 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=oOnqbN8D; 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 qw6-20020a1709066a0600b00a59a75d715bsi4028145ejc.59.2024.05.07.00.36.59; Tue, 07 May 2024 00:36: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=oOnqbN8D; 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 032EB68D724; Tue, 7 May 2024 10:36:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-245.mail.qq.com (out203-205-221-245.mail.qq.com [203.205.221.245]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E231E68D672 for ; Tue, 7 May 2024 10:36:35 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1715067386; bh=rfYmEsIn3a3xbYUqW3g9tyn7FhyMjzOzvVsi+8o8ghA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oOnqbN8DBxAI5rvWvRfwgQ+o81wnbqGI5+46loyriLY28o7V+Ozdztqgok4cEsVNc FwFr1sBNX0AyWyZBLdRUr4IxMfX6h+fqwoiWMl9PySXWvWlIwEzJvO8w++v+wNxLEh GbNCapWTbseanDNoAgXsdA1pWgY3aUlBKs9V1Hq4= Received: from localhost.localdomain ([42.56.223.122]) by newxmesmtplogicsvrsza29-0.qq.com (NewEsmtp) with SMTP id 9188D283; Tue, 07 May 2024 15:36:24 +0800 X-QQ-mid: xmsmtpt1715067385tdpr67ywb Message-ID: X-QQ-XMAILINFO: NESW2WbOJFGIAohpK8iHD7Iu76UzytwoJ65pljeQpvZUVrVeb0szAvbAMLd5w3 WbsL+wshaF7ezvnXR0pebnb4V52fnQMoqee9VHJoLX5idq9+NIyO18QIQdn9EP0ucUfzeb/WwE+8 9CimzM723Z2kjvurOd7it83otq+YjfkVhnoTgva/PEyh5RbMzUCZUIpzIO+ugMDXpiOA43b5iU1x vip3D4lPH86HHjJE9HuurOLGZ3aeLcMHhxT/uEQZPDww04mh6WXCvvyqLJwqQeKzLfnyET5ZvfrZ jrTLjJoYAFufQHGE1xoeQqfAFs9qRHRhGImlmdsWgnmFD5uXlcmVo8Ef4lLxAROjrjPy7UQyL0E3 onERYNw5121Ou/yv7GA/r21haZgozIaOkzlKHZG7d7dzK1MZy4NC3cRK93fbUwi3TbAvEkTNWpG3 FPmJGcx922GNAgwb5V5+a2QYwK66zych/R9TPL4Ujs+x6XVrGSERNFbVtg+nM3LL56+fzDxV10b1 IM1kM/DXvm07L40nR7Y1nj83BMg+jguAJ1PVVOC+PHAlJS/UBzlSH9c6ja7T2jXZCtsubDLcpya1 0T+3IrrSElk3ZPuA9JeBNEv0Wgtl9Z87FnPW5xSx2eacHtYtZxP//DQZvvRWpgRNrQoVq1oRTpgU BQSl5HZQNHFZ/5ZElyfP+2ExUoscw/DnCHlBInVuKNVgZrRIXPqzbQePZpOPXySyALQGfbMCBaZ3 NkUYSisV+mEKfCfGCZJw9zEnxTRyk5wePWX1hXuWXA9r7h6yS5JTce5o61b1/bkvTV0i7h0blDNJ ovdiLJyBjDIcftOVS+if2HKWTM1GnrJ6HsJKFUmiDlQ9ts99WtSpeDvsI7O8HcNR50J91nyKyZyE lpkrQfEJb1WEml4MUeF90ZnmeJ7/M40snAHa6wEVpuhvOUjoIU6xk8cvVMRKNpIOoroUPQAqWzu4 48Qa7zP6A= X-QQ-XMRINFO: OD9hHCdaPRBwq3WW+NvGbIU= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 May 2024 15:36:06 +0800 X-OQ-MSGID: <20240507073613.2871668-2-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240507073613.2871668-1-uk7b@foxmail.com> References: <20240507073613.2871668-1-uk7b@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: knBqXV+YG1Oc 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 | 25 ++++++++ 4 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 libavcodec/riscv/vp9_mc_rvi.S diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index 65dd0d656a..5846861bac 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -63,7 +63,8 @@ RVV-OBJS-$(CONFIG_VC1DSP) += riscv/vc1dsp_rvv.o OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_init.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 d249dd71b2..c10f8bbe41 100644 --- a/libavcodec/riscv/vp9dsp_init.c +++ b/libavcodec/riscv/vp9dsp_init.c @@ -64,7 +64,32 @@ static av_cold void vp9dsp_intrapred_init_riscv(VP9DSPContext *dsp, int bpp) #endif } +static av_cold void vp9dsp_mc_init_riscv(VP9DSPContext *dsp, int bpp) +{ +#if HAVE_RV + int flags = av_get_cpu_flags(); + + if (bpp == 8 && flags & AV_CPU_FLAG_RVI) { + +#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 +} + 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); }