From d73372d8c391f4fcdaf7be5b82d36e507e2cedfb Mon Sep 17 00:00:00 2001
From: James Willis <james.s.willis@durham.ac.uk>
Date: Tue, 8 Aug 2017 12:02:12 +0100
Subject: [PATCH] Changed vec_init_mask to vec_init_mask_true.
---
src/runner_doiact_vec.c | 12 ++++++------
src/vector.h | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/runner_doiact_vec.c b/src/runner_doiact_vec.c
index 1a2d123510..c18ae542d7 100644
--- a/src/runner_doiact_vec.c
+++ b/src/runner_doiact_vec.c
@@ -73,8 +73,8 @@ __attribute__((always_inline)) INLINE static void calcRemInteractions(
*icount_align += pad;
/* Initialise masks to true. */
- vec_init_mask(int_mask);
- vec_init_mask(int_mask2);
+ vec_init_mask_true(int_mask);
+ vec_init_mask_true(int_mask2);
/* Pad secondary cache so that there are no contributions in the interaction
* function. */
@@ -205,8 +205,8 @@ __attribute__((always_inline)) INLINE static void storeInteractions(
v_hi_inv, v_vix, v_viy, v_viz, &icount_align);
mask_t int_mask, int_mask2;
- vec_init_mask(int_mask);
- vec_init_mask(int_mask2);
+ vec_init_mask_true(int_mask);
+ vec_init_mask_true(int_mask2);
/* Perform interactions. */
for (int pjd = 0; pjd < icount_align; pjd += (NUM_VEC_PROC * VEC_SIZE)) {
@@ -545,8 +545,8 @@ __attribute__((always_inline)) INLINE void runner_doself1_density_vec(
/* Initialise masks to true in case remainder interactions have been
* performed. */
mask_t int_mask, int_mask2;
- vec_init_mask(int_mask);
- vec_init_mask(int_mask2);
+ vec_init_mask_true(int_mask);
+ vec_init_mask_true(int_mask2);
/* Perform interaction with 2 vectors. */
for (int pjd = 0; pjd < icount_align; pjd += (num_vec_proc * VEC_SIZE)) {
diff --git a/src/vector.h b/src/vector.h
index bddad1df48..494d338fb3 100644
--- a/src/vector.h
+++ b/src/vector.h
@@ -85,7 +85,7 @@
#define vec_mask_and(a, b) _mm512_kand(a, b)
#define vec_and_mask(a, mask) \
_mm512_maskz_expand_ps(mask, a) /* TODO: Alternative needs to be found. */
-#define vec_init_mask(mask) mask = 0xFFFF
+#define vec_init_mask_true(mask) mask = 0xFFFF
#define vec_zero_mask(mask) mask = 0
#define vec_create_mask(mask, cond) mask = cond
#define vec_pad_mask(mask, pad) mask = mask >> (pad)
@@ -181,7 +181,7 @@
#define vec_and(a, b) _mm256_and_ps(a, b)
#define vec_mask_and(a, b) _mm256_and_ps(a.v, b.v)
#define vec_and_mask(a, mask) _mm256_and_ps(a, mask.v)
-#define vec_init_mask(mask) mask.m = vec_setint1(0xFFFFFFFF)
+#define vec_init_mask_true(mask) mask.m = vec_setint1(0xFFFFFFFF)
#define vec_create_mask(mask, cond) mask.v = cond
#define vec_zero_mask(mask) mask.v = vec_setzero()
#define vec_pad_mask(mask, pad) \
--
GitLab