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 @@
1OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_init.o riscv/sbrdsp_init.o1OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_init.o riscv/sbrdsp_init.o
2RVV-OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_rvv.o riscv/sbrdsp_rvv.o2RVV-OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_rvv.o riscv/sbrdsp_rvv.o
3OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_init.o \3OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_init.o
4 riscv/ac3dsp_rvb.o4RV-OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_rvb.o
5RVV-OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_rvv.o5RVV-OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_rvv.o
6OBJS-$(CONFIG_ALAC_DECODER) += riscv/alacdsp_init.o6OBJS-$(CONFIG_ALAC_DECODER) += riscv/alacdsp_init.o
7RVV-OBJS-$(CONFIG_ALAC_DECODER) += riscv/alacdsp_rvv.o7RVV-OBJS-$(CONFIG_ALAC_DECODER) += riscv/alacdsp_rvv.o
8OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_init.o \8OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_init.o
9 riscv/audiodsp_rvf.o9RV-OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_rvf.o
10RVV-OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_rvv.o10RVV-OBJS-$(CONFIG_AUDIODSP) += riscv/audiodsp_rvv.o
11OBJS-$(CONFIG_BSWAPDSP) += riscv/bswapdsp_init.o \11OBJS-$(CONFIG_BSWAPDSP) += riscv/bswapdsp_init.o
12 riscv/bswapdsp_rvb.o12RV-OBJS-$(CONFIG_BSWAPDSP) += riscv/bswapdsp_rvb.o
13RVV-OBJS-$(CONFIG_BSWAPDSP) += riscv/bswapdsp_rvv.o13RVV-OBJS-$(CONFIG_BSWAPDSP) += riscv/bswapdsp_rvv.o
14OBJS-$(CONFIG_EXR_DECODER) += riscv/exrdsp_init.o14OBJS-$(CONFIG_EXR_DECODER) += riscv/exrdsp_init.o
15RVV-OBJS-$(CONFIG_EXR_DECODER) += riscv/exrdsp_rvv.o15RVV-OBJS-$(CONFIG_EXR_DECODER) += riscv/exrdsp_rvv.o
@@ -35,8 +35,8 @@ OBJS-$(CONFIG_LLVIDENCDSP) += riscv/llvidencdsp_init.o · 19 unmodified lines
35RVV-OBJS-$(CONFIG_LLVIDENCDSP) += riscv/llvidencdsp_rvv.o35RVV-OBJS-$(CONFIG_LLVIDENCDSP) += riscv/llvidencdsp_rvv.o
36OBJS-$(CONFIG_OPUS_DECODER) += riscv/opusdsp_init.o36OBJS-$(CONFIG_OPUS_DECODER) += riscv/opusdsp_init.o
37RVV-OBJS-$(CONFIG_OPUS_DECODER) += riscv/opusdsp_rvv.o37RVV-OBJS-$(CONFIG_OPUS_DECODER) += riscv/opusdsp_rvv.o
38OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_init.o \38OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_init.o
39 riscv/pixblockdsp_rvi.o39RV-OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_rvi.o
40RVV-OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_rvv.o40RVV-OBJS-$(CONFIG_PIXBLOCKDSP) += riscv/pixblockdsp_rvv.o
41OBJS-$(CONFIG_UTVIDEO_DECODER) += riscv/utvideodsp_init.o41OBJS-$(CONFIG_UTVIDEO_DECODER) += riscv/utvideodsp_init.o
42RVV-OBJS-$(CONFIG_UTVIDEO_DECODER) += riscv/utvideodsp_rvv.o42RVV-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
31 31
32av_cold void ff_ac3dsp_init_riscv(AC3DSPContext *c)32av_cold void ff_ac3dsp_init_riscv(AC3DSPContext *c)
33{33{
34#if HAVE_RV
34 int flags = av_get_cpu_flags();35 int flags = av_get_cpu_flags();
35 36
36 if (flags & AV_CPU_FLAG_RVB_ADDR) {37 if (flags & AV_CPU_FLAG_RVB_ADDR) {
@@ -39,4 +40,5 @@ av_cold void ff_ac3dsp_init_riscv(AC3DSPContext *c) · 2 unmodified lines
39 if (flags & AV_CPU_FLAG_RVV_F32)40 if (flags & AV_CPU_FLAG_RVV_F32)
40 c->float_to_fixed24 = ff_float_to_fixed24_rvv;41 c->float_to_fixed24 = ff_float_to_fixed24_rvv;
41 }42 }
43#endif
42}44}
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
33 33
34av_cold void ff_audiodsp_init_riscv(AudioDSPContext *c)34av_cold void ff_audiodsp_init_riscv(AudioDSPContext *c)
35{35{
36#if HAVE_RV
36 int flags = av_get_cpu_flags();37 int flags = av_get_cpu_flags();
37 38
38 if (flags & AV_CPU_FLAG_RVF)39 if (flags & AV_CPU_FLAG_RVF)
@@ -47,4 +48,5 @@ av_cold void ff_audiodsp_init_riscv(AudioDSPContext *c) · 8 unmodified lines
47 c->vector_clipf = ff_vector_clipf_rvv;48 c->vector_clipf = ff_vector_clipf_rvv;
48 }49 }
49#endif50#endif
51#endif
50}52}
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
30 30
31av_cold void ff_bswapdsp_init_riscv(BswapDSPContext *c)31av_cold void ff_bswapdsp_init_riscv(BswapDSPContext *c)
32{32{
33#if HAVE_RV
33 int flags = av_get_cpu_flags();34 int flags = av_get_cpu_flags();
34 35
35 if (flags & AV_CPU_FLAG_RVB_ADDR) {36 if (flags & AV_CPU_FLAG_RVB_ADDR) {
@@ -42,4 +43,5 @@ av_cold void ff_bswapdsp_init_riscv(BswapDSPContext *c) · 6 unmodified lines
42 c->bswap16_buf = ff_bswap16_buf_rvv;43 c->bswap16_buf = ff_bswap16_buf_rvv;
43#endif44#endif
44 }45 }
46#endif
45}47}
libavcodec/riscv/pixblockdsp_init.c+2−0
@@ -45,6 +45,7 @@ av_cold void ff_pixblockdsp_init_riscv(PixblockDSPContext *c, · 44 unmodified lines
45 AVCodecContext *avctx,45 AVCodecContext *avctx,
46 unsigned high_bit_depth)46 unsigned high_bit_depth)
47{47{
48#if HAVE_RV
48 int cpu_flags = av_get_cpu_flags();49 int cpu_flags = av_get_cpu_flags();
49 50
50 if (cpu_flags & AV_CPU_FLAG_RVI) {51 if (cpu_flags & AV_CPU_FLAG_RVI) {
@@ -69,4 +70,5 @@ av_cold void ff_pixblockdsp_init_riscv(PixblockDSPContext *c, · 18 unmodified lines
69 c->diff_pixels = ff_diff_pixels_rvv;70 c->diff_pixels = ff_diff_pixels_rvv;
70 }71 }
71#endif72#endif
73#endif
72}74}

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