From patchwork Tue Sep 27 20:04:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 38388 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp776569pzh; Tue, 27 Sep 2022 13:05:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4/MgK8kBf7zjZCds9L5U/FoZrmiNlV6lxcDR6hdrwRESt0TRus2Dbyt5iiVD3jOyZ+qkUo X-Received: by 2002:a17:907:74e:b0:74f:83d4:cf58 with SMTP id xc14-20020a170907074e00b0074f83d4cf58mr24702557ejb.178.1664309113924; Tue, 27 Sep 2022 13:05:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664309113; cv=none; d=google.com; s=arc-20160816; b=tNFXde3yMuSr6Q7bATZMOmOEeHT/MHyFZwZpsODTOG29ZMs81WhYqZ+TxbaEW0c/6n N4plcjqyurEa4qhTmw+D3d+BT3U81hDZEYQ8Q1OoWD2/CAAz8GH3NU/VDe7Oy6ObMEux HdEY9gSNB74VeipN/NJgrCBaRxFIn/D2zOrPcLDWkabJYK2UqJNPc5Uic9eOLoLDav3b W2sYTeC1dYW9iHKkyLwgIcuUu0TbnfGOBWG5ftOWzj5wlKcG+XIxvkzaXSv1iY58py9I SEiUzNlAzhHuvb0V5upzxbI6VPf896Tr1tj8Mr4mkpqIWIdbMZNw4pP5jAPoGOHyzXXd nPdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=mSA7shDopi6fOspe5JThkd8KjJ+0uMtQKhqxb6Oms6w=; b=yT28sNmjEvS76tRvRO4B3gw+Hm1gaErRjatbDZxskDarYGMVWteKifuU3Mj/XAfQ7N OO+PhaDxU//leVr8GbzRY6J5HebOs8qQ4EuChyK9imtVa+blpT+D+CPeUdv98euO0jjy bmwksS66ci2QSAfj9Zqg3kQTSg0xITcBRwyMgbpmyPNS/q1tkURUKa+34E4km0yfhh/w CEm++EKFoijRyAdMtbm4Gcm4yg+bFpmxNwbpaGYqiPtroDQKs+rjFMgvi6R5TZM5p5lV atyY+0rCja4h1ylU/CrxqdkICtBgCWzRlm8OJ0fqU1whRyc/DOdDeeQGRfueRv+5uWtk yL4g== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id oz36-20020a1709077da400b0073dced7204bsi2126551ejc.767.2022.09.27.13.05.13; Tue, 27 Sep 2022 13:05:13 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2DF1168BABD; Tue, 27 Sep 2022 23:04:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ursule.remlab.net (vps-a2bccee9.vps.ovh.net [51.75.19.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E3F0C68BAE8 for ; Tue, 27 Sep 2022 23:04:28 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 970AAC00B1 for ; Tue, 27 Sep 2022 23:04:28 +0300 (EEST) From: remi@remlab.net To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Sep 2022 23:04:25 +0300 Message-Id: <20220927200427.11811-5-remi@remlab.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <2846208.e9J7NaK4W3@basile.remlab.net> References: <2846208.e9J7NaK4W3@basile.remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/7] lavc/pixblockdsp: RISC-V V 8-bit get_pixels & get_pixels_unaligned 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: njHN7V7l5qPW From: Rémi Denis-Courmont --- libavcodec/riscv/Makefile | 1 + libavcodec/riscv/pixblockdsp_init.c | 12 ++++++++++ libavcodec/riscv/pixblockdsp_rvv.S | 37 +++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 libavcodec/riscv/pixblockdsp_rvv.S diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index 96925afdab..0fb2c81c75 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -9,5 +9,6 @@ OBJS-$(CONFIG_IDCTDSP) += riscv/idctdsp_init.o RVV-OBJS-$(CONFIG_IDCTDSP) += riscv/idctdsp_rvv.o OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_init.o \ riscv/pixblockdsp_rvi.o +RVV-OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_rvv.o OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_init.o RVV-OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_rvv.o diff --git a/libavcodec/riscv/pixblockdsp_init.c b/libavcodec/riscv/pixblockdsp_init.c index 04bf52649f..69dbd18918 100644 --- a/libavcodec/riscv/pixblockdsp_init.c +++ b/libavcodec/riscv/pixblockdsp_init.c @@ -20,8 +20,10 @@ #include +#include "config.h" #include "libavutil/attributes.h" #include "libavutil/cpu.h" +#include "libavutil/riscv/cpu.h" #include "libavcodec/avcodec.h" #include "libavcodec/pixblockdsp.h" @@ -30,6 +32,9 @@ void ff_get_pixels_8_rvi(int16_t *block, const uint8_t *pixels, void ff_get_pixels_16_rvi(int16_t *block, const uint8_t *pixels, ptrdiff_t stride); +void ff_get_pixels_8_rvv(int16_t *block, const uint8_t *pixels, + ptrdiff_t stride); + av_cold void ff_pixblockdsp_init_riscv(PixblockDSPContext *c, AVCodecContext *avctx, unsigned high_bit_depth) @@ -42,4 +47,11 @@ av_cold void ff_pixblockdsp_init_riscv(PixblockDSPContext *c, else c->get_pixels = ff_get_pixels_8_rvi; } + +#if HAVE_RVV + if ((cpu_flags & AV_CPU_FLAG_RVV_I32) && ff_get_rv_vlenb() >= 16) { + if (!high_bit_depth) + c->get_pixels_unaligned = c->get_pixels = ff_get_pixels_8_rvv; + } +#endif } diff --git a/libavcodec/riscv/pixblockdsp_rvv.S b/libavcodec/riscv/pixblockdsp_rvv.S new file mode 100644 index 0000000000..b7c74b88b5 --- /dev/null +++ b/libavcodec/riscv/pixblockdsp_rvv.S @@ -0,0 +1,37 @@ +/* + * Copyright © 2022 Rémi Denis-Courmont. + * + * 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 "config.h" +#include "../libavutil/riscv/asm.S" + +func ff_get_pixels_8_rvv, zve32x + vsetivli zero, 8, e8, mf2, ta, ma + vlsseg8e8.v v16, (a1), a2 + vwcvtu.x.x.v v8, v16 + vwcvtu.x.x.v v9, v17 + vwcvtu.x.x.v v10, v18 + vwcvtu.x.x.v v11, v19 + vwcvtu.x.x.v v12, v20 + vwcvtu.x.x.v v13, v21 + vwcvtu.x.x.v v14, v22 + vwcvtu.x.x.v v15, v23 + vsseg8e16.v v8, (a0) + ret +endfunc