From 93c7e69916c598868710328fee28cae89c4730bd Mon Sep 17 00:00:00 2001
From: James Willis <james.s.willis@durham.ac.uk>
Date: Sun, 30 Jul 2017 14:04:43 +0100
Subject: [PATCH] Move mask2 inside of #ifdef.
---
tests/benchmarkInteractions.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/tests/benchmarkInteractions.c b/tests/benchmarkInteractions.c
index 23ddde0ae6..c32d0cfcfd 100644
--- a/tests/benchmarkInteractions.c
+++ b/tests/benchmarkInteractions.c
@@ -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 rhoSum, rho_dhSum, wcountSum, wcount_dhSum, div_vSum, curlvxSum,
curlvySum, curlvzSum;
- mask_t mask, mask2;
rhoSum.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,
viz_vec.v = vec_load(&vizq[0]);
hi_inv_vec = vec_reciprocal(hi_vec);
+
+ mask_t mask;
vec_init_mask(mask);
+#if (NUM_VEC_PROC_INT == 2)
+ mask_t mask2;
vec_init_mask(mask2);
+#endif
const ticks vec_tic = getticks();
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)
IACT_VEC(&(r2q[i]), &(dxq[i]), &(dyq[i]), &(dzq[i]), (hi_inv_vec),
(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,
dy.v = vec_load(&(dyq[i]));
dz.v = vec_load(&(dzq[i]));
- IACT_VEC(&r2, &dx, &dy, &dz, (hi_inv_vec),
- (vix_vec), (viy_vec), (viz_vec), &(vjxq[i]), &(vjyq[i]),
- &(vjzq[i]), &(mjq[i]), &rhoSum, &rho_dhSum, &wcountSum,
- &wcount_dhSum, &div_vSum, &curlvxSum, &curlvySum, &curlvzSum,
- mask);
+ IACT_VEC(&r2, &dx, &dy, &dz, (hi_inv_vec), (vix_vec), (viy_vec),
+ (viz_vec), &(vjxq[i]), &(vjyq[i]), &(vjzq[i]), &(mjq[i]),
+ &rhoSum, &rho_dhSum, &wcountSum, &wcount_dhSum, &div_vSum,
+ &curlvxSum, &curlvySum, &curlvzSum, mask);
#endif
}
--
GitLab