Updated the patch to resolve conflicts, updated m4 to m8, using c908's
benchmark.
flow gg <hlefthl...@gmail.com> 于2023年11月29日周三 01:00写道：
> c910:
> abs_pow34_c: 24610.7
> abs_pow34_rvv_f32: 6177.7
>
> (need use "[FFmpeg-devel] [PATCH 1/2] checkasm: test for abs_pow34" first)
>
From 7dd1efb25e4cf6f98afde90bb472002d3aba1830 Mon Sep 17 00:00:00 2001
From: sunyuechi <sunyue...@iscas.ac.cn>
Date: Tue, 28 Nov 2023 20:14:14 +0800
Subject: [PATCH 2/2] lavc/aacencdsp: R-V V abs_pow34
C908:
abs_pow34_c: 535.5
abs_pow34_rvv_f32: 337.2
---
libavcodec/aacenc.c | 4 +++
libavcodec/aacenc.h | 1 +
libavcodec/riscv/Makefile | 2 ++
libavcodec/riscv/aacencdsp_init.c | 42 +++++++++++++++++++++++++++++++
libavcodec/riscv/aacencdsp_rvv.S | 38 ++++++++++++++++++++++++++++
5 files changed, 87 insertions(+)
create mode 100644 libavcodec/riscv/aacencdsp_init.c
create mode 100644 libavcodec/riscv/aacencdsp_rvv.S
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index 443b25e25a..55c4bf55ce 100644
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -1440,6 +1440,10 @@ void ff_aac_dsp_init(AACEncContext *s){
s->abs_pow34 = abs_pow34_v;
s->quant_bands = quantize_bands;
+#if ARCH_RISCV
+ ff_aac_dsp_init_riscv(s);
+#endif
+
#if ARCH_X86
ff_aac_dsp_init_x86(s);
#endif
diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h
index 09dd8639be..18b424736d 100644
--- a/libavcodec/aacenc.h
+++ b/libavcodec/aacenc.h
@@ -155,6 +155,7 @@ typedef struct AACEncContext {
} AACEncContext;
void ff_aac_dsp_init(AACEncContext *s);
+void ff_aac_dsp_init_riscv(AACEncContext *s);
void ff_aac_dsp_init_x86(AACEncContext *s);
void ff_aac_coder_init_mips(AACEncContext *c);
void ff_quantize_band_cost_cache_init(struct AACEncContext *s);
diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile
index e9825c0856..69805e3b19 100644
--- a/libavcodec/riscv/Makefile
+++ b/libavcodec/riscv/Makefile
@@ -1,5 +1,7 @@
OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_init.o riscv/sbrdsp_init.o
RVV-OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_rvv.o riscv/sbrdsp_rvv.o
+OBJS-$(CONFIG_AAC_ENCODER) += riscv/aacencdsp_init.o
+RVV-OBJS-$(CONFIG_AAC_ENCODER) += riscv/aacencdsp_rvv.o
OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_init.o
RV-OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_rvb.o
RVV-OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_rvv.o
diff --git a/libavcodec/riscv/aacencdsp_init.c b/libavcodec/riscv/aacencdsp_init.c
new file mode 100644
index 0000000000..83ae16f46b
--- /dev/null
+++ b/libavcodec/riscv/aacencdsp_init.c
@@ -0,0 +1,42 @@
+/*
+ * AAC encoder assembly optimizations
+ * Copyright (c) 2023 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 "config.h"
+
+#include "libavutil/attributes.h"
+#include "libavutil/float_dsp.h"
+#include "libavutil/cpu.h"
+#include "libavcodec/aacenc.h"
+
+void ff_abs_pow34_rvv(float *out, const float *in, const int size);
+
+av_cold void ff_aac_dsp_init_riscv(AACEncContext *s)
+{
+#if HAVE_RVV
+ int flags = av_get_cpu_flags();
+
+ if (flags & AV_CPU_FLAG_RVV_F32) {
+ if (flags & AV_CPU_FLAG_RVB_ADDR) {
+ s->abs_pow34 = ff_abs_pow34_rvv;
+ }
+ }
+#endif
+}
diff --git a/libavcodec/riscv/aacencdsp_rvv.S b/libavcodec/riscv/aacencdsp_rvv.S
new file mode 100644
index 0000000000..4c7a874d77
--- /dev/null
+++ b/libavcodec/riscv/aacencdsp_rvv.S
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2023 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"
+
+func ff_abs_pow34_rvv, zve32f
+1:
+ vsetvli t0, a2, e32, m8, ta, ma
+ sub a2, a2, t0
+ vle32.v v0, (a1)
+ sh2add a1, t0, a1
+ vfabs.v v0, v0
+ vfsqrt.v v8, v0
+ vfmul.vv v8, v8, v0
+ vfsqrt.v v8, v8
+ vse32.v v8, (a0)
+ sh2add a0, t0, a0
+ bnez a2, 1b
+
+ ret
+endfunc
--
2.43.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
