History

riscv: test for assembler support

This should fix the build on LLVM 16 and earlier, at the cost of turning all non-RVV optimisations off.

Rémi Denis-Courmont committed 2 years ago

Commit b3825bb1 parent 0b9d00913 files · +33 −16Browse files

Showing the changes to libavcodec (5 of 13 files). Show all

Unified · Split

5 files
  1. libavcodec/riscv/Makefile +8 −8
  2. libavcodec/riscv/ac3dsp_init.c +2 −0
  3. libavcodec/riscv/audiodsp_init.c +2 −0
  4. libavcodec/riscv/bswapdsp_init.c +2 −0
  5. libavcodec/riscv/pixblockdsp_init.c +2 −0
libavcodec/riscv/Makefile+8−8
@@ -1,15 +1,15 @@
11 OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_init.o riscv/sbrdsp_init.o
22 RVV-OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_rvv.o riscv/sbrdsp_rvv.o
3−OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_init.o \
4− riscv/ac3dsp_rvb.o
3+OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_init.o
4+RV-OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_rvb.o
55 RVV-OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_rvv.o
66 OBJS-$(CONFIG_ALAC_DECODER) += riscv/alacdsp_init.o
77 RVV-OBJS-$(CONFIG_ALAC_DECODER) += riscv/alacdsp_rvv.o
8−OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_init.o \
9− riscv/audiodsp_rvf.o
8+OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_init.o
9+RV-OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_rvf.o
1010 RVV-OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_rvv.o
11−OBJS-$(CONFIG_BSWAPDSP) += riscv/bswapdsp_init.o \
12− riscv/bswapdsp_rvb.o
11+OBJS-$(CONFIG_BSWAPDSP) += riscv/bswapdsp_init.o
12+RV-OBJS-$(CONFIG_BSWAPDSP) += riscv/bswapdsp_rvb.o
1313 RVV-OBJS-$(CONFIG_BSWAPDSP) += riscv/bswapdsp_rvv.o
1414 OBJS-$(CONFIG_EXR_DECODER) += riscv/exrdsp_init.o
1515 RVV-OBJS-$(CONFIG_EXR_DECODER) += riscv/exrdsp_rvv.o
@@ -35,8 +35,8 @@ OBJS-$(CONFIG_LLVIDENCDSP) += riscv/llvidencdsp_init.o · 19 unmodified lines
3535 RVV-OBJS-$(CONFIG_LLVIDENCDSP) += riscv/llvidencdsp_rvv.o
3636 OBJS-$(CONFIG_OPUS_DECODER) += riscv/opusdsp_init.o
3737 RVV-OBJS-$(CONFIG_OPUS_DECODER) += riscv/opusdsp_rvv.o
38−OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_init.o \
39− riscv/pixblockdsp_rvi.o
38+OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_init.o
39+RV-OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_rvi.o
4040 RVV-OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_rvv.o
4141 OBJS-$(CONFIG_UTVIDEO_DECODER) += riscv/utvideodsp_init.o
4242 RVV-OBJS-$(CONFIG_UTVIDEO_DECODER) += riscv/utvideodsp_rvv.o
libavcodec/riscv/ac3dsp_init.c+2−0
@@ -31,6 +31,7 @@ void ff_float_to_fixed24_rvv(int32_t *dst, const float *src, size_t len); · 30 unmodified lines
3131
3232 av_cold void ff_ac3dsp_init_riscv(AC3DSPContext *c)
3333 {
34+#if HAVE_RV
3435 int flags = av_get_cpu_flags();
3536
3637 if (flags & AV_CPU_FLAG_RVB_ADDR) {
@@ -39,4 +40,5 @@ av_cold void ff_ac3dsp_init_riscv(AC3DSPContext *c) · 2 unmodified lines
3940 if (flags & AV_CPU_FLAG_RVV_F32)
4041 c->float_to_fixed24 = ff_float_to_fixed24_rvv;
4142 }
43+#endif
4244 }
libavcodec/riscv/audiodsp_init.c+2−0
@@ -33,6 +33,7 @@ void ff_vector_clipf_rvv(float *dst, const float *src, int len, float min, float · 32 unmodified lines
3333
3434 av_cold void ff_audiodsp_init_riscv(AudioDSPContext *c)
3535 {
36+#if HAVE_RV
3637 int flags = av_get_cpu_flags();
3738
3839 if (flags & AV_CPU_FLAG_RVF)
@@ -47,4 +48,5 @@ av_cold void ff_audiodsp_init_riscv(AudioDSPContext *c) · 8 unmodified lines
4748 c->vector_clipf = ff_vector_clipf_rvv;
4849 }
4950 #endif
51+#endif
5052 }
libavcodec/riscv/bswapdsp_init.c+2−0
@@ -30,6 +30,7 @@ void ff_bswap16_buf_rvv(uint16_t *dst, const uint16_t *src, int len); · 29 unmodified lines
3030
3131 av_cold void ff_bswapdsp_init_riscv(BswapDSPContext *c)
3232 {
33+#if HAVE_RV
3334 int flags = av_get_cpu_flags();
3435
3536 if (flags & AV_CPU_FLAG_RVB_ADDR) {
@@ -42,4 +43,5 @@ av_cold void ff_bswapdsp_init_riscv(BswapDSPContext *c) · 6 unmodified lines
4243 c->bswap16_buf = ff_bswap16_buf_rvv;
4344 #endif
4445 }
46+#endif
4547 }
libavcodec/riscv/pixblockdsp_init.c+2−0
@@ -45,6 +45,7 @@ av_cold void ff_pixblockdsp_init_riscv(PixblockDSPContext *c, · 44 unmodified lines
4545 AVCodecContext *avctx,
4646 unsigned high_bit_depth)
4747 {
48+#if HAVE_RV
4849 int cpu_flags = av_get_cpu_flags();
4950
5051 if (cpu_flags & AV_CPU_FLAG_RVI) {
@@ -69,4 +70,5 @@ av_cold void ff_pixblockdsp_init_riscv(PixblockDSPContext *c, · 18 unmodified lines
6970 c->diff_pixels = ff_diff_pixels_rvv;
7071 }
7172 #endif
73+#endif
7274 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t