Skip to content

Commit

Permalink
Fix ipred_* for avx512 initialization
Browse files Browse the repository at this point in the history
This change prevents us from generating function declarations for
non-existent assembly routines.
  • Loading branch information
thedataking committed Mar 22, 2024
1 parent 4a1113c commit 2ddf0da
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions src/ipred.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ use std::slice;
use strum::FromRepr;

#[cfg(feature = "asm")]
use crate::{include::common::bitdepth::bd_fn, src::cpu::rav1d_get_cpu_flags, src::cpu::CpuFlags};
use crate::{
include::common::bitdepth::{bd_fn, bpc_fn},
src::cpu::rav1d_get_cpu_flags,
src::cpu::CpuFlags,
};

wrap_fn_ptr!(pub unsafe extern "C" fn angular_ipred(
dst: *mut DynPixel,
Expand Down Expand Up @@ -2125,17 +2129,17 @@ fn intra_pred_dsp_init_x86<BD: BitDepth>(c: &mut Rav1dIntraPredDSPContext) {

if BD::BPC == BPC::BPC8 {
c.intra_pred[DC_PRED as usize] =
bd_fn!(angular_ipred::decl_fn, BD, ipred_dc, avx512icl);
bpc_fn!(angular_ipred::decl_fn, 8 bpc, ipred_dc, avx512icl);
c.intra_pred[DC_128_PRED as usize] =
bd_fn!(angular_ipred::decl_fn, BD, ipred_dc_128, avx512icl);
bpc_fn!(angular_ipred::decl_fn, 8 bpc, ipred_dc_128, avx512icl);
c.intra_pred[TOP_DC_PRED as usize] =
bd_fn!(angular_ipred::decl_fn, BD, ipred_dc_top, avx512icl);
bpc_fn!(angular_ipred::decl_fn, 8 bpc, ipred_dc_top, avx512icl);
c.intra_pred[LEFT_DC_PRED as usize] =
bd_fn!(angular_ipred::decl_fn, BD, ipred_dc_left, avx512icl);
bpc_fn!(angular_ipred::decl_fn, 8 bpc, ipred_dc_left, avx512icl);
c.intra_pred[HOR_PRED as usize] =
bd_fn!(angular_ipred::decl_fn, BD, ipred_h, avx512icl);
bpc_fn!(angular_ipred::decl_fn, 8 bpc, ipred_h, avx512icl);
c.intra_pred[VERT_PRED as usize] =
bd_fn!(angular_ipred::decl_fn, BD, ipred_v, avx512icl);
bpc_fn!(angular_ipred::decl_fn, 8 bpc, ipred_v, avx512icl);
}

c.intra_pred[PAETH_PRED as usize] =
Expand Down

0 comments on commit 2ddf0da

Please sign in to comment.