lavu/riscv: depend on RVB and simplify accordingly

release/7.1
Rémi Denis-Courmont 5 months ago
parent ba88e8174a
commit cb31f17ca8
  1. 2
      libavutil/riscv/fixed_dsp_init.c
  2. 2
      libavutil/riscv/float_dsp_init.c
  3. 5
      libavutil/riscv/lls_init.c

@ -45,7 +45,7 @@ av_cold void ff_fixed_dsp_init_riscv(AVFixedDSPContext *fdsp)
#if HAVE_RVV
int flags = av_get_cpu_flags();
if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR)) {
if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB)) {
if (flags & AV_CPU_FLAG_RVV_I64) {
fdsp->vector_fmul_window_scaled = ff_vector_fmul_window_scaled_rvv;
fdsp->vector_fmul_window = ff_vector_fmul_window_fixed_rvv;

@ -54,7 +54,7 @@ av_cold void ff_float_dsp_init_riscv(AVFloatDSPContext *fdsp)
#if HAVE_RVV
int flags = av_get_cpu_flags();
if (flags & AV_CPU_FLAG_RVB_ADDR) {
if (flags & AV_CPU_FLAG_RVB) {
if (flags & AV_CPU_FLAG_RVV_F32) {
fdsp->vector_fmul = ff_vector_fmul_rvv;
fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_rvv;

@ -47,9 +47,8 @@ av_cold void ff_init_lls_riscv(LLSModel *m)
#if HAVE_RVV
int flags = av_get_cpu_flags();
if ((flags & AV_CPU_FLAG_RVB_ADDR) && (flags & AV_CPU_FLAG_RVV_F64)) {
if ((flags & AV_CPU_FLAG_RVB_BASIC) &&
ff_get_rv_vlenb() > m->indep_count)
if ((flags & AV_CPU_FLAG_RVB) && (flags & AV_CPU_FLAG_RVV_F64)) {
if (ff_get_rv_vlenb() > m->indep_count)
m->update_lls = ff_lls_update_rvv;
m->evaluate_lls = ff_lls_evaluate_rvv;
}

Loading…
Cancel
Save