From patchwork Sun May 26 11:12:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 49270 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2694055vqf; Sun, 26 May 2024 04:12:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVr80Wc+XgVhkjYW3cfRRAf5SUzp6hYaP19SY+GUN6uKU2EYWqGuRxUyuGuyl+OunzH000CLSKBz6QLRAQru/HMb4bQpV8xAOtjtQ== X-Google-Smtp-Source: AGHT+IHxgVJrQHvbJAnrf2klMMZc++TvtczDavZ4BL0u3wXVBYpCpFgZ+WsaQF0dFuts52BVOxmj X-Received: by 2002:a50:875d:0:b0:578:5756:1519 with SMTP id 4fb4d7f45d1cf-578575616d5mr5218131a12.16.1716721937238; Sun, 26 May 2024 04:12:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716721937; cv=none; d=google.com; s=arc-20160816; b=E+Coe9WjtjmssSokvMrfb2OXWVAmQuIVckShdF4zO1Uod4SjKMiukngmEzkHjt73n0 K1NIasFVWHDaEQ7wc1t5WgdKBuLhB57iXDZymypJDyV10W9ifrW2k3wDa/fe51mmmlQo TQ9pf+CfiWrfKxeUflzi546ZMDaUY78PxOiCxGRy2TjflKQyc4p9Ad9ZvZsxXShMWgIs urdFd5gzkPPy5SJfDIRhJn53L3ZlHM1HXqyz1a+goTkV0WVCMvq0UFeJ0X8d4d9Bsws8 hM1zu85kJdau5CvTKKN8R/Pr5wRHarXsG2+nKcnIi1M/VSxvKw5ui2DXAnNQPS2Phzs2 xhFQ== 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=bOqDxv0gmqJnt11OKrwFpFQJm8Zdr1m0gofteHcXILI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=exbvfCw7OiS9XsHQAzbKsWVCaxqjF45hII6HVZa2GhnVaVoVdgPsYWRGCEGZJFlR9V oWXy6JSR47OXmnqomAjdo2iUrBM2J7SJUfJN9/76P81/TAKy9bCLFk4znBN/FbrhfgC7 n5l/6Sr8xqA10v9luUfYH+fFgAj5KrmZ/K2meu5FT2sO55CayaHNsPKJ5WEek2DQlLfx Nkrfy655zTtc7bRpjBG2qCgzUXMSKRmrJQrKh/WGwnkAkrS3GsQpspUUa8VFCl/VQgYK Zy62yPAVyDgR9Tgbtzmp1rgbbL5g4bdsSswRLCQzvmtEhoHANLK4Svg/xGsi+7COHhoB 9nYg==; dara=google.com 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 4fb4d7f45d1cf-5785f41e9efsi2357742a12.542.2024.05.26.04.12.16; Sun, 26 May 2024 04:12:17 -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 A4C8C68D4D5; Sun, 26 May 2024 14:12:12 +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 6398468D1FD for ; Sun, 26 May 2024 14:12:06 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 0628CC006F for ; Sun, 26 May 2024 14:12:05 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 May 2024 14:12:04 +0300 Message-ID: <20240526111205.21965-1-remi@remlab.net> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240526092823.16116-1-remi@remlab.net> References: <20240526092823.16116-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavc/vp7dsp: revector ff_vp7_dc_wht_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: hHTc7HC4t1NM This prepares for some code reuse. --- libavcodec/riscv/vp7dsp_init.c | 3 ++- libavcodec/riscv/vp7dsp_rvv.S | 23 ++++++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/libavcodec/riscv/vp7dsp_init.c b/libavcodec/riscv/vp7dsp_init.c index 5a57a39d0b..1406eb1c6a 100644 --- a/libavcodec/riscv/vp7dsp_init.c +++ b/libavcodec/riscv/vp7dsp_init.c @@ -32,7 +32,8 @@ av_cold void ff_vp7dsp_init_riscv(VP8DSPContext *c) #if HAVE_RVV int flags = av_get_cpu_flags(); - if ((flags & AV_CPU_FLAG_RVV_I32) && ff_rv_vlen_least(128)) { + if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR) && + ff_rv_vlen_least(128)) { #if __riscv_xlen >= 64 c->vp8_luma_dc_wht = ff_vp7_luma_dc_wht_rvv; #endif diff --git a/libavcodec/riscv/vp7dsp_rvv.S b/libavcodec/riscv/vp7dsp_rvv.S index 819d2056dc..06e251f5ce 100644 --- a/libavcodec/riscv/vp7dsp_rvv.S +++ b/libavcodec/riscv/vp7dsp_rvv.S @@ -22,6 +22,15 @@ #if __riscv_xlen >= 64 func ff_vp7_luma_dc_wht_rvv, zve32x + li a2, 4 * 16 * 2 + li a7, 16 * 2 + jal t0, 1f + vsse16.v v4, (a0), a7 + vsse16.v v5, (t1), a7 + vsse16.v v6, (t2), a7 + vsse16.v v7, (t3), a7 + ret +1: csrwi vxrm, 0 li t4, 12540 vsetivli zero, 4, e16, mf2, ta, ma @@ -58,14 +67,14 @@ func ff_vp7_luma_dc_wht_rvv, zve32x vle16.v v2, (t2) vle16.v v3, (t3) vwmul.vx v8, v1, t4 - li t0, 16 * 2 vwmul.vx v9, v3, t6 - addi t1, a0, 1 * 4 * 16 * 2 + add t1, a2, a0 vwmul.vx v10, v1, t6 - addi t2, a0, 2 * 4 * 16 * 2 + sh1add t2, a2, a0 vwmul.vx v11, v3, t4 - addi t3, a0, 3 * 4 * 16 * 2 + sh1add a2, a2, a2 # a2 *= 3 vwadd.vv v4, v0, v2 + add t3, a2, a0 vwsub.vv v5, v0, v2 vsetvli zero, zero, e32, m1, ta, ma vmul.vx v4, v4, t5 @@ -86,10 +95,6 @@ func ff_vp7_luma_dc_wht_rvv, zve32x vnclip.wi v5, v1, 18 vnclip.wi v6, v2, 18 vnclip.wi v7, v3, 18 - vsse16.v v4, (a0), t0 - vsse16.v v5, (t1), t0 - vsse16.v v6, (t2), t0 - vsse16.v v7, (t3), t0 - ret + jr t0 endfunc #endif