[FFmpeg-devel] [PATCH v2] riscv: vc1dsp: Don't check vlenb before checking the CPU flags
Martin Storsjö
martin at martin.st
Sat Dec 16 22:31:52 EET 2023
On Sat, 16 Dec 2023, Rémi Denis-Courmont wrote:
> Le perjantaina 15. joulukuuta 2023, 17.38.45 EET Martin Storsjö a écrit :
>> We can't call ff_get_rv_vlenb() if we don't have RVV available
>> at all.
>>
>> Due to the SIGILL signal handler in checkasm catching it, in an
>> unexpected place, this caused checkasm to hang instead of reporting
>> the issue.
>> ---
>> libavcodec/riscv/vc1dsp_init.c | 8 +++-----
>> 1 file changed, 3 insertions(+), 5 deletions(-)
>>
>> diff --git a/libavcodec/riscv/vc1dsp_init.c b/libavcodec/riscv/vc1dsp_init.c
>> index 0d22d28f4d..e47b644f80 100644
>> --- a/libavcodec/riscv/vc1dsp_init.c
>> +++ b/libavcodec/riscv/vc1dsp_init.c
>> @@ -35,15 +35,13 @@ av_cold void ff_vc1dsp_init_riscv(VC1DSPContext *dsp)
>> #if HAVE_RVV
>> int flags = av_get_cpu_flags();
>>
>> - if (ff_get_rv_vlenb() >= 16) {
>> + if (flags & AV_CPU_FLAG_RVV_I32 && ff_get_rv_vlenb() >= 16) {
>> + dsp->vc1_inv_trans_4x8_dc = ff_vc1_inv_trans_4x8_dc_rvv;
>> + dsp->vc1_inv_trans_4x4_dc = ff_vc1_inv_trans_4x4_dc_rvv;
>> if (flags & AV_CPU_FLAG_RVV_I64) {
>> dsp->vc1_inv_trans_8x8_dc = ff_vc1_inv_trans_8x8_dc_rvv;
>> dsp->vc1_inv_trans_8x4_dc = ff_vc1_inv_trans_8x4_dc_rvv;
>> }
>> - if (flags & AV_CPU_FLAG_RVV_I32) {
>> - dsp->vc1_inv_trans_4x8_dc = ff_vc1_inv_trans_4x8_dc_rvv;
>> - dsp->vc1_inv_trans_4x4_dc = ff_vc1_inv_trans_4x4_dc_rvv;
>> - }
>> }
>> #endif
>> }
>
> Acked-by: Rémi Denis-Courmont <remi at remlab.net>
Thanks, pushed.
// Martin
More information about the ffmpeg-devel
mailing list