Commit fcebd697 authored by James Willis's avatar James Willis
Browse files

Added vectorisation guards.

parent c6972a00
...@@ -382,6 +382,7 @@ runner_iact_nonsym_vec_density(float *R2, float *Dx, float *Hi, float *Hj, ...@@ -382,6 +382,7 @@ runner_iact_nonsym_vec_density(float *R2, float *Dx, float *Hi, float *Hj,
#endif #endif
} }
#ifdef WITH_VECTORIZATION
/** /**
* @brief Density interaction computed using 2 interleaved vectors (non-symmetric vectorized version). * @brief Density interaction computed using 2 interleaved vectors (non-symmetric vectorized version).
*/ */
...@@ -505,6 +506,7 @@ runner_iact_nonsym_2_vec_density(float *R2, float *Dx, float *Dy, float *Dz, vec ...@@ -505,6 +506,7 @@ runner_iact_nonsym_2_vec_density(float *R2, float *Dx, float *Dy, float *Dz, vec
curlvzSum->v += vec_and(vec_mul(mj2.v, vec_mul(curlvrz2.v, wi_dx2.v)),mask2.v); curlvzSum->v += vec_and(vec_mul(mj2.v, vec_mul(curlvrz2.v, wi_dx2.v)),mask2.v);
#endif #endif
} }
#endif
/** /**
* @brief Force loop * @brief Force loop
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#define NUM_VEC_PROC 2 #define NUM_VEC_PROC 2
#define C2_CACHE_SIZE (NUM_VEC_PROC * VEC_SIZE * 6) + (NUM_VEC_PROC * VEC_SIZE) #define C2_CACHE_SIZE (NUM_VEC_PROC * VEC_SIZE * 6) + (NUM_VEC_PROC * VEC_SIZE)
#ifdef WITH_VECTORIZATION
__attribute__((always_inline)) INLINE static void calcRemInteractions(const struct cache *const cell_cache, float *r2q, float *dxq, float *dyq, float *dzq, float *mq, float *vxq, float *vyq, float *vzq, const int icount, vector *rhoSum, vector *rho_dhSum, vector *wcountSum, vector *wcount_dhSum, vector *div_vSum, vector *curlvxSum,vector *curlvySum, vector *curlvzSum, vector v_hi_inv, vector v_vix, vector v_viy, vector v_viz, int *icount_align) { __attribute__((always_inline)) INLINE static void calcRemInteractions(const struct cache *const cell_cache, float *r2q, float *dxq, float *dyq, float *dzq, float *mq, float *vxq, float *vyq, float *vzq, const int icount, vector *rhoSum, vector *rho_dhSum, vector *wcountSum, vector *wcount_dhSum, vector *div_vSum, vector *curlvxSum,vector *curlvySum, vector *curlvzSum, vector v_hi_inv, vector v_vix, vector v_viy, vector v_viz, int *icount_align) {
#ifdef HAVE_AVX512_F #ifdef HAVE_AVX512_F
...@@ -153,6 +154,7 @@ __attribute__((always_inline)) INLINE static void storeInteractions(const int ma ...@@ -153,6 +154,7 @@ __attribute__((always_inline)) INLINE static void storeInteractions(const int ma
#endif #endif
} }
#endif
/** /**
* @brief Compute the cell self-interaction (non-symmetric) vec. * @brief Compute the cell self-interaction (non-symmetric) vec.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment