Skip to content
Snippets Groups Projects
Commit 93c7e699 authored by James Willis's avatar James Willis
Browse files

Move mask2 inside of #ifdef.

parent 25dc403c
No related branches found
No related tags found
1 merge request!396Avx512 fixes
...@@ -373,7 +373,6 @@ void test_interactions(struct part test_part, struct part *parts, size_t count, ...@@ -373,7 +373,6 @@ void test_interactions(struct part test_part, struct part *parts, size_t count,
vector hi_vec, hi_inv_vec, vix_vec, viy_vec, viz_vec; vector hi_vec, hi_inv_vec, vix_vec, viy_vec, viz_vec;
vector rhoSum, rho_dhSum, wcountSum, wcount_dhSum, div_vSum, curlvxSum, vector rhoSum, rho_dhSum, wcountSum, wcount_dhSum, div_vSum, curlvxSum,
curlvySum, curlvzSum; curlvySum, curlvzSum;
mask_t mask, mask2;
rhoSum.v = vec_set1(0.f); rhoSum.v = vec_set1(0.f);
rho_dhSum.v = vec_set1(0.f); rho_dhSum.v = vec_set1(0.f);
...@@ -390,14 +389,19 @@ void test_interactions(struct part test_part, struct part *parts, size_t count, ...@@ -390,14 +389,19 @@ void test_interactions(struct part test_part, struct part *parts, size_t count,
viz_vec.v = vec_load(&vizq[0]); viz_vec.v = vec_load(&vizq[0]);
hi_inv_vec = vec_reciprocal(hi_vec); hi_inv_vec = vec_reciprocal(hi_vec);
mask_t mask;
vec_init_mask(mask); vec_init_mask(mask);
#if (NUM_VEC_PROC_INT == 2)
mask_t mask2;
vec_init_mask(mask2); vec_init_mask(mask2);
#endif
const ticks vec_tic = getticks(); const ticks vec_tic = getticks();
for (size_t i = 0; i < count; i += NUM_VEC_PROC_INT * VEC_SIZE) { for (size_t i = 0; i < count; i += NUM_VEC_PROC_INT * VEC_SIZE) {
/* Interleave two vectors for interaction. */ /* Interleave two vectors for interaction. */
#if (NUM_VEC_PROC_INT == 2) #if (NUM_VEC_PROC_INT == 2)
IACT_VEC(&(r2q[i]), &(dxq[i]), &(dyq[i]), &(dzq[i]), (hi_inv_vec), IACT_VEC(&(r2q[i]), &(dxq[i]), &(dyq[i]), &(dzq[i]), (hi_inv_vec),
(vix_vec), (viy_vec), (viz_vec), &(vjxq[i]), &(vjyq[i]), (vix_vec), (viy_vec), (viz_vec), &(vjxq[i]), &(vjyq[i]),
...@@ -411,11 +415,10 @@ void test_interactions(struct part test_part, struct part *parts, size_t count, ...@@ -411,11 +415,10 @@ void test_interactions(struct part test_part, struct part *parts, size_t count,
dy.v = vec_load(&(dyq[i])); dy.v = vec_load(&(dyq[i]));
dz.v = vec_load(&(dzq[i])); dz.v = vec_load(&(dzq[i]));
IACT_VEC(&r2, &dx, &dy, &dz, (hi_inv_vec), IACT_VEC(&r2, &dx, &dy, &dz, (hi_inv_vec), (vix_vec), (viy_vec),
(vix_vec), (viy_vec), (viz_vec), &(vjxq[i]), &(vjyq[i]), (viz_vec), &(vjxq[i]), &(vjyq[i]), &(vjzq[i]), &(mjq[i]),
&(vjzq[i]), &(mjq[i]), &rhoSum, &rho_dhSum, &wcountSum, &rhoSum, &rho_dhSum, &wcountSum, &wcount_dhSum, &div_vSum,
&wcount_dhSum, &div_vSum, &curlvxSum, &curlvySum, &curlvzSum, &curlvxSum, &curlvySum, &curlvzSum, mask);
mask);
#endif #endif
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment