* [FFmpeg-devel] [PATCH 2/3] lavc/jpeg2000dsp: R-V V ict_float
2023-10-28 19:04 [FFmpeg-devel] [PATCH 1/3] lavc/jpeg2000dsp: make coefficients extern Rémi Denis-Courmont
@ 2023-10-28 19:04 ` Rémi Denis-Courmont
2023-10-28 19:04 ` [FFmpeg-devel] [PATCH 3/3] lavc/jpeg2000dsp: R-V V rct_int Rémi Denis-Courmont
2023-10-30 12:33 ` [FFmpeg-devel] [PATCH 1/3] lavc/jpeg2000dsp: make coefficients extern Tomas Härdin
2 siblings, 0 replies; 4+ messages in thread
From: Rémi Denis-Courmont @ 2023-10-28 19:04 UTC (permalink / raw)
To: ffmpeg-devel
jpeg2000_ict_float_c: 3112.2
jpeg2000_ict_float_rvv_f32: 1225.0
---
libavcodec/jpeg2000dsp.c | 4 ++-
libavcodec/jpeg2000dsp.h | 1 +
libavcodec/riscv/Makefile | 2 ++
libavcodec/riscv/jpeg2000dsp_init.c | 36 +++++++++++++++++++++
libavcodec/riscv/jpeg2000dsp_rvv.S | 49 +++++++++++++++++++++++++++++
5 files changed, 91 insertions(+), 1 deletion(-)
create mode 100644 libavcodec/riscv/jpeg2000dsp_init.c
create mode 100644 libavcodec/riscv/jpeg2000dsp_rvv.S
diff --git a/libavcodec/jpeg2000dsp.c b/libavcodec/jpeg2000dsp.c
index 50bc1ecee6..7840fdc357 100644
--- a/libavcodec/jpeg2000dsp.c
+++ b/libavcodec/jpeg2000dsp.c
@@ -96,7 +96,9 @@ av_cold void ff_jpeg2000dsp_init(Jpeg2000DSPContext *c)
c->mct_decode[FF_DWT53] = rct_int;
c->mct_decode[FF_DWT97_INT] = ict_int;
-#if ARCH_X86
+#if ARCH_RISCV
+ ff_jpeg2000dsp_init_riscv(c);
+#elif ARCH_X86
ff_jpeg2000dsp_init_x86(c);
#endif
}
diff --git a/libavcodec/jpeg2000dsp.h b/libavcodec/jpeg2000dsp.h
index 932dbb2102..6854c7762d 100644
--- a/libavcodec/jpeg2000dsp.h
+++ b/libavcodec/jpeg2000dsp.h
@@ -33,6 +33,7 @@ typedef struct Jpeg2000DSPContext {
extern const float ff_jpeg2000_f_ict_params[4];
void ff_jpeg2000dsp_init(Jpeg2000DSPContext *c);
+void ff_jpeg2000dsp_init_riscv(Jpeg2000DSPContext *c);
void ff_jpeg2000dsp_init_x86(Jpeg2000DSPContext *c);
#endif /* AVCODEC_JPEG2000DSP_H */
diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile
index 9c31c901cf..06815d3170 100644
--- a/libavcodec/riscv/Makefile
+++ b/libavcodec/riscv/Makefile
@@ -16,6 +16,8 @@ OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_init.o
RVV-OBJS-$(CONFIG_FMTCONVERT) += riscv/fmtconvert_rvv.o
OBJS-$(CONFIG_G722DSP) += riscv/g722dsp_init.o
RVV-OBJS-$(CONFIG_G722DSP) += riscv/g722dsp_rvv.o
+OBJS-$(CONFIG_JPEG2000_DECODER) += riscv/jpeg2000dsp_init.o
+RVV-OBJS-$(CONFIG_JPEG2000_DECODER) += riscv/jpeg2000dsp_rvv.o
OBJS-$(CONFIG_H264CHROMA) += riscv/h264_chroma_init_riscv.o
RVV-OBJS-$(CONFIG_H264CHROMA) += riscv/h264_mc_chroma.o
OBJS-$(CONFIG_HUFFYUV_DECODER) += riscv/huffyuvdsp_init.o
diff --git a/libavcodec/riscv/jpeg2000dsp_init.c b/libavcodec/riscv/jpeg2000dsp_init.c
new file mode 100644
index 0000000000..9415a22f79
--- /dev/null
+++ b/libavcodec/riscv/jpeg2000dsp_init.c
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2023 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/attributes.h"
+#include "libavutil/cpu.h"
+#include "libavcodec/jpeg2000dsp.h"
+
+void ff_ict_float_rvv(void *src0, void *src1, void *src2, int csize);
+
+av_cold void ff_jpeg2000dsp_init_riscv(Jpeg2000DSPContext *c)
+{
+#if HAVE_RVV
+ int flags = av_get_cpu_flags();
+
+ if ((flags & AV_CPU_FLAG_RVV_F32) && (flags & AV_CPU_FLAG_RVB_ADDR))
+ c->mct_decode[FF_DWT97] = ff_ict_float_rvv;
+#endif
+}
diff --git a/libavcodec/riscv/jpeg2000dsp_rvv.S b/libavcodec/riscv/jpeg2000dsp_rvv.S
new file mode 100644
index 0000000000..d10ebd491f
--- /dev/null
+++ b/libavcodec/riscv/jpeg2000dsp_rvv.S
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2023 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_ict_float_rvv, zve32f
+ lla t0, ff_jpeg2000_f_ict_params
+ flw ft0, 0(t0)
+ flw ft1, 4(t0)
+ flw ft2, 8(t0)
+ flw ft3, 12(t0)
+1:
+ vsetvli t0, a3, e32, m8, ta, ma
+ vle32.v v8, (a0)
+ sub a3, a3, t0
+ vle32.v v16, (a1)
+ vle32.v v24, (a2)
+ vfmul.vf v0, v16, ft1
+ vfmadd.vf v16, ft3, v8
+ vfsub.vv v0, v8, v0
+ vfmacc.vf v8, ft0, v24
+ vfnmsac.vf v0, ft2, v24
+ vse32.v v8, (a0)
+ sh2add a0, t0, a0
+ vse32.v v0, (a1)
+ sh2add a1, t0, a1
+ vse32.v v16, (a2)
+ sh2add a2, t0, a2
+ bnez a3, 1b
+
+ ret
+endfunc
--
2.42.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-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread* [FFmpeg-devel] [PATCH 3/3] lavc/jpeg2000dsp: R-V V rct_int
2023-10-28 19:04 [FFmpeg-devel] [PATCH 1/3] lavc/jpeg2000dsp: make coefficients extern Rémi Denis-Courmont
2023-10-28 19:04 ` [FFmpeg-devel] [PATCH 2/3] lavc/jpeg2000dsp: R-V V ict_float Rémi Denis-Courmont
@ 2023-10-28 19:04 ` Rémi Denis-Courmont
2023-10-30 12:33 ` [FFmpeg-devel] [PATCH 1/3] lavc/jpeg2000dsp: make coefficients extern Tomas Härdin
2 siblings, 0 replies; 4+ messages in thread
From: Rémi Denis-Courmont @ 2023-10-28 19:04 UTC (permalink / raw)
To: ffmpeg-devel
jpeg2000_rct_int_c: 2592.2
jpeg2000_rct_int_rvv_i32: 1154.2
---
libavcodec/riscv/jpeg2000dsp_init.c | 8 ++++++--
libavcodec/riscv/jpeg2000dsp_rvv.S | 23 +++++++++++++++++++++++
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/libavcodec/riscv/jpeg2000dsp_init.c b/libavcodec/riscv/jpeg2000dsp_init.c
index 9415a22f79..e82ec47bde 100644
--- a/libavcodec/riscv/jpeg2000dsp_init.c
+++ b/libavcodec/riscv/jpeg2000dsp_init.c
@@ -24,13 +24,17 @@
#include "libavcodec/jpeg2000dsp.h"
void ff_ict_float_rvv(void *src0, void *src1, void *src2, int csize);
+void ff_rct_int_rvv(void *src0, void *src1, void *src2, int csize);
av_cold void ff_jpeg2000dsp_init_riscv(Jpeg2000DSPContext *c)
{
#if HAVE_RVV
int flags = av_get_cpu_flags();
- if ((flags & AV_CPU_FLAG_RVV_F32) && (flags & AV_CPU_FLAG_RVB_ADDR))
- c->mct_decode[FF_DWT97] = ff_ict_float_rvv;
+ if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR)) {
+ if (flags & AV_CPU_FLAG_RVV_F32)
+ c->mct_decode[FF_DWT97] = ff_ict_float_rvv;
+ c->mct_decode[FF_DWT53] = ff_rct_int_rvv;
+ }
#endif
}
diff --git a/libavcodec/riscv/jpeg2000dsp_rvv.S b/libavcodec/riscv/jpeg2000dsp_rvv.S
index d10ebd491f..10efe6b0db 100644
--- a/libavcodec/riscv/jpeg2000dsp_rvv.S
+++ b/libavcodec/riscv/jpeg2000dsp_rvv.S
@@ -47,3 +47,26 @@ func ff_ict_float_rvv, zve32f
ret
endfunc
+
+func ff_rct_int_rvv, zve32x
+1:
+ vsetvli t0, a3, e32, m8, ta, ma
+ vle32.v v16, (a1)
+ sub a3, a3, t0
+ vle32.v v24, (a2)
+ vle32.v v8, (a0)
+ vadd.vv v0, v16, v24
+ vsra.vi v0, v0, 2
+ vsub.vv v0, v8, v0
+ vadd.vv v8, v0, v24
+ vadd.vv v24, v0, v16
+ vse32.v v8, (a0)
+ sh2add a0, t0, a0
+ vse32.v v0, (a1)
+ sh2add a1, t0, a1
+ vse32.v v24, (a2)
+ sh2add a2, t0, a2
+ bnez a3, 1b
+
+ ret
+endfunc
--
2.42.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-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread