From 2d25e38d9c07abacba92b512baa6734186b02ee4 Mon Sep 17 00:00:00 2001 From: James Willis <james.s.willis@durham.ac.uk> Date: Tue, 8 Aug 2017 13:51:48 +0100 Subject: [PATCH] Enclose old kernel_deval_vec in ifdefs. --- src/kernel_hydro.h | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/kernel_hydro.h b/src/kernel_hydro.h index 68a1c9e767..eb6cdf0270 100644 --- a/src/kernel_hydro.h +++ b/src/kernel_hydro.h @@ -341,20 +341,7 @@ __attribute__((always_inline)) INLINE static void kernel_eval_dWdx( /* ------------------------------------------------------------------------- */ -#ifdef WITH_VECTORIZATION - -static const vector kernel_gamma_inv_vec = FILL_VEC((float)kernel_gamma_inv); - -static const vector kernel_ivals_vec = FILL_VEC((float)kernel_ivals); - -static const vector kernel_constant_vec = FILL_VEC((float)kernel_constant); - -static const vector kernel_gamma_inv_dim_vec = - FILL_VEC((float)kernel_gamma_inv_dim); - -static const vector kernel_gamma_inv_dim_plus_one_vec = - FILL_VEC((float)kernel_gamma_inv_dim_plus_one); - +#ifdef WITH_OLD_VECTORIZATION /** * @brief Computes the kernel function and its derivative (Vectorised version). * @@ -398,6 +385,21 @@ __attribute__((always_inline)) INLINE static void kernel_deval_vec( dw_dx->v = vec_mul(dw_dx->v, vec_mul(kernel_constant_vec.v, kernel_gamma_inv_dim_plus_one_vec.v)); } +#endif + +#ifdef WITH_VECTORIZATION + +static const vector kernel_gamma_inv_vec = FILL_VEC((float)kernel_gamma_inv); + +static const vector kernel_ivals_vec = FILL_VEC((float)kernel_ivals); + +static const vector kernel_constant_vec = FILL_VEC((float)kernel_constant); + +static const vector kernel_gamma_inv_dim_vec = + FILL_VEC((float)kernel_gamma_inv_dim); + +static const vector kernel_gamma_inv_dim_plus_one_vec = + FILL_VEC((float)kernel_gamma_inv_dim_plus_one); /* Define constant vectors for the Wendland C2 and Cubic Spline kernel * coefficients. */ -- GitLab