From patchwork Sun May 12 12:57:07 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: 48816 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp565355pzb; Sun, 12 May 2024 05:58:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVqBzlmJc9pfbEu0aTcu8GvP5ulOTsBEyviNPxp5oZMTgsnw8y1A5kBg5E6coAnvmjSRXRqq9oUA7l+RhdCU/mEPvxJo8IvD2i8BQ== X-Google-Smtp-Source: AGHT+IEHPyGNvv5Q6BcUCQPqtriSBqIKvlXfYcvMW/pR3Izb4rKqDByTYQZqRwKzzPsmmeGwt5Il X-Received: by 2002:a17:906:7807:b0:a58:7298:fdfe with SMTP id a640c23a62f3a-a5a2d672028mr495562966b.53.1715518718967; Sun, 12 May 2024 05:58:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715518718; cv=none; d=google.com; s=arc-20160816; b=KRnH0dcti3J7mcM6N6S9cz6BOEXhPjcTrlaB7C15vIoU6akbJfbh25OPxw58Zf1sbE EDyW13K6bbBjM/ja8stKTM2xhYgZKhnPh4aemMmWQNs/Ikt15/7ZJSAOz9/cmdGG0ZKF WhHYbKoJwF8KCj/JHkrCNv1UCBmWhuApkuZ2Lcy1oDQ1coS1xKdPiYQkCGaOzZh1Zola vuvtmBsJkA46D4KkXxFf9HfYYUwbM3bZqT1J+dtaeH7ajbl6vvdoeHB2bIE9H1Zvihvm sMRZqupB8gh4BaWOtwl37G1uaWM0sGqpAePhU8MgqXhEYhy3iQpTQoeuYuYRQRHT//pj LtHg== 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=TVGxrRKoV+NTL8goCa6llSUDl4UE1NmShA0x/QDR5Zo=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=VMtpF2OIyPhNhUT/InCH0Oxh6c6apaMQvfYV4K1scuqM2W+h6E7VAXDw+o7LnJwgU9 d5mLFIq4757B79fufYZz5CeW6HQV24cMSpB+/xq7IR48Q+wP7QRxaJgCH6eI09sJyHct lhl5/vEObc1i6Bwn0y829Q0vcagxaryMiYRnUuEgGNiJNVvOofqrx8KWqAtog1/1cC7h t5endWQLp7iqulOWytKWPl39gHX0wKt2qu7k7ifEb5+EqnqAN8tNDW6RS9By3NFwKS8W AINGpGr66F+ePT29L9dge83pZOu28wwZxgorQZRSaNX+4rexKC8+AAICYWUvdIYI2A2t lVTw==; 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=vtCpaPmo; 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-5733c36d5a4si3938841a12.535.2024.05.12.05.58.38; Sun, 12 May 2024 05:58:38 -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=vtCpaPmo; 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 C53CD68D650; Sun, 12 May 2024 15:58:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-173.mail.qq.com (out203-205-221-173.mail.qq.com [203.205.221.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 263F168D5B9 for ; Sun, 12 May 2024 15:58:26 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1715518703; bh=iXUvK7PQUAKpiaBKxSEyk9pwQ3P1TcBvuT4Ferdw2yM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vtCpaPmoqf3YT1/OZ2S3KHh93DTaye4Zgq24FDTOVz3/91PxGG8hKsDhCqMvmRG7k 5aMOqS7pfpZmOp0FtgJr24ByLo1V/IsBRQ9sibicOrxXM15yjgqyJ5jaaSiw9zpFIH bAXPQvVubHt/Qw6veD1W4Kratf0litxF+WSR4GEQ= Received: from localhost.localdomain ([42.56.223.122]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id E4ABB41F; Sun, 12 May 2024 20:57:10 +0800 X-QQ-mid: xmsmtpt1715518630tg9h77n0p Message-ID: X-QQ-XMAILINFO: OR+tS2yJykEIuExM5bL88S6zzNsMKqQI1CoDOGa06FOX0tRmobGTxBxpyOOXtC nVwXyX15ttV3l+sSdGGmO4DExwvWqz3AmBOztwKpNgCyrduDBnKYW5m63Jb4UgP8wE4CRbrM28RI mJ5oNGebPZ9hKufat0FQII6JoKibx1MT0XLuKxc717VgiUVjF8YqNuBGciWC8QrSFj3yIP1ovU5A Ak1OaUZ5W12SgmUmpOdZxSqjsYDZK6I2BP6qmKiUC70r5+2sMO1qSvW1zh3UT/EXP3dTRvbnCpkK ndfIFUjI/3kiGHlgvbK9JMbaiFmzoEoK3vDC85R0JmR1I4InH0kZ9Caz/r23wbAIP4hfz0bNjGeE rZu9V4uX0IBb4IgBLAg8L4eWkF83B68kck143sKO0U/e4bENCrRD/WUAYqVN4jRsiYRE2E7qA6kI qCG9RDCx/F2+LT5WUemeklIyJI+a3rEh4HO3oZe3R6jPO8GOjCYYS9yQbSZChmOFgHlfKAHYeIih RCMIOPlna0tx8RfN2QJgSiMN3pEkBWVZjV0wQd/PYUV2lzfPjPHoaI3bLGzsSymFweZcnrq120v+ R5D0PJAufqG68ZnbWXVzvB+LVqUvvOolDGmX4pWqAmvadoNeVJn9Y7rBxNY/Po9riFLUrvaqMPWU OPOf7HSY7jOzQAk/ZBOhLray/+inpqu5VwnfZLkVqgFfwC/3+6KAThzKJYgeYnSbMU54mz/t+A2s 0/66QP3kTqHy3oeiD2XwZYVLS6RZJQO6BE35wl4KBh5KZBmwKWjJmNb30+KYV9Sa/pxqRMt+mLyj 7wvEs2nE18SE7GhoZvim0CiOIVMXwqnSrbif5naoBNDzAE4fnfqclL+q7zLeytoxhV6y3zlPDi7J Y5aAfTD52GHLpBCh0D5Z2FwaI4q2uSrlyybgWPOSCuy73tAmzvjAR92UG8EKmiDHMk1ucvwSJZ0v N8d1cbHoyws6DZ5b2Vv+wN+jG53R20+mKIEgbGzDOADPSnHTvs5Q== X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 May 2024 20:57:07 +0800 X-OQ-MSGID: <20240512125707.1878137-1-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/vc1dsp: R-V V mspel_pixels 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: w0Y22uNQvojS From: sunyuechi C908 X60 vc1dsp.avg_vc1_mspel_pixels_tab[0][0]_c : 14.7 13.2 vc1dsp.avg_vc1_mspel_pixels_tab[0][0]_rvv_i32 : 2.5 2.2 vc1dsp.avg_vc1_mspel_pixels_tab[1][0]_c : 3.7 3.5 vc1dsp.avg_vc1_mspel_pixels_tab[1][0]_rvv_i64 : 1.0 1.2 vc1dsp.put_vc1_mspel_pixels_tab[0][0]_c : 9.0 8.0 vc1dsp.put_vc1_mspel_pixels_tab[0][0]_rvi : 1.0 1.0 vc1dsp.put_vc1_mspel_pixels_tab[1][0]_c : 2.5 2.2 vc1dsp.put_vc1_mspel_pixels_tab[1][0]_rvi : 0.5 0.5 --- libavcodec/riscv/Makefile | 1 + libavcodec/riscv/vc1dsp_init.c | 16 +++++++++++- libavcodec/riscv/vc1dsp_rvi.S | 47 +++++++++++++++++++++++++++++++++ libavcodec/riscv/vc1dsp_rvv.S | 48 ++++++++++++++++++++++++++++++++++ 4 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 libavcodec/riscv/vc1dsp_rvi.S diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index f2348e259e..6f4869145a 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -58,6 +58,7 @@ RVV-OBJS-$(CONFIG_TAK_DECODER) += riscv/takdsp_rvv.o OBJS-$(CONFIG_UTVIDEO_DECODER) += riscv/utvideodsp_init.o RVV-OBJS-$(CONFIG_UTVIDEO_DECODER) += riscv/utvideodsp_rvv.o OBJS-$(CONFIG_VC1DSP) += riscv/vc1dsp_init.o +RV-OBJS-$(CONFIG_VC1DSP) += riscv/vc1dsp_rvi.o RVV-OBJS-$(CONFIG_VC1DSP) += riscv/vc1dsp_rvv.o OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_init.o RV-OBJS-$(CONFIG_VP8DSP) += riscv/vp8dsp_rvi.o diff --git a/libavcodec/riscv/vc1dsp_init.c b/libavcodec/riscv/vc1dsp_init.c index e47b644f80..2628369155 100644 --- a/libavcodec/riscv/vc1dsp_init.c +++ b/libavcodec/riscv/vc1dsp_init.c @@ -29,19 +29,33 @@ void ff_vc1_inv_trans_8x8_dc_rvv(uint8_t *dest, ptrdiff_t stride, int16_t *block void ff_vc1_inv_trans_4x8_dc_rvv(uint8_t *dest, ptrdiff_t stride, int16_t *block); void ff_vc1_inv_trans_8x4_dc_rvv(uint8_t *dest, ptrdiff_t stride, int16_t *block); void ff_vc1_inv_trans_4x4_dc_rvv(uint8_t *dest, ptrdiff_t stride, int16_t *block); +void ff_put_pixels16x16_rvi(uint8_t *dst, const uint8_t *src, ptrdiff_t line_size, int rnd); +void ff_put_pixels8x8_rvi(uint8_t *dst, const uint8_t *src, ptrdiff_t line_size, int rnd); +void ff_avg_pixels16x16_rvv(uint8_t *dst, const uint8_t *src, ptrdiff_t line_size, int rnd); +void ff_avg_pixels8x8_rvv(uint8_t *dst, const uint8_t *src, ptrdiff_t line_size, int rnd); av_cold void ff_vc1dsp_init_riscv(VC1DSPContext *dsp) { -#if HAVE_RVV +#if HAVE_RV int flags = av_get_cpu_flags(); +# if __riscv_xlen >= 64 + if (flags & AV_CPU_FLAG_RV_MISALIGNED) { + dsp->put_vc1_mspel_pixels_tab[1][0] = ff_put_pixels8x8_rvi; + dsp->put_vc1_mspel_pixels_tab[0][0] = ff_put_pixels16x16_rvi; + } +# endif +#if HAVE_RVV if (flags & AV_CPU_FLAG_RVV_I32 && ff_get_rv_vlenb() >= 16) { dsp->vc1_inv_trans_4x8_dc = ff_vc1_inv_trans_4x8_dc_rvv; dsp->vc1_inv_trans_4x4_dc = ff_vc1_inv_trans_4x4_dc_rvv; + dsp->avg_vc1_mspel_pixels_tab[0][0] = ff_avg_pixels16x16_rvv; if (flags & AV_CPU_FLAG_RVV_I64) { dsp->vc1_inv_trans_8x8_dc = ff_vc1_inv_trans_8x8_dc_rvv; dsp->vc1_inv_trans_8x4_dc = ff_vc1_inv_trans_8x4_dc_rvv; + dsp->avg_vc1_mspel_pixels_tab[1][0] = ff_avg_pixels8x8_rvv; } } #endif +#endif } diff --git a/libavcodec/riscv/vc1dsp_rvi.S b/libavcodec/riscv/vc1dsp_rvi.S new file mode 100644 index 0000000000..d4a1b5bf49 --- /dev/null +++ b/libavcodec/riscv/vc1dsp_rvi.S @@ -0,0 +1,47 @@ +/* + * 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_put_pixels8x8_rvi +.rept 8 + ld t0, (a1) + sd t0, (a0) + add a1, a1, a2 + add a0, a0, a2 +.endr + + ret +endfunc + +func ff_put_pixels16x16_rvi +.rept 16 + ld t0, (a1) + ld t1, 8(a1) + sd t0, (a0) + sd t1, 8(a0) + add a1, a1, a2 + add a0, a0, a2 +.endr + + ret +endfunc +#endif diff --git a/libavcodec/riscv/vc1dsp_rvv.S b/libavcodec/riscv/vc1dsp_rvv.S index 4a00945ead..7c2b47f66c 100644 --- a/libavcodec/riscv/vc1dsp_rvv.S +++ b/libavcodec/riscv/vc1dsp_rvv.S @@ -111,3 +111,51 @@ func ff_vc1_inv_trans_4x4_dc_rvv, zve32x vsse32.v v0, (a0), a1 ret endfunc + +.macro mspel_op op pos n1 n2 + add t1, \pos, a2 + v\op\()e8.v v\n1, (\pos) + sh1add \pos, a2, \pos + v\op\()e8.v v\n2, (t1) +.endm + +.macro mspel_op_all op pos a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 + mspel_op \op \pos \a1 \a2 + mspel_op \op \pos \a3 \a4 + mspel_op \op \pos \a5 \a6 + mspel_op \op \pos \a7 \a8 + mspel_op \op \pos \a9 \a10 + mspel_op \op \pos \a11 \a12 + mspel_op \op \pos \a13 \a14 + mspel_op \op \pos \a15 \a16 +.endm + +func ff_avg_pixels16x16_rvv, zve32x + csrwi vxrm, 0 + vsetivli zero, 16, e8, m1, ta, ma + mspel_op_all l a1 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 + mspel_op_all l a0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + vsetvli t0, zero, e8, m8, ta, ma + sub a0, a0, a2 + vaaddu.vv v0, v0, v16 + neg a2, a2 + vaaddu.vv v8, v8, v24 + vsetivli zero, 16, e8, m1, ta, ma + mspel_op_all s a0 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0 + + ret +endfunc + +func ff_avg_pixels8x8_rvv, zve64x + csrwi vxrm, 0 + li t0, 64 + vsetivli zero, 8, e8, mf2, ta, ma + vlse64.v v16, (a1), a2 + vlse64.v v8, (a0), a2 + vsetvli zero, t0, e8, m4, ta, ma + vaaddu.vv v16, v16, v8 + vsetivli zero, 8, e8, mf2, ta, ma + vsse64.v v16, (a0), a2 + + ret +endfunc