Use the correct check for NEON functions using intrinsics

Author: ccawley2011

celt/arm/pitch_arm.h

@@ -35,11 +35,11 @@ opus_val32 celt_inner_prod_neon(const opus_val16 *x, const opus_val16 *y, int N)
 void dual_inner_prod_neon(const opus_val16 *x, const opus_val16 *y01,
         const opus_val16 *y02, int N, opus_val32 *xy1, opus_val32 *xy2);
 
-#  if !defined(OPUS_HAVE_RTCD) && defined(OPUS_ARM_PRESUME_NEON)
+#  if !defined(OPUS_HAVE_RTCD) && defined(OPUS_ARM_PRESUME_NEON_INTR)
 #   define OVERRIDE_CELT_INNER_PROD (1)
 #   define OVERRIDE_DUAL_INNER_PROD (1)
-#   define celt_inner_prod(x, y, N, arch) ((void)(arch), PRESUME_NEON(celt_inner_prod)(x, y, N))
-#   define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) ((void)(arch), PRESUME_NEON(dual_inner_prod)(x, y01, y02, N, xy1, xy2))
+#   define celt_inner_prod(x, y, N, arch) ((void)(arch), celt_inner_prod_neon(x, y, N))
+#   define dual_inner_prod(x, y01, y02, N, xy1, xy2, arch) ((void)(arch), dual_inner_prod_neon(x, y01, y02, N, xy1, xy2))
 #  endif
 # endif
 

silk/arm/LPC_inv_pred_gain_arm.h

@@ -36,9 +36,9 @@ opus_int32 silk_LPC_inverse_pred_gain_neon(         /* O   Returns inverse predi
     const opus_int              order               /* I   Prediction order                                             */
 );
 
-#  if !defined(OPUS_HAVE_RTCD) && defined(OPUS_ARM_PRESUME_NEON)
+#  if !defined(OPUS_HAVE_RTCD) && defined(OPUS_ARM_PRESUME_NEON_INTR)
 #   define OVERRIDE_silk_LPC_inverse_pred_gain            (1)
-#   define silk_LPC_inverse_pred_gain(A_Q12, order, arch) ((void)(arch), PRESUME_NEON(silk_LPC_inverse_pred_gain)(A_Q12, order))
+#   define silk_LPC_inverse_pred_gain(A_Q12, order, arch) ((void)(arch), silk_LPC_inverse_pred_gain_neon(A_Q12, order))
 #  endif
 # endif
 

silk/arm/NSQ_del_dec_arm.h

@@ -44,14 +44,14 @@ void silk_NSQ_del_dec_neon(
     const opus_int pitchL[MAX_NB_SUBFR], const opus_int Lambda_Q10,
     const opus_int LTP_scale_Q14);
 
-#if !defined(OPUS_HAVE_RTCD)
+#if !defined(OPUS_HAVE_RTCD) && defined(OPUS_ARM_PRESUME_NEON_INTR)
 #define OVERRIDE_silk_NSQ_del_dec (1)
 #define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12,  \
                          LTPCoef_Q14, AR_Q13, HarmShapeGain_Q14, Tilt_Q14,   \
                          LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10,          \
                          LTP_scale_Q14, arch)                                \
     ((void)(arch),                                                           \
-     PRESUME_NEON(silk_NSQ_del_dec)(                                         \
+     silk_NSQ_del_dec_neon(                                                  \
          psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14,     \
          AR_Q13, HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, \
          Lambda_Q10, LTP_scale_Q14))

silk/arm/biquad_alt_arm.h

@@ -40,9 +40,9 @@ void silk_biquad_alt_stride2_neon(
     const opus_int32            len                 /* I     signal length (must be even)                               */
 );
 
-#  if !defined(OPUS_HAVE_RTCD) && defined(OPUS_ARM_PRESUME_NEON)
+#  if !defined(OPUS_HAVE_RTCD) && defined(OPUS_ARM_PRESUME_NEON_INTR)
 #   define OVERRIDE_silk_biquad_alt_stride2                   (1)
-#   define silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, arch) ((void)(arch), PRESUME_NEON(silk_biquad_alt_stride2)(in, B_Q28, A_Q28, S, out, len))
+#   define silk_biquad_alt_stride2(in, B_Q28, A_Q28, S, out, len, arch) ((void)(arch), silk_biquad_alt_stride2_neon(in, B_Q28, A_Q28, S, out, len))
 #  endif
 # endif
 

silk/fixed/arm/warped_autocorrelation_FIX_arm.h

@@ -42,10 +42,10 @@ void silk_warped_autocorrelation_FIX_neon(
     const opus_int                  order                                   /* I    Correlation order (even)                                                    */
 );
 
-#  if !defined(OPUS_HAVE_RTCD) && defined(OPUS_ARM_PRESUME_NEON)
+#  if !defined(OPUS_HAVE_RTCD) && defined(OPUS_ARM_PRESUME_NEON_INTR)
 #   define OVERRIDE_silk_warped_autocorrelation_FIX (1)
 #   define silk_warped_autocorrelation_FIX(corr, scale, input, warping_Q16, length, order, arch) \
-    ((void)(arch), PRESUME_NEON(silk_warped_autocorrelation_FIX)(corr, scale, input, warping_Q16, length, order))
+    ((void)(arch), silk_warped_autocorrelation_FIX_neon(corr, scale, input, warping_Q16, length, order))
 #  endif
 #  endif