From patchwork Fri Mar 22 06:03:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: flow gg X-Patchwork-Id: 47303 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a4a:b0:1a3:31a3:7958 with SMTP id zu10csp1007364pzb; Thu, 21 Mar 2024 23:04:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU3UU0t++mcmHgRdt67+888WxcBsxk6UvtjT01C/s28mgkjk5yhPuHyNFfTQDABaswvpX55504Qz5iFKl1pyPpv5fHx/AGm3hUOTQ== X-Google-Smtp-Source: AGHT+IFFWXKfCl0FgyriO3qPLVm6wuPJUChV5azwtQcv0G36i6vNHGcO9wMR5G0IJLRhnth99AMM X-Received: by 2002:a17:906:d150:b0:a46:9a9e:f3b5 with SMTP id br16-20020a170906d15000b00a469a9ef3b5mr568626ejb.0.1711087444245; Thu, 21 Mar 2024 23:04:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711087444; cv=none; d=google.com; s=arc-20160816; b=IgGaiEY9VY6HMknzm7Dh2wbZUI3TGs5LrXlJzBRZNVfc0W9aFtcPghq3/iBkK+xK34 Wzeyg35lCOD+0909OYdOtmgR8+KQVvFF4dUPxPf9Wgz7B0qgSPQxdlMyy7NVmRJOco+K hhIZdPNWvSTWK1gBcSpGxjWM5XSbb4e9zBKHe0AQ0EYB/Bbrr+MWi6XR0YrkVIModJtn RI3LyMNi1sPIVGixMc/xbTXZieinZ7MavbGWnZnCc1iDHUrFz3BHmdQMwc7Liw43qsjw ZaHCAY3/fHwaOjEDi5Md4YNuRstO6eaq9AMFlti+X49XBpmZq+7sNKqg0fsrHkokCTVJ oYdQ== 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=K76+aT6BvNaNnQ+RKEyRCbRvUxEaE4gQn72vSsASyHA=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=YAUMaus98q3AYZpgN8URXmoGAK2pnoYg1JEG1ZLaDcukIrgzeuVqhgxCvNkWAJOXUa YBqBOHrudgmv1zxW2p87cARvk0NEPYenHtaTjsFYOg3dQdZDoVr2xwdtRFB1omP9JEzz m+VyULMJ4BxUbyRHysL3pp2fk7d6Qe7jNDXarJ0pVXuWOlflXkv3BmPVmQuSd37s3/YG 2Fn86gqFtt0nYRJdIITOKgA6hGKQbiwfXAG5bLwZ6XvkgC5d8pJjj5/h0ZuiTUeBTLGc rVcFizBOnQ0PL5goff4UdHD70+Kwyc2I8QQwQ+j8D1i59pagtbRvcp+CXEZmCWe4q8nq IGhg==; 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=BlHqvN7M; 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 y26-20020a170906471a00b00a4668973ad2si635803ejq.937.2024.03.21.23.04.03; Thu, 21 Mar 2024 23:04:04 -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=@gmail.com header.s=20230601 header.b=BlHqvN7M; 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 87C6068D58A; Fri, 22 Mar 2024 08:04:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f170.google.com (mail-vk1-f170.google.com [209.85.221.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 625E368D4CE for ; Fri, 22 Mar 2024 08:04:00 +0200 (EET) Received: by mail-vk1-f170.google.com with SMTP id 71dfb90a1353d-4d4404fbdf5so764844e0c.0 for ; Thu, 21 Mar 2024 23:04:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711087438; x=1711692238; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=Ajh3+UZP2zUodgxrUdz1IZm60viT8tJBmLgtrTK+tkY=; b=BlHqvN7MFks1uB0WO0g/JiwIre8wNI+gRV8OXmj3a/z4zb6C063SXR5pZgTZ8Qh1Zs GfYxtlIST+rfUPsR89AwDbDBalIKWqjzdK72G7KONoksAlUjTEkBJ51rM7pdJBCoh0Bh VHqjggrQ4bQVSHLYqS6eB42phSKKbhL7bQgQgWVcGPxAONGESPXrrxDH6HSyPD9gMcCn xTon74GH4kXw7cK5ph7OtjxVwhC73ydtl6d/6ve2BgS9JaZh/l0l5SqK1hhTAO00cFMr ME70LTQ4YzUf4dDdPjgfXFycIRTfAj8ksJ+gwOUWowLa/51ARrlGjLGf0DXUYS6O6Fzm /VDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711087438; x=1711692238; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Ajh3+UZP2zUodgxrUdz1IZm60viT8tJBmLgtrTK+tkY=; b=sBB+d8+QFESCNE5ROip8S7exVxLPcWMGLixabOiqhtYgEWYwpO4WySsZgBCum322Z2 wTIGuniC15QhzxejniPmy07LkRjBMBFrF5Os8imx0j8DXhQdicykNSnB18Z9nOn7Lhl3 QrJmaZE+PeWdYnP6xOAQZyKngsUBK9OkYhX/lsK/G2Mw41PQKH9vR+96p7ZPM9LCyDC1 X8p5HWLT9+BYljBZFaXKTI85IYzoFJj138E8oyMquGHlSXscUGcGslbkAQ0gPcspvJop IN3tKLXFTyZgMD9gois1gmXqzsu23zhkdWbExZRN6XyV8OZLEPEXyKvCr8KqhWyKPpA1 CWZg== X-Gm-Message-State: AOJu0YxqpaJiBWpimnBOM7lXk3+hV6s9fk0YG6fMkBYpPmfckAnk2Qpl FsZpcuJDyGDVP5Ytd6YUvDIBx9T6ust2X5SeeTvvJjZOerS3kyHXqpEkceKbtyseY/IOqwcdCzG il4NI4EDkbjhNrbogaO9MhuGpEnMtmW4QSmMQkg== X-Received: by 2002:a05:6122:2505:b0:4d3:34b1:7211 with SMTP id cl5-20020a056122250500b004d334b17211mr1817782vkb.3.1711087438285; Thu, 21 Mar 2024 23:03:58 -0700 (PDT) MIME-Version: 1.0 From: flow gg Date: Fri, 22 Mar 2024 14:03:47 +0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH 1/7] lavc/vp9dsp: R-V mc copy_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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KS8bqbGsL8NA (This should be used after applying these patches) ``` [FFmpeg-devel] [PATCH 1/4] lavc/vp9dsp: R-V V ipred dc 1-4 ``` From ea81872215165ff859a0b5b2e003c5c678ea8ed0 Mon Sep 17 00:00:00 2001 From: sunyuechi Date: Thu, 21 Mar 2024 22:01:18 +0800 Subject: [PATCH 1/7] lavc/vp9dsp: R-V mc copy_avg 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 vp9_put4_8bpp_c: 0.7 vp9_put4_8bpp_rvi: 0.2 vp9_put8_8bpp_c: 2.5 vp9_put8_8bpp_rvi: 0.5 vp9_put16_8bpp_c: 16.5 vp9_put16_8bpp_rvv_i64: 1.7 vp9_put32_8bpp_c: 37.2 vp9_put32_8bpp_rvv_i64: 5.7 vp9_put64_8bpp_c: 91.2 vp9_put64_8bpp_rvv_i64: 19.7 --- libavcodec/riscv/Makefile | 4 ++- libavcodec/riscv/vp9_mc_rvi.S | 43 +++++++++++++++++++++++ libavcodec/riscv/vp9_mc_rvv.S | 64 ++++++++++++++++++++++++++++++++++ libavcodec/riscv/vp9dsp_init.c | 47 +++++++++++++++++++++++++ 4 files changed, 157 insertions(+), 1 deletion(-) create mode 100644 libavcodec/riscv/vp9_mc_rvi.S create mode 100644 libavcodec/riscv/vp9_mc_rvv.S diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index c237e60800..dce1236b84 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -61,6 +61,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 -RVV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_intra_rvv.o +RV-OBJS-$(CONFIG_VP9_DECODER) += riscv/vp9_mc_rvi.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_rvi.S b/libavcodec/riscv/vp9_mc_rvi.S new file mode 100644 index 0000000000..03d8dbbbae --- /dev/null +++ b/libavcodec/riscv/vp9_mc_rvi.S @@ -0,0 +1,43 @@ +/* + * 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" + +func ff_copy8_rvi +1: + addi a4, a4, -1 + ld t4, (a2) + sd t4, (a0) + add a2, a2, a3 + add a0, a0, a1 + bnez a4, 1b + ret +endfunc + +func ff_copy4_rvi +1: + addi a4, a4, -1 + lw t4, (a2) + sw t4, (a0) + add a2, a2, a3 + add a0, a0, a1 + bnez a4, 1b + ret +endfunc diff --git a/libavcodec/riscv/vp9_mc_rvv.S b/libavcodec/riscv/vp9_mc_rvv.S new file mode 100644 index 0000000000..ba9ec3431f --- /dev/null +++ b/libavcodec/riscv/vp9_mc_rvv.S @@ -0,0 +1,64 @@ +/* + * 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 copy_avg len type +.ifc \type,avg + csrwi vxrm, 0 +.endif +.ifc \len,64 + li t5, 64 + vsetvli t0, t5, e8, m4, ta, ma +.elseif \len == 32 + li t5, 32 + vsetvli t0, t5, e8, m2, ta, ma +.elseif \len == 16 + vsetivli t0, 16, e8, m1, ta, ma +.elseif \len == 8 + vsetivli t0, 8, e8, mf2, ta, ma +.elseif \len == 4 + vsetivli t0, 4, e8, mf4, ta, ma +.endif +1: + addi a4, a4, -1 + vle8.v v8, (a2) +.ifc \type,avg + vle8.v v16, (a0) + vaaddu.vv v8, v8, v16 +.endif + vse8.v v8, (a0) + add a2, a2, a3 + add a0, a0, a1 + bnez a4, 1b + ret +.endm + +.irp len 64, 32, 16 +func ff_copy\len\()_rvv, zve32x + copy_avg \len copy +endfunc +.endr + +.irp len 64, 32, 16, 8, 4 +func ff_avg\len\()_rvv, zve32x + copy_avg \len avg +endfunc +.endr diff --git a/libavcodec/riscv/vp9dsp_init.c b/libavcodec/riscv/vp9dsp_init.c index f08c8f6a42..c602c38bb2 100644 --- a/libavcodec/riscv/vp9dsp_init.c +++ b/libavcodec/riscv/vp9dsp_init.c @@ -65,7 +65,54 @@ static av_cold void vp9dsp_intrapred_init_rvv(VP9DSPContext *dsp, int bpp) #endif } +static av_cold void vp9dsp_mc_init_rvv(VP9DSPContext *dsp, int bpp) +{ +#if HAVE_RV + int flags = av_get_cpu_flags(); + + if (flags & AV_CPU_FLAG_RVI) { + dsp->mc[3][FILTER_8TAP_SMOOTH][0][0][0] = ff_copy8_rvi; + dsp->mc[3][FILTER_8TAP_REGULAR][0][0][0] = ff_copy8_rvi; + dsp->mc[3][FILTER_8TAP_SHARP][0][0][0] = ff_copy8_rvi; + dsp->mc[3][FILTER_BILINEAR][0][0][0] = ff_copy8_rvi; + dsp->mc[4][FILTER_8TAP_SMOOTH][0][0][0] = ff_copy4_rvi; + dsp->mc[4][FILTER_8TAP_REGULAR][0][0][0] = ff_copy4_rvi; + dsp->mc[4][FILTER_8TAP_SHARP][0][0][0] = ff_copy4_rvi; + dsp->mc[4][FILTER_BILINEAR][0][0][0] = ff_copy4_rvi; + } + +#if HAVE_RVV + if (bpp == 8 && flags & AV_CPU_FLAG_RVV_I64 && ff_get_rv_vlenb() >= 16) { + +#define init_fpel(idx1, idx2, sz, type) \ + dsp->mc[idx1][FILTER_8TAP_SMOOTH ][idx2][0][0] = ff_##type##sz##_rvv; \ + dsp->mc[idx1][FILTER_8TAP_REGULAR][idx2][0][0] = ff_##type##sz##_rvv; \ + dsp->mc[idx1][FILTER_8TAP_SHARP ][idx2][0][0] = ff_##type##sz##_rvv; \ + dsp->mc[idx1][FILTER_BILINEAR ][idx2][0][0] = ff_##type##sz##_rvv + +#define init_copy_avg(idx, sz) \ + init_fpel(idx, 0, sz, copy); \ + init_fpel(idx, 1, sz, avg) + +#define init_avg(idx, sz) \ + init_fpel(idx, 1, sz, avg) + + init_copy_avg(0, 64); + init_copy_avg(1, 32); + init_copy_avg(2, 16); + init_avg(3, 8); + init_avg(4, 4); + +#undef init_copy_avg +#undef init_avg +#undef init_fpel + } +#endif +#endif +} + av_cold void ff_vp9dsp_init_riscv(VP9DSPContext *dsp, int bpp, int bitexact) { vp9dsp_intrapred_init_rvv(dsp, bpp); + vp9dsp_mc_init_rvv(dsp, bpp); } -- 2.44.0