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

libavutil/riscv/fixed_dsp_init.c +1 −1
libavutil/riscv/float_dsp_init.c +1 −1
libavutil/riscv/lls_init.c +2 −3

libavutil/riscv/fixed_dsp_init.c+1−1

@@ -45,7 +45,7 @@ av_cold void ff_fixed_dsp_init_riscv(AVFixedDSPContext *fdsp) · 44 unmodified lines
45	45	#if HAVE_RVV
46	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	49	if (flags & AV_CPU_FLAG_RVV_I64) {
50	50	fdsp->vector_fmul_window_scaled = ff_vector_fmul_window_scaled_rvv;
51	51	fdsp->vector_fmul_window = ff_vector_fmul_window_fixed_rvv;

libavutil/riscv/float_dsp_init.c+1−1

@@ -54,7 +54,7 @@ av_cold void ff_float_dsp_init_riscv(AVFloatDSPContext *fdsp) · 53 unmodified lines
54	54	#if HAVE_RVV
55	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	58	if (flags & AV_CPU_FLAG_RVV_F32) {
59	59	fdsp->vector_fmul = ff_vector_fmul_rvv;
60	60	fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_rvv;

libavutil/riscv/lls_init.c+2−3

@@ -47,9 +47,8 @@ av_cold void ff_init_lls_riscv(LLSModel *m) · 46 unmodified lines
47	47	#if HAVE_RVV
48	48	int flags = av_get_cpu_flags();
49	49
50		− if ((flags & AV_CPU_FLAG_RVB_ADDR) && (flags & AV_CPU_FLAG_RVV_F64)) {
51		− if ((flags & AV_CPU_FLAG_RVB_BASIC) &&
52		− ff_get_rv_vlenb() > m->indep_count)
	50	+ if ((flags & AV_CPU_FLAG_RVB) && (flags & AV_CPU_FLAG_RVV_F64)) {
	51	+ if (ff_get_rv_vlenb() > m->indep_count)
53	52	m->update_lls = ff_lls_update_rvv;
54	53	m->evaluate_lls = ff_lls_evaluate_rvv;
55	54	}