lavu/riscv: depend on RVB and simplify accordingly

Rémi Denis-Courmont committed 2 years ago

Commit cb31f171 parent ba88e813 files · +4 −5Browse files

Unified · Split

3 files

@@ -45,7 +45,7 @@ av_cold void ff_fixed_dsp_init_riscv(AVFixedDSPContext *fdsp) · 44 unmodified lines
45	#if HAVE_RVV	45	#if HAVE_RVV
46	int flags = av_get_cpu_flags();	46	int flags = av_get_cpu_flags();
47		47
48	if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR)) {	48	if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB)) {
49	if (flags & AV_CPU_FLAG_RVV_I64) {	49	if (flags & AV_CPU_FLAG_RVV_I64) {
50	fdsp->vector_fmul_window_scaled = ff_vector_fmul_window_scaled_rvv;	50	fdsp->vector_fmul_window_scaled = ff_vector_fmul_window_scaled_rvv;
51	fdsp->vector_fmul_window = ff_vector_fmul_window_fixed_rvv;	51	fdsp->vector_fmul_window = ff_vector_fmul_window_fixed_rvv;

@@ -54,7 +54,7 @@ av_cold void ff_float_dsp_init_riscv(AVFloatDSPContext *fdsp) · 53 unmodified lines
54	#if HAVE_RVV	54	#if HAVE_RVV
55	int flags = av_get_cpu_flags();	55	int flags = av_get_cpu_flags();
56		56
57	if (flags & AV_CPU_FLAG_RVB_ADDR) {	57	if (flags & AV_CPU_FLAG_RVB) {
58	if (flags & AV_CPU_FLAG_RVV_F32) {	58	if (flags & AV_CPU_FLAG_RVV_F32) {
59	fdsp->vector_fmul = ff_vector_fmul_rvv;	59	fdsp->vector_fmul = ff_vector_fmul_rvv;
60	fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_rvv;	60	fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_rvv;

 #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) && (flags & AV_CPU_FLAG_RVV_F64)) {
-        if ((flags & AV_CPU_FLAG_RVB_BASIC) &&
+        if (ff_get_rv_vlenb() > m->indep_count)
-            ff_get_rv_vlenb() > m->indep_count)
             m->update_lls = ff_lls_update_rvv;
         m->evaluate_lls = ff_lls_evaluate_rvv;
     }

Keyboard shortcuts