From patchwork Mon Jun 10 06:22:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "J. Dekker" X-Patchwork-Id: 49766 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp2322647vqo; Sun, 9 Jun 2024 23:22:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUkSfoD8saTBxPreKy4XsF3R3u+qnXON7VjqbnEGnaNMBv/HayDMltP0anRAQ3bhsoI3BE4MfOZtWsfoVWDYvPqEc7vKj1PQScfJw== X-Google-Smtp-Source: AGHT+IH8pomUaOMk/wQoUIHv8ybCp4WSIzEQFv3cxfqbek53M9bWTQvw4q5ZoFTqBjCvHNIzKnQ8 X-Received: by 2002:a17:906:6a1c:b0:a6f:1e1b:f9ea with SMTP id a640c23a62f3a-a6f1e1bfd6emr158500566b.31.1718000551555; Sun, 09 Jun 2024 23:22:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718000551; cv=none; d=google.com; s=arc-20160816; b=nDGjIjGGh/F3Dy0gAtxNqKgQ1Fp+LwEFPZyUdXTvW+pTQpBWRARAeu7Ycc3xwBEiAH r4suoh5RujX+ygq+duPFhPecaruEQkW2G1CenZ+opmZehJGch8xDAMbpfNgEkj6fPhj6 prn9GgxDYSJIWQahMSGjXWuwuX3jVui2h1uRuuPA7oYsGjC/sG+n7SVrDh//8sf4RL69 Vwef3A0qqwn+HDdu4bb9GNQuzKMg+qgXK7ysQG7XMBiQYaFs0Ymco1dkLe/SxZFhn7Jm f20RNYxvniDnqAmBeMUwbKCXSgkJg7YxlEmCH6RuvWXNLn8bJHSYjZpes7Seilw4Tofh ALRw== 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:message-id:date:to:from:feedback-id :dkim-signature:dkim-signature:delivered-to; bh=FvLJxQOVctIQ/by3bywWwhMZFLMYrfCSumNLV6605H0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=KvrOprtptwfA4gRl4zQDielDtKZqJeDEghaxl0kFf58XVUD12m+Vsh2PJGOsdAq3AL T/CZqN1KMNJHfxa5R0JWh/0zOMrV5qLvaGawWrOS9zO13FKhRul204dA+AoFwpKQ3zJt +39AfMNM1dVNizZ0xOZpLAR6OpE6FPbo7sbOdAdD5MQ+c0palsQTqgcDXkQXC7iSaNZH 93X301o46yKPWaQHjemWV4+gJR4CMHTi3v8jEkA1/O5EnEB7zzOMhbg6/zy/Fh/LqS80 Vnkv9dcRkVGSmlSm96cCAq9GdCFT4jNRnGfVFXKNfbLupWy2MP/XeNpiXwQNotXX1Klv jLSw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm2 header.b=c4pdj3vR; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=mymexICm; 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 a640c23a62f3a-a6f15c3d275si130772466b.180.2024.06.09.23.22.31; Sun, 09 Jun 2024 23:22:31 -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=@itanimul.li header.s=fm2 header.b=c4pdj3vR; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=mymexICm; 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 9ADBC68D70C; Mon, 10 Jun 2024 09:22:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from fout6-smtp.messagingengine.com (fout6-smtp.messagingengine.com [103.168.172.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 69E7568D5D0 for ; Mon, 10 Jun 2024 09:22:20 +0300 (EEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfout.nyi.internal (Postfix) with ESMTP id D4B3C13800F0 for ; Mon, 10 Jun 2024 02:22:18 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 10 Jun 2024 02:22:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= cc:content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to; s=fm2; t=1718000538; x=1718086938; bh=+R3NUsSbPT ttoBTLf9QvBCBMghn+conP2jzjpLpgusk=; b=c4pdj3vRRRfVMEisXnmY5fg9mP 0KmG7LuD01P70P5K7vmUTvKNfLiqllR0XQ0CThGvVkiKpC9eUF+VKYH1908QZy1o wmfWbjc0PONdsZuDNgvetyefHFmk1blVdcQgloJxBju9WhyeYMClZLrOLiq1ikzA 42QvsggeS+vhh6ThXXR7q8A1gqkbv1Uiub22lfNxj9hLZq1iBOqjkLiwG6WdDmN7 cZIdGF2hYYoBgjTkfBAg6hfNQ2SOytjChYpmi+PLOfsQDXdXNpuUcsS/DyVrvtbt l+RDk2efvqHmZDooKDSqp07BxvR68d6Ict8F3Pkijsya0enQN0/LUDdjvu7g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1718000538; x=1718086938; bh=+R3NUsSbPTttoBTLf9QvBCBMghn+ conP2jzjpLpgusk=; b=mymexICm9invLYa5ThroTu3GNVh+ZGdz8k/DNy6Cv+XB o/RDGKQdKXqft2jjz/Uo6Dn/twGaTMqP+aNEC+I2B4rBrwo2penT/iUMkhx1UG5m 6D+tFv02tue5Crkan0WMdr9NP3c+KHUJG4ScOD2loe0Aqyq1uYlnfHtzA5jWuQFU 6CBBqD8S3sMkpGCylgSLmQ8Hdpz8HIC2K11VaiUt1L/T2PH6hkZunBKhFzAtAOW/ ZaDqqIZ2rKwrSqlbLfeO2q5nOYdo2JYUNE2E0TdZiKED4wPfI3ks7Xm/+/pPtgpn ppHnQFT4dmci4yH/TY1sZHZKBlUqlCdfKSxCWoU4Ew== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfedtledghedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofggtgfgsehtkeertd ertdejnecuhfhrohhmpedflfdrucffvghkkhgvrhdfuceojhguvghksehithgrnhhimhhu lhdrlhhiqeenucggtffrrghtthgvrhhnpeekuedvvddtffeludfgjeefgfeiffdtteehhf etgeevtdfgteevjefghffhjeffudenucffohhmrghinhephhdvieegughsphgprhhvvhdr shgsnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjh guvghksehithgrnhhimhhulhdrlhhi X-ME-Proxy: Feedback-ID: i84994747:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 10 Jun 2024 02:22:17 -0400 (EDT) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jun 2024 06:22:14 +0000 Message-ID: <20240610062216.30053-1-jdek@itanimul.li> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/riscv: add h264 dc idct rvv 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: M841jSk3/bjm checkasm: bench runs 131072 (1 << 17) h264_idct4_add_dc_8bpp_c: 1.5 h264_idct4_add_dc_8bpp_rvv_i64: 0.7 h264_idct4_add_dc_9bpp_c: 1.5 h264_idct4_add_dc_9bpp_rvv_i64: 0.7 h264_idct4_add_dc_10bpp_c: 1.5 h264_idct4_add_dc_10bpp_rvv_i64: 0.7 h264_idct4_add_dc_12bpp_c: 1.2 h264_idct4_add_dc_12bpp_rvv_i64: 0.7 h264_idct4_add_dc_14bpp_c: 1.2 h264_idct4_add_dc_14bpp_rvv_i64: 0.7 h264_idct8_add_dc_8bpp_c: 5.2 h264_idct8_add_dc_8bpp_rvv_i64: 1.5 h264_idct8_add_dc_9bpp_c: 5.5 h264_idct8_add_dc_9bpp_rvv_i64: 1.2 h264_idct8_add_dc_10bpp_c: 5.5 h264_idct8_add_dc_10bpp_rvv_i64: 1.2 h264_idct8_add_dc_12bpp_c: 4.2 h264_idct8_add_dc_12bpp_rvv_i64: 1.2 h264_idct8_add_dc_14bpp_c: 4.2 h264_idct8_add_dc_14bpp_rvv_i64: 1.2 Signed-off-by: J. Dekker --- libavcodec/riscv/Makefile | 1 + libavcodec/riscv/h264dsp_init.c | 40 +++++++++- libavcodec/riscv/h264dsp_rvv.S | 129 ++++++++++++++++++++++++++++++++ 3 files changed, 167 insertions(+), 3 deletions(-) create mode 100644 libavcodec/riscv/h264dsp_rvv.S diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index 590655f829..cb63631de4 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -31,6 +31,7 @@ RVV-OBJS-$(CONFIG_H263DSP) += riscv/h263dsp_rvv.o OBJS-$(CONFIG_H264CHROMA) += riscv/h264_chroma_init_riscv.o RVV-OBJS-$(CONFIG_H264CHROMA) += riscv/h264_mc_chroma.o OBJS-$(CONFIG_H264DSP) += riscv/h264dsp_init.o +RVV-OBJS-$(CONFIG_H264DSP) += riscv/h264dsp_rvv.o OBJS-$(CONFIG_HUFFYUV_DECODER) += riscv/huffyuvdsp_init.o RVV-OBJS-$(CONFIG_HUFFYUV_DECODER) += riscv/huffyuvdsp_rvv.o OBJS-$(CONFIG_IDCTDSP) += riscv/idctdsp_init.o diff --git a/libavcodec/riscv/h264dsp_init.c b/libavcodec/riscv/h264dsp_init.c index dbbf3db400..fe3caf686d 100644 --- a/libavcodec/riscv/h264dsp_init.c +++ b/libavcodec/riscv/h264dsp_init.c @@ -1,4 +1,5 @@ /* + * Copyright (c) 2024 J. Dekker * Copyright © 2024 Rémi Denis-Courmont. * * This file is part of FFmpeg. @@ -24,22 +25,55 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" +#include "libavutil/riscv/cpu.h" #include "libavcodec/h264dsp.h" extern int ff_startcode_find_candidate_rvb(const uint8_t *, int); extern int ff_startcode_find_candidate_rvv(const uint8_t *, int); +void ff_h264_idct4_dc_add_8_rvv(uint8_t *dst, int16_t *block, int stride); +void ff_h264_idct8_dc_add_8_rvv(uint8_t *dst, int16_t *block, int stride); +void ff_h264_idct4_dc_add_9_rvv(uint8_t *dst, int16_t *block, int stride); +void ff_h264_idct8_dc_add_9_rvv(uint8_t *dst, int16_t *block, int stride); +void ff_h264_idct4_dc_add_10_rvv(uint8_t *dst, int16_t *block, int stride); +void ff_h264_idct8_dc_add_10_rvv(uint8_t *dst, int16_t *block, int stride); +void ff_h264_idct4_dc_add_12_rvv(uint8_t *dst, int16_t *block, int stride); +void ff_h264_idct8_dc_add_12_rvv(uint8_t *dst, int16_t *block, int stride); +void ff_h264_idct4_dc_add_14_rvv(uint8_t *dst, int16_t *block, int stride); +void ff_h264_idct8_dc_add_14_rvv(uint8_t *dst, int16_t *block, int stride); -av_cold void ff_h264dsp_init_riscv(H264DSPContext *dsp, const int bit_depth, +av_cold void ff_h264dsp_init_riscv(H264DSPContext *c, const int bit_depth, const int chroma_format_idc) { #if HAVE_RV int flags = av_get_cpu_flags(); if (flags & AV_CPU_FLAG_RVB_BASIC) - dsp->startcode_find_candidate = ff_startcode_find_candidate_rvb; + c->startcode_find_candidate = ff_startcode_find_candidate_rvb; # if HAVE_RVV if (flags & AV_CPU_FLAG_RVV_I32) - dsp->startcode_find_candidate = ff_startcode_find_candidate_rvv; + c->startcode_find_candidate = ff_startcode_find_candidate_rvv; # endif + if ((flags & AV_CPU_FLAG_RVV_I64) && ff_get_rv_vlenb() >= 16) { + if (bit_depth == 8) { + c->h264_idct_dc_add = ff_h264_idct4_dc_add_8_rvv; + c->h264_idct8_dc_add = ff_h264_idct8_dc_add_8_rvv; + } + if (bit_depth == 9) { + c->h264_idct_dc_add = ff_h264_idct4_dc_add_9_rvv; + c->h264_idct8_dc_add = ff_h264_idct8_dc_add_9_rvv; + } + if (bit_depth == 10) { + c->h264_idct_dc_add = ff_h264_idct4_dc_add_10_rvv; + c->h264_idct8_dc_add = ff_h264_idct8_dc_add_10_rvv; + } + if (bit_depth == 12) { + c->h264_idct_dc_add = ff_h264_idct4_dc_add_12_rvv; + c->h264_idct8_dc_add = ff_h264_idct8_dc_add_12_rvv; + } + if (bit_depth == 14) { + c->h264_idct_dc_add = ff_h264_idct4_dc_add_14_rvv; + c->h264_idct8_dc_add = ff_h264_idct8_dc_add_14_rvv; + } + } #endif } diff --git a/libavcodec/riscv/h264dsp_rvv.S b/libavcodec/riscv/h264dsp_rvv.S new file mode 100644 index 0000000000..c392403add --- /dev/null +++ b/libavcodec/riscv/h264dsp_rvv.S @@ -0,0 +1,129 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 J. Dekker + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include "libavutil/riscv/asm.S" + +.macro clip min, max, regs:vararg +.irp x, \regs + vmax.vx \x, \x, \min +.endr +.irp x, \regs + vmin.vx \x, \x, \max +.endr +.endm + +.macro idct_dc_add depth +func ff_h264_idct_dc_add_\depth\()_rvv, zve64x, zbb +.if \depth == 8 + lh a3, 0(a1) +.else + lw a3, 0(a1) +.endif + addi a3, a3, 32 + mv t1, a4 // lines = cols + srai a3, a3, 6 +.if \depth == 8 + sh zero, 0(a1) +.else + sw zero, 0(a1) +.endif +1: add t4, a0, a2 // &src[line * 1] + sh1add t5, a2, a0 // &src[line * 2] + sh1add t6, a2, t4 // &src[line * 3] +.if \depth == 8 + vsetvli zero, a4, e8, mf2, ta, ma + vle8.v v0, (a0) + vle8.v v1, (t4) + vle8.v v2, (t5) + vle8.v v3, (t6) + vwcvtu.x.x.v v8, v0 + vwcvtu.x.x.v v9, v1 + vwcvtu.x.x.v v10, v2 + vwcvtu.x.x.v v11, v3 + vsetvli zero, a4, e16, m1, ta, ma +.else + vsetvli zero, a4, e16, m1, ta, ma + vle16.v v8, (a0) + vle16.v v9, (t4) + vle16.v v10, (t5) + vle16.v v11, (t6) +.endif + vadd.vx v8, v8, a3 + vadd.vx v9, v9, a3 + vadd.vx v10, v10, a3 + vadd.vx v11, v11, a3 + clip zero, a5, v8, v9, v10, v11 + addi t1, t1, -4 +.if \depth == 8 + vsetvli zero, a4, e8, mf2, ta, ma + vncvt.x.x.w v0, v8 + vncvt.x.x.w v1, v9 + vncvt.x.x.w v2, v10 + vncvt.x.x.w v3, v11 + vse8.v v0, (a0) + vse8.v v1, (t4) + vse8.v v2, (t5) + vse8.v v3, (t6) +.else + vse16.v v8, (a0) + vse16.v v9, (t4) + vse16.v v10, (t5) + vse16.v v11, (t6) +.endif + sh2add a0, a2, a0 // src += stride * 4 + bnez t1, 1b + ret +endfunc +.endm + +idct_dc_add 8 +idct_dc_add 16 + +func ff_h264_idct4_dc_add_8_rvv, zve64x + li a4, 4 + li a5, 255 + j ff_h264_idct_dc_add_8_rvv +endfunc +func ff_h264_idct8_dc_add_8_rvv, zve64x + li a4, 8 + li a5, 255 + j ff_h264_idct_dc_add_8_rvv +endfunc + +.irp depth,9,10,12,14 +func ff_h264_idct4_dc_add_\depth\()_rvv, zve64x + li a4, 4 + li a5, (1 << \depth) - 1 + j ff_h264_idct_dc_add_16_rvv +endfunc + +func ff_h264_idct8_dc_add_\depth\()_rvv, zve64x + li a4, 8 + li a5, (1 << \depth) - 1 + j ff_h264_idct_dc_add_16_rvv +endfunc +.endr