From patchwork Thu Jul 25 20:25:18 2024 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: 50738 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:a830:0:b0:482:c625:d099 with SMTP id z16csp79911vqo; Thu, 25 Jul 2024 13:26:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW0vrNBYrU3oCUFVTyX8PVLB4irVFp0dLUkXIl9/eT9ubv27Nq7jQk/2iuoXkh2E69gq61lU6p2zzG/v54spvOrOOVy6RXzfGTmlA== X-Google-Smtp-Source: AGHT+IEyjF1NMNcO3CeGdUgyqjJt3efds2jiz9qPeSxTcv0nkHrVLHlSBPw1zTcdFE6J+rEOiha2 X-Received: by 2002:ac2:4e03:0:b0:52e:74f5:d13 with SMTP id 2adb3069b0e04-52fd3f1d3dbmr2867142e87.30.1721939167072; Thu, 25 Jul 2024 13:26:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721939167; cv=none; d=google.com; s=arc-20160816; b=wCukWaSbEoUEjBpOYZiqcr3xiuZJL4Zj7DPC5ugzmFKtY+tpuYSYUvjiCRV+z92N4m 6BXqFuCCC+BXIz+SM8mY846NWlNOathnzYCFGf2rKwrMAohYDtlSG58NCiVs/0aEkvdJ 0lV2rpjShvz7ICPA/lDbd6ApmL9K66mwsjKpW6h9tUmZdKEmPcfqZcxxMyaHqCjquHGa kUoykLjdVN2A+Gt4TxyyZ8L6+W8VDOgsyVxQAWKg8ymGJlQHrVWrSZcO4QaxMJjbPRAB qCPhcyweHua8vf+tXRQkT1oGJ1qfqaU/f/e0y04GV9PEnJEs4t0c6UWid43cRgcVXx1w dhWQ== 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=CN+COfAtbVw+m7sACwbXEwkYKGzgHCf2OxHDhrwards=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=IFns/tADIN4swl1B7S/iSkHulZ+tEQLIkZ1hfrYjIkENSQ8BkgE+D50Ot+35Ns4lNv OGD0WKe0nPovkfqiGwRvq6MBWQrPlvSeyZKvDRs1f8Sx8iMxLetgfNfr5zs9YIRSMPJz w1O1h9kJZtWDp9m9+XNeMuW8Njd/f2EWyssZ8t7Q9sg6MWN5FJEQW5/F/Qnr5l4XSLev HowV7Xfqn+Tp/GcXwKKByxCncue2KHrk7+Fau3Ijgij9Pxsok9oJR4q4MZ6me1JwzFVb 8Yl0qUhexKWNkRwiP3uVVUapgu6kB3oeKRf+3jPyIi3qjc2JHFZVGMT5dTekqMUPMoKj A0qQ==; 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 2adb3069b0e04-52fd5b9dba3si634013e87.172.2024.07.25.13.26.06; Thu, 25 Jul 2024 13:26:07 -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 EBD8C68D7C8; Thu, 25 Jul 2024 23:25:32 +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 E7CF968D2F7 for ; Thu, 25 Jul 2024 23:25:23 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 7ABABC0233 for ; Thu, 25 Jul 2024 23:25:23 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Jul 2024 23:25:18 +0300 Message-ID: <20240725202522.276182-4-remi@remlab.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240725202522.276182-1-remi@remlab.net> References: <20240725202522.276182-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/6] lavc/audiodsp: drop R-V F vector_clipf 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: RghLHlevi0UM This is now firmly slower than C. SiFive-U74 (cycles): audiodsp.vector_clipf_c: 31.2 audiodsp.vector_clipf_rvf: 39.5 --- libavcodec/riscv/Makefile | 1 - libavcodec/riscv/audiodsp_init.c | 8 +---- libavcodec/riscv/audiodsp_rvf.S | 50 -------------------------------- 3 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 libavcodec/riscv/audiodsp_rvf.S diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index 0bbdd38116..621c099a5b 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -9,7 +9,6 @@ RVVB-OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_rvvb.o OBJS-$(CONFIG_ALAC_DECODER) += riscv/alacdsp_init.o RVV-OBJS-$(CONFIG_ALAC_DECODER) += riscv/alacdsp_rvv.o OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_init.o -RV-OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_rvf.o RVV-OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_rvv.o OBJS-$(CONFIG_BLOCKDSP) += riscv/blockdsp_init.o RVV-OBJS-$(CONFIG_BLOCKDSP) += riscv/blockdsp_rvv.o diff --git a/libavcodec/riscv/audiodsp_init.c b/libavcodec/riscv/audiodsp_init.c index f606406429..5750d4d8a7 100644 --- a/libavcodec/riscv/audiodsp_init.c +++ b/libavcodec/riscv/audiodsp_init.c @@ -24,8 +24,6 @@ #include "libavutil/cpu.h" #include "libavcodec/audiodsp.h" -void ff_vector_clipf_rvf(float *dst, const float *src, int len, float min, float max); - int32_t ff_scalarproduct_int16_rvv(const int16_t *v1, const int16_t *v2, int len); void ff_vector_clip_int32_rvv(int32_t *dst, const int32_t *src, int32_t min, int32_t max, unsigned int len); @@ -33,12 +31,9 @@ void ff_vector_clipf_rvv(float *dst, const float *src, int len, float min, float av_cold void ff_audiodsp_init_riscv(AudioDSPContext *c) { -#if HAVE_RV +#if HAVE_RVV int flags = av_get_cpu_flags(); - if (flags & AV_CPU_FLAG_RVF) - c->vector_clipf = ff_vector_clipf_rvf; -#if HAVE_RVV if (flags & AV_CPU_FLAG_RVB_ADDR) { if (flags & AV_CPU_FLAG_RVV_I32) { c->scalarproduct_int16 = ff_scalarproduct_int16_rvv; @@ -48,5 +43,4 @@ av_cold void ff_audiodsp_init_riscv(AudioDSPContext *c) c->vector_clipf = ff_vector_clipf_rvv; } #endif -#endif } diff --git a/libavcodec/riscv/audiodsp_rvf.S b/libavcodec/riscv/audiodsp_rvf.S deleted file mode 100644 index 97aa930ab5..0000000000 --- a/libavcodec/riscv/audiodsp_rvf.S +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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 "libavutil/riscv/asm.S" - -func ff_vector_clipf_rvf, f - lpad 0 -NOHWF fmv.w.x fa0, a3 -NOHWF fmv.w.x fa1, a4 -1: - flw ft0, (a1) - flw ft1, 4(a1) - fmax.s ft0, ft0, fa0 - flw ft2, 8(a1) - fmax.s ft1, ft1, fa0 - flw ft3, 12(a1) - fmax.s ft2, ft2, fa0 - addi a2, a2, -4 - fmax.s ft3, ft3, fa0 - addi a1, a1, 16 - fmin.s ft0, ft0, fa1 - fmin.s ft1, ft1, fa1 - fsw ft0, (a0) - fmin.s ft2, ft2, fa1 - fsw ft1, 4(a0) - fmin.s ft3, ft3, fa1 - fsw ft2, 8(a0) - fsw ft3, 12(a0) - addi a0, a0, 16 - bnez a2, 1b - - ret -endfunc