[FFmpeg-devel] [PATCH 2/7] lavc/idctdsp: RISC-V V put_pixels_clamped function
Lynne
dev at lynne.ee
Wed Sep 28 12:48:09 EEST 2022
Sep 28, 2022, 10:06 by remi at remlab.net:
> Le 27 septembre 2022 23:04:22 GMT+03:00, remi at remlab.net a écrit :
> >From: Rémi Denis-Courmont <remi at remlab.net>
>
>>
>>
> >---
>
>> libavcodec/idctdsp.c | 2 ++
>> libavcodec/idctdsp.h | 2 ++
>> libavcodec/riscv/Makefile | 2 ++
>> libavcodec/riscv/idctdsp_init.c | 41 +++++++++++++++++++++++++++++++
>> libavcodec/riscv/idctdsp_rvv.S | 43 +++++++++++++++++++++++++++++++++
>> 5 files changed, 90 insertions(+)
>> create mode 100644 libavcodec/riscv/idctdsp_init.c
>> create mode 100644 libavcodec/riscv/idctdsp_rvv.S
>>
> >diff --git a/libavcodec/idctdsp.c b/libavcodec/idctdsp.c
> >index 9035003b72..4ee9c3aa74 100644
> >--- a/libavcodec/idctdsp.c
> >+++ b/libavcodec/idctdsp.c
> >@@ -312,6 +312,8 @@ av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx)
>
>> ff_idctdsp_init_arm(c, avctx, high_bit_depth);
>> #elif ARCH_PPC
>> ff_idctdsp_init_ppc(c, avctx, high_bit_depth);
>>
> >+#elif ARCH_RISCV
> >+ ff_idctdsp_init_riscv(c, avctx, high_bit_depth);
>
>> #elif ARCH_X86
>> ff_idctdsp_init_x86(c, avctx, high_bit_depth);
>> #elif ARCH_MIPS
>>
> >diff --git a/libavcodec/idctdsp.h b/libavcodec/idctdsp.h
> >index e8f20acaf2..2bd9820f72 100644
> >--- a/libavcodec/idctdsp.h
> >+++ b/libavcodec/idctdsp.h
> >@@ -114,6 +114,8 @@ void ff_idctdsp_init_arm(IDCTDSPContext *c, AVCodecContext *avctx,
>
>> unsigned high_bit_depth);
>> void ff_idctdsp_init_ppc(IDCTDSPContext *c, AVCodecContext *avctx,
>> unsigned high_bit_depth);
>>
> >+void ff_idctdsp_init_riscv(IDCTDSPContext *c, AVCodecContext *avctx,
> >+ unsigned high_bit_depth);
>
>> void ff_idctdsp_init_x86(IDCTDSPContext *c, AVCodecContext *avctx,
>> unsigned high_bit_depth);
>> void ff_idctdsp_init_mips(IDCTDSPContext *c, AVCodecContext *avctx,
>>
> >diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile
> >index 829a1823d2..96925afdab 100644
> >--- a/libavcodec/riscv/Makefile
> >+++ b/libavcodec/riscv/Makefile
> >@@ -5,6 +5,8 @@ OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_init.o \
>
>> RVV-OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_rvv.o
>> OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_init.o
>> RVV-OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_rvv.o
>>
> >+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
>> OBJS-$(CONFIG_VORBIS_DECODER) += riscv/vorbisdsp_init.o
>>
> >diff --git a/libavcodec/riscv/idctdsp_init.c b/libavcodec/riscv/idctdsp_init.c
> >new file mode 100644
> >index 0000000000..1a6add80da
> >--- /dev/null
> >+++ b/libavcodec/riscv/idctdsp_init.c
> >@@ -0,0 +1,41 @@
> >+/*
> >+ * 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 <stdint.h>
> >+
> >+#include "libavutil/attributes.h"
> >+#include "libavutil/cpu.h"
> >+#include "libavutil/riscv/cpu.h"
> >+#include "libavcodec/avcodec.h"
> >+#include "libavcodec/idctdsp.h"
> >+
> >+void ff_put_pixels_clamped_rvv(const int16_t *block, uint8_t *pixels,
> >+ ptrdiff_t stride);
> >+
> >+av_cold void ff_idctdsp_init_riscv(IDCTDSPContext *c, AVCodecContext *avctx,
> >+ unsigned high_bit_depth)
> >+{
> >+#if HAVE_RVV
> >+ int flags = av_get_cpu_flags();
> >+
> >+ if ((flags & AV_CPU_FLAG_RVV_I32) && ff_get_rv_vlenb() >= 16)
> >+ c->put_pixels_clamped = ff_put_pixels_clamped_rvv;
> >+#endif
> >+}
> >diff --git a/libavcodec/riscv/idctdsp_rvv.S b/libavcodec/riscv/idctdsp_rvv.S
> >new file mode 100644
> >index 0000000000..a59edd0a83
> >--- /dev/null
> >+++ b/libavcodec/riscv/idctdsp_rvv.S
> >@@ -0,0 +1,43 @@
> >+/*
> >+ * 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_put_pixels_clamped_rvv, zve32x
> >+ vsetivli zero, 8, e16, m1, ta, ma
> >+ vlseg8e16.v v24, (a0)
> >+ /* RVV only has signed-signed and unsigned-unsigned clipping.
> >+ * We need two steps for signed-to-unsigned clipping. */
> >+ vsetvli t0, zero, e16, m8, ta, ma
> >+ vmax.vx v24, v24, zero
> >+
> >+ vsetivli zero, 8, e8, mf2, ta, ma
> >+ vnclipu.wi v16, v24, 0
> >+ vnclipu.wi v17, v25, 0
> >+ vnclipu.wi v18, v26, 0
> >+ vnclipu.wi v19, v27, 0
> >+ vnclipu.wi v20, v28, 0
> >+ vnclipu.wi v21, v29, 0
> >+ vnclipu.wi v22, v30, 0
> >+ vnclipu.wi v23, v31, 0
> >+ vssseg8e8.v v16, (a1), a2
> >+ ret
> >+endfunc
> >--
> >2.37.2
>
>>
>>
> >_______________________________________________
> >ffmpeg-devel mailing list
> >ffmpeg-devel at ffmpeg.org
> >https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
>>
>>
> >To unsubscribe, visit link above, or email
> >ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".
>
> This seems to have the same include path problem as Martin noticed (can't test right now).
>
Pushed with the same fix wbs applied.
Thanks.
More information about the ffmpeg-devel
mailing list